[evolution] Updated Galician translations



commit ff1db12d7f06e3c3739f0aec7543552d33e34739
Author: Fran DiÃguez <fran dieguez mabishu com>
Date:   Sun Jan 15 01:43:17 2012 +0100

    Updated Galician translations

 po/gl.po |12394 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 6203 insertions(+), 6191 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index ced5cfe..72814d7 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -16,15 +16,15 @@
 # AntÃn MÃixome <meixome mancomun org>, 2009.
 # AntÃn MÃixome <meixome certima net>, 2010.
 # Fran DiÃguez <frandieguez gnome org>, 2009, 2010, 2011.
-# Fran Dieguez <frandieguez gnome org>, 2010, 2011.
+# Fran Dieguez <frandieguez gnome org>, 2010, 2011, 2012.
 #
 #: ../shell/main.c:570
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-master-po-gl-53747.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-15 23:35+0100\n"
-"PO-Revision-Date: 2011-12-15 23:43+0100\n"
+"POT-Creation-Date: 2012-01-15 01:40+0100\n"
+"PO-Revision-Date: 2012-01-15 01:43+0100\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
 "Language-Team: Galician <gnome-l10n-gl gnome org>\n"
 "Language: gl\n"
@@ -33,199 +33,208 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:1
+msgid "This address book could not be opened."
+msgstr "Non foi posÃbel abrir esta axenda de enderezos."
+
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
-"'{0}' is a read-only address book and cannot be modified. Please select a "
-"different address book from the side bar in the Contacts view."
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
 msgstr ""
-"Â{0} à unha axenda de enderezos sà de lectura e non à posÃbel modificala. "
-"Seleccione unha axenda de enderezos diferente na barra lateral en Contactos."
+"Este servidor de axenda de enderezos pode estar inaccesÃbel, o nome do "
+"servidor quizais estea escrito incorrectamente ou pode que caese a conexiÃn "
+"de rede."
 
 #: ../addressbook/addressbook.error.xml.h:3
-msgid ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
-msgstr ""
-"Xa existe un contacto con este enderezo. Desexa, de todas formas, engadir "
-"unha tarxeta nova co mesmo enderezo?"
+msgid "Failed to authenticate with LDAP server."
+msgstr "Produciuse un fallo ao autenticarse no servidor LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid ""
-"A contact list named '{0}' is already in this contact list. Would you like "
-"to add it anyway?"
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
 msgstr ""
-"Xa existe a lista de contactos Â{0}Â nesta lista de contactos. Desexa "
-"engadila de todas as formas?"
+"Comprobe se o seu contrasinal està escrito correctamente e que usa un mÃtodo "
+"de inicio de sesiÃn compatÃbel. Lembre que moitos contrasinais diferencian "
+"entre maiÃsculas e minÃsculas; pode ser que a sÃa tecla Bloq maiÃs estea "
+"activada."
 
 #: ../addressbook/addressbook.error.xml.h:5
-msgid "Add with duplicates"
-msgstr "Engadir sen duplicados"
+msgid "This address book server does not have any suggested search bases."
+msgstr ""
+"Este servidor de axenda de enderezos non ten ningunha base de busca suxerida."
 
 #: ../addressbook/addressbook.error.xml.h:6
-msgid "Address '{0}' already exists."
-msgstr "O enderezo Â{0}Â xa existe."
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"Pode que este servidor LDAP use unha versiÃn de LDAP antiga que non permite "
+"esta funcionalidade ou que estea mal configurada. Pida bases de busca "
+"compatÃbeis ao seu administrador de sistema."
 
 #: ../addressbook/addressbook.error.xml.h:7
-msgid "Cannot add new contact"
-msgstr "Non à posÃbel engadir un contacto novo"
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Este servidor non à compatÃbel co esquema de informaciÃn LDAPv3."
 
 #: ../addressbook/addressbook.error.xml.h:8
-msgid "Cannot move contact."
-msgstr "Non à posÃbel mover o contacto."
+msgid "Could not get schema information for LDAP server."
+msgstr "Non foi posÃbel obter a informaciÃn do esquema para o servidor LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:9
-msgid "Category editor not available."
-msgstr "O editor de categorÃas non està dispoÃÃbel."
+msgid "LDAP server did not respond with valid schema information."
+msgstr "O servidor LDAP non respondeu cunha informaciÃn do esquema correcta."
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"Comprobe se o seu contrasinal està escrito correctamente e que usa un mÃtodo "
-"de inicio de sesiÃn compatÃbel. Lembre que moitos contrasinais diferencian "
-"entre maiÃsculas e minÃsculas; pode ser que a sÃa tecla Bloq maiÃs estea "
-"activada."
+msgid "Could not remove address book."
+msgstr "Non foi posÃbel eliminar a axenda de enderezos."
 
 #: ../addressbook/addressbook.error.xml.h:11
-msgid "Could not get schema information for LDAP server."
-msgstr "Non foi posÃbel obter a informaciÃn do esquema para o servidor LDAP."
+msgid "Delete address book '{0}'?"
+msgstr "Desexa eliminar a axenda de enderezos Â{0}Â?"
 
 #: ../addressbook/addressbook.error.xml.h:12
-msgid "Could not remove address book."
-msgstr "Non foi posÃbel eliminar a axenda de enderezos."
+msgid "This address book will be removed permanently."
+msgstr "Esta axenda de enderezos eliminarase permanentemente."
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid ""
-"Currently you can only access the GroupWise System Address Book from "
-"Evolution. Please use some other GroupWise mail client once to get your "
-"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr ""
-"Actualmente sà pode acceder à axenda de enderezos do sistema GropuWise desde "
-"o Evolution. Empregue polo menos unha vez algÃn cliente de Correo GroupWise "
-"para obter os seus contactos frecuentes do Groupwise e os seus cartafoles de "
-"contactos persoais."
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:63
+msgid "Do _Not Delete"
+msgstr "_Non eliminar"
 
 #: ../addressbook/addressbook.error.xml.h:14
-msgid "Delete address book '{0}'?"
-msgstr "Desexa eliminar a axenda de enderezos Â{0}Â?"
+msgid "Category editor not available."
+msgstr "O editor de categorÃas non està dispoÃÃbel."
 
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../calendar/calendar.error.xml.h:37 ../mail/mail.error.xml.h:44
-msgid "Do _Not Delete"
-msgstr "_Non eliminar"
+msgid "Unable to open address book"
+msgstr "Non à posÃbel abrir a axenda de enderezos"
 
 #: ../addressbook/addressbook.error.xml.h:16
-msgid "Error saving {0} to {1}: {2}"
-msgstr "Produciuse un erro ao gardar {0} en {1}: {2}"
+msgid "Unable to perform search."
+msgstr "Non à posÃbel realizar a busca."
 
 #: ../addressbook/addressbook.error.xml.h:17
-msgid "Failed to authenticate with LDAP server."
-msgstr "Produciuse un fallo ao autenticarse no servidor LDAP."
+msgid "Would you like to save your changes?"
+msgstr "Desexa gardar os cambios?"
 
 #: ../addressbook/addressbook.error.xml.h:18
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
-msgid "Failed to delete contact"
-msgstr "Produciuse un fallo ao eliminar o contacto"
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr "Fixo modificaciÃns neste contacto. Desexa gardar esas modificaciÃns?"
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "GroupWise Address book creation:"
-msgstr "CreaciÃn dunha axenda de enderezos do GroupWise:"
+msgid "_Discard"
+msgstr "Re_xeitar"
 
 #: ../addressbook/addressbook.error.xml.h:20
-msgid "LDAP server did not respond with valid schema information."
-msgstr "O servidor LDAP non respondeu cunha informaciÃn do esquema correcta."
+msgid "Cannot move contact."
+msgstr "Non à posÃbel mover o contacto."
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "List '{0}' is already in this contact list."
-msgstr "A lista Â{0} xa està na lista de contactos."
+msgid ""
+"You are attempting to move a contact from one address book to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"Està tentando mover un contacto dunha axenda de enderezos a outra pero non à "
+"posÃbel eliminalo da fonte. No seu lugar desexa gardar unha copia?"
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid "Skip duplicates"
-msgstr "Omitir duplicados"
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr "A imaxe que seleccionou à grande. Desexa redimensionala e gardala?"
 
 #: ../addressbook/addressbook.error.xml.h:23
-msgid "Some addresses already exist in this contact list."
-msgstr "AlgÃns enderezos xa existen nesta lista de contactos."
+msgid "_Resize"
+msgstr "_Redimensionar"
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "Some features may not work properly with your current server"
-msgstr ""
-"Algunhas caracterÃsticas pode que non funcionen axeitadamente co servidor "
-"actual"
+msgid "_Use as it is"
+msgstr "_Usar tal como estÃ"
 
 #: ../addressbook/addressbook.error.xml.h:25
-msgid "The Evolution address book has quit unexpectedly."
-msgstr "A axenda de enderezos do Evolution saÃu inesperadamente."
+msgid "_Do not save"
+msgstr "Non gar_dar"
 
 #: ../addressbook/addressbook.error.xml.h:26
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
-msgstr "A imaxe que seleccionou à grande. Desexa redimensionala e gardala?"
+msgid "Unable to save {0}."
+msgstr "Non à posÃbel gardar {0}."
 
 #: ../addressbook/addressbook.error.xml.h:27
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-"Pode que este servidor LDAP use unha versiÃn de LDAP antiga que non permite "
-"esta funcionalidade ou que estea mal configurada. Pida bases de busca "
-"compatÃbeis ao seu administrador de sistema."
+msgid "Error saving {0} to {1}: {2}"
+msgstr "Produciuse un erro ao gardar {0} en {1}: {2}"
 
 #: ../addressbook/addressbook.error.xml.h:28
-msgid "This address book could not be opened."
-msgstr "Non foi posÃbel abrir esta axenda de enderezos."
-
-#: ../addressbook/addressbook.error.xml.h:29
-msgid "This address book server does not have any suggested search bases."
-msgstr ""
-"Este servidor de axenda de enderezos non ten ningunha base de busca suxerida."
+msgid "The Evolution address book has quit unexpectedly."
+msgstr "A axenda de enderezos do Evolution saÃu inesperadamente."
 
+#. Translators: {0} is replaced with an address book name which will not be available
 #: ../addressbook/addressbook.error.xml.h:30
 msgid ""
-"This address book server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
-"Este servidor de axenda de enderezos pode estar inaccesÃbel, o nome do "
-"servidor quizais estea escrito incorrectamente ou pode que caese a conexiÃn "
-"de rede."
+"Os contactos para {0} non estarÃn dispoÃÃbeis atà que reinicie o Evolution."
 
 #: ../addressbook/addressbook.error.xml.h:31
-msgid "This address book will be removed permanently."
-msgstr "Esta axenda de enderezos eliminarase permanentemente."
+msgid "Address '{0}' already exists."
+msgstr "O enderezo Â{0}Â xa existe."
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid "This server does not support LDAPv3 schema information."
-msgstr "Este servidor non à compatÃbel co esquema de informaciÃn LDAPv3."
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
+msgstr ""
+"Xa existe un contacto con este enderezo. Desexa, de todas formas, engadir "
+"unha tarxeta nova co mesmo enderezo?"
 
-#: ../addressbook/addressbook.error.xml.h:33
-msgid "Unable to open address book"
-msgstr "Non à posÃbel abrir a axenda de enderezos"
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:595
+#: ../widgets/table/e-table-config.ui.h:6
+msgid "_Add"
+msgstr "Eng_adir"
 
 #: ../addressbook/addressbook.error.xml.h:34
-msgid "Unable to perform search."
-msgstr "Non à posÃbel realizar a busca."
+msgid "Some addresses already exist in this contact list."
+msgstr "AlgÃns enderezos xa existen nesta lista de contactos."
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid "Unable to save {0}."
-msgstr "Non à posÃbel gardar {0}."
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr ""
+"Està tentando engadir enderezos que xa son parte desta lista. Desexa "
+"engadilo de todas as formas?"
 
 #: ../addressbook/addressbook.error.xml.h:36
-msgid "Would you like to save your changes?"
-msgstr "Desexa gardar os cambios?"
+msgid "Skip duplicates"
+msgstr "Omitir duplicados"
 
 #: ../addressbook/addressbook.error.xml.h:37
+msgid "Add with duplicates"
+msgstr "Engadir sen duplicados"
+
+#: ../addressbook/addressbook.error.xml.h:38
+msgid "List '{0}' is already in this contact list."
+msgstr "A lista Â{0} xa està na lista de contactos."
+
+#: ../addressbook/addressbook.error.xml.h:39
 msgid ""
-"You are attempting to move a contact from one address book to another but it "
-"cannot be removed from the source. Do you want to save a copy instead?"
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
 msgstr ""
-"Està tentando mover un contacto dunha axenda de enderezos a outra pero non à "
-"posÃbel eliminalo da fonte. No seu lugar desexa gardar unha copia?"
+"Xa existe a lista de contactos Â{0}Â nesta lista de contactos. Desexa "
+"engadila de todas as formas?"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:40
+msgid "Some features may not work properly with your current server"
+msgstr ""
+"Algunhas caracterÃsticas pode que non funcionen axeitadamente co servidor "
+"actual"
+
+#: ../addressbook/addressbook.error.xml.h:41
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -235,336 +244,327 @@ msgstr ""
 "problemas ao usar o Evolution. Para ter os mellores resultados, o servidor "
 "deberÃa actualizarse a unha versiÃn compatÃbel"
 
-#: ../addressbook/addressbook.error.xml.h:39
-msgid ""
-"You are trying to add addresses that are part of this list already. Would "
-"you like to add them anyway?"
-msgstr ""
-"Està tentando engadir enderezos que xa son parte desta lista. Desexa "
-"engadilo de todas as formas?"
-
-#: ../addressbook/addressbook.error.xml.h:40
-msgid "You do not have permission to delete contacts in this address book."
-msgstr "Non ten permisos para eliminar contactos desta axenda de enderezos."
-
-#: ../addressbook/addressbook.error.xml.h:41
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
-msgstr "Fixo modificaciÃns neste contacto. Desexa gardar esas modificaciÃns?"
+#: ../addressbook/addressbook.error.xml.h:42
+msgid "GroupWise Address book creation:"
+msgstr "CreaciÃn dunha axenda de enderezos do GroupWise:"
 
-#. Translators: {0} is replaced with an address book name which will not be available
 #: ../addressbook/addressbook.error.xml.h:43
 msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
-"Os contactos para {0} non estarÃn dispoÃÃbeis atà que reinicie o Evolution."
+"Actualmente sà pode acceder à axenda de enderezos do sistema GropuWise desde "
+"o Evolution. Empregue polo menos unha vez algÃn cliente de Correo GroupWise "
+"para obter os seus contactos frecuentes do Groupwise e os seus cartafoles de "
+"contactos persoais."
 
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:595
-#: ../widgets/table/e-table-config.ui.h:18
-msgid "_Add"
-msgstr "Eng_adir"
+#: ../addressbook/addressbook.error.xml.h:44
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
+msgid "Failed to delete contact"
+msgstr "Produciuse un fallo ao eliminar o contacto"
 
 #: ../addressbook/addressbook.error.xml.h:45
-msgid "_Discard"
-msgstr "Re_xeitar"
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "Non ten permisos para eliminar contactos desta axenda de enderezos."
 
 #: ../addressbook/addressbook.error.xml.h:46
-msgid "_Do not save"
-msgstr "Non gar_dar"
-
-#: ../addressbook/addressbook.error.xml.h:47
-msgid "_Resize"
-msgstr "_Redimensionar"
+msgid "Cannot add new contact"
+msgstr "Non à posÃbel engadir un contacto novo"
 
+#. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:48
-msgid "_Use as it is"
-msgstr "_Usar tal como estÃ"
+msgid ""
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr ""
+"Â{0} à unha axenda de enderezos sà de lectura e non à posÃbel modificala. "
+"Seleccione unha axenda de enderezos diferente na barra lateral en Contactos."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:717
-#: ../calendar/gui/e-calendar-view.c:2068
-msgid "Anniversary"
-msgstr "Aniversario"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:654
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:676
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2937
+msgid "Contact Editor"
+msgstr "Editor de contactos"
 
-#. XXX Allow the category icons to be referenced as named
-#. *     icons, since GtkAction does not support GdkPixbufs.
-#. Get the icon file for some default category.  Doesn't matter
-#. * which, so long as it has an icon.  We're just interested in
-#. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:716
-#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:78
-#: ../shell/main.c:134
-msgid "Birthday"
-msgstr "Aniversario"
+msgid "Image"
+msgstr "Imaxe"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+msgid "Nic_kname:"
+msgstr "_Alcume:"
 
-#. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
-msgid "Blog:"
-msgstr "blogue:"
+msgid "_File under:"
+msgstr "_Arquivar como:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+msgid "_Where:"
+msgstr "_Onde:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:16
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorÃasâ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-msgid "Calendar:"
-msgstr "_Calendario:"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:990
-msgid "Contact"
-msgstr "Contacto"
+msgid "Full _Name..."
+msgstr "_Nome completoâ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:654
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:676
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2933
-msgid "Contact Editor"
-msgstr "Editor de contactos"
+msgid "_Wants to receive HTML mail"
+msgstr "_Desexa recibir o correo en HTML"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:390
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
-#: ../addressbook/gui/widgets/eab-contact-display.c:1043
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/merging/eab-contact-merging.c:392
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:1046
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 #: ../smime/lib/e-cert.c:833
 msgid "Email"
 msgstr "Correo electrÃnico"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
-msgid "Free/Busy:"
-msgstr "_DispoÃibilidade:"
+msgid "Telephone"
+msgstr "TelÃfono"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
-msgid "Full _Name..."
-msgstr "_Nome completoâ"
+msgid "Instant Messaging"
+msgstr "MensaxarÃa instantÃnea"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
-#: ../addressbook/gui/widgets/eab-contact-display.c:78
-#: ../addressbook/gui/widgets/eab-contact-display.c:1348
-#: ../widgets/misc/e-contact-map.c:297
-msgid "Home"
-msgstr "Particular"
+#: ../addressbook/importers/evolution-vcard-importer.c:990
+msgid "Contact"
+msgstr "Contacto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-msgid "Home Page:"
-msgstr "PÃxina web:"
+msgid "_Home Page:"
+msgstr "PÃxi_na web:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-msgid "Image"
-msgstr "Imaxe"
+#: ../calendar/gui/dialogs/event-page.c:710
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../plugins/itip-formatter/itip-view.c:1971
+msgid "_Calendar:"
+msgstr "_Calendario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-msgid "Instant Messaging"
-msgstr "MensaxarÃa instantÃnea"
+msgid "_Free/Busy:"
+msgstr "_DispoÃibilidade:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
-msgid "Job"
-msgstr "Traballo"
+msgid "_Video Chat:"
+msgstr "_Videoconferencia:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
-msgid "Mailing Address"
-msgstr "Enderezo de correo"
+msgid "Home Page:"
+msgstr "PÃxina web:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../calendar/gui/dialogs/task-details-page.ui.h:11
-msgid "Miscellaneous"
-msgstr "Varios"
+msgid "Calendar:"
+msgstr "_Calendario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-msgid "Nic_kname:"
-msgstr "_Alcume:"
+msgid "Free/Busy:"
+msgstr "_DispoÃibilidade:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-msgid "Notes"
-msgstr "Notas"
+msgid "Video Chat:"
+msgstr "_Videoconferencia:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
-#: ../addressbook/gui/widgets/eab-contact-display.c:79
-#: ../addressbook/gui/widgets/eab-contact-display.c:409
-#: ../calendar/gui/e-cal-model.c:3445
-msgid "Other"
-msgstr "Outros"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
-msgid "Personal Information"
-msgstr "Datos persoais"
+msgid "_Blog:"
+msgstr "_blogue:"
 
+#. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
-msgid "Telephone"
-msgstr "TelÃfono"
+msgid "Blog:"
+msgstr "blogue:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Video Chat:"
-msgstr "_Videoconferencia:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "Enderezos web"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web addresses"
 msgstr "Enderezos web"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+msgid "_Profession:"
+msgstr "_ProfesiÃn:"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
-#: ../addressbook/gui/widgets/eab-contact-display.c:77
-#: ../addressbook/gui/widgets/eab-contact-display.c:696
-#: ../addressbook/gui/widgets/eab-contact-display.c:1345
-#: ../widgets/misc/e-contact-map.c:305
-msgid "Work"
-msgstr "Traballo"
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+msgid "_Title:"
+msgstr "_TÃtulo:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
-msgid "_Address:"
-msgstr "_Enderezo:"
+msgid "_Company:"
+msgstr "_Empresa:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
-msgid "_Anniversary:"
-msgstr "_Aniversario:"
+msgid "_Department:"
+msgstr "_Departamento:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-msgid "_Assistant:"
-msgstr "_Secretaria/o:"
+msgid "_Manager:"
+msgstr "_Director:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
-msgid "_Birthday:"
-msgstr "_Aniversario:"
+msgid "_Assistant:"
+msgstr "_Secretaria/o:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
-msgid "_Blog:"
-msgstr "_blogue:"
+msgid "Job"
+msgstr "Traballo"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:710
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-#: ../plugins/itip-formatter/itip-view.c:1971
-msgid "_Calendar:"
-msgstr "_Calendario:"
+msgid "_Office:"
+msgstr "_Oficina:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
-msgid "_City:"
-msgstr "_Cidade:"
+msgid "_Spouse:"
+msgstr "_CÃnxuxe:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
-msgid "_Company:"
-msgstr "_Empresa:"
+msgid "_Birthday:"
+msgstr "_Aniversario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
-msgid "_Country:"
-msgstr "_PaÃs:"
+msgid "_Anniversary:"
+msgstr "_Aniversario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-msgid "_Department:"
-msgstr "_Departamento:"
+#: ../addressbook/gui/widgets/eab-contact-display.c:720
+#: ../calendar/gui/e-calendar-view.c:2068
+msgid "Anniversary"
+msgstr "Aniversario"
 
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-msgid "_File under:"
-msgstr "_Arquivar como:"
+#: ../addressbook/gui/widgets/eab-contact-display.c:719
+#: ../calendar/gui/e-calendar-view.c:2067 ../capplet/anjal-settings-main.c:78
+#: ../shell/main.c:134
+msgid "Birthday"
+msgstr "Aniversario"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
-msgid "_Free/Busy:"
-msgstr "_DispoÃibilidade:"
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+msgid "Miscellaneous"
+msgstr "Varios"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
-msgid "_Home Page:"
-msgstr "PÃxi_na web:"
+msgid "Personal Information"
+msgstr "Datos persoais"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
-msgid "_Manager:"
-msgstr "_Director:"
+msgid "_City:"
+msgstr "_Cidade:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
-msgid "_Office:"
-msgstr "_Oficina:"
+msgid "_Zip/Postal Code:"
+msgstr "_CÃdigo Postal:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
-msgid "_PO Box:"
-msgstr "A_partado de correos:"
+msgid "_State/Province:"
+msgstr "Provincia/AutonomÃa:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
-msgid "_Profession:"
-msgstr "_ProfesiÃn:"
+msgid "_Country:"
+msgstr "_PaÃs:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
-msgid "_Spouse:"
-msgstr "_CÃnxuxe:"
+msgid "_PO Box:"
+msgstr "A_partado de correos:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
-msgid "_State/Province:"
-msgstr "Provincia/AutonomÃa:"
+msgid "_Address:"
+msgstr "_Enderezo:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/fullname.ui.h:17
-msgid "_Title:"
-msgstr "_TÃtulo:"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:1351
+#: ../widgets/misc/e-contact-map.c:297
+msgid "Home"
+msgstr "Particular"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-msgid "_Video Chat:"
-msgstr "_Videoconferencia:"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
+#: ../addressbook/gui/widgets/eab-contact-display.c:699
+#: ../addressbook/gui/widgets/eab-contact-display.c:1348
+#: ../widgets/misc/e-contact-map.c:305
+msgid "Work"
+msgstr "Traballo"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-msgid "_Wants to receive HTML mail"
-msgstr "_Desexa recibir o correo en HTML"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../addressbook/gui/widgets/eab-contact-display.c:79
+#: ../addressbook/gui/widgets/eab-contact-display.c:412
+#: ../calendar/gui/e-cal-model.c:3445
+msgid "Other"
+msgstr "Outros"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
-msgid "_Where:"
-msgstr "_Onde:"
+msgid "Mailing Address"
+msgstr "Enderezo de correo"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
-msgid "_Zip/Postal Code:"
-msgstr "_CÃdigo Postal:"
+msgid "Notes"
+msgstr "Notas"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../addressbook/gui/widgets/eab-contact-display.c:663
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/widgets/eab-contact-display.c:665
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:663
+#: ../addressbook/gui/widgets/eab-contact-display.c:666
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:661
+#: ../addressbook/gui/widgets/eab-contact-display.c:664
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:662
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:661
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:664
+#: ../addressbook/gui/widgets/eab-contact-display.c:667
 msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:220
-#: ../addressbook/gui/widgets/eab-gui-util.c:473
+#: ../addressbook/gui/widgets/eab-gui-util.c:481
 msgid "Error adding contact"
 msgstr "Produciuse un erro ao engadir o contacto"
 
@@ -577,20 +577,20 @@ msgid "Error removing contact"
 msgstr "Produciuse un erro ao eliminar o contacto"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:670
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2927
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2931
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3407
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3411
 msgid "Please select an image for this contact"
 msgstr "Escolla unha imaxe para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3408
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3412
 msgid "_No image"
 msgstr "_Sen imaxe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3739
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -598,28 +598,28 @@ msgstr ""
 "Os datos do contacto son incorrectos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3741
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3745
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Â%s ten un formato incorrecto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3748
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3752
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "Â%s non pode ser unha data no futuro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3756
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3760
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sÂ%s ten un formato incorrecto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3769
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3783
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3773
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3787
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sÂ%s està baleiro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3798
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3802
 msgid "Invalid contact."
 msgstr "Contacto incorrecto."
 
@@ -644,67 +644,67 @@ msgid "_Select Address Book"
 msgstr "_Seleccionar a axenda de enderezos"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
-msgid "Dr."
-msgstr "Dr."
+msgid "Mr."
+msgstr "Sr."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:2
-msgid "Esq."
-msgstr "Esq."
+msgid "Mrs."
+msgstr "Sra."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Full Name"
-msgstr "Nome completo"
+msgid "Ms."
+msgstr "Sra. ou Srta."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:4
-msgid "I"
-msgstr "I"
+msgid "Miss"
+msgstr "Srta."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:5
-msgid "II"
-msgstr "II"
+msgid "Dr."
+msgstr "Dr."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:6
-msgid "III"
-msgstr "III"
+msgid "Sr."
+msgstr "Sr."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:7
 msgid "Jr."
 msgstr "fillo"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:8
-msgid "Miss"
-msgstr "Srta."
+msgid "I"
+msgstr "I"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:9
-msgid "Mr."
-msgstr "Sr."
+msgid "II"
+msgstr "II"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:10
-msgid "Mrs."
-msgstr "Sra."
+msgid "III"
+msgstr "III"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:11
-msgid "Ms."
-msgstr "Sra. ou Srta."
+msgid "Esq."
+msgstr "Esq."
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:12
-msgid "Sr."
-msgstr "Sr."
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Full Name"
+msgstr "Nome completo"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "_Nome:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
-msgid "_Last:"
-msgstr "_Apelido 2:"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "_Apelido 1:"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:16
+msgid "_Last:"
+msgstr "_Apelido 2:"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Suffix:"
 msgstr "_Sufixo:"
 
@@ -714,27 +714,27 @@ msgid "Contact List Editor"
 msgstr "Editor da lista de contactos"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+msgid "_List name:"
+msgstr "Nome da _lista:"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "Members"
 msgstr "Membros"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+msgid "_Type an email address or drag a contact into the list below:"
+msgstr ""
+"_Escriba un enderezo de correo ou arrastre un contacto à lista de embaixo:"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ocultar os enderezos cando se envÃe un correo a esta lista"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
-msgid "_List name:"
-msgstr "Nome da _lista:"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:175
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
+#: ../mail/mail-config.ui.h:156
 msgid "_Select..."
 msgstr "_Seleccionarâ"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
-msgid "_Type an email address or drag a contact into the list below:"
-msgstr ""
-"_Escriba un enderezo de correo ou arrastre un contacto à lista de embaixo:"
-
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:885
 msgid "Contact List Members"
 msgstr "Membros da lista de contactos"
@@ -756,20 +756,11 @@ msgid "Error removing list"
 msgstr "Produciuse un erro ao eliminar a lista"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
-msgid "Changed Contact:"
-msgstr "Contacto modificado:"
-
-#. Translators: Heading of the contact which has same name or email address in this folder already.
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
-msgid "Conflicting Contact:"
-msgstr "Contacto en conflito:"
-
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Detectouse un contacto duplicado"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
 msgid ""
 "The name or email of this contact already exists in this folder. Would you "
 "like to save the changes anyway?"
@@ -777,15 +768,21 @@ msgstr ""
 "O nome ou o enderezo de correo electrÃnico deste contacto xa existe neste "
 "cartafol. Desexa gardalos cambios de todas formas?"
 
+#. Translators: Heading of the contact which has same name or email address in this folder already.
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
+msgid "Conflicting Contact:"
+msgstr "Contacto en conflito:"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
+msgid "Changed Contact:"
+msgstr "Contacto modificado:"
+
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-msgid "New Contact:"
-msgstr "Contacto novo:"
+#: ../addressbook/gui/merging/eab-contact-merging.c:338
+msgid "_Merge"
+msgstr "_Combinar"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
-msgid "Original Contact:"
-msgstr "Contacto orixinal:"
-
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -793,24 +790,22 @@ msgstr ""
 "O nome ou enderezo de correo deste contacto xa existe neste\n"
 "cartafol. Desexa engadilo de todas as formas?"
 
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:5
+msgid "Original Contact:"
+msgstr "Contacto orixinal:"
+
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:336
-msgid "_Merge"
-msgstr "_Combinar"
+msgid "New Contact:"
+msgstr "Contacto novo:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:319
+#: ../addressbook/gui/merging/eab-contact-merging.c:320
 msgid "Merge Contact"
 msgstr "Combinar o contacto"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:1063
-#: ../modules/calendar/e-cal-shell-view-actions.c:1734
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:987
-msgid "Any field contains"
-msgstr "Calquera campo contÃn"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1077
+msgid "Name contains"
+msgstr "O nome contÃn"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
 #: ../modules/addressbook/e-book-shell-view-actions.c:1070
@@ -818,9 +813,14 @@ msgid "Email begins with"
 msgstr "O correo comeza por"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:1077
-msgid "Name contains"
-msgstr "O nome contÃn"
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../modules/addressbook/e-book-shell-view-actions.c:1063
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
+msgid "Any field contains"
+msgstr "Calquera campo contÃn"
 
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:97
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:106
@@ -847,98 +847,98 @@ msgstr "Enviar unha men_saxe nova aâ"
 msgid "Send a mail message to this address"
 msgstr "Enviar unha mensaxe a este enderezo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:215
+#: ../addressbook/gui/widgets/eab-contact-display.c:218
 msgid "Open map"
 msgstr "Abrir mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:530
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:533
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
 msgid "List Members:"
 msgstr "Membros da lista:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Alcume"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:682
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Empresa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:683
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
 msgid "Department"
 msgstr "Departamento"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:684
+#: ../addressbook/gui/widgets/eab-contact-display.c:687
 msgid "Profession"
 msgstr "ProfesiÃn"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:685
+#: ../addressbook/gui/widgets/eab-contact-display.c:688
 msgid "Position"
 msgstr "Cargo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:686
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:689
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Director"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:687
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Secretaria/o"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:688
+#: ../addressbook/gui/widgets/eab-contact-display.c:691
 msgid "Video Chat"
 msgstr "Videoconferencia"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:689
+#: ../addressbook/gui/widgets/eab-contact-display.c:692
 #: ../calendar/gui/dialogs/calendar-setup.c:463
 #: ../modules/calendar/e-cal-shell-view-actions.c:232
 #: ../modules/calendar/e-cal-shell-view-actions.c:261
 #: ../modules/calendar/e-cal-shell-view.c:528
 #: ../modules/online-accounts/e-online-accounts-google.c:302
-#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
 #: ../widgets/misc/e-send-options.c:528
 msgid "Calendar"
 msgstr "Calendario"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:690
+#: ../addressbook/gui/widgets/eab-contact-display.c:693
 #: ../calendar/gui/dialogs/event-editor.c:123
 #: ../calendar/gui/dialogs/event-editor.c:350
-#: ../plugins/publish-calendar/publish-calendar.ui.h:6
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "DispoÃibilidade"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:691
-#: ../addressbook/gui/widgets/eab-contact-display.c:713
+#: ../addressbook/gui/widgets/eab-contact-display.c:694
+#: ../addressbook/gui/widgets/eab-contact-display.c:716
 msgid "Phone"
 msgstr "TelÃfono"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:692
+#: ../addressbook/gui/widgets/eab-contact-display.c:695
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:693
-#: ../addressbook/gui/widgets/eab-contact-display.c:715
+#: ../addressbook/gui/widgets/eab-contact-display.c:696
+#: ../addressbook/gui/widgets/eab-contact-display.c:718
 msgid "Address"
 msgstr "Enderezo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:710
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
 msgid "Home Page"
 msgstr "PÃxina persoal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:711
+#: ../addressbook/gui/widgets/eab-contact-display.c:714
 msgid "Web Log"
 msgstr "Diario web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:714
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:717
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Mobile Phone"
 msgstr "TelÃfono mÃbil"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-display.c:721
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "CÃnxuxe"
 
@@ -946,7 +946,7 @@ msgstr "CÃnxuxe"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:720
+#: ../addressbook/gui/widgets/eab-contact-display.c:723
 #: ../capplet/settings/mail-capplet-shell.c:379
 #: ../modules/addressbook/e-book-shell-backend.c:126
 #: ../modules/addressbook/e-book-shell-migrate.c:144
@@ -959,28 +959,28 @@ msgstr "CÃnxuxe"
 msgid "Personal"
 msgstr "Persoal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:741
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:744
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Nota"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1010
+#: ../addressbook/gui/widgets/eab-contact-display.c:1013
 msgid "List Members"
 msgstr "Membros da lista"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1028
+#: ../addressbook/gui/widgets/eab-contact-display.c:1031
 msgid "Job Title"
 msgstr "Posto de traballo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1065
+#: ../addressbook/gui/widgets/eab-contact-display.c:1068
 msgid "Home page"
 msgstr "PÃxina web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1074
+#: ../addressbook/gui/widgets/eab-contact-display.c:1077
 msgid "Blog"
 msgstr "Blogue"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1273
+#: ../addressbook/gui/widgets/eab-contact-display.c:1276
 #: ../widgets/misc/e-web-view.c:980
 #, c-format
 msgid "Click to mail %s"
@@ -1079,27 +1079,27 @@ msgstr "Esta consulta non terminou correctamente. %s"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
+#: ../addressbook/gui/widgets/eab-gui-util.c:309
 msgid "Select Address Book"
 msgstr "Seleccionar a axenda de enderezos"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:375
+#: ../addressbook/gui/widgets/eab-gui-util.c:383
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:560
+#: ../addressbook/gui/widgets/eab-gui-util.c:568
 msgid "Move contact to"
 msgstr "Mover o contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:562
+#: ../addressbook/gui/widgets/eab-gui-util.c:570
 msgid "Copy contact to"
 msgstr "Copiar o contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:565
+#: ../addressbook/gui/widgets/eab-gui-util.c:573
 msgid "Move contacts to"
 msgstr "Mover os contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:567
+#: ../addressbook/gui/widgets/eab-gui-util.c:575
 msgid "Copy contacts to"
 msgstr "Copiar os contactos a"
 
@@ -1197,111 +1197,93 @@ msgstr "_Non mostrar"
 msgid "Display _All Contacts"
 msgstr "Mostrar _todos os contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "TelÃfono da secretaria/o"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "File As"
+msgstr "Arquivar como"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Fax do traballo"
+msgid "Given Name"
+msgstr "Nome propio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Family Name"
+msgstr "Apelidos"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Email 2"
+msgstr "Correo electrÃnico 2"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Email 3"
+msgstr "Correo electrÃnico 3"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Assistant Phone"
+msgstr "TelÃfono da secretaria/o"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 msgid "Business Phone"
 msgstr "TelÃfono do traballo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Business Phone 2"
 msgstr "TelÃfono do traballo 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Business Fax"
+msgstr "Fax do traballo"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Callback Phone"
 msgstr "TelÃfono de devoluciÃn de chamadas"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Car Phone"
 msgstr "TelÃfono do automÃbil"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-cal-list-view.etspec.h:1
-#: ../calendar/gui/e-memo-table.etspec.h:1
-msgid "Categories"
-msgstr "CategorÃas"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Company Phone"
 msgstr "TelÃfono da empresa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 2"
-msgstr "Correo electrÃnico 2"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Email 3"
-msgstr "Correo electrÃnico 3"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "Family Name"
-msgstr "Apelidos"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
-msgid "File As"
-msgstr "Arquivar como"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Home Phone"
+msgstr "TelÃfono particular"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Given Name"
-msgstr "Nome propio"
+msgid "Home Phone 2"
+msgstr "TelÃfono particular 2"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "Fax particular"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone"
-msgstr "TelÃfono particular"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Home Phone 2"
-msgstr "TelÃfono particular 2"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
 msgstr "TelÃfono RDSI"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Journal"
-msgstr "Xornal"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Oficina"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Other Phone"
+msgstr "Outro telÃfono"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Outro telÃfono"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Pager"
 msgstr "Buscapersoas"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Primary Phone"
 msgstr "TelÃfono principal"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:610
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "FunciÃn"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Telex"
+msgstr "TÃlex"
 
 #. Translators: This is a vcard standard and stands for the type of
 #. phone used by the hearing impaired. TTY stands for "teletype"
@@ -1309,26 +1291,44 @@ msgstr "FunciÃn"
 #. Device for Deaf". However, you probably want to leave this
 #. abbreviation unchanged unless you know that there is actually a
 #. different and established translation for this in your language.
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
-msgid "Telex"
-msgstr "TÃlex"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+msgid "Unit"
+msgstr "Unidade"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Office"
+msgstr "Oficina"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "TÃtulo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-msgid "Unit"
-msgstr "Unidade"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: ../calendar/gui/e-meeting-list-view.c:638
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Role"
+msgstr "FunciÃn"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Sitio Web"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+msgid "Journal"
+msgstr "Xornal"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../calendar/gui/dialogs/event-page.ui.h:20
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:4
+msgid "Categories"
+msgstr "CategorÃas"
+
 #: ../addressbook/gui/widgets/ea-minicard.c:34
 msgid "Open"
 msgstr "Abrir"
@@ -1440,7 +1440,7 @@ msgstr "Vista de tarxetas"
 #: ../addressbook/importers/evolution-vcard-importer.c:280
 #: ../calendar/importers/icalendar-importer.c:413
 #: ../calendar/importers/icalendar-importer.c:903
-#: ../calendar/importers/icalendar-importer.c:942 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:942 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Importandoâ"
 
@@ -1486,7 +1486,7 @@ msgstr "Importador de vCard do Evolution"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:719
+#: ../addressbook/printing/e-contact-print.c:721
 #, c-format
 msgid "Page %d"
 msgstr "PÃxina %d"
@@ -1563,8 +1563,8 @@ msgstr "Non foi posÃbel obter unha lista das axendas de enderezos: %s"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#: ../calendar/gui/dialogs/memo-page.c:938 ../em-format/em-format.c:2321
-#: ../mail/em-folder-tree.c:675 ../mail/mail-ops.c:670
+#: ../calendar/gui/dialogs/memo-page.c:946 ../em-format/em-format.c:2321
+#: ../mail/em-folder-tree.c:673 ../mail/mail-ops.c:636
 #: ../plugins/caldav/caldav-browse-server.c:220
 #: ../plugins/caldav/caldav-browse-server.c:1469 ../plugins/face/face.c:174
 #: ../plugins/itip-formatter/itip-formatter.c:1474
@@ -1578,244 +1578,242 @@ msgstr "Erro descoÃecido"
 msgid "Failed to open client '%s': %s"
 msgstr "Produciuse un fallo ao abrir o cliente Â%s (%s)"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:2
-msgid ""
-"'{0}' does not support assigned tasks, please select a different task list."
-msgstr ""
-"Â{0}Â no admite asignaciÃn de tarefas, seleccione unha lista de tarefas "
-"diferentes."
-
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:4
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
-msgstr ""
-"Â{0} à un calendario sà de lectura e non à posÃbel modificalo. Seleccione "
-"un calendario diferente na barra lateral da vista de Calendario."
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:109
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minuto"
+msgstr[1] "minutos"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:6
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar that can accept appointments."
-msgstr ""
-"Â{0} à un calendario sà de lectura e non à posÃbel modificalo. Seleccione "
-"un calendario diferente que poida aceptar citas."
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:122
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "hora"
+msgstr[1] "horas"
 
-#: ../calendar/calendar.error.xml.h:7
-msgid ""
-"Adding a meaningful summary to your appointment will give you an idea of "
-"what your appointment is about."
-msgstr ""
-"Engadir un resumo significativo à sÃa cita daralle unha idea sobre o contido "
-"desta."
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:135
+#: ../calendar/gui/dialogs/recurrence-page.c:1188
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dÃa"
+msgstr[1] "dÃas"
 
-#: ../calendar/calendar.error.xml.h:8
-msgid ""
-"Adding a meaningful summary to your task will give you an idea of what your "
-"task is about."
-msgstr ""
-"Engadir un resumo significativo à sÃa tarefa daralle unha idea sobre o "
-"contido desta."
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:331
+msgid "Start time"
+msgstr "Hora de inicio"
 
-#: ../calendar/calendar.error.xml.h:9
-msgid "All information in these memos will be deleted and can not be restored."
-msgstr ""
-"Vaise eliminar toda a informaciÃn destas notas e non serà posÃbel "
-"restabelecela."
+#: ../calendar/alarm-notify/alarm-notify.ui.h:1
+msgid "Appointments"
+msgstr "Citas"
 
-#: ../calendar/calendar.error.xml.h:10
-msgid "All information in this memo will be deleted and can not be restored."
-msgstr ""
-"Vaise eliminar toda a informaciÃn desta nota e non serà posÃbel "
-"restabelecela."
+#: ../calendar/alarm-notify/alarm-notify.ui.h:2
+msgid "_Snooze"
+msgstr "_FunciÃn de repeticiÃn"
 
-#: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
-msgstr ""
-"Vaise eliminar toda a informaciÃn destas citas e non serà posÃbel "
-"restabelecela."
+#: ../calendar/alarm-notify/alarm-notify.ui.h:3 ../e-util/e-alert-dialog.c:160
+msgid "_Dismiss"
+msgstr "_Ignorar"
 
-#: ../calendar/calendar.error.xml.h:12
-msgid "All information on these tasks will be deleted and can not be restored."
-msgstr ""
-"Vaise eliminar toda a informaciÃn destas tarefas e non serà posÃbel "
-"restabelecela."
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4
+msgid "Snooze _time:"
+msgstr "Tempo antes da repeticiÃn:"
 
-#: ../calendar/calendar.error.xml.h:13
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
-msgstr ""
-"Vaise eliminar toda a informaciÃn desta cita e non serà posÃbel "
-"restabelecela."
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../e-util/e-plugin-util.c:454
+#: ../filter/filter.ui.h:8 ../modules/calendar/e-cal-shell-view-actions.c:350
+#: ../plugins/google-account-setup/google-contacts-source.c:387
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
+msgid "days"
+msgstr "dÃas"
 
-#: ../calendar/calendar.error.xml.h:14
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
-msgstr ""
-"Vaise eliminar toda a informaciÃn desta reuniÃn e non serà posÃbel "
-"restabelecela."
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/e-plugin-util.c:453
+#: ../filter/filter.ui.h:7
+#: ../plugins/google-account-setup/google-contacts-source.c:386
+msgid "hours"
+msgstr "horas"
 
-#: ../calendar/calendar.error.xml.h:15
-msgid "All information on this memo will be deleted and can not be restored."
-msgstr ""
-"Vaise eliminar toda a informaciÃn desta nota e non serà posÃbel "
-"restabelecela."
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/e-plugin-util.c:452
+#: ../filter/filter.ui.h:6 ../modules/addressbook/ldap-config.ui.h:29
+#: ../plugins/google-account-setup/google-contacts-source.c:385
+msgid "minutes"
+msgstr "minutos"
 
-#: ../calendar/calendar.error.xml.h:16
-msgid "All information on this task will be deleted and can not be restored."
-msgstr ""
-"Vaise eliminar toda a informaciÃn desta tarefa e non serà posÃbel "
-"restabelecela."
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
+msgid "location of appointment"
+msgstr "localizaciÃn da cita"
 
-#: ../calendar/calendar.error.xml.h:17
-msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "Està seguro de que desexa eliminar a tarefa Â{0}Â?"
+#. Location
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/alarm-notify/alarm-queue.c:1756
+#: ../calendar/alarm-notify/alarm-queue.c:1766
+#: ../plugins/itip-formatter/itip-view.c:1052
+msgid "Location:"
+msgstr "LocalizaciÃn:"
 
-#: ../calendar/calendar.error.xml.h:18
-msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "Està seguro de que desexa eliminar a cita titulada Â{0}Â?"
+#: ../calendar/alarm-notify/alarm-notify.ui.h:10
+msgid "Dismiss _All"
+msgstr "Ignorar _todo"
 
-#: ../calendar/calendar.error.xml.h:19
-msgid "Are you sure you want to delete the meeting titled '{0}'?"
-msgstr "Està seguro de que desexa eliminar a reuniÃn titulada Â{0}Â?"
+#: ../calendar/alarm-notify/alarm-queue.c:1605
+#: ../calendar/alarm-notify/alarm-queue.c:1737
+msgid "No summary available."
+msgstr "Non hai un resumo dispoÃÃbel."
 
-#: ../calendar/calendar.error.xml.h:20
-msgid "Are you sure you want to delete the memo '{0}'?"
-msgstr "Està seguro de que desexa eliminar a nota Â{0}Â?"
+#: ../calendar/alarm-notify/alarm-queue.c:1614
+#: ../calendar/alarm-notify/alarm-queue.c:1616
+msgid "No description available."
+msgstr "Non hai unha descriciÃn dispoÃÃbel."
 
-#: ../calendar/calendar.error.xml.h:21
-msgid "Are you sure you want to delete these {0} appointments?"
-msgstr "Està seguro de que desexa eliminar estas {0} citas?"
+#: ../calendar/alarm-notify/alarm-queue.c:1624
+msgid "No location information available."
+msgstr "Non hai informaciÃn da localizaciÃn dispoÃÃbel."
 
-#: ../calendar/calendar.error.xml.h:22
-msgid "Are you sure you want to delete these {0} memos?"
-msgstr "Està seguro de que desexa eliminar estas {0} notas?"
+#: ../calendar/alarm-notify/alarm-queue.c:1670
+#, c-format
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] "Ten %d recordatorio"
+msgstr[1] "Ten %d recordatorios"
 
-#: ../calendar/calendar.error.xml.h:23
-msgid "Are you sure you want to delete these {0} tasks?"
-msgstr "Està seguro de que desexa eliminar estas {0} tarefas?"
+#: ../calendar/alarm-notify/alarm-queue.c:1870
+#: ../calendar/alarm-notify/alarm-queue.c:1905
+msgid "Warning"
+msgstr "Aviso"
 
-#: ../calendar/calendar.error.xml.h:24
-msgid "Are you sure you want to delete this appointment?"
-msgstr "Està seguro de que desexa eliminar esta cita?"
-
-#: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:189
-#, c-format
-msgid "Are you sure you want to delete this meeting?"
-msgstr "Està seguro de que desexa eliminar esta reuniÃn?"
-
-#: ../calendar/calendar.error.xml.h:26
-#: ../calendar/gui/dialogs/delete-comp.c:195
-#, c-format
-msgid "Are you sure you want to delete this memo?"
-msgstr "Està seguro de que desexa eliminar esta nota?"
+#: ../calendar/alarm-notify/alarm-queue.c:1874
+msgid ""
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email.  Evolution will display\n"
+"a normal reminder dialog box instead."
+msgstr ""
+"O Evolution aÃnda non permite avisos de calendario con\n"
+"notificaciÃns por correo electrÃnico, pero este aviso configurouse\n"
+"para enviar unha mensaxe de correo electrÃnico. No seu lugar\n"
+"O Evolution vai mostrar un diÃlogo de aviso normal."
 
-#: ../calendar/calendar.error.xml.h:27
-#: ../calendar/gui/dialogs/delete-comp.c:192
+#: ../calendar/alarm-notify/alarm-queue.c:1911
 #, c-format
-msgid "Are you sure you want to delete this task?"
-msgstr "Està seguro de que desexa eliminar esta tarefa?"
-
-#: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to save the appointment without a summary?"
-msgstr "Està seguro de que desexa gardar a cita sen un resumo?"
-
-#: ../calendar/calendar.error.xml.h:29
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "Està seguro que desexa gardar a nota sen un resumo?"
+msgid ""
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
+msgstr ""
+"Vaise activar un aviso de calendario do Evolution. Este aviso configurouse "
+"para executar o seguinte programa:\n"
+"\n"
+"        %s\n"
+"\n"
+"Està seguro de que desexa executar este programa?"
 
-#: ../calendar/calendar.error.xml.h:30
-msgid "Are you sure you want to save the task without a summary?"
-msgstr "Està seguro de que desexa gardar a tarefa sen un resumo?"
+#: ../calendar/alarm-notify/alarm-queue.c:1926
+msgid "Do not ask me about this program again."
+msgstr "Non volver preguntar sobre este programa."
 
-#: ../calendar/calendar.error.xml.h:31
-msgid "Cannot create a new event"
-msgstr "Non à posÃbel crear unha nova actividade"
+#: ../calendar/alarm-notify/util.c:45
+msgid "invalid time"
+msgstr "hora incorrecta"
 
-#: ../calendar/calendar.error.xml.h:32
-msgid "Cannot save event"
-msgstr "Non à posÃbel gardar a actividade"
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/misc.c:116
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d horas"
 
-#: ../calendar/calendar.error.xml.h:33
-msgid "Cannot save task"
-msgstr "Non à posÃbel gardar a tarefa"
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:411
+#: ../calendar/gui/misc.c:122
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minutos"
 
-#: ../calendar/calendar.error.xml.h:34
-msgid "Delete calendar '{0}'?"
-msgstr "Desexa eliminar o calendario Â{0}Â?"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:417
+#: ../calendar/gui/misc.c:126
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segundo"
+msgstr[1] "%d segundos"
 
-#: ../calendar/calendar.error.xml.h:35
-msgid "Delete memo list '{0}'?"
-msgstr "Desexa eliminar a lista de notas Â{0}Â?"
+#: ../calendar/calendar.error.xml.h:1
+msgid "Would you like to send all the participants a cancelation notice?"
+msgstr ""
+"Desexa enviar a todos os participantes unha notificaciÃn de cancelaciÃn?"
 
-#: ../calendar/calendar.error.xml.h:36
-msgid "Delete task list '{0}'?"
-msgstr "Desexa eliminar a lista de tarefas Â{0}Â?"
+#: ../calendar/calendar.error.xml.h:2
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+"Se non envÃa unha notificaciÃn de cancelaciÃn, os outros participantes "
+"quizais non saiban que se cancelou a cita."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:3
 msgid "Do _not Send"
 msgstr "_Non enviar"
 
-#: ../calendar/calendar.error.xml.h:39
-msgid "Download in progress. Do you want to save the appointment?"
-msgstr "Hai unha descarga en progreso. Desexa gardar a cita?"
-
-#: ../calendar/calendar.error.xml.h:40
-msgid "Download in progress. Do you want to save the task?"
-msgstr "Hai unha descarga en progreso. Desexa gardar a tarefa?"
+#: ../calendar/calendar.error.xml.h:4
+msgid "_Send Notice"
+msgstr "_Enviar a notificaciÃn"
 
-#: ../calendar/calendar.error.xml.h:41
-msgid "Editor could not be loaded."
-msgstr "Non foi posÃbel cargar o editor."
+#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/gui/dialogs/delete-comp.c:189
+#, c-format
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Està seguro de que desexa eliminar esta reuniÃn?"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:6
 msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
+"All information on this meeting will be deleted and can not be restored."
 msgstr ""
-"Enviaranse convites por correo electrÃnico a todos os participantes e "
-"permitirÃselles aceptar esta tarefa."
+"Vaise eliminar toda a informaciÃn desta reuniÃn e non serà posÃbel "
+"restabelecela."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:8
 msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
 msgstr ""
-"Enviaranse convites por correo electrÃnico a todos os participantes e "
-"permitirÃselles responder."
-
-#: ../calendar/calendar.error.xml.h:44
-msgid "Error loading calendar"
-msgstr "Produciuse un erro ao cargar o calendario"
-
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error loading memo list"
-msgstr "Produciuse un erro ao cargar a lista de notas"
-
-#: ../calendar/calendar.error.xml.h:46
-msgid "Error loading task list"
-msgstr "Produciuse un erro ao cargar a lista de tarefas"
+"Se non envÃa unha notificaciÃn de cancelaciÃn, os outros participantes "
+"quizais non saiban que se eliminou a tarefa."
 
-#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
-#. {1} is replaced with a calendar/task/memo list name, where the error happened
-#: ../calendar/calendar.error.xml.h:49
-msgid "Error on {0}: {1}"
-msgstr "Erro en {0}: {1}"
+#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/gui/dialogs/delete-comp.c:192
+#, c-format
+msgid "Are you sure you want to delete this task?"
+msgstr "Està seguro de que desexa eliminar esta tarefa?"
 
-#: ../calendar/calendar.error.xml.h:50
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
+#: ../calendar/calendar.error.xml.h:10
+msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
-"Se non envÃa unha notificaciÃn de cancelaciÃn, os outros participantes "
-"quizais non saiban que se cancelou a cita."
+"Vaise eliminar toda a informaciÃn desta tarefa e non serà posÃbel "
+"restabelecela."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:11
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr "Desexa enviar unha notificaciÃn de cancelaciÃn para esta nota?"
+
+#: ../calendar/calendar.error.xml.h:12
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -1823,371 +1821,373 @@ msgstr ""
 "Se non envÃa unha notificaciÃn de cancelaciÃn, os outros participantes "
 "quizais non saiban que se eliminou a nota."
 
-#: ../calendar/calendar.error.xml.h:52
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
-msgstr ""
-"Se non envÃa unha notificaciÃn de cancelaciÃn, os outros participantes "
-"quizais non saiban que se eliminou a tarefa."
+#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/gui/dialogs/delete-comp.c:195
+#, c-format
+msgid "Are you sure you want to delete this memo?"
+msgstr "Està seguro de que desexa eliminar esta nota?"
 
-#: ../calendar/calendar.error.xml.h:53
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+#: ../calendar/calendar.error.xml.h:14
+msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
-"Ao enviar informaciÃn actualizada permite que outros participantes manteÃan "
-"os seus calendarios ao dÃa."
+"Vaise eliminar toda a informaciÃn desta nota e non serà posÃbel "
+"restabelecela."
 
-#: ../calendar/calendar.error.xml.h:54
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
-msgstr ""
-"Ao enviar informaciÃn actualizada permite que outros participantes manteÃan "
-"a sÃa lista de tarefas ao dÃa."
+#: ../calendar/calendar.error.xml.h:15
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "Està seguro de que desexa eliminar a reuniÃn titulada Â{0}Â?"
 
-#: ../calendar/calendar.error.xml.h:55
-msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
-msgstr ""
-"Estanse descargando algÃns anexos. Se garda a cita farà que se perdan eses "
-"anexos."
+#: ../calendar/calendar.error.xml.h:16
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Està seguro de que desexa eliminar a cita titulada Â{0}Â?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:17
 msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
+"All information on this appointment will be deleted and can not be restored."
 msgstr ""
-"Estanse descargando algÃns anexos. Se garda a tarefa farà que se perdan eses "
-"anexos."
+"Vaise eliminar toda a informaciÃn desta cita e non serà posÃbel "
+"restabelecela."
 
-#: ../calendar/calendar.error.xml.h:57
-msgid "Some features may not work properly with your current server."
+#: ../calendar/calendar.error.xml.h:18
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Està seguro de que desexa eliminar esta cita?"
+
+#: ../calendar/calendar.error.xml.h:19
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Està seguro de que desexa eliminar a tarefa Â{0}Â?"
+
+#: ../calendar/calendar.error.xml.h:20
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr "Està seguro de que desexa eliminar a nota Â{0}Â?"
+
+#: ../calendar/calendar.error.xml.h:21
+msgid "All information in this memo will be deleted and can not be restored."
 msgstr ""
-"Pode que algunhas caracterÃsticas non funcionen axeitadamente co servidor "
-"actual."
+"Vaise eliminar toda a informaciÃn desta nota e non serà posÃbel "
+"restabelecela."
 
-#: ../calendar/calendar.error.xml.h:58
-msgid "The Evolution calendar has quit unexpectedly."
-msgstr "O calendario do Evolution saÃu inesperadamente."
+#: ../calendar/calendar.error.xml.h:22
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Està seguro de que desexa eliminar estas {0} citas?"
 
-#: ../calendar/calendar.error.xml.h:59
-msgid "The Evolution calendars have quit unexpectedly."
-msgstr "Os calendarios do Evolution saÃron inesperadamente."
+#: ../calendar/calendar.error.xml.h:23
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+"Vaise eliminar toda a informaciÃn destas citas e non serà posÃbel "
+"restabelecela."
 
-#: ../calendar/calendar.error.xml.h:60
-msgid "The Evolution memo has quit unexpectedly."
-msgstr "A nota do Evolution saÃu inesperadamente."
+#: ../calendar/calendar.error.xml.h:24
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Està seguro de que desexa eliminar estas {0} tarefas?"
 
-#: ../calendar/calendar.error.xml.h:61
-msgid "The Evolution tasks have quit unexpectedly."
-msgstr "As tarefas do Evolution saÃron inesperadamente."
+#: ../calendar/calendar.error.xml.h:25
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+"Vaise eliminar toda a informaciÃn destas tarefas e non serà posÃbel "
+"restabelecela."
 
-#: ../calendar/calendar.error.xml.h:62
-msgid "The calendar is not marked for offline usage."
-msgstr "O calendario non està marcado para o seu uso sen conexiÃn."
+#: ../calendar/calendar.error.xml.h:26
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "Està seguro de que desexa eliminar estas {0} notas?"
 
-#: ../calendar/calendar.error.xml.h:63
-msgid "The memo list is not marked for offline usage."
-msgstr "A lista de notas non està marcada para o seu uso sen conexiÃn."
+#: ../calendar/calendar.error.xml.h:27
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr ""
+"Vaise eliminar toda a informaciÃn destas notas e non serà posÃbel "
+"restabelecela."
 
-#: ../calendar/calendar.error.xml.h:64
-msgid "The task list is not marked for offline usage."
-msgstr "A lista de tarefas non està marcada para o seu uso sen conexiÃn."
+#: ../calendar/calendar.error.xml.h:28
+msgid "Would you like to save your changes to this meeting?"
+msgstr "Desexa gardar as modificaciÃns feitas nesta reuniÃn?"
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "This calendar will be removed permanently."
-msgstr "Este calendario eliminarase permanentemente."
+#: ../calendar/calendar.error.xml.h:29
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "Modificou esta reuniÃn pero aÃnda non a gardou."
 
-#: ../calendar/calendar.error.xml.h:66
-msgid "This memo list will be removed permanently."
-msgstr "Esta lista de notas eliminarase permanentemente."
+#: ../calendar/calendar.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:16
+msgid "_Discard Changes"
+msgstr "_Rexeitar as modificaciÃns"
 
-#: ../calendar/calendar.error.xml.h:67
-msgid "This task list will be removed permanently."
-msgstr "Esta lista de tarefas eliminarase permanentemente."
+#: ../calendar/calendar.error.xml.h:31
+msgid "_Save Changes"
+msgstr "_Gardar as modificaciÃns"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:32
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Desexa gardar as modificaciÃns feitas nesta cita?"
 
-#: ../calendar/calendar.error.xml.h:69
-msgid "Would you like to save your changes to this meeting?"
-msgstr "Desexa gardar as modificaciÃns feitas nesta reuniÃn?"
-
-#: ../calendar/calendar.error.xml.h:70
-msgid "Would you like to save your changes to this memo?"
-msgstr "Desexa gardar as modificaciÃns feitas nesta nota?"
+#: ../calendar/calendar.error.xml.h:33
+msgid "You have changed this appointment, but not yet saved it."
+msgstr "Modificou esta cita pero aÃnda non a gardou."
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:34
 msgid "Would you like to save your changes to this task?"
 msgstr "Desexa gardar as modificaciÃns feitas nesta tarefa?"
 
-#: ../calendar/calendar.error.xml.h:72
-msgid "Would you like to send a cancelation notice for this memo?"
-msgstr "Desexa enviar unha notificaciÃn de cancelaciÃn para esta nota?"
+#: ../calendar/calendar.error.xml.h:35
+msgid "You have changed this task, but not yet saved it."
+msgstr "Modificou esta tarefa pero aÃnda non a gardou."
 
-#: ../calendar/calendar.error.xml.h:73
-msgid "Would you like to send all the participants a cancelation notice?"
-msgstr ""
-"Desexa enviar a todos os participantes unha notificaciÃn de cancelaciÃn?"
+#: ../calendar/calendar.error.xml.h:36
+msgid "Would you like to save your changes to this memo?"
+msgstr "Desexa gardar as modificaciÃns feitas nesta nota?"
+
+#: ../calendar/calendar.error.xml.h:37
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr "Modificou esta nota pero aÃnda non gardou os cambios."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:38
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Desexa enviar aos participantes convites para a reuniÃn?"
 
-#: ../calendar/calendar.error.xml.h:75
-msgid "Would you like to send this task to participants?"
-msgstr "Desexa enviar esta tarefa aos participantes?"
+#: ../calendar/calendar.error.xml.h:39
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+"Enviaranse convites por correo electrÃnico a todos os participantes e "
+"permitirÃselles responder."
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:40
+#: ../composer/mail-composer.error.xml.h:13 ../mail/mail.error.xml.h:8
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Send"
+msgstr "_Enviar"
+
+#: ../calendar/calendar.error.xml.h:41
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Desexa enviar informaciÃn actualizada da reuniÃn aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:77
-msgid "Would you like to send updated task information to participants?"
-msgstr "Desexa enviar informaciÃn actualizada das tarefas aos participantes?"
+#: ../calendar/calendar.error.xml.h:42
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+"Ao enviar informaciÃn actualizada permite que outros participantes manteÃan "
+"os seus calendarios ao dÃa."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:43
+msgid "Would you like to send this task to participants?"
+msgstr "Desexa enviar esta tarefa aos participantes?"
+
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results, the server should be upgraded to "
-"a supported version."
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
 msgstr ""
-"Està conectado con un servidor GroupWise non compatÃbel e poderÃa atopar "
-"problemas ao usar o Evolution. Para mellorar os resultados, o servidor "
-"deberÃa anovarse a unha versiÃn compatÃbel."
+"Enviaranse convites por correo electrÃnico a todos os participantes e "
+"permitirÃselles aceptar esta tarefa."
 
-#: ../calendar/calendar.error.xml.h:79
-msgid "You have changed this appointment, but not yet saved it."
-msgstr "Modificou esta cita pero aÃnda non a gardou."
+#: ../calendar/calendar.error.xml.h:45
+msgid "Download in progress. Do you want to save the task?"
+msgstr "Hai unha descarga en progreso. Desexa gardar a tarefa?"
 
-#: ../calendar/calendar.error.xml.h:80
-msgid "You have changed this meeting, but not yet saved it."
-msgstr "Modificou esta reuniÃn pero aÃnda non a gardou."
+#: ../calendar/calendar.error.xml.h:46
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+"Estanse descargando algÃns anexos. Se garda a tarefa farà que se perdan eses "
+"anexos."
 
-#: ../calendar/calendar.error.xml.h:81
-msgid "You have changed this task, but not yet saved it."
-msgstr "Modificou esta tarefa pero aÃnda non a gardou."
+#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
+msgid "_Save"
+msgstr "_Gardar"
 
-#: ../calendar/calendar.error.xml.h:82
-msgid "You have made changes to this memo, but not yet saved them."
-msgstr "Modificou esta nota pero aÃnda non gardou os cambios."
+#: ../calendar/calendar.error.xml.h:48
+msgid "Download in progress. Do you want to save the appointment?"
+msgstr "Hai unha descarga en progreso. Desexa gardar a cita?"
 
-#: ../calendar/calendar.error.xml.h:83
-msgid "Your calendars will not be available until Evolution is restarted."
+#: ../calendar/calendar.error.xml.h:49
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
 msgstr ""
-"Os seus calendarios non estarÃn dispoÃÃbeis atà que reinicie o Evolution."
-
-#: ../calendar/calendar.error.xml.h:84
-msgid "Your memos will not be available until Evolution is restarted."
-msgstr "As sÃas notas non estarÃn dispoÃÃbeis atà que reinicie o Evolution."
+"Estanse descargando algÃns anexos. Se garda a cita farà que se perdan eses "
+"anexos."
 
-#: ../calendar/calendar.error.xml.h:85
-msgid "Your tasks will not be available until Evolution is restarted."
-msgstr "As sÃas tarefas non estarÃn dispoÃÃbeis atà que reinicie o Evolution."
+#: ../calendar/calendar.error.xml.h:50
+msgid "Would you like to send updated task information to participants?"
+msgstr "Desexa enviar informaciÃn actualizada das tarefas aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "_Rexeitar as modificaciÃns"
+#: ../calendar/calendar.error.xml.h:51
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+"Ao enviar informaciÃn actualizada permite que outros participantes manteÃan "
+"a sÃa lista de tarefas ao dÃa."
 
-#: ../calendar/calendar.error.xml.h:87 ../composer/e-composer-actions.c:316
-msgid "_Save"
-msgstr "_Gardar"
+#: ../calendar/calendar.error.xml.h:52
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr "As tarefas do Evolution saÃron inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:88
-msgid "_Save Changes"
-msgstr "_Gardar as modificaciÃns"
+#: ../calendar/calendar.error.xml.h:53
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr "As sÃas tarefas non estarÃn dispoÃÃbeis atà que reinicie o Evolution."
 
-#: ../calendar/calendar.error.xml.h:89
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:164
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
-msgid "_Send"
-msgstr "_Enviar"
+#: ../calendar/calendar.error.xml.h:54
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "O calendario do Evolution saÃu inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:90
-msgid "_Send Notice"
-msgstr "_Enviar a notificaciÃn"
+#: ../calendar/calendar.error.xml.h:55
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+"Os seus calendarios non estarÃn dispoÃÃbeis atà que reinicie o Evolution."
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:107
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minuto"
-msgstr[1] "minutos"
+#: ../calendar/calendar.error.xml.h:56
+msgid "The Evolution memo has quit unexpectedly."
+msgstr "A nota do Evolution saÃu inesperadamente."
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "hora"
-msgstr[1] "horas"
+#: ../calendar/calendar.error.xml.h:57
+msgid "Your memos will not be available until Evolution is restarted."
+msgstr "As sÃas notas non estarÃn dispoÃÃbeis atà que reinicie o Evolution."
 
-#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:133
-#: ../calendar/gui/dialogs/recurrence-page.c:1188
-msgid "day"
-msgid_plural "days"
-msgstr[0] "dÃa"
-msgstr[1] "dÃas"
+#: ../calendar/calendar.error.xml.h:58
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "Os calendarios do Evolution saÃron inesperadamente."
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:313
-msgid "Start time"
-msgstr "Hora de inicio"
+#: ../calendar/calendar.error.xml.h:59
+msgid "Editor could not be loaded."
+msgstr "Non foi posÃbel cargar o editor."
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
-msgid "Appointments"
-msgstr "Citas"
+#: ../calendar/calendar.error.xml.h:60
+msgid "Delete calendar '{0}'?"
+msgstr "Desexa eliminar o calendario Â{0}Â?"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
-msgid "Dismiss _All"
-msgstr "Ignorar _todo"
+#: ../calendar/calendar.error.xml.h:61
+msgid "This calendar will be removed permanently."
+msgstr "Este calendario eliminarase permanentemente."
 
-#. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1738
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1748
-#: ../plugins/itip-formatter/itip-view.c:1052
-msgid "Location:"
-msgstr "LocalizaciÃn:"
+#: ../calendar/calendar.error.xml.h:62
+msgid "Delete task list '{0}'?"
+msgstr "Desexa eliminar a lista de tarefas Â{0}Â?"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
-msgid "Snooze _time:"
-msgstr "Tempo antes da repeticiÃn:"
+#: ../calendar/calendar.error.xml.h:63
+msgid "This task list will be removed permanently."
+msgstr "Esta lista de tarefas eliminarase permanentemente."
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
-msgid "_Dismiss"
-msgstr "_Ignorar"
+#: ../calendar/calendar.error.xml.h:64
+msgid "Delete memo list '{0}'?"
+msgstr "Desexa eliminar a lista de notas Â{0}Â?"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-msgid "_Snooze"
-msgstr "_FunciÃn de repeticiÃn"
+#: ../calendar/calendar.error.xml.h:65
+msgid "This memo list will be removed permanently."
+msgstr "Esta lista de notas eliminarase permanentemente."
 
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:454
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
-#: ../plugins/google-account-setup/google-contacts-source.c:387
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "days"
-msgstr "dÃas"
+#: ../calendar/calendar.error.xml.h:66
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "Està seguro de que desexa gardar a cita sen un resumo?"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:453
-#: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:386
-msgid "hours"
-msgstr "horas"
+#: ../calendar/calendar.error.xml.h:67
+msgid ""
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
+msgstr ""
+"Engadir un resumo significativo à sÃa cita daralle unha idea sobre o contido "
+"desta."
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
-msgid "location of appointment"
-msgstr "localizaciÃn da cita"
+#: ../calendar/calendar.error.xml.h:68
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "Està seguro de que desexa gardar a tarefa sen un resumo?"
 
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:452
-#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:385
-msgid "minutes"
-msgstr "minutos"
+#: ../calendar/calendar.error.xml.h:69
+msgid ""
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
+msgstr ""
+"Engadir un resumo significativo à sÃa tarefa daralle unha idea sobre o "
+"contido desta."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1587
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1719
-msgid "No summary available."
-msgstr "Non hai un resumo dispoÃÃbel."
+#: ../calendar/calendar.error.xml.h:70
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Està seguro que desexa gardar a nota sen un resumo?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
-msgid "No description available."
-msgstr "Non hai unha descriciÃn dispoÃÃbel."
+#: ../calendar/calendar.error.xml.h:71
+msgid "Error loading calendar"
+msgstr "Produciuse un erro ao cargar o calendario"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
-msgid "No location information available."
-msgstr "Non hai informaciÃn da localizaciÃn dispoÃÃbel."
+#: ../calendar/calendar.error.xml.h:72
+msgid "The calendar is not marked for offline usage."
+msgstr "O calendario non està marcado para o seu uso sen conexiÃn."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1652
-#, c-format
-msgid "You have %d reminder"
-msgid_plural "You have %d reminders"
-msgstr[0] "Ten %d recordatorio"
-msgstr[1] "Ten %d recordatorios"
+#: ../calendar/calendar.error.xml.h:73
+msgid "Cannot create a new event"
+msgstr "Non à posÃbel crear unha nova actividade"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1852
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1887
-msgid "Warning"
-msgstr "Aviso"
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:75
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr ""
+"Â{0} à un calendario sà de lectura e non à posÃbel modificalo. Seleccione "
+"un calendario diferente na barra lateral da vista de Calendario."
+
+#: ../calendar/calendar.error.xml.h:76
+msgid "Cannot save event"
+msgstr "Non à posÃbel gardar a actividade"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1856
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:78
 msgid ""
-"Evolution does not support calendar reminders with\n"
-"email notifications yet, but this reminder was\n"
-"configured to send an email.  Evolution will display\n"
-"a normal reminder dialog box instead."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
 msgstr ""
-"O Evolution aÃnda non permite avisos de calendario con\n"
-"notificaciÃns por correo electrÃnico, pero este aviso configurouse\n"
-"para enviar unha mensaxe de correo electrÃnico. No seu lugar\n"
-"O Evolution vai mostrar un diÃlogo de aviso normal."
+"Â{0} à un calendario sà de lectura e non à posÃbel modificalo. Seleccione "
+"un calendario diferente que poida aceptar citas."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1893
-#, c-format
+#: ../calendar/calendar.error.xml.h:79
+msgid "Cannot save task"
+msgstr "Non à posÃbel gardar a tarefa"
+
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:81
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
-"\n"
-"        %s\n"
-"\n"
-"Are you sure you want to run this program?"
+"'{0}' does not support assigned tasks, please select a different task list."
 msgstr ""
-"Vaise activar un aviso de calendario do Evolution. Este aviso configurouse "
-"para executar o seguinte programa:\n"
-"\n"
-"        %s\n"
-"\n"
-"Està seguro de que desexa executar este programa?"
+"Â{0}Â no admite asignaciÃn de tarefas, seleccione unha lista de tarefas "
+"diferentes."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1908
-msgid "Do not ask me about this program again."
-msgstr "Non volver preguntar sobre este programa."
+#: ../calendar/calendar.error.xml.h:82
+msgid "Error loading task list"
+msgstr "Produciuse un erro ao cargar a lista de tarefas"
 
-#: ../calendar/gui/alarm-notify/util.c:45
-msgid "invalid time"
-msgstr "hora incorrecta"
+#: ../calendar/calendar.error.xml.h:83
+msgid "The task list is not marked for offline usage."
+msgstr "A lista de tarefas non està marcada para o seu uso sen conexiÃn."
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:405
-#: ../calendar/gui/misc.c:116
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hora"
-msgstr[1] "%d horas"
+#: ../calendar/calendar.error.xml.h:84
+msgid "Error loading memo list"
+msgstr "Produciuse un erro ao cargar a lista de notas"
 
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:411
-#: ../calendar/gui/misc.c:122
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuto"
-msgstr[1] "%d minutos"
+#: ../calendar/calendar.error.xml.h:85
+msgid "The memo list is not marked for offline usage."
+msgstr "A lista de notas non està marcada para o seu uso sen conexiÃn."
 
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:417
-#: ../calendar/gui/misc.c:126
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d segundo"
-msgstr[1] "%d segundos"
+#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
+#. {1} is replaced with a calendar/task/memo list name, where the error happened
+#: ../calendar/calendar.error.xml.h:88
+msgid "Error on {0}: {1}"
+msgstr "Erro en {0}: {1}"
+
+#: ../calendar/calendar.error.xml.h:89
+msgid "Some features may not work properly with your current server."
+msgstr ""
+"Pode que algunhas caracterÃsticas non funcionen axeitadamente co servidor "
+"actual."
+
+#: ../calendar/calendar.error.xml.h:90
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+"Està conectado con un servidor GroupWise non compatÃbel e poderÃa atopar "
+"problemas ao usar o Evolution. Para mellorar os resultados, o servidor "
+"deberÃa anovarse a unha versiÃn compatÃbel."
 
 #: ../calendar/gui/calendar-view-factory.c:110
 msgid "Day View"
@@ -2205,266 +2205,265 @@ msgstr "Vista semanal"
 msgid "Month View"
 msgstr "Vista mensual"
 
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:3
-msgid "Any Field"
-msgstr "Calquera campo"
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:383
+msgid "Summary"
+msgstr "Resumo"
+
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "contÃn"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "Anexos"
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "non contÃn"
 
-#: ../calendar/gui/caltypes.xml.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-#: ../calendar/gui/tasktypes.xml.h:6
-msgid "Attendee"
-msgstr "Participante"
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
+#: ../modules/plugin-manager/evolution-plugin-manager.c:70
+#: ../widgets/misc/e-attachment-tree-view.c:526
+#: ../widgets/table/e-table-config.ui.h:24
+msgid "Description"
+msgstr "DescriciÃn"
 
-#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:8
-msgid "Category"
-msgstr "CategorÃa"
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Any Field"
+msgstr "Calquera campo"
 
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:7
 msgid "Classification"
 msgstr "ClasificaciÃn"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:243
-#: ../calendar/gui/e-cal-model.c:795 ../calendar/gui/e-task-table.c:544
-#: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
-msgid "Confidential"
-msgstr "Confidencial"
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:31
+msgid "is"
+msgstr "Ã"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../modules/plugin-manager/evolution-plugin-manager.c:70
-#: ../widgets/misc/e-attachment-tree-view.c:526
-#: ../widgets/table/e-table-config.ui.h:6
-msgid "Description"
-msgstr "DescriciÃn"
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:37
+msgid "is not"
+msgstr "non Ã"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:11
-msgid "Description Contains"
-msgstr "A descriciÃn contÃn"
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:784 ../calendar/gui/e-cal-model.c:791
+#: ../calendar/gui/e-task-table.c:542 ../calendar/gui/memotypes.xml.h:10
+msgid "Public"
+msgstr "PÃblico"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "Non existe"
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:793 ../calendar/gui/e-task-table.c:543
+#: ../calendar/gui/memotypes.xml.h:11
+msgid "Private"
+msgstr "Privado"
 
-#: ../calendar/gui/caltypes.xml.h:11
-msgid "Exactly"
-msgstr "Exactamente"
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
+#: ../calendar/gui/e-cal-model.c:795 ../calendar/gui/e-task-table.c:544
+#: ../calendar/gui/memotypes.xml.h:12 ../widgets/misc/e-send-options.ui.h:7
+msgid "Confidential"
+msgstr "Confidencial"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "Existe"
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:5
+msgid "Organizer"
+msgstr "Organizador"
 
 #: ../calendar/gui/caltypes.xml.h:13
-msgid "Less Than"
-msgstr "Menor que"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/tasktypes.xml.h:6
+msgid "Attendee"
+msgstr "Participante"
 
 #: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
 #: ../plugins/publish-calendar/publish-calendar.c:855
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:397
 msgid "Location"
 msgstr "LocalizaciÃn"
 
-#: ../calendar/gui/caltypes.xml.h:15
-msgid "More Than"
-msgstr "MÃis que"
-
-#: ../calendar/gui/caltypes.xml.h:16
-msgid "Occurs"
-msgstr "Acontece"
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Category"
+msgstr "CategorÃa"
 
-#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Organizer"
-msgstr "Organizador"
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:15 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Anexos"
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:793 ../calendar/gui/e-task-table.c:543
-#: ../calendar/gui/memotypes.xml.h:12
-msgid "Private"
-msgstr "Privado"
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:25
+msgid "Exist"
+msgstr "Existe"
 
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:784 ../calendar/gui/e-cal-model.c:791
-#: ../calendar/gui/e-task-table.c:542 ../calendar/gui/memotypes.xml.h:13
-msgid "Public"
-msgstr "PÃblico"
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:22
+msgid "Do Not Exist"
+msgstr "Non existe"
 
-#: ../calendar/gui/caltypes.xml.h:20
+#: ../calendar/gui/caltypes.xml.h:19
 #: ../calendar/gui/dialogs/event-editor.c:317
 #: ../calendar/gui/dialogs/event-editor.c:338
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "RepeticiÃn"
 
+#: ../calendar/gui/caltypes.xml.h:20
+msgid "Occurs"
+msgstr "Acontece"
+
 #: ../calendar/gui/caltypes.xml.h:21
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
-#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:383
-msgid "Summary"
-msgstr "Resumo"
+msgid "Less Than"
+msgstr "Menor que"
 
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:23
-msgid "Summary Contains"
-msgstr "O resumo contÃn"
+#: ../calendar/gui/caltypes.xml.h:22
+msgid "Exactly"
+msgstr "Exactamente"
 
-#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "contÃn"
+#: ../calendar/gui/caltypes.xml.h:23
+msgid "More Than"
+msgstr "MÃis que"
 
 #: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "non contÃn"
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Summary Contains"
+msgstr "O resumo contÃn"
 
 #: ../calendar/gui/caltypes.xml.h:25 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
-msgid "is"
-msgstr "Ã"
-
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
-msgid "is not"
-msgstr "non Ã"
+#: ../calendar/gui/tasktypes.xml.h:29
+msgid "Description Contains"
+msgstr "A descriciÃn contÃn"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:634
+#: ../calendar/gui/dialogs/alarm-dialog.c:632
 msgid "Edit Reminder"
 msgstr "Editar recordatorio"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/dialogs/alarm-dialog.c:823
 #: ../calendar/gui/e-alarm-list.c:447
 msgid "Pop up an alert"
 msgstr "Alerta emerxente"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:826
+#: ../calendar/gui/dialogs/alarm-dialog.c:824
 #: ../calendar/gui/e-alarm-list.c:443
 msgid "Play a sound"
 msgstr "Reproducir un son"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:827
+#: ../calendar/gui/dialogs/alarm-dialog.c:825
 #: ../calendar/gui/e-alarm-list.c:455
 msgid "Run a program"
 msgstr "Executar un programa"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:828
+#: ../calendar/gui/dialogs/alarm-dialog.c:826
 #: ../calendar/gui/e-alarm-list.c:451
 msgid "Send an email"
 msgstr "Enviar un correo"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Reminder"
-msgstr "Engadir recordatorio"
+msgid "minute(s)"
+msgstr "minuto(s)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-msgid "Custom _message"
-msgstr "_Mensaxe personalizada"
+msgid "hour(s)"
+msgstr "hora(s)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
-msgid "Custom reminder sound"
-msgstr "Son de recordatorio personalizado"
+msgid "day(s)"
+msgstr "dÃa(s)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Mes_sage:"
-msgstr "Mensa_xe:"
+msgid "before"
+msgstr "Ã anterior a"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:80
-msgid "Options"
-msgstr "OpciÃns"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+msgid "after"
+msgstr "MÃis tarde"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
-#: ../calendar/gui/dialogs/event-editor.c:360
-msgid "Reminder"
-msgstr "Recordatorio"
+msgid "start of appointment"
+msgstr "inicio da cita"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-msgid "Repeat"
-msgstr "Repetir"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-msgid "Select A File"
-msgstr "Seleccionar un ficheiro"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-msgid "Send To:"
-msgstr "Enviar a:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
-msgid "_Arguments:"
-msgstr "_Argumentos:"
+msgid "end of appointment"
+msgstr "fin da cita"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
-msgid "_Program:"
-msgstr "_Programa:"
+msgid "Add Reminder"
+msgstr "Engadir recordatorio"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the reminder"
-msgstr "_Repetir o recordatorio"
+#: ../calendar/gui/dialogs/event-editor.c:360
+msgid "Reminder"
+msgstr "Recordatorio"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
-msgid "_Sound:"
-msgstr "_Son:"
+msgid "Repeat"
+msgstr "Repetir"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
-msgid "after"
-msgstr "MÃis tarde"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
-msgid "before"
-msgstr "Ã anterior a"
+msgid "_Repeat the reminder"
+msgstr "_Repetir o recordatorio"
 
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-msgid "day(s)"
-msgstr "dÃa(s)"
+msgid "extra times every"
+msgstr "veces adicionais cada"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:32
+msgid "Options"
+msgstr "OpciÃns"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
-msgid "end of appointment"
-msgstr "fin da cita"
+msgid "Custom _message"
+msgstr "_Mensaxe personalizada"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+msgid "Mes_sage:"
+msgstr "Mensa_xe:"
 
-#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
-msgid "extra times every"
-msgstr "veces adicionais cada"
+msgid "Custom reminder sound"
+msgstr "Son de recordatorio personalizado"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-msgid "hour(s)"
-msgstr "hora(s)"
+msgid "_Sound:"
+msgstr "_Son:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+msgid "Select A File"
+msgstr "Seleccionar un ficheiro"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-msgid "minute(s)"
-msgstr "minuto(s)"
+msgid "_Program:"
+msgstr "_Programa:"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+msgid "_Arguments:"
+msgstr "_Argumentos:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
-msgid "start of appointment"
-msgstr "inicio da cita"
+msgid "Send To:"
+msgstr "Enviar a:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:243
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "AcciÃn/Activador"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-msgid "A_dd"
-msgstr "Enga_dir"
-
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:8
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Reminders"
 msgstr "Recordatorios"
 
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+msgid "A_dd"
+msgstr "Enga_dir"
+
 #: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "Type:"
 msgstr "Tipo:"
@@ -2474,8 +2473,8 @@ msgstr "Tipo:"
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:262 ../mail/mail-config.ui.h:167
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../calendar/gui/dialogs/calendar-setup.c:262 ../mail/mail-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:12
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:284
 msgid "_Name:"
@@ -2509,18 +2508,18 @@ msgstr "Co_r:"
 #: ../calendar/gui/dialogs/calendar-setup.c:462
 #: ../calendar/gui/dialogs/calendar-setup.c:474
 #: ../calendar/gui/dialogs/calendar-setup.c:485
-#: ../mail/em-folder-properties.c:232 ../mail/mail-config.ui.h:56
+#: ../mail/em-folder-properties.c:232 ../mail/mail-config.ui.h:25
 #: ../modules/addressbook/addressbook-config.c:1082
 #: ../modules/addressbook/autocompletion-config.c:240
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
 #: ../plugins/itip-formatter/itip-formatter.c:3225
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "Xeral"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:475
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Task List"
 msgstr "Lista de tarefas"
 
@@ -2695,9 +2694,9 @@ msgid "_Classification"
 msgstr "_ClasificaciÃn"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1199
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
 #: ../mail/e-mail-browser.c:172
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
 #: ../shell/e-shell-window-actions.c:1614
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
@@ -2724,7 +2723,7 @@ msgid "_Options"
 msgstr "_OpciÃns"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1234 ../mail/e-mail-browser.c:179
-#: ../shell/e-shell-window-actions.c:1663 ../smime/gui/smime-ui.ui.h:46
+#: ../shell/e-shell-window-actions.c:1663 ../smime/gui/smime-ui.ui.h:28
 msgid "_View"
 msgstr "_Vista"
 
@@ -2933,16 +2932,16 @@ msgid "The item could not be deleted due to an error: %s"
 msgstr "Non foi posÃbel eliminar o elemento debido a un erro: %s"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
-msgid "Contacts..."
-msgstr "Contactosâ"
+msgid "Enter Delegate"
+msgstr "Introducir un delegado"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
 msgstr "Delegar en:"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
-msgid "Enter Delegate"
-msgstr "Introducir un delegado"
+msgid "Contacts..."
+msgstr "Contactosâ"
 
 #: ../calendar/gui/dialogs/event-editor.c:212
 msgid "_Reminders"
@@ -2969,7 +2968,7 @@ msgid "Make this a recurring event"
 msgstr "Converter en actividade con repeticiÃns"
 
 #: ../calendar/gui/dialogs/event-editor.c:240
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "OpciÃns de envÃo"
 
@@ -2994,13 +2993,13 @@ msgstr "_DispoÃibilidade"
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar a informaciÃn de dispoÃibilidade para os participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3308
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3327
 msgid "Appointment"
 msgstr "Cita"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:2
-#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../calendar/gui/dialogs/event-page.ui.h:24
+#: ../calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "Participantes"
 
@@ -3025,62 +3024,62 @@ msgstr ""
 "organizador"
 
 #: ../calendar/gui/dialogs/event-page.c:651
-#: ../calendar/gui/dialogs/event-page.c:3082
+#: ../calendar/gui/dialogs/event-page.c:3093
 msgid "This event has reminders"
 msgstr "Esta actividade ten recordatorios"
 
 #: ../calendar/gui/dialogs/event-page.c:718
-#: ../calendar/gui/dialogs/event-page.ui.h:7
-#: ../calendar/gui/dialogs/memo-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:1263
+#: ../calendar/gui/dialogs/event-page.c:1277
 msgid "Event with no start date"
 msgstr "Actividade sen data de inicio"
 
-#: ../calendar/gui/dialogs/event-page.c:1266
+#: ../calendar/gui/dialogs/event-page.c:1280
 msgid "Event with no end date"
 msgstr "Actividade sen data de finalizaciÃn"
 
-#: ../calendar/gui/dialogs/event-page.c:1439
-#: ../calendar/gui/dialogs/memo-page.c:708
-#: ../calendar/gui/dialogs/task-page.c:825
+#: ../calendar/gui/dialogs/event-page.c:1453
+#: ../calendar/gui/dialogs/memo-page.c:718
+#: ../calendar/gui/dialogs/task-page.c:836
 msgid "Start date is wrong"
 msgstr "A data de inicio à incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1449
+#: ../calendar/gui/dialogs/event-page.c:1463
 msgid "End date is wrong"
 msgstr "A data de finalizaciÃn à incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1472
+#: ../calendar/gui/dialogs/event-page.c:1486
 msgid "Start time is wrong"
 msgstr "A hora de inicio à incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1479
+#: ../calendar/gui/dialogs/event-page.c:1493
 msgid "End time is wrong"
 msgstr "A hora de finalizaciÃn à incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1644
-#: ../calendar/gui/dialogs/memo-page.c:749
-#: ../calendar/gui/dialogs/task-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:1656
+#: ../calendar/gui/dialogs/memo-page.c:757
+#: ../calendar/gui/dialogs/task-page.c:889
 msgid "An organizer is required."
 msgstr "RequÃrese un organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1678
-#: ../calendar/gui/dialogs/task-page.c:913
+#: ../calendar/gui/dialogs/event-page.c:1690
+#: ../calendar/gui/dialogs/task-page.c:923
 msgid "At least one attendee is required."
 msgstr "RequÃrese polo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:1885
+#: ../calendar/gui/dialogs/event-page.c:1897
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:1887
+#: ../calendar/gui/dialogs/event-page.c:1899
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:2922
+#: ../calendar/gui/dialogs/event-page.c:2933
 #, c-format
 msgid "Unable to open the calendar '%s': %s"
 msgstr "Non foi posÃbel abrir o calendario Â%sÂ: %s"
@@ -3091,175 +3090,175 @@ msgstr "Non foi posÃbel abrir o calendario Â%sÂ: %s"
 #. * on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. * on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:3000
-#: ../calendar/gui/dialogs/memo-page.c:1012
-#: ../calendar/gui/dialogs/task-page.c:1845
+#: ../calendar/gui/dialogs/event-page.c:3011
+#: ../calendar/gui/dialogs/memo-page.c:1020
+#: ../calendar/gui/dialogs/task-page.c:1854
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Està actuando no nome de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3327
+#: ../calendar/gui/dialogs/event-page.c:3338
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dÃa antes da cita"
 msgstr[1] "%d dÃas antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3333
+#: ../calendar/gui/dialogs/event-page.c:3344
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora antes da cita"
 msgstr[1] "%d horas antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3339
+#: ../calendar/gui/dialogs/event-page.c:3350
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antes da cita"
 msgstr[1] "%d minutos antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:3358
+#: ../calendar/gui/dialogs/event-page.c:3369
 msgid "Customize"
 msgstr "Personalizar"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3364
+#: ../calendar/gui/dialogs/event-page.c:3375
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ningunha"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:565
-msgid "Atte_ndees..."
-msgstr "Participa_ntesâ"
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+msgctxt "eventpage"
+msgid "for"
+msgstr "durante"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Custom Reminder:"
-msgstr "Recordatorio personalizado:"
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#: ../calendar/gui/dialogs/event-page.ui.h:4
+msgctxt "eventpage"
+msgid "until"
+msgstr "atÃ"
 
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Event Description"
-msgstr "DescriciÃn da actividade"
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "15 minutos antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "Time _zone:"
-msgstr "Fuso _horario:"
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "1 hora antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:347
-msgid "_Description:"
-msgstr "_DescriciÃn:"
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:10
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "1 dÃa antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../plugins/calendar-weather/calendar-weather.c:381
 msgid "_Location:"
 msgstr "_LocalizaciÃn:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-msgid "_Reminder"
-msgstr "_Recordatorio"
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:7
+#: ../widgets/misc/e-attachment-dialog.c:347
+msgid "_Description:"
+msgstr "_DescriciÃn:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:14
-msgid "_Summary:"
-msgstr "_Resumo:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "_Time:"
 msgstr "_Hora:"
 
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-msgctxt "eventpage"
-msgid "1 day before appointment"
-msgstr "1 dÃa antes da cita"
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
+msgid "Time _zone:"
+msgstr "Fuso _horario:"
 
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-msgctxt "eventpage"
-msgid "1 hour before appointment"
-msgstr "1 hora antes da cita"
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgid "_Summary:"
+msgstr "_Resumo:"
 
-#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
-msgctxt "eventpage"
-msgid "15 minutes before appointment"
-msgstr "15 minutos antes da cita"
+msgid "Event Description"
+msgstr "DescriciÃn da actividade"
 
-#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-msgctxt "eventpage"
-msgid "for"
-msgstr "durante"
+#: ../calendar/gui/dialogs/task-page.ui.h:8
+#: ../calendar/gui/e-meeting-time-sel.c:565
+msgid "Atte_ndees..."
+msgstr "Participa_ntesâ"
 
-#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#: ../calendar/gui/dialogs/event-page.ui.h:25
-msgctxt "eventpage"
-msgid "until"
-msgstr "atÃ"
+#: ../calendar/gui/dialogs/event-page.ui.h:26
+msgid "_Reminder"
+msgstr "_Recordatorio"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:27
+msgid "Custom Reminder:"
+msgstr "Recordatorio personalizado:"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:1
-msgid "April"
-msgstr "Abril"
+msgid "January"
+msgstr "Xaneiro"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:2
-msgid "August"
-msgstr "Agosto"
+msgid "February"
+msgstr "Febreiro"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:3
-msgid "December"
-msgstr "Decembro"
+msgid "March"
+msgstr "Marzo"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:4
-msgid "February"
-msgstr "Febreiro"
+msgid "April"
+msgstr "Abril"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:5
-msgid "January"
-msgstr "Xaneiro"
+msgid "May"
+msgstr "Maio"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:6
-msgid "July"
-msgstr "Xullo"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
 msgid "June"
 msgstr "XuÃo"
 
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
+msgid "July"
+msgstr "Xullo"
+
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:8
-msgid "March"
-msgstr "Marzo"
+msgid "August"
+msgstr "Agosto"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:9
-msgid "May"
-msgstr "Maio"
+msgid "September"
+msgstr "Setembro"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:10
-msgid "November"
-msgstr "Novembro"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
 msgid "October"
 msgstr "Outubro"
 
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
+msgid "November"
+msgstr "Novembro"
+
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "December"
+msgstr "Decembro"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
 msgid "Select Date"
 msgstr "Seleccionar unha data"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
 #: ../modules/calendar/e-cal-shell-view-actions.c:1363
 msgid "Select _Today"
 msgstr "Seleccionar o dÃa de _hoxe"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-msgid "September"
-msgstr "Setembro"
-
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3312
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3331
 msgid "Memo"
 msgstr "Nota"
 
@@ -3267,53 +3266,53 @@ msgstr "Nota"
 msgid "Print this memo"
 msgstr "Imprimir esta nota"
 
-#: ../calendar/gui/dialogs/memo-page.c:405
+#: ../calendar/gui/dialogs/memo-page.c:418
 msgid "Memo's start date is in the past"
 msgstr "A hora de inicio da nota xa pasou"
 
-#: ../calendar/gui/dialogs/memo-page.c:442
+#: ../calendar/gui/dialogs/memo-page.c:455
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr ""
 "Non à posÃbel editar a nota porque a lista de notas solicitada à de sà "
 "lectura"
 
-#: ../calendar/gui/dialogs/memo-page.c:446
+#: ../calendar/gui/dialogs/memo-page.c:459
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Non à posÃbel editar a nota na sÃa totalidade porque vostede non à o "
 "organizador"
 
-#: ../calendar/gui/dialogs/memo-page.c:936
+#: ../calendar/gui/dialogs/memo-page.c:944
 #, c-format
 msgid "Unable to open memos in '%s': %s"
 msgstr "Non à posÃbel abrir as notas en Â%sÂ: %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1144 ../em-format/em-format.c:1062
+#: ../calendar/gui/dialogs/memo-page.c:1151 ../em-format/em-format.c:1062
 #: ../em-format/em-format-quote.c:318 ../mail/em-format-html.c:2663
 #: ../mail/em-format-html.c:2728 ../mail/em-format-html.c:2752
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:72
 msgid "To"
 msgstr "Para"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.ui.h:5
-msgid "Sta_rt date:"
-msgstr "Data de _inicio:"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "Resu_mo:"
+#: ../calendar/gui/dialogs/task-page.c:338
+#: ../calendar/gui/dialogs/task-page.ui.h:9
+msgid "_List:"
+msgstr "_Lista:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "_Para:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:4
+msgid "Sta_rt date:"
+msgstr "Data de _inicio:"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:339
-#: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_List:"
-msgstr "_Lista:"
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+msgid "Su_mmary:"
+msgstr "Resu_mo:"
 
 #: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
@@ -3450,37 +3449,37 @@ msgid "21st to 31st"
 msgstr "Do 21 ao 31"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1189
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Monday"
 msgstr "Luns"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1190
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Tuesday"
 msgstr "Martes"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1191
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Wednesday"
 msgstr "MÃrcores"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1192
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "Thursday"
 msgstr "Xoves"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1193
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "Friday"
 msgstr "Venres"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1194
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "Saturday"
 msgstr "SÃbado"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1195
-#: ../modules/calendar/e-calendar-preferences.ui.h:38
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -3515,27 +3514,29 @@ msgstr "Non foi posÃbel obter unha selecciÃn para eliminar."
 msgid "Date/Time"
 msgstr "Data e hora"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
-msgid "Every"
-msgstr "Cada"
-
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:2
-msgid "Exceptions"
-msgstr "ExcepciÃns"
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "dÃa(s)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:88
-msgid "Preview"
-msgstr "Vista previa"
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
+msgctxt "recurrpage"
+msgid "week(s)"
+msgstr "semana(s)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
-msgid "This appointment rec_urs"
-msgstr "Esta cita r_epÃtese"
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
+msgctxt "recurrpage"
+msgid "month(s)"
+msgstr "mes(es)"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgctxt "recurrpage"
-msgid "day(s)"
-msgstr "dÃa(s)"
+msgid "year(s)"
+msgstr "ano(s)"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:10
@@ -3546,32 +3547,30 @@ msgstr "durante"
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
 msgctxt "recurrpage"
-msgid "forever"
-msgstr "Indefinidamente"
+msgid "until"
+msgstr "atÃ"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
 msgctxt "recurrpage"
-msgid "month(s)"
-msgstr "mes(es)"
+msgid "forever"
+msgstr "Indefinidamente"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-msgctxt "recurrpage"
-msgid "until"
-msgstr "atÃ"
+msgid "This appointment rec_urs"
+msgstr "Esta cita r_epÃtese"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:17
+msgid "Every"
+msgstr "Cada"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:18
-msgctxt "recurrpage"
-msgid "week(s)"
-msgstr "semana(s)"
+msgid "Exceptions"
+msgstr "ExcepciÃns"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-msgctxt "recurrpage"
-msgid "year(s)"
-msgstr "ano(s)"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20 ../mail/mail-config.ui.h:27
+msgid "Preview"
+msgstr "Vista previa"
 
 #: ../calendar/gui/dialogs/send-comp.c:196
 msgid "Send my reminders with this event"
@@ -3586,116 +3585,117 @@ msgstr "Notificar sà aos participantes n_ovos"
 msgid "Completed date is wrong"
 msgstr "A data de conclusiÃn à incorrecta"
 
-#: ../calendar/gui/dialogs/task-details-page.c:488
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "PÃxina web"
 
-#. To Translators: This is task status
+#. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:300
-#: ../calendar/gui/e-cal-model-tasks.c:493
-#: ../calendar/gui/e-cal-model-tasks.c:778 ../calendar/gui/e-task-table.c:220
-#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:646
-#: ../calendar/gui/print.c:3398 ../mail/em-sync-stream.c:152
-#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
-#, c-format
-msgid "Canceled"
-msgstr "Cancelada"
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-task-table.c:566 ../calendar/gui/tasktypes.xml.h:19
+#: ../mail/message-list.c:1282 ../widgets/misc/e-send-options.ui.h:2
+msgid "High"
+msgstr "Alta"
 
-#. To Translators: This is task status
+#. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:297
-#: ../calendar/gui/e-cal-model-tasks.c:491
-#: ../calendar/gui/e-cal-model-tasks.c:776
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
-#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:645 ../calendar/gui/print.c:3395
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:387
-msgid "Completed"
-msgstr "Completada"
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model.c:1607 ../calendar/gui/e-task-table.c:567
+#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1281
+#: ../widgets/misc/e-send-options.ui.h:5
+msgid "Normal"
+msgstr "Normal"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-task-table.c:566 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1286 ../widgets/misc/e-send-options.ui.h:13
-msgid "High"
-msgstr "Alta"
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-task-table.c:568 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1280 ../widgets/misc/e-send-options.ui.h:4
+msgid "Low"
+msgstr "Baixa"
 
-#. To Translators: This is task status
+#. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#: ../calendar/gui/e-task-table.c:569 ../calendar/gui/tasktypes.xml.h:22
+#: ../widgets/misc/e-send-options.ui.h:1
+msgid "Undefined"
+msgstr "Sen definir"
+
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/e-cal-component-preview.c:304
+#: ../calendar/gui/e-cal-model-tasks.c:487
+#: ../calendar/gui/e-cal-model-tasks.c:772 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:643
+#: ../calendar/gui/print.c:3408 ../calendar/gui/tasktypes.xml.h:11
+msgid "Not Started"
+msgstr "Non iniciada"
+
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:12
 #: ../calendar/gui/e-cal-component-preview.c:294
 #: ../calendar/gui/e-cal-model-tasks.c:489
 #: ../calendar/gui/e-cal-model-tasks.c:774
 #: ../calendar/gui/e-cal-model-tasks.c:852 ../calendar/gui/e-task-table.c:216
 #: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:644
-#: ../calendar/gui/print.c:3392
+#: ../calendar/gui/print.c:3411
 msgid "In Progress"
 msgstr "En progreso"
 
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:323
-#: ../calendar/gui/e-task-table.c:568 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1284 ../widgets/misc/e-send-options.ui.h:14
-msgid "Low"
-msgstr "Baixa"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-cal-model.c:1607 ../calendar/gui/e-task-table.c:567
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1285
-#: ../widgets/misc/e-send-options.ui.h:16
-msgid "Normal"
-msgstr "Normal"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:14
+#: ../calendar/gui/e-cal-component-preview.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:491
+#: ../calendar/gui/e-cal-model-tasks.c:776
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
+#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
+#: ../calendar/gui/e-task-table.c:645 ../calendar/gui/print.c:3414
+#: ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:387
+msgid "Completed"
+msgstr "Completada"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:304
-#: ../calendar/gui/e-cal-model-tasks.c:487
-#: ../calendar/gui/e-cal-model-tasks.c:772 ../calendar/gui/e-task-table.c:214
-#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:643
-#: ../calendar/gui/print.c:3389 ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "Non iniciada"
-
 #: ../calendar/gui/dialogs/task-details-page.ui.h:16
-msgid "P_ercent complete:"
-msgstr "Porc_entaxe completada:"
-
-#: ../calendar/gui/dialogs/task-details-page.ui.h:17
-msgid "Stat_us:"
-msgstr "Esta_do:"
+#: ../calendar/gui/e-cal-component-preview.c:300
+#: ../calendar/gui/e-cal-model-tasks.c:493
+#: ../calendar/gui/e-cal-model-tasks.c:778 ../calendar/gui/e-task-table.c:220
+#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:646
+#: ../calendar/gui/print.c:3417 ../mail/em-sync-stream.c:152
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
+#, c-format
+msgid "Canceled"
+msgstr "Cancelada"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/dialogs/task-details-page.ui.h:18
-#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 #: ../calendar/gui/e-cal-model.c:3496
-#: ../calendar/gui/e-meeting-list-view.c:635
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
-#: ../mail/message-list.etspec.h:17
+#: ../calendar/gui/e-meeting-list-view.c:661
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:72
+#: ../mail/message-list.etspec.h:1
 msgid "Status"
 msgstr "Estado"
 
-#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:18
+msgid "Stat_us:"
+msgstr "Esta_do:"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:19
+msgid "P_ercent complete:"
+msgstr "Porc_entaxe completada:"
+
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:569 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:27
-msgid "Undefined"
-msgstr "Sen definir"
+#: ../widgets/misc/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "_Prioridade:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
 msgstr "_Data completada:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:35
-msgid "_Priority:"
-msgstr "_Prioridade:"
-
 #: ../calendar/gui/dialogs/task-details-page.ui.h:23
 msgid "_Web Page:"
 msgstr "PÃxina _Web:"
@@ -3712,7 +3712,7 @@ msgstr "Prema para cambiar ou ver a informaciÃn do estado da tarefa"
 msgid "_Send Options"
 msgstr "OpciÃn_s de envÃo"
 
-#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3310
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3329
 #: ../widgets/misc/e-send-options.c:535
 msgid "Task"
 msgstr "Tarefa"
@@ -3725,27 +3725,27 @@ msgstr "InformaciÃn da tarefa"
 msgid "Print this task"
 msgstr "Imprimir esta tarefa"
 
-#: ../calendar/gui/dialogs/task-page.c:251
+#: ../calendar/gui/dialogs/task-page.c:250
 msgid "Task's start date is in the past"
 msgstr "A data de inicio da tarefa xa pasou"
 
-#: ../calendar/gui/dialogs/task-page.c:252
+#: ../calendar/gui/dialogs/task-page.c:251
 msgid "Task's due date is in the past"
 msgstr "A data de vencemento da tarefa xa pasou"
 
-#: ../calendar/gui/dialogs/task-page.c:286
+#: ../calendar/gui/dialogs/task-page.c:285
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
 "Non à posÃbel editar a tarefa porque a lista de tarefas seleccionada à de sà "
 "lectura"
 
-#: ../calendar/gui/dialogs/task-page.c:290
+#: ../calendar/gui/dialogs/task-page.c:289
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Non à posÃbel editar a tarefa na sÃa totalidade porque vostede non à o "
 "organizador"
 
-#: ../calendar/gui/dialogs/task-page.c:294
+#: ../calendar/gui/dialogs/task-page.c:293
 msgid ""
 "Task cannot be edited, because the selected task list does not support "
 "assigned tasks"
@@ -3753,29 +3753,29 @@ msgstr ""
 "Non à posÃbel editar a tarefa porque a lista de tarefas seleccionada non "
 "admite asignaciÃn de tarefas"
 
-#: ../calendar/gui/dialogs/task-page.c:347
-#: ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.c:346
+#: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:807
+#: ../calendar/gui/dialogs/task-page.c:818
 msgid "Due date is wrong"
 msgstr "A data de vencemento à incorrecta"
 
-#: ../calendar/gui/dialogs/task-page.c:1764
+#: ../calendar/gui/dialogs/task-page.c:1773
 #, c-format
 msgid "Unable to open tasks in '%s': %s"
 msgstr "Non à posÃbel abrir as tarefas en Â%sÂ: %s"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:2
-msgid "Categor_ies..."
-msgstr "Ca_tegorÃasâ"
-
 #: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
 msgstr "D_ata de vencemento:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:7
+#: ../calendar/gui/dialogs/task-page.ui.h:5
+msgid "Categor_ies..."
+msgstr "Ca_tegorÃasâ"
+
+#: ../calendar/gui/dialogs/task-page.ui.h:6
 msgid "Time zone:"
 msgstr "Fuso horario:"
 
@@ -4028,7 +4028,7 @@ msgstr "vista de calendario para un mes"
 msgid "calendar view for one or more weeks"
 msgstr "vista de calendario para unha ou mÃis semanas"
 
-#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:671
+#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:680
 msgid "Untitled"
 msgstr "Sen tÃtulo"
 
@@ -4059,7 +4059,7 @@ msgstr "Estado:"
 msgid "Priority:"
 msgstr "Prioridade:"
 
-#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:159
 msgid "Description:"
 msgstr "DescriciÃn:"
 
@@ -4067,58 +4067,58 @@ msgstr "DescriciÃn:"
 msgid "Web Page:"
 msgstr "PÃxina Web:"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr "% completado"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:4
+#: ../calendar/gui/e-calendar-table.etspec.h:1
 msgid "Click to add a task"
 msgstr "Prema para engadir unha tarefa"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5
-msgid "Complete"
-msgstr "Completado"
+#: ../calendar/gui/e-calendar-table.etspec.h:2
+msgid "Start date"
+msgstr "Data de inicio"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6
+#: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-meeting-list-view.c:627
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../mail/e-mail-account-tree-view.c:139
+#: ../widgets/misc/e-attachment-tree-view.c:584
+msgid "Type"
+msgstr "Tipo"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Completion date"
 msgstr "Data de conclusiÃn"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
-#: ../calendar/gui/e-cal-list-view.etspec.h:2
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:388
-msgid "Created"
-msgstr "Creado"
+#: ../calendar/gui/e-calendar-table.etspec.h:6
+msgid "Complete"
+msgstr "Completado"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Data de vencemento"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:9
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-memo-table.etspec.h:4
-msgid "Last modified"
-msgstr "Ãltima modificaciÃn"
+#, no-c-format
+msgid "% Complete"
+msgstr "% completado"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:18
 #: ../plugins/save-calendar/csv-format.c:394
 msgid "Priority"
 msgstr "Prioridade"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-msgid "Start date"
-msgstr "Data de inicio"
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../plugins/save-calendar/csv-format.c:388
+msgid "Created"
+msgstr "Creado"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:598
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../mail/e-mail-account-tree-view.c:139
-#: ../widgets/misc/e-attachment-tree-view.c:584
-msgid "Type"
-msgstr "Tipo"
+msgid "Last modified"
+msgstr "Ãltima modificaciÃn"
 
 #: ../calendar/gui/e-calendar-view.c:423
 msgid "Cut selected events to the clipboard"
@@ -4165,7 +4165,7 @@ msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1932 ../calendar/gui/print.c:3344
+#: ../calendar/gui/e-calendar-view.c:1932 ../calendar/gui/print.c:3363
 #, c-format
 msgid "Location: %s"
 msgstr "LocalizaciÃn: %s"
@@ -4176,20 +4176,20 @@ msgstr "LocalizaciÃn: %s"
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
-msgid "End Date"
-msgstr "Data de finalizaciÃn"
-
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Data de inicio"
 
-#: ../calendar/gui/e-cal-model.c:797 ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Data de finalizaciÃn"
+
+#: ../calendar/gui/e-cal-model.c:797 ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1149
-#: ../calendar/gui/print.c:1166 ../e-util/e-charset.c:52
+#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1162
+#: ../calendar/gui/print.c:1179 ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
 #: ../plugins/itip-formatter/itip-formatter.c:466
 #: ../plugins/itip-formatter/itip-formatter.c:2872
@@ -4205,14 +4205,14 @@ msgid "Assigned"
 msgstr "Asignada"
 
 #: ../calendar/gui/e-cal-model.c:1613 ../calendar/gui/e-cal-model-tasks.c:1143
-#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
 #: ../calendar/gui/e-meeting-store.c:1053
 msgid "Yes"
 msgstr "Si"
 
 #: ../calendar/gui/e-cal-model.c:1613 ../calendar/gui/e-cal-model-tasks.c:1143
-#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "Non"
@@ -4223,28 +4223,28 @@ msgid "Opening %s"
 msgstr "Abrindo %s"
 
 #: ../calendar/gui/e-cal-model.c:3440
-#: ../calendar/gui/e-meeting-list-view.c:214
+#: ../calendar/gui/e-meeting-list-view.c:213
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
 #: ../plugins/itip-formatter/itip-formatter.c:2860
 msgid "Accepted"
 msgstr "Aceptado"
 
 #: ../calendar/gui/e-cal-model.c:3441
-#: ../calendar/gui/e-meeting-list-view.c:215
+#: ../calendar/gui/e-meeting-list-view.c:214
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
 #: ../plugins/itip-formatter/itip-formatter.c:2866
 msgid "Declined"
 msgstr "Rexeitado"
 
 #: ../calendar/gui/e-cal-model.c:3442
-#: ../calendar/gui/e-meeting-list-view.c:216
+#: ../calendar/gui/e-meeting-list-view.c:215
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
 #: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Tentative"
 msgstr "Provisional"
 
 #: ../calendar/gui/e-cal-model.c:3443
-#: ../calendar/gui/e-meeting-list-view.c:217
+#: ../calendar/gui/e-meeting-list-view.c:216
 #: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
 #: ../plugins/itip-formatter/itip-formatter.c:2869
 msgid "Delegated"
@@ -4301,15 +4301,15 @@ msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../calendar/gui/e-day-view.c:1021 ../calendar/gui/e-week-view.c:773
-#: ../calendar/gui/print.c:975 ../calendar/gui/print.c:994
-#: ../calendar/gui/print.c:2482 ../calendar/gui/print.c:2502
+#: ../calendar/gui/print.c:988 ../calendar/gui/print.c:1007
+#: ../calendar/gui/print.c:2498 ../calendar/gui/print.c:2518
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:1024 ../calendar/gui/e-week-view.c:776
-#: ../calendar/gui/print.c:980 ../calendar/gui/print.c:996
-#: ../calendar/gui/print.c:2487 ../calendar/gui/print.c:2504
+#: ../calendar/gui/print.c:993 ../calendar/gui/print.c:1009
+#: ../calendar/gui/print.c:2503 ../calendar/gui/print.c:2520
 msgid "pm"
 msgstr "pm"
 
@@ -4320,7 +4320,7 @@ msgstr "pm"
 #. * order but don't change the specifiers or add
 #. * anything.
 #: ../calendar/gui/e-day-view.c:1821 ../calendar/gui/e-day-view-top-item.c:848
-#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1966
+#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1982
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
@@ -4347,7 +4347,7 @@ msgstr "Mostrar o fuso horario secundario"
 #: ../calendar/gui/e-day-view-time-item.c:842
 #: ../modules/calendar/e-calendar-preferences.c:179
 #: ../modules/calendar/e-calendar-preferences.c:231
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ningunha"
@@ -4358,84 +4358,84 @@ msgstr "Ningunha"
 msgid "Select..."
 msgstr "Seleccionarâ"
 
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../calendar/gui/e-meeting-list-view.c:63
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Required Participants"
 msgstr "Participantes necesarios"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Optional Participants"
 msgstr "Participantes opcionais"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Resources"
 msgstr "Recursos"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-list-view.c:173
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1145
+#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1158
 msgid "Individual"
 msgstr "Individual"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1146 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/print.c:1159 ../widgets/table/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Grupo"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1147
+#: ../calendar/gui/print.c:1160
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/print.c:1148
+#: ../calendar/gui/print.c:1161
 msgid "Room"
 msgstr "Sala"
 
-#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/print.c:1162
+#: ../calendar/gui/print.c:1175
 msgid "Chair"
 msgstr "Presidente"
 
-#: ../calendar/gui/e-meeting-list-view.c:189
+#: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1163
+#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1176
 msgid "Required Participant"
 msgstr "Participante necesario"
 
-#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-list-view.c:189
 #: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1164
+#: ../calendar/gui/print.c:1177
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
-#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-list-view.c:190
 #: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/print.c:1165
+#: ../calendar/gui/print.c:1178
 msgid "Non-Participant"
 msgstr "Non-participante"
 
-#: ../calendar/gui/e-meeting-list-view.c:213
+#: ../calendar/gui/e-meeting-list-view.c:212
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
 #: ../calendar/gui/e-meeting-store.c:1060
 msgid "Needs Action"
 msgstr "Necesita unha acciÃn"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:608
 msgid "Attendee                          "
 msgstr "Participante                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:623
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+#: ../calendar/gui/e-meeting-list-view.c:650
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "RSVP"
 
@@ -4523,30 +4523,30 @@ msgstr "Hora de _inicio:"
 msgid "_End time:"
 msgstr "Hora de _finalizaciÃn:"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Click here to add an attendee"
 msgstr "Prema aquà para engadir un participante"
 
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Nome comÃn"
+msgid "Member"
+msgstr "Integrante"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Delegated To"
+msgstr "Delegada a"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Delegated From"
 msgstr "Delegada por"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Delegada a"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+msgid "Common Name"
+msgstr "Nome comÃn"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Language"
 msgstr "Idioma"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Integrante"
-
 #: ../calendar/gui/e-memo-table.c:420
 #: ../modules/calendar/e-cal-shell-content.c:474
 #: ../modules/calendar/e-memo-shell-view-actions.c:231
@@ -4591,7 +4591,7 @@ msgstr "Eliminar as notas seleccionadas"
 msgid "Select all visible memos"
 msgstr "Seleccionar todas as notas visÃbeis"
 
-#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.etspec.h:1
 msgid "Click to add a memo"
 msgstr "Prema para engadir unha nota"
 
@@ -4604,10 +4604,10 @@ msgstr "Prema para engadir unha nota"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:692 ../calendar/gui/print.c:2271
+#: ../calendar/gui/e-task-table.c:692 ../calendar/gui/print.c:2287
 #: ../calendar/importers/icalendar-importer.c:85
 #: ../calendar/importers/icalendar-importer.c:1044
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 #: ../modules/calendar/e-cal-shell-content.c:435
 #: ../modules/calendar/e-task-shell-view-actions.c:254
 #: ../modules/calendar/e-task-shell-view-actions.c:269
@@ -4645,7 +4645,7 @@ msgstr "Seleccionar un fuso horario"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1947
+#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1963
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -4776,247 +4776,247 @@ msgstr "Non foi posÃbel reservar un recurso, erro: "
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante na actividade."
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:592
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:592
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:592
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:592
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:579
+#: ../calendar/gui/print.c:592
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:593
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:593
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:593
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:593
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:580
+#: ../calendar/gui/print.c:593
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:594
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:594
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:594
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:594
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:594
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:595
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:595
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:595
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:595
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:595
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:596
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:596
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:596
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:596
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:596
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:597
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:597
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:597
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:597
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:597
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:598
 msgid "31st"
 msgstr "31"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:642
+#: ../calendar/gui/print.c:655
 msgid "Su"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:642
+#: ../calendar/gui/print.c:655
 msgid "Mo"
 msgstr "Lu"
 
-#: ../calendar/gui/print.c:642
+#: ../calendar/gui/print.c:655
 msgid "Tu"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:642
+#: ../calendar/gui/print.c:655
 msgid "We"
 msgstr "MÃ"
 
-#: ../calendar/gui/print.c:643
+#: ../calendar/gui/print.c:656
 msgid "Th"
 msgstr "Xo"
 
-#: ../calendar/gui/print.c:643
+#: ../calendar/gui/print.c:656
 msgid "Fr"
 msgstr "Ve"
 
-#: ../calendar/gui/print.c:643
+#: ../calendar/gui/print.c:656
 msgid "Sa"
 msgstr "SÃ"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3137
+#: ../calendar/gui/print.c:3156
 msgid " to "
 msgstr " para "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3147
+#: ../calendar/gui/print.c:3166
 msgid " (Completed "
 msgstr " (Completado "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3153
+#: ../calendar/gui/print.c:3172
 msgid "Completed "
 msgstr "Completado "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3163
+#: ../calendar/gui/print.c:3182
 msgid " (Due "
 msgstr " (Vencemento "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3170
+#: ../calendar/gui/print.c:3189
 msgid "Due "
 msgstr "Vencemento "
 
-#: ../calendar/gui/print.c:3335
+#: ../calendar/gui/print.c:3354
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:3362
+#: ../calendar/gui/print.c:3381
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:3405
+#: ../calendar/gui/print.c:3424
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:3420
+#: ../calendar/gui/print.c:3439
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:3438
+#: ../calendar/gui/print.c:3457
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada: %i"
 
-#: ../calendar/gui/print.c:3449
+#: ../calendar/gui/print.c:3468
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3462
+#: ../calendar/gui/print.c:3481
 #, c-format
 msgid "Categories: %s"
 msgstr "CategorÃas: %s"
 
-#: ../calendar/gui/print.c:3473
+#: ../calendar/gui/print.c:3492
 msgid "Contacts: "
 msgstr "Contactos: "
 
-#: ../calendar/gui/tasktypes.xml.h:2
-#, no-c-format
-msgid "% Completed"
-msgstr "% completado"
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "In progress"
+msgstr "En progreso"
 
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:14
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: ../calendar/gui/tasktypes.xml.h:15
-msgid "In progress"
-msgstr "En progreso"
+#: ../calendar/gui/tasktypes.xml.h:25
+#, no-c-format
+msgid "% Completed"
+msgstr "% completado"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "Ã maior que"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "Ã menor que"
 
@@ -6781,13 +6781,13 @@ msgid "Please enter your password."
 msgstr "Introduza o seu contrasinal."
 
 #: ../capplet/settings/mail-account-view.c:280
-#: ../mail/em-account-editor.c:5065 ../plugins/caldav/caldav-source.c:67
+#: ../mail/em-account-editor.c:5085 ../plugins/caldav/caldav-source.c:67
 msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../capplet/settings/mail-account-view.c:374
 #: ../capplet/settings/mail-account-view.c:419
-#: ../mail/em-account-editor.c:4936 ../mail/em-account-editor.c:4993
+#: ../mail/em-account-editor.c:4956 ../mail/em-account-editor.c:5013
 #: ../modules/online-accounts/e-online-accounts-google.c:295
 #: ../modules/online-accounts/e-online-accounts-google.c:369
 #: ../plugins/google-account-setup/google-contacts-source.c:55
@@ -6799,31 +6799,31 @@ msgstr "Google"
 msgid "Personal details:"
 msgstr "InformaciÃn persoal:"
 
-#: ../capplet/settings/mail-account-view.c:493 ../mail/mail-config.ui.h:75
+#: ../capplet/settings/mail-account-view.c:493 ../mail/mail-config.ui.h:179
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../capplet/settings/mail-account-view.c:502 ../mail/mail-config.ui.h:46
+#: ../capplet/settings/mail-account-view.c:502 ../mail/mail-config.ui.h:180
 msgid "Email address:"
 msgstr "Enderezo de correo:"
 
-#: ../capplet/settings/mail-account-view.c:512 ../mail/mail-config.ui.h:38
+#: ../capplet/settings/mail-account-view.c:512 ../mail/mail-config.ui.h:181
 msgid "Details:"
 msgstr "InformaciÃn:"
 
-#: ../capplet/settings/mail-account-view.c:520 ../mail/mail-config.ui.h:93
+#: ../capplet/settings/mail-account-view.c:520 ../mail/mail-config.ui.h:182
 msgid "Receiving"
 msgstr "Recibindo"
 
-#: ../capplet/settings/mail-account-view.c:527 ../mail/mail-config.ui.h:129
+#: ../capplet/settings/mail-account-view.c:527 ../mail/mail-config.ui.h:184
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: ../capplet/settings/mail-account-view.c:536 ../mail/mail-config.ui.h:128
+#: ../capplet/settings/mail-account-view.c:536 ../mail/mail-config.ui.h:185
 msgid "Server address:"
 msgstr "Endrezo do servidor:"
 
-#: ../capplet/settings/mail-account-view.c:545 ../mail/mail-config.ui.h:153
+#: ../capplet/settings/mail-account-view.c:545 ../mail/mail-config.ui.h:186
 msgid "Username:"
 msgstr "Nome do usuario:"
 
@@ -6836,7 +6836,7 @@ msgstr "Usar cifrado:"
 msgid "never"
 msgstr "nunca"
 
-#: ../capplet/settings/mail-account-view.c:571 ../mail/mail-config.ui.h:113
+#: ../capplet/settings/mail-account-view.c:571 ../mail/mail-config.ui.h:183
 msgid "Sending"
 msgstr "Enviando"
 
@@ -6886,7 +6886,7 @@ msgstr ""
 "o seu correo electrÃnico"
 
 #: ../capplet/settings/mail-account-view.c:636
-#: ../mail/em-account-editor.c:2852 ../mail/em-account-editor.c:2988
+#: ../mail/em-account-editor.c:2878 ../mail/em-account-editor.c:3014
 msgid "Identity"
 msgstr "Identidade"
 
@@ -6938,7 +6938,7 @@ msgid "Back - Receiving options"
 msgstr "Anterior - OpciÃns de recepciÃn"
 
 #: ../capplet/settings/mail-account-view.c:641
-#: ../mail/em-account-editor.c:3975
+#: ../mail/em-account-editor.c:4001
 msgid "Defaults"
 msgstr "PredefiniciÃns"
 
@@ -6967,12 +6967,12 @@ msgid "Setup Google calendar with Evolution"
 msgstr "Configurar o calendario de Google co Evolution."
 
 #: ../capplet/settings/mail-account-view.c:772
-#: ../mail/em-account-editor.c:4730
+#: ../mail/em-account-editor.c:4752
 msgid "You may need to enable IMAP access."
 msgstr "Pode que deba activar o acceso IMAP."
 
 #: ../capplet/settings/mail-account-view.c:780
-#: ../mail/em-account-editor.c:4721
+#: ../mail/em-account-editor.c:4743
 msgid "Google account settings:"
 msgstr "Axustes da conta de Google:"
 
@@ -6981,7 +6981,7 @@ msgid "Setup Yahoo calendar with Evolution"
 msgstr "Configurar o calendario Yahoo co Evolution"
 
 #: ../capplet/settings/mail-account-view.c:810
-#: ../mail/em-account-editor.c:4749
+#: ../mail/em-account-editor.c:4770
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
@@ -6991,7 +6991,7 @@ msgstr ""
 "calendario. Se non à vÃlido confirme ou reintroduza o nome do calendario."
 
 #: ../capplet/settings/mail-account-view.c:819
-#: ../mail/em-account-editor.c:4758
+#: ../mail/em-account-editor.c:4779
 msgid "Yahoo account settings:"
 msgstr "Axustes da conta de Yahoo:"
 
@@ -7017,7 +7017,7 @@ msgid "Evolution account assistant"
 msgstr "Asistente de contas do Evolution"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:371 ../mail/e-mail-session.c:781
+#: ../capplet/settings/mail-capplet-shell.c:371 ../mail/e-mail-session.c:839
 #: ../modules/addressbook/e-book-shell-backend.c:106
 #: ../modules/addressbook/e-book-shell-migrate.c:136
 #: ../modules/calendar/e-cal-shell-backend.c:119
@@ -7103,7 +7103,7 @@ msgstr "Gardar como borra_dor"
 msgid "Save as draft"
 msgstr "Gardar como borrador"
 
-#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:350
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:349
 msgid "S_end"
 msgstr "_Enviar"
 
@@ -7211,43 +7211,43 @@ msgstr ""
 "Introducir os enderezos que recibirÃn unha copia da mensaxe sen aparecerer "
 "na lista de destinatarios"
 
-#: ../composer/e-composer-header-table.c:1006
+#: ../composer/e-composer-header-table.c:775
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:1015
+#: ../composer/e-composer-header-table.c:784
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-composer-header-table.c:1019
+#: ../composer/e-composer-header-table.c:788
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:1024
+#: ../composer/e-composer-header-table.c:793
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:1029
+#: ../composer/e-composer-header-table.c:798
 msgid "_Bcc:"
 msgstr "_Cco:"
 
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:803
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-composer-header-table.c:1038
+#: ../composer/e-composer-header-table.c:807
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../composer/e-composer-header-table.c:1047
+#: ../composer/e-composer-header-table.c:816
 msgid "Si_gnature:"
 msgstr "Si_natura:"
 
-#: ../composer/e-composer-name-header.c:141
+#: ../composer/e-composer-name-header.c:145
 msgid "Click here for the address book"
 msgstr "Premer aquà para ir à axenda de enderezos"
 
-#: ../composer/e-composer-post-header.c:131
+#: ../composer/e-composer-post-header.c:135
 msgid "Click here to select folders to post to"
 msgstr "Premer aquà para seleccionar os cartafoles de destino"
 
@@ -7267,7 +7267,7 @@ msgstr "Busca de texto"
 msgid "Search for and replace text"
 msgstr "Buscar e substituÃr un texto"
 
-#: ../composer/e-composer-private.c:370
+#: ../composer/e-composer-private.c:369
 msgid "Save draft"
 msgstr "Gardar o borrador"
 
@@ -7288,72 +7288,86 @@ msgstr ""
 "Non à posÃbel cifrar a mensaxe saÃnte: non hai un certificado de cifrado "
 "estabelecido para esta conta"
 
-#: ../composer/e-msg-composer.c:1700 ../composer/e-msg-composer.c:2087
+#: ../composer/e-msg-composer.c:1609 ../composer/e-msg-composer.c:1996
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:4257
+#: ../composer/e-msg-composer.c:4166
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "O editor contÃn un corpo de mensaxe sen texto, polo que non à posÃbel a "
 "ediciÃn."
 
-#: ../composer/e-msg-composer.c:4961
+#: ../composer/e-msg-composer.c:4870
 msgid "Untitled Message"
 msgstr "Mensaxe sen tÃtulo"
 
 #: ../composer/mail-composer.error.xml.h:1
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-msgstr ""
-" Hai algÃns anexos descargÃndose. Enviar o correo agora farà que se envÃe "
-"sen eses anexos pendentes "
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "Non pode anexar o ficheiro Â{0}Â a esta mensaxe."
 
 #: ../composer/mail-composer.error.xml.h:2
-msgid "All accounts have been removed."
-msgstr "EliminÃronse todas as contas."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr ""
+"O ficheiro Â{0} non à un ficheiro normal e non pode enviarse nunha mensaxe."
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid "An error occurred while saving to your Drafts folder."
-msgstr "Produciuse un erro ao gardar no cartafol dos borradores."
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Non foi posÃbel obter as mensaxes para anexar de {0}."
 
 #: ../composer/mail-composer.error.xml.h:4
-msgid "An error occurred while saving to your Outbox folder."
-msgstr "Produciuse un erro ao gardar no cartafol de saÃda."
+msgid "Because &quot;{1}&quot;."
+msgstr "Debido a Â{1}Â."
 
 #: ../composer/mail-composer.error.xml.h:5
-msgid "An error occurred while sending. How do you want to proceed?"
-msgstr "Produciuse un erro durante o envÃo. Que desexa facer?"
+msgid "Do you want to recover unfinished messages?"
+msgstr "Desexa recuperar as mensaxes non finalizadas?"
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
-"Està seguro de que desexa rexeitar a mensaxe que està redactando titulada "
-"Â{0}Â?"
+"O Evolution saÃu inesperadamente mentres estaba redactando unha mensaxe "
+"nova. Se recupera a mensaxe poderà continuar onde a deixou."
 
 #: ../composer/mail-composer.error.xml.h:7
-msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr ""
-"Debido a Â{0}Â, quizais necesite seleccionar diferentes opciÃns de correo."
+msgid "_Do not Recover"
+msgstr "_Non recuperar"
 
 #: ../composer/mail-composer.error.xml.h:8
-msgid "Because &quot;{1}&quot;."
-msgstr "Debido a Â{1}Â."
+msgid "_Recover"
+msgstr "_Recuperar"
 
 #: ../composer/mail-composer.error.xml.h:9
+msgid "Could not save to autosave file &quot;{0}&quot;."
+msgstr "Non foi posÃbel gardar no ficheiro de gardado automÃtico Â{0}Â."
+
+#: ../composer/mail-composer.error.xml.h:10
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr "Produciuse un erro no gardado automÃtico debido a Â{1}Â."
+
+#: ../composer/mail-composer.error.xml.h:11
+msgid "Download in progress. Do you want to send the mail?"
+msgstr "Hai unha descarga en progreso. Desexa enviar o correo?"
+
+#: ../composer/mail-composer.error.xml.h:12
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr ""
+" Hai algÃns anexos descargÃndose. Enviar o correo agora farà que se envÃe "
+"sen eses anexos pendentes "
+
+#: ../composer/mail-composer.error.xml.h:14
 msgid ""
-"Because you are working offline, the message will be saved to your local "
-"Outbox folder. When you are back online you can send the message by clicking "
-"the Send/Receive button in Evolution's toolbar."
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
 msgstr ""
-"Està traballando sen conexiÃn, por este motivo a mensaxe gardarase no "
-"cartafol do correo de saÃda. Cando estea conectado, a mensaxe enviarase "
-"premendo no botÃn ÂEnviar / Recibir da barra de ferramentas"
+"Està seguro de que desexa rexeitar a mensaxe que està redactando titulada "
+"Â{0}Â?"
 
-#: ../composer/mail-composer.error.xml.h:10
+#: ../composer/mail-composer.error.xml.h:15
 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 "
@@ -7363,206 +7377,183 @@ msgstr ""
 "non ser que escolla gardar a mensaxe no cartafol dos borradores. Isto "
 "permitiralle continuar coa redacciÃn da mensaxe mÃis tarde."
 
-#: ../composer/mail-composer.error.xml.h:11
-msgid "Could not create message."
-msgstr "Non foi posÃbel crear a mensaxe."
-
-#: ../composer/mail-composer.error.xml.h:12
-msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "Non foi posÃbel ler o ficheiro da sinatura Â{0}Â."
-
-#: ../composer/mail-composer.error.xml.h:13
-msgid "Could not retrieve messages to attach from {0}."
-msgstr "Non foi posÃbel obter as mensaxes para anexar de {0}."
-
-#: ../composer/mail-composer.error.xml.h:14
-msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr "Non foi posÃbel gardar no ficheiro de gardado automÃtico Â{0}Â."
-
-#: ../composer/mail-composer.error.xml.h:15
-msgid "Do you want to recover unfinished messages?"
-msgstr "Desexa recuperar as mensaxes non finalizadas?"
-
-#: ../composer/mail-composer.error.xml.h:16
-msgid "Download in progress. Do you want to send the mail?"
-msgstr "Hai unha descarga en progreso. Desexa enviar o correo?"
-
-#: ../composer/mail-composer.error.xml.h:17
-msgid "Error saving to autosave because &quot;{1}&quot;."
-msgstr "Produciuse un erro no gardado automÃtico debido a Â{1}Â."
-
+#. Response codes were chosen somewhat arbitrarily.
 #: ../composer/mail-composer.error.xml.h:18
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-msgstr ""
-"O Evolution saÃu inesperadamente mentres estaba redactando unha mensaxe "
-"nova. Se recupera a mensaxe poderà continuar onde a deixou."
+msgid "_Continue Editing"
+msgstr "_Continuar a ediciÃn"
 
 #: ../composer/mail-composer.error.xml.h:19
-msgid "Saving message to Outbox."
-msgstr "Gardando a mensaxe no cartafol de saÃda."
+msgid "_Save Draft"
+msgstr "_Gardar o borrador"
 
 #: ../composer/mail-composer.error.xml.h:20
-msgid "The file '{0}' is not a regular file and cannot be sent in a message."
-msgstr ""
-"O ficheiro Â{0} non à un ficheiro normal e non pode enviarse nunha mensaxe."
+msgid "Could not create message."
+msgstr "Non foi posÃbel crear a mensaxe."
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:123
-msgid "The reported error was &quot;{0}&quot;."
-msgstr "O informe de erro foi Â{0}Â."
+#: ../composer/mail-composer.error.xml.h:21
+msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+msgstr ""
+"Debido a Â{0}Â, quizais necesite seleccionar diferentes opciÃns de correo."
 
 #: ../composer/mail-composer.error.xml.h:22
-msgid ""
-"The reported error was &quot;{0}&quot;. The message has most likely not been "
-"saved."
-msgstr "O erro devolto foi Â{0}Â. Ã moi posÃbel que non se gardase a mensaxe."
+msgid "Could not read signature file &quot;{0}&quot;."
+msgstr "Non foi posÃbel ler o ficheiro da sinatura Â{0}Â."
 
 #: ../composer/mail-composer.error.xml.h:23
-msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
-msgstr "O erro devolto foi Â{0}Â. Non se enviou a mensaxe."
+msgid "All accounts have been removed."
+msgstr "EliminÃronse todas as contas."
 
 #: ../composer/mail-composer.error.xml.h:24
-msgid "You cannot attach the file &quot;{0}&quot; to this message."
-msgstr "Non pode anexar o ficheiro Â{0}Â a esta mensaxe."
-
-#: ../composer/mail-composer.error.xml.h:25
 msgid "You need to configure an account before you can compose mail."
 msgstr "Necesita configurar unha conta antes de poder escribir un correo."
 
+#: ../composer/mail-composer.error.xml.h:25
+msgid "An error occurred while saving to your Outbox folder."
+msgstr "Produciuse un erro ao gardar no cartafol de saÃda."
+
 #: ../composer/mail-composer.error.xml.h:26
-msgid "Your message was sent, but an error occurred during post-processing."
-msgstr ""
-"A sÃa mensaxe foi enviada, porÃn produciuse un erro durante o post-procesado."
+msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
+msgstr "O erro devolto foi Â{0}Â. Non se enviou a mensaxe."
+
+#: ../composer/mail-composer.error.xml.h:27
+msgid "An error occurred while saving to your Drafts folder."
+msgstr "Produciuse un erro ao gardar no cartafol dos borradores."
 
-#. Response codes were chosen somewhat arbitrarily.
 #: ../composer/mail-composer.error.xml.h:28
-msgid "_Continue Editing"
-msgstr "_Continuar a ediciÃn"
+msgid ""
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
+msgstr "O erro devolto foi Â{0}Â. Ã moi posÃbel que non se gardase a mensaxe."
 
-#: ../composer/mail-composer.error.xml.h:30
-msgid "_Do not Recover"
-msgstr "_Non recuperar"
+#: ../composer/mail-composer.error.xml.h:29
+msgid "An error occurred while sending. How do you want to proceed?"
+msgstr "Produciuse un erro durante o envÃo. Que desexa facer?"
+
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:157
+msgid "The reported error was &quot;{0}&quot;."
+msgstr "O informe de erro foi Â{0}Â."
 
 #: ../composer/mail-composer.error.xml.h:31
-msgid "_Recover"
-msgstr "_Recuperar"
+msgid "_Save to Outbox"
+msgstr "Gardar na caixa de _saÃda"
 
 #: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Draft"
-msgstr "_Gardar o borrador"
+msgid "_Try Again"
+msgstr "Tentar outra vez"
 
 #: ../composer/mail-composer.error.xml.h:33
-msgid "_Save to Outbox"
-msgstr "Gardar na caixa de _saÃda"
+msgid "Your message was sent, but an error occurred during post-processing."
+msgstr ""
+"A sÃa mensaxe foi enviada, porÃn produciuse un erro durante o post-procesado."
+
+#: ../composer/mail-composer.error.xml.h:34
+msgid "Saving message to Outbox."
+msgstr "Gardando a mensaxe no cartafol de saÃda."
 
 #: ../composer/mail-composer.error.xml.h:35
-msgid "_Try Again"
-msgstr "Tentar outra vez"
+msgid ""
+"Because you are working offline, the message will be saved to your local "
+"Outbox folder. When you are back online you can send the message by clicking "
+"the Send/Receive button in Evolution's toolbar."
+msgstr ""
+"Està traballando sen conexiÃn, por este motivo a mensaxe gardarase no "
+"cartafol do correo de saÃda. Cando estea conectado, a mensaxe enviarase "
+"premendo no botÃn ÂEnviar / Recibir da barra de ferramentas"
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
-msgid "Calendar event notifications"
-msgstr "NotificaciÃns de actividades do calendario"
-
-#: ../data/evolution-alarm-notify.desktop.in.in.h:2
 msgid "Evolution Alarm Notify"
 msgstr "Notificador de alarmas do Evolution"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:936
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Calendar event notifications"
+msgstr "NotificaciÃns de actividades do calendario"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:938
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2
-msgid "Evolution Mail and Calendar"
-msgstr "Correo e calendario do Evolution"
-
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Suite de Groupware"
 
+#: ../data/evolution.desktop.in.in.h:3
+msgid "Evolution Mail and Calendar"
+msgstr "Correo e calendario do Evolution"
+
 #: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "Xestione o seu correo, contactos e programaciÃn"
 
 #: ../data/evolution-settings.desktop.in.in.h:1
-msgid "Configure email accounts"
-msgstr "Configurar as contas de correo"
-
-#: ../data/evolution-settings.desktop.in.in.h:2
 msgid "Email Settings"
 msgstr "Axustes do correo electrÃnico"
 
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Configure email accounts"
+msgstr "Configurar as contas de correo"
+
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr "Lonxitude do completado automÃtico"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:21
+msgid "Enable address formatting"
+msgstr "Activar formatado de enderezos"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:2
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
-msgid "Contact layout style"
-msgstr "Estilo da disposiciÃn dos contactos"
+msgid ""
+"Whether addresses should be formatted according to standard in their "
+"destination country"
+msgstr ""
+"Indica se se deben formatar os enderezos segundo o estÃndar do paÃs de "
+"destino"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
-msgid "Contact preview pane position (horizontal)"
-msgstr "PosiciÃn do panel de vista previa de contactos (horizontal)"
+msgid "Autocomplete length"
+msgstr "Lonxitude do completado automÃtico"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
-msgid "Contact preview pane position (vertical)"
-msgstr "PosiciÃn do panel de vista previa de contactos (vertical)"
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+"O nÃmero de caracteres que deben teclearse antes de que o Evolution tente "
+"completar automaticamente."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
-msgid "Enable address formatting"
-msgstr "Activar formatado de enderezos"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr "Mostrar o nome completado automaticamente co enderezo"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
-msgid "Position of the contact preview pane when oriented horizontally."
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
 msgstr ""
-"PosiciÃn do panel de vista previa de contactos cando se dispoÃa "
-"horizontalmente."
+"Indica se forzar a vista do enderezo de correo co nome do contacto "
+"completado automaticamente na entrada."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
-msgid "Position of the contact preview pane when oriented vertically."
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
-"PosiciÃn do panel de vista previa de contactos cando se dispoÃa "
-"verticalmente."
+"O URI para o cartafol usado por Ãltima vez no diÃlogo de selecciÃn de nomes"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
-msgid "Primary address book"
-msgstr "Axenda de enderezos primaria"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "URI for the folder last used in the select names dialog."
+msgstr ""
+"O URI para o cartafol usado por Ãltima vez no diÃlogo de selecciÃn de nomes."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
-msgid "Show autocompleted name with an address"
-msgstr "Mostrar o nome completado automaticamente co enderezo"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Contact layout style"
+msgstr "Estilo da disposiciÃn dos contactos"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid "Show maps"
-msgstr "Mostrar mapas"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
-msgid "Show preview pane"
-msgstr "Mostrar o panel de vista previa"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
-msgid ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view"
-msgstr ""
-"O UID da axenda de enderezos seleccionada (ou a ÂprimariaÂ) na barra lateral "
-"da vista de ÂContactosÂ"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -7574,50 +7565,59 @@ msgstr ""
 "previa embaixo da lista de contactos. Â1Â (vista vertical) mostra o panel de "
 "vista previa ao lado da lista de contactos."
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid "Contact preview pane position (horizontal)"
+msgstr "PosiciÃn do panel de vista previa de contactos (horizontal)"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr ""
+"PosiciÃn do panel de vista previa de contactos cando se dispoÃa "
+"horizontalmente."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid "Contact preview pane position (vertical)"
+msgstr "PosiciÃn do panel de vista previa de contactos (vertical)"
+
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
+msgid "Position of the contact preview pane when oriented vertically."
 msgstr ""
-"O nÃmero de caracteres que deben teclearse antes de que o Evolution tente "
-"completar automaticamente."
+"PosiciÃn do panel de vista previa de contactos cando se dispoÃa "
+"verticalmente."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
-msgid "URI for the folder last used in the select names dialog"
-msgstr ""
-"O URI para o cartafol usado por Ãltima vez no diÃlogo de selecciÃn de nomes"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+msgid "Show maps"
+msgstr "Mostrar mapas"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
-msgid "URI for the folder last used in the select names dialog."
-msgstr ""
-"O URI para o cartafol usado por Ãltima vez no diÃlogo de selecciÃn de nomes."
+msgid "Whether to show maps in preview pane"
+msgstr "Indica se se mostran os mapas no panel de vista previa"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
-msgid ""
-"Whether addresses should be formatted according to standard in their "
-"destination country"
-msgstr ""
-"Indica se se deben formatar os enderezos segundo o estÃndar do paÃs de "
-"destino"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid "Primary address book"
+msgstr "Axenda de enderezos primaria"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:18
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view"
 msgstr ""
-"Indica se forzar a vista do enderezo de correo co nome do contacto "
-"completado automaticamente na entrada."
+"O UID da axenda de enderezos seleccionada (ou a ÂprimariaÂ) na barra lateral "
+"da vista de ÂContactosÂ"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
-msgid "Whether to show maps in preview pane"
-msgstr "Indica se se mostran os mapas no panel de vista previa"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
+msgid "Show preview pane"
+msgstr "Mostrar o panel de vista previa"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:22
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid "Whether to show the preview pane."
 msgstr "Indica se mostrar o panel de vista previa."
 
@@ -7636,265 +7636,282 @@ msgstr ""
 "ham que veÃen de diferentes conxuntos de caracteres."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
-msgid "Ask for confirmation when deleting items"
-msgstr "Pedir confirmaciÃn antes de eliminar elementos"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
+msgid "Save directory for reminder audio"
+msgstr "Cartafol onde gardar o son dos recordatorios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
-#, fuzzy
-msgid ""
-"Background color of tasks that are due today, in \"#rrggbb\" format. Used "
-"together with task-due-today-highlight"
-msgstr ""
-"Cor de fondo para as tarefas que vencen hoxe, no formato Â#rrggbbÂ. Usado en "
-"conxunto con task-due-today-highlight"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
+msgid "Directory for saving reminder audio files"
+msgstr "Cartafol onde gardar ficheiros de son para os recordatorios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
-#, fuzzy
-msgid ""
-"Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
-"together with task-overdue-highlight."
-msgstr ""
-"Cor de fondo para as tarefas atrasadas, no formato Â#rrggbbÂ. Usado en "
-"conxunto con task-overdue-highlight."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
+msgid "Birthday and anniversary reminder value"
+msgstr "Valor de aviso de aniversarios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:4
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
-msgid "Birthday and anniversary reminder"
-msgstr "Avisos de aniversarios"
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr ""
+"NÃmero de unidades para determinar un recordatorio de cumpreanos ou "
+"aniversario"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
 msgid "Birthday and anniversary reminder units"
 msgstr "Unidades de aviso de aniversarios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
-msgid "Birthday and anniversary reminder value"
-msgstr "Valor de aviso de aniversarios"
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
+msgstr "Unidades para os avisos de aniversario, ÂminutosÂ, Âhoras ou ÂdÃasÂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
-msgstr ""
-"Cor para debuxar a liÃa de Marcus Bains na barra de tempo (baleiro para a "
-"predeterminada)"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+msgid "Compress weekends in month view"
+msgstr "Comprimir as fins de semana na vista mensual"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:8
-msgid "Color to draw the Marcus Bains line in the Day View"
-msgstr "Cor para debuxar a liÃa de Marcus Bains na vista diaria"
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday"
+msgstr ""
+"Indica se se comprimen as fins de semana na vista mensual. Isto pon o sÃbado "
+"e o domingo no mesmo espazo que un dÃa laborÃbel"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
-msgid "Compress weekends in month view"
-msgstr "Comprimir as fins de semana na vista mensual"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
+msgid "Ask for confirmation when deleting items"
+msgstr "Pedir confirmaciÃn antes de eliminar elementos"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
-msgid "Confirm expunge"
-msgstr "Confirmar a expurgaciÃn"
+msgid "Whether to ask for confirmation when deleting an appointment or task"
+msgstr "Indica se se solicita confirmaciÃn ao eliminar unha cita ou tarefa"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
-msgid "Days on which the start and end of work hours should be indicated"
-msgstr "DÃas nos que debe indicarse o inicio e fin das horas de traballo"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
+msgid "Confirm expunge"
+msgstr "Confirmar a expurgaciÃn"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:12
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
-msgid "Default appointment reminder"
-msgstr "Aviso de cita predeterminado"
+msgid "Whether to ask for confirmation when expunging appointments and tasks"
+msgstr ""
+"Indica se se solicita a confirmaciÃn antes de expurgar as citas ou as tarefas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
-msgid "Default reminder units"
-msgstr "Unidades predeterminadas para o aviso"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+msgid "Month view vertical pane position"
+msgstr "PosiciÃn do panel vertical na vista mensual"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
-msgid "Default reminder value"
-msgstr "Valor predeterminado para o aviso"
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar"
+msgstr ""
+"PosiciÃn do panel vertical entre as listas do calendario e o navegador de "
+"datas do calendario"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
-msgid "Directory for saving reminder audio files"
-msgstr "Cartafol onde gardar ficheiros de son para os recordatorios"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+msgid "Workday end hour"
+msgstr "Hora de finalizaciÃn da xornada laboral"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:16
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
-msgid "Free/busy template URL"
-msgstr "URL do modelo de dispoÃibilidade"
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
+msgstr ""
+"Hora do fin da xornada laboral, en formato de vinte e catro horas, de 0 a 23"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
-msgid "Hide completed tasks"
-msgstr "Ocultar as tarefas terminadas"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+msgid "Workday end minute"
+msgstr "Minuto de finalizaciÃn da xornada laboral"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
-msgid "Hide task units"
-msgstr "Ocultar as unidades da tarefa"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "Minuto de finalizaciÃn da xornada laboral, de 0 a 59."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
-msgid "Hide task value"
-msgstr "Ocultar o valor da tarefa"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Workday start hour"
+msgstr "Hora de inicio da xornada laboral"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
-msgid "Highlight overdue tasks"
-msgstr "Realce das tarefas vencidas"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr ""
+"Hora do inicio da xornada laboral, en formato de vinte e catro horas, de 0 a "
+"23."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
-msgid "Highlight tasks due today"
-msgstr "Realce das tarefas que vencen hoxe"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+msgid "Workday start minute"
+msgstr "Minuto de inicio da xornada laboral"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
-msgid "Horizontal pane position"
-msgstr "PosiciÃn do panel horizontal"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "Minuto de inicio da xornada laboral, de 0 a 59."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
-msgstr ""
-"Hora do fin da xornada laboral, en formato de vinte e catro horas, de 0 a 23"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+msgid "The second timezone for a Day View"
+msgstr "O fuso horario secundario para unha vista diaria"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
-msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key"
 msgstr ""
-"Hora do inicio da xornada laboral, en formato de vinte e catro horas, de 0 a "
-"23."
+"Mostra os fusos horarios secundarios nunha vista diaria se està "
+"estabelecido. O valor à semellante ao usado na chave ÂtimezoneÂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
-msgid "If \"true\", show the memo preview pane in the main window"
-msgstr ""
-"Se à verdadeiro, mÃstrase o panel de vista previa das notas na xanela "
-"principal"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+msgid "Recently used second time zones in a Day View"
+msgstr "Fusos horarios secundarios usados recentemente nunha vista diaria"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
-msgid "If \"true\", show the task preview pane in the main window"
+msgid "List of recently used second time zones in a Day View"
 msgstr ""
-"Se à verdadeiro, mÃstrase o panel de vista previa de tarefas na xanela "
-"principal"
+"Lista dos fusos horarios secundarios usados recentemente na Vista diaria"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
-msgid "Intervals shown in Day and Work Week views, in minutes"
+msgid "Maximum number of recently used timezones to remember"
 msgstr ""
-"Os intervalos de tempo mostrados nas vistas diaria e de semana laboral, en "
-"minutos"
+"O nÃmero mÃximo de fusos horarios usados recentemente que hai que recordar"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
-msgid "Last reminder time"
-msgstr "Hora do Ãltimo recordatorio"
+msgid ""
+"Maximum number of recently used timezones to remember in a 'day-second-"
+"zones' list"
+msgstr ""
+"O nÃmero mÃximo de fusos horarios usados recentemente para recordar nunha "
+"lista 'day-second-zones'"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
-msgid "List of calendars to load"
-msgstr "Lista de calendarios a cargar"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
+msgid "Default reminder value"
+msgstr "Valor predeterminado para o aviso"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
-msgid "List of memo lists to load"
-msgstr "Lista de listados de recordatorios a cargar"
+msgid "Number of units for determining a default reminder"
+msgstr "NÃmero de unidades para determinar un aviso predeterminado"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
-msgid "List of recently used second time zones in a Day View"
-msgstr ""
-"Lista dos fusos horarios secundarios usados recentemente na Vista diaria"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
+msgid "Default reminder units"
+msgstr "Unidades predeterminadas para o aviso"
 
+# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
-msgid "List of selected calendars"
-msgstr "Lista dos calendarios seleccionados"
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
+msgstr "Unidades para un aviso predeterminado:  ÂminutosÂ, Âhoras ou ÂdÃasÂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
-msgid "List of selected memo lists"
-msgstr "Lista dos recordatorios seleccionados"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+msgid "Show categories field in the event/meeting/task editor"
+msgstr "Mostrar o campo categorÃas no editor de actividades/reuniÃns/tarefas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
-msgid "List of selected task lists"
-msgstr "Lista das listas de tarefas seleccionadas"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr ""
+"Indica se se mostra o campo de categorÃas no editor de actividades/reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
-msgid "List of task lists to load"
-msgstr "Lista das listas de tarefas a cargar"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "Mostrar o campo ÂFunciÃn no editor de actividades/tarefas/reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
-msgid "Marcus Bains Line"
-msgstr "LiÃa de Marcus Bains"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr ""
+"Indica se se mostra o campo de funciÃn no editor de actividades/tarefas/"
+"reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
-msgid "Marcus Bains Line Color - Day View"
-msgstr "Cor da liÃa de Marcus Bains - Vista de dÃa"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "Mostrar o campo RSVP no editor de actividades/tarefas/reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
-msgid "Marcus Bains Line Color - Time bar"
-msgstr "Cor da liÃa de Marcus Bains - Barra de tempo"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr ""
+"Indica se se mostra o campo RSVP no editor de actividades/tarefas/reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
-msgid "Maximum number of recently used timezones to remember"
-msgstr ""
-"O nÃmero mÃximo de fusos horarios usados recentemente que hai que recordar"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+msgid "Show status field in the event/task/meeting editor"
+msgstr "Mostrar o campo de estado no editor de actividades/tarefas/reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
-msgid ""
-"Maximum number of recently used timezones to remember in a 'day-second-"
-"zones' list"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
+msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
-"O nÃmero mÃximo de fusos horarios usados recentemente para recordar nunha "
-"lista 'day-second-zones'"
+"Indica se se mostra o campo de estado no editor de actividades/tarefas/"
+"reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
-msgid "Memo layout style"
-msgstr "Estilo da disposiciÃn das notas"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+msgid "Show timezone field in the event/meeting editor"
+msgstr "Mostrar o campo do fuso horario no editor de actividades/reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
-msgid "Memo preview pane position (horizontal)"
-msgstr "PosiciÃn do panel de vista previa de notas (horizontal)"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr ""
+"Indica se se mostra o campo de fuso horario no editor de actividades/reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
-msgid "Memo preview pane position (vertical)"
-msgstr "PosiciÃn do panel de vista previa de notas (vertical)"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+msgid "Show type field in the event/task/meeting editor"
+msgstr "Mostrar o campo de tipo no editor de actividades/tarefas/reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
-msgid "Minute the workday ends on, 0 to 59."
-msgstr "Minuto de finalizaciÃn da xornada laboral, de 0 a 59."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr ""
+"Indica se se mostra o campo de tipo no editor de actividades/tarefas/reuniÃns"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
-msgid "Minute the workday starts on, 0 to 59."
-msgstr "Minuto de inicio da xornada laboral, de 0 a 59."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
+msgid "Hide completed tasks"
+msgstr "Ocultar as tarefas terminadas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
-msgid "Month view horizontal pane position"
-msgstr "PosiciÃn do panel horizontal da vista mensual"
+msgid "Whether to hide completed tasks in the tasks view"
+msgstr "Indica se se ocultan as tarefas terminadas na vista de tarefas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
-msgid "Month view vertical pane position"
-msgstr "PosiciÃn do panel vertical na vista mensual"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
+msgid "Hide task units"
+msgstr "Ocultar as unidades da tarefa"
 
+# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
-msgid "Number of units for determining a birthday or anniversary reminder"
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
 msgstr ""
-"NÃmero de unidades para determinar un recordatorio de cumpreanos ou "
-"aniversario"
+"Unidades para determinar cando ocultar as tarefas: ÂminutosÂ, Âhoras ou "
+"ÂdÃasÂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
-msgid "Number of units for determining a default reminder"
-msgstr "NÃmero de unidades para determinar un aviso predeterminado"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+msgid "Hide task value"
+msgstr "Ocultar o valor da tarefa"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
 msgid "Number of units for determining when to hide tasks"
 msgstr "NÃmero de unidades para determinar cando ocultar as tarefas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
-msgid "Overdue tasks color"
-msgstr "Cor para as tarefas atrasadas"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+msgid "Horizontal pane position"
+msgstr "PosiciÃn do panel horizontal"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
 msgid ""
@@ -7905,173 +7922,129 @@ msgstr ""
 "lista de tarefas cando non està na vista mensual, en pÃxeles"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels"
-msgstr ""
-"PosiciÃn do panel horizontal entre a visualizaciÃn, o navegador de datas do "
-"calendario e a lista de tarefas na vista mensual, en pÃxeles"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
+msgid "Last reminder time"
+msgstr "Hora do Ãltimo recordatorio"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
-msgid "Position of the memo preview pane when oriented vertically"
-msgstr ""
-"PosiciÃn do panel de vista previa de notas cando està orientado verticalmente"
+msgid "Time the last reminder ran, in time_t"
+msgstr "A hora na que se executou o Ãltimo recordatorio, en time_t"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
-msgid "Position of the task preview pane when oriented horizontally"
-msgstr ""
-"PosiciÃn do panel de vista previa de tarefas cando està orientado "
-"horizontalmente"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
+msgid "Marcus Bains Line Color - Day View"
+msgstr "Cor da liÃa de Marcus Bains - Vista de dÃa"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
-msgid "Position of the task preview pane when oriented vertically"
-msgstr ""
-"PosiciÃn do panel de vista previa de tarefas cando està orientado "
-"verticalmente"
+msgid "Color to draw the Marcus Bains line in the Day View"
+msgstr "Cor para debuxar a liÃa de Marcus Bains na vista diaria"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar"
-msgstr ""
-"PosiciÃn do panel vertical entre as listas do calendario e o navegador de "
-"datas do calendario"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
+msgid "Marcus Bains Line Color - Time bar"
+msgstr "Cor da liÃa de Marcus Bains - Barra de tempo"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
-msgid "Primary calendar"
-msgstr "Calendario principal"
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
+msgstr ""
+"Cor para debuxar a liÃa de Marcus Bains na barra de tempo (baleiro para a "
+"predeterminada)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
-msgid "Primary memo list"
-msgstr "Lista de notas principal"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
+msgid "Marcus Bains Line"
+msgstr "LiÃa de Marcus Bains"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
-msgid "Primary task list"
-msgstr "Lista de tarefas principal"
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
+msgstr ""
+"Indica se se debuxa a liÃa Marcus Bains (liÃa na hora actual) no calendario"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
-msgid "Programs that are allowed to be run by reminders"
-msgstr "Programas que se poden executar desde os recordatorios"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+msgid "Memo preview pane position (horizontal)"
+msgstr "PosiciÃn do panel de vista previa de notas (horizontal)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Recently used second time zones in a Day View"
-msgstr "Fusos horarios secundarios usados recentemente nunha vista diaria"
+msgid "Position of the task preview pane when oriented horizontally"
+msgstr ""
+"PosiciÃn do panel de vista previa de tarefas cando està orientado "
+"horizontalmente"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
-msgid "Recurrent Events in Italic"
-msgstr "Actividades con repeticiÃn en cursiva"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+msgid "Memo layout style"
+msgstr "Estilo da disposiciÃn das notas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
-msgid "Reminder programs"
-msgstr "Programas de recordatorio"
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list"
+msgstr ""
+"O estilo da disposiciÃn determina onde dispoÃer o panel de vista previa en "
+"relaciÃn coa lista de notas. Â0Â (vista clÃsica) mostra o panel de vista "
+"previa embaixo da lista de notas. Â1Â (vista vertical) mostra o panel de "
+"vista previa ao lado da lista de notas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for reminder audio"
-msgstr "Cartafol onde gardar o son dos recordatorios"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+msgid "Memo preview pane position (vertical)"
+msgstr "PosiciÃn do panel de vista previa de notas (vertical)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
-msgid "Scroll Month View by a week, not by a month"
-msgstr "Desprazar a Vista mensual por semana, non por mes"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "Mostrar o campo RSVP no editor de actividades/tarefas/reuniÃns"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
-msgid "Show Role field in the event/task/meeting editor"
-msgstr "Mostrar o campo ÂFunciÃn no editor de actividades/tarefas/reuniÃns"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
-msgid "Show appointment end times in week and month views"
-msgstr "Mostrar as horas finais das citas nas vista semanal e mensual"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
-msgid "Show categories field in the event/meeting/task editor"
-msgstr "Mostrar o campo categorÃas no editor de actividades/reuniÃns/tarefas"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
-msgid "Show days with recurrent events in italic font in bottom left calendar"
+msgid "Position of the memo preview pane when oriented vertically"
 msgstr ""
-"Mostrar en cursiva os dÃas con actividades con repeticiÃns no calendario "
-"inferior esquerdo"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display reminders in notification tray"
-msgstr "Mostrar o visualizador de recordatorios na bandexa de notificaciÃn"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
-msgid "Show status field in the event/task/meeting editor"
-msgstr "Mostrar o campo de estado no editor de actividades/tarefas/reuniÃns"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
-msgid "Show the memo preview pane"
-msgstr "Mostrar o panel de vista previa de notas"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
-msgid "Show the task preview pane"
-msgstr "Mostrar o panel de vista previa de tarefas"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
-msgid "Show timezone field in the event/meeting editor"
-msgstr "Mostrar o campo do fuso horario no editor de actividades/reuniÃns"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
-msgid "Show type field in the event/task/meeting editor"
-msgstr "Mostrar o campo de tipo no editor de actividades/tarefas/reuniÃns"
+"PosiciÃn do panel de vista previa de notas cando està orientado verticalmente"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
-msgstr ""
-"Mostrar os nÃmeros das semanas na vista diaria, de semana laboral e no "
-"navegador de datas"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+msgid "Month view horizontal pane position"
+msgstr "PosiciÃn do panel horizontal da vista mensual"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
 msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key"
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels"
 msgstr ""
-"Mostra os fusos horarios secundarios nunha vista diaria se està "
-"estabelecido. O valor à semellante ao usado na chave ÂtimezoneÂ"
+"PosiciÃn do panel horizontal entre a visualizaciÃn, o navegador de datas do "
+"calendario e a lista de tarefas na vista mensual, en pÃxeles"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
-msgid "Task layout style"
-msgstr "Estilo da disposiciÃn de tarefas"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+msgid "Scroll Month View by a week, not by a month"
+msgstr "Desprazar a Vista mensual por semana, non por mes"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
-msgid "Task preview pane position (horizontal)"
-msgstr "PosiciÃn do panel de vista previa de tarefas (horizontal)"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+msgid "Whether to scroll a Month View by a week, not by a month"
+msgstr "Indica se se despraza a vista mensual por semana e non por mes"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
-msgid "Task preview pane position (vertical)"
-msgstr "PosiciÃn do panel de vista previa de tarefas (vertical)"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
+msgid "Reminder programs"
+msgstr "Programas de recordatorio"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
-msgid "Tasks due today color"
-msgstr "Cor para as tarefas que vencen hoxe"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+msgid "Programs that are allowed to be run by reminders"
+msgstr "Programas que se poden executar desde os recordatorios"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
+msgid "Show display reminders in notification tray"
+msgstr "Mostrar o visualizador de recordatorios na bandexa de notificaciÃn"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
+msgid "Whether or not to use the notification tray for display reminders"
+msgstr ""
+"Indica se se debe usar a bandexa de notificaciÃn para mostrar os "
+"recordatorios"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
+msgid "Primary calendar"
+msgstr "Calendario principal"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
 msgid ""
 "The UID of the selected (or \"primary\") calendar in the sidebar of the "
 "\"Calendar\" view"
@@ -8079,7 +8052,12 @@ msgstr ""
 "UID do calendario seleccionado ou primario na barra lateral da vista de "
 "ÂCalendariosÂ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
+msgid "Primary memo list"
+msgstr "Lista de notas principal"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
 msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view"
@@ -8087,7 +8065,12 @@ msgstr ""
 "UID da lista de notas seleccionada ou primaria da barra lateral da vista de "
 "ÂNotasÂ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
+msgid "Primary task list"
+msgstr "Lista de tarefas principal"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
 msgid ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view"
@@ -8095,7 +8078,12 @@ msgstr ""
 "UID da lista de tarefas seleccionada ou primaria na barra lateral da vista "
 "de ÂTarefasÂ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
+msgid "Free/busy template URL"
+msgstr "URL do modelo de dispoÃibilidade"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -8105,259 +8093,260 @@ msgstr ""
 "substitÃese pola parte de usuario do enderezo de correo, e %d substitÃese "
 "polo dominio"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\""
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
+msgid "Recurrent Events in Italic"
+msgstr "Actividades con repeticiÃn en cursiva"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr ""
-"Fuso horario predeterminado para usar nas datas e horas do calendario, como "
-"unha localizaciÃn sen traducir da base de datos de fusos horarios Olsen, p."
-"e:ÂAmerica/New YorkÂ"
+"Mostrar en cursiva os dÃas con actividades con repeticiÃns no calendario "
+"inferior esquerdo"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+msgid "List of selected calendars"
+msgstr "Lista dos calendarios seleccionados"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+msgid "List of calendars to load"
+msgstr "Lista de calendarios a cargar"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+msgid "List of selected memo lists"
+msgstr "Lista dos recordatorios seleccionados"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+msgid "List of memo lists to load"
+msgstr "Lista de listados de recordatorios a cargar"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list"
-msgstr ""
-"O estilo da disposiciÃn determina onde dispoÃer o panel de vista previa en "
-"relaciÃn coa lista de notas. Â0Â (vista clÃsica) mostra o panel de vista "
-"previa embaixo da lista de notas. Â1Â (vista vertical) mostra o panel de "
-"vista previa ao lado da lista de notas"
+msgid "List of selected task lists"
+msgstr "Lista das listas de tarefas seleccionadas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list"
-msgstr ""
-"O estilo de disposiciÃn determina onde dispoÃer o panel de vista previa en "
-"relaciÃn coa lista de tarefas. Â0Â (vista clÃsica) mostra o panel de vista "
-"previa embaixo da lista de tarefas. Â1Â (vista vertical) mostra o panel de "
-"vista previa ao lado da lista de tarefas"
+msgid "List of task lists to load"
+msgstr "Lista das listas de tarefas a cargar"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
-msgid "The second timezone for a Day View"
-msgstr "O fuso horario secundario para unha vista diaria"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
+msgid "Show appointment end times in week and month views"
+msgstr "Mostrar as horas finais das citas nas vista semanal e mensual"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
-msgid "Time divisions"
-msgstr "DivisiÃns horarias"
+msgid "Whether to display the end time of events in the week and month views"
+msgstr ""
+"Indica se se mostra a hora de finalizaciÃn das actividades nas vistas "
+"semanais e mensuais"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
-msgid "Time the last reminder ran, in time_t"
-msgstr "A hora na que se executou o Ãltimo recordatorio, en time_t"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+msgid "Show the memo preview pane"
+msgstr "Mostrar o panel de vista previa de notas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
-msgid "Timezone"
-msgstr "Fuso horario"
+msgid "If \"true\", show the memo preview pane in the main window"
+msgstr ""
+"Se à verdadeiro, mÃstrase o panel de vista previa das notas na xanela "
+"principal"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
-msgid "Twenty four hour time format"
-msgstr "Formato de hora de vinte e catro horas"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+msgid "Show the task preview pane"
+msgstr "Mostrar o panel de vista previa de tarefas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\""
-msgstr "Unidades para os avisos de aniversario, ÂminutosÂ, Âhoras ou ÂdÃasÂ"
+msgid "If \"true\", show the task preview pane in the main window"
+msgstr ""
+"Se à verdadeiro, mÃstrase o panel de vista previa de tarefas na xanela "
+"principal"
 
-# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
-msgstr "Unidades para un aviso predeterminado:  ÂminutosÂ, Âhoras ou ÂdÃasÂ"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr ""
+"Mostrar os nÃmeros das semanas na vista diaria, de semana laboral e no "
+"navegador de datas"
 
-# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
+msgid "Whether to show week numbers in various places in the Calendar"
 msgstr ""
-"Unidades para determinar cando ocultar as tarefas: ÂminutosÂ, Âhoras ou "
-"ÂdÃasÂ"
+"Indica se se mostran os nÃmeros de semana en diferentes lugares do calendario"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
-msgid "Use system timezone"
-msgstr "Usar o fuso horario do sistema"
+msgid "Vertical position for the tag pane"
+msgstr "PosiciÃn vertical do panel de etiquetas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
-msgid "Use the system timezone instead of the timezone selected in Evolution"
-msgstr ""
-"Usar o fuso horario do sistema en vez do fuso horario seleccionado no "
-"Evolution"
+msgid "Highlight tasks due today"
+msgstr "Realce das tarefas que vencen hoxe"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
-msgid "Vertical position for the tag pane"
-msgstr "PosiciÃn vertical do panel de etiquetas"
+msgid ""
+"Whether highlight tasks due today with a special color (task-due-today-color)"
+msgstr ""
+"Indica se realzar as tarefas que vencen hoxe con unha cor especial (task-"
+"overdue-color)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
-msgid "Week start"
-msgstr "inicio da semana"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
+msgid "Tasks due today color"
+msgstr "Cor para as tarefas que vencen hoxe"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
-msgstr "O dÃa no que comeza a semana, desde o domingo (0) ata o sÃbado (6)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid ""
-"Whether highlight overdue tasks with a special color (task-overdue-color)"
+"Background color of tasks that are due today, in \"#rrggbb\" format. Used "
+"together with task-due-today-highlight"
 msgstr ""
-"Indica se realzar as tarefas vencidas con unha cor especial (task-overdue-"
-"color)"
+"Cor de fondo para as tarefas que vencen hoxe, no formato Â#rrggbbÂ. Usado "
+"xunto ao resaltado de tarefas que vencen hoxe."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Task preview pane position (horizontal)"
+msgstr "PosiciÃn do panel de vista previa de tarefas (horizontal)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
-msgid ""
-"Whether highlight tasks due today with a special color (task-due-today-color)"
-msgstr ""
-"Indica se realzar as tarefas que vencen hoxe con unha cor especial (task-"
-"overdue-color)"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+msgid "Task layout style"
+msgstr "Estilo da disposiciÃn de tarefas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
-msgid "Whether or not to use the notification tray for display reminders"
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list"
 msgstr ""
-"Indica se se debe usar a bandexa de notificaciÃn para mostrar os "
-"recordatorios"
+"O estilo de disposiciÃn determina onde dispoÃer o panel de vista previa en "
+"relaciÃn coa lista de tarefas. Â0Â (vista clÃsica) mostra o panel de vista "
+"previa embaixo da lista de tarefas. Â1Â (vista vertical) mostra o panel de "
+"vista previa ao lado da lista de tarefas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
-msgid "Whether to ask for confirmation when deleting an appointment or task"
-msgstr "Indica se se solicita confirmaciÃn ao eliminar unha cita ou tarefa"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+msgid "Task preview pane position (vertical)"
+msgstr "PosiciÃn do panel de vista previa de tarefas (vertical)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
-msgid "Whether to ask for confirmation when expunging appointments and tasks"
-msgstr ""
-"Indica se se solicita a confirmaciÃn antes de expurgar as citas ou as tarefas"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday"
+msgid "Position of the task preview pane when oriented vertically"
 msgstr ""
-"Indica se se comprimen as fins de semana na vista mensual. Isto pon o sÃbado "
-"e o domingo no mesmo espazo que un dÃa laborÃbel"
+"PosiciÃn do panel de vista previa de tarefas cando està orientado "
+"verticalmente"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+msgid "Highlight overdue tasks"
+msgstr "Realce das tarefas vencidas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
-msgid "Whether to display the end time of events in the week and month views"
+msgid ""
+"Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
-"Indica se se mostra a hora de finalizaciÃn das actividades nas vistas "
-"semanais e mensuais"
+"Indica se realzar as tarefas vencidas con unha cor especial (task-overdue-"
+"color)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
-msgstr ""
-"Indica se se debuxa a liÃa Marcus Bains (liÃa na hora actual) no calendario"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+msgid "Overdue tasks color"
+msgstr "Cor para as tarefas atrasadas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
-msgid "Whether to hide completed tasks in the tasks view"
-msgstr "Indica se se ocultan as tarefas terminadas na vista de tarefas"
+msgid ""
+"Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
+"together with task-overdue-highlight."
+msgstr ""
+"Cor de fondo para as tarefas fÃra de prazo, no formato Â#rrggbbÂ. Usado "
+"xunto ao realzado de tarefas fÃra de prazo."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
-msgid "Whether to scroll a Month View by a week, not by a month"
-msgstr "Indica se se despraza a vista mensual por semana e non por mes"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+msgid "Time divisions"
+msgstr "DivisiÃns horarias"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
-msgid "Whether to set a default reminder for appointments"
-msgstr "Indica se se estabelece un aviso predeterminado para as citas"
+msgid "Intervals shown in Day and Work Week views, in minutes"
+msgstr ""
+"Os intervalos de tempo mostrados nas vistas diaria e de semana laboral, en "
+"minutos"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
-msgid "Whether to set a reminder for birthdays and anniversaries"
-msgstr "Indica se se estabelece un aviso para os aniversarios"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+msgid "Timezone"
+msgstr "Fuso horario"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
-msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olson timezone database location like \"America/New York\""
 msgstr ""
-"Indica se se mostra o campo RSVP no editor de actividades/tarefas/reuniÃns"
+"Fuso horario predeterminado para usar nas datas e horas do calendario, como "
+"unha localizaciÃn sen traducir da base de datos de fusos horarios Olsen, p."
+"ex:ÂAmerica/New YorkÂ"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr ""
-"Indica se se mostra o campo de categorÃas no editor de actividades/reuniÃns"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+msgid "Twenty four hour time format"
+msgstr "Formato de hora de vinte e catro horas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
-msgid "Whether to show role field in the event/task/meeting editor"
+msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr ""
-"Indica se se mostra o campo de funciÃn no editor de actividades/tarefas/"
-"reuniÃns"
+"Indica se se mostran as horas en formato de vinte e catro horas en vez de "
+"usar am/pm"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr ""
-"Indica se se mostra o campo de estado no editor de actividades/tarefas/"
-"reuniÃns"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+msgid "Birthday and anniversary reminder"
+msgstr "Avisos de aniversarios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
-msgid "Whether to show times in twenty four hour format instead of using am/pm"
-msgstr ""
-"Indica se se mostran as horas en formato de vinte e catro horas en vez de "
-"usar am/pm"
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr "Indica se se estabelece un aviso para os aniversarios"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr ""
-"Indica se se mostra o campo de fuso horario no editor de actividades/reuniÃns"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+msgid "Default appointment reminder"
+msgstr "Aviso de cita predeterminado"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
-msgid "Whether to show type field in the event/task/meeting editor"
-msgstr ""
-"Indica se se mostra o campo de tipo no editor de actividades/tarefas/reuniÃns"
+msgid "Whether to set a default reminder for appointments"
+msgstr "Indica se se estabelece un aviso predeterminado para as citas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
-msgid "Whether to show week numbers in various places in the Calendar"
-msgstr ""
-"Indica se se mostran os nÃmeros de semana en diferentes lugares do calendario"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+msgid "Use system timezone"
+msgstr "Usar o fuso horario do sistema"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
-msgid "Work days"
-msgstr "DÃas laborÃbeis"
+msgid "Use the system timezone instead of the timezone selected in Evolution"
+msgstr ""
+"Usar o fuso horario do sistema en vez do fuso horario seleccionado no "
+"Evolution"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
-msgid "Workday end hour"
-msgstr "Hora de finalizaciÃn da xornada laboral"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+msgid "Week start"
+msgstr "inicio da semana"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
-msgid "Workday end minute"
-msgstr "Minuto de finalizaciÃn da xornada laboral"
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
+msgstr "O dÃa no que comeza a semana, desde o domingo (0) ata o sÃbado (6)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
-msgid "Workday start hour"
-msgstr "Hora de inicio da xornada laboral"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+msgid "Work days"
+msgstr "DÃas laborÃbeis"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
-msgid "Workday start minute"
-msgstr "Minuto de inicio da xornada laboral"
+msgid "Days on which the start and end of work hours should be indicated"
+msgstr "DÃas nos que debe indicarse o inicio e fin das horas de traballo"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
-#: ../shell/apps_evolution_shell.schemas.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Configuration version"
 msgstr "VersiÃn de configuraciÃn"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:2
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-msgid "Last upgraded configuration version"
-msgstr "Ãltima versiÃn da configuraciÃn anovada"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:3
-msgid "List of disabled plugins"
-msgstr "Lista dos engadidos desactivados"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:4
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -8365,8 +8354,13 @@ msgstr ""
 "A versiÃn de configuraciÃn do Evolution, co nivel de configuraciÃn maior/"
 "menor (por exemplo Â2.6.0Â)."
 
-#: ../data/org.gnome.evolution.gschema.xml.in.h:5
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../data/org.gnome.evolution.gschema.xml.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Last upgraded configuration version"
+msgstr "Ãltima versiÃn da configuraciÃn anovada"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -8374,6 +8368,10 @@ msgstr ""
 "A Ãltima versiÃn anovada da configuraciÃn do Evolution, con nivel de "
 "configuraciÃn maior/menor (por exemplo \"2.6.0\")."
 
+#: ../data/org.gnome.evolution.gschema.xml.in.h:5
+msgid "List of disabled plugins"
+msgstr "Lista dos engadidos desactivados"
+
 #: ../data/org.gnome.evolution.gschema.xml.in.h:6
 msgid "The list of disabled plugins in Evolution"
 msgstr "A lista dos engadidos desactivados en Evolution"
@@ -8387,13 +8385,13 @@ msgid "The window's Y coordinate"
 msgstr "Coordenada Y predeterminada da xanela"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:9
-msgid "The window's height in pixels"
-msgstr "Altura predeterminada da xanela"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:10
 msgid "The window's width in pixels"
 msgstr "A xanela à que pertence a ÂshellÂ"
 
+#: ../data/org.gnome.evolution.gschema.xml.in.h:10
+msgid "The window's height in pixels"
+msgstr "Altura predeterminada da xanela"
+
 #: ../data/org.gnome.evolution.gschema.xml.in.h:11
 msgid "Whether the window is maximized"
 msgstr "Indica se a xanela debe ou non maximizarse"
@@ -8403,1115 +8401,1137 @@ msgid "Gnome Calendar's calendar import done"
 msgstr "ImportaciÃn de calendarios de GNOME Calendar realizada"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
-msgid "Gnome Calendar's tasks import done"
-msgstr "ImportaciÃn de tarefas de GNOME Calendar realizada"
-
-#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
 msgid "Whether calendar from Gnome Calendar has been imported or not"
 msgstr "Indica se o calendario desde GNOME Galendar foi importado ou non"
 
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
+msgid "Gnome Calendar's tasks import done"
+msgstr "ImportaciÃn de tarefas de GNOME Calendar realizada"
+
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
 msgid "Whether tasks from Gnome Calendar have been imported or not"
 msgstr "Indica se a tarefa desde GNOME Calendar foi importada ou non"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
-#: ../mail/evolution-mail.schemas.in.h:13
-msgid "Always request read receipt"
-msgstr "Requirir sempre a confirmaciÃn de lectura"
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Comprobar se o Evolution à o aplicativo de correo predeterminado"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Amount of time in seconds the error should be shown on the status bar."
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
-"Tempo (en segundos) durante o que se mostrarà o erro na barra de estado."
+"Cada vez que se inicie o Evolution, comprobar se à o cliente de correo "
+"predeterminado."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
-#: ../mail/evolution-mail.schemas.in.h:15
-msgid ""
-"Asks whether to close the message window when the user forwards or replies "
-"to the message shown in the window"
-msgstr ""
-"Pregunta se se pecha a xanela da mensaxe cando o usuario reencamiÃa ou "
-"responde à mensaxe mostrada"
+#: ../mail/evolution-mail.schemas.in.h:1
+msgid "Default charset in which to compose messages"
+msgstr "Conxunto de caracteres predeterminado para escribir mensaxes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-msgid "Attribute message"
-msgstr "Atribuir mensaxe"
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "Default charset in which to compose messages."
+msgstr "Conxunto de caracteres predeterminado para escribir mensaxes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
-#: ../mail/evolution-mail.schemas.in.h:17
-msgid "Automatic emoticon recognition"
-msgstr "RecoÃecemento automÃtico de emoticonas"
+#: ../mail/evolution-mail.schemas.in.h:51
+msgid "Path where picture gallery should search for its content"
+msgstr "Ruta onde a galerÃa de imaxes deberÃa buscar o seu contido"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
-#: ../mail/evolution-mail.schemas.in.h:18
-msgid "Automatic link recognition"
-msgstr "RecoÃecemento automÃtico de ligazÃns"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
-#: ../mail/evolution-mail.schemas.in.h:19
 msgid ""
-"Automatically enable PGP or S/MIME signatures when replying to a message "
-"which is also PGP or S/MIME signed."
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder"
 msgstr ""
-"Activar as firmas PGP ou S/MIME automaticamente ao responder a unha mensaxe "
-"firmada con PGP ou S/MIME."
+"Este valor pode ser unha cadea baleira, isto significa que usarà o cartafol "
+"ÂImaxes do sistema, xeralmente localizado en ~/Imaxes. Este cartafol "
+"usarase tamÃn cando a ruta estabelecida non apunta a un cartafol existente."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "Spell check inline"
+msgstr "ComprobaciÃn ortogrÃfica en liÃa"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
-#: ../mail/evolution-mail.schemas.in.h:20
-msgid "Check for new messages in all active accounts"
-msgstr "Comprobar se hai mensaxes novas nas contas activas"
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "Draw spelling error indicators on words as you type."
+msgstr "Mostrar os erros de ortografÃa mentres se escribe."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
-#: ../mail/evolution-mail.schemas.in.h:21
-msgid "Check for new messages on start"
-msgstr "Comprobar se hai mensaxes novas ao iniciar"
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "Automatic link recognition"
+msgstr "RecoÃecemento automÃtico de ligazÃns"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
-#: ../mail/evolution-mail.schemas.in.h:22
-msgid "Check incoming mail being junk"
-msgstr "Comprobar se o correo entrante à correo lixo"
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "Recognize links in text and replace them."
+msgstr "RecoÃecer as ligazÃns no texto e substituÃlas."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "Comprobar se o Evolution à o aplicativo de correo predeterminado"
+#: ../mail/evolution-mail.schemas.in.h:7
+msgid "Automatic emoticon recognition"
+msgstr "RecoÃecemento automÃtico de emoticonas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-#: ../mail/evolution-mail.schemas.in.h:23
-msgid "Citation highlight color"
-msgstr "Cor de realce das citas"
+#: ../mail/evolution-mail.schemas.in.h:8
+msgid "Recognize emoticons in text and replace them with images."
+msgstr "RecoÃecer as emoticonas no texto e substituÃlas con imaxes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
-#: ../mail/evolution-mail.schemas.in.h:24
-msgid "Citation highlight color."
-msgstr "Cor de realce das citas."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+msgid "Attribute message"
+msgstr "Atribuir mensaxe"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
-msgid "Composer load/attach directory"
-msgstr "Cartafol para cargar/anexar do editor de mensaxes"
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author"
+msgstr ""
+"O texto inserido cando se responde unha mensaxe, atribuÃndolle a mensaxe ao "
+"autor orixinal"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
-#: ../mail/evolution-mail.schemas.in.h:27
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Abreviar a vista de enderezos en A/CC/CCO"
+msgid "Forward message"
+msgstr "ReencamiÃar mensaxe"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
-#: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows"
 msgstr ""
-"Abrevia a vista de enderezos en A/CC/CCO co nÃmero indicado en address_count."
+"O texto inserido ao reencamiÃar unha mensaxe, informando que a continuaciÃn "
+"vai a mensaxe reencamiÃada"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
-#: ../mail/evolution-mail.schemas.in.h:29
-msgid ""
-"Controls how frequently local changes are synchronized with the remote mail "
-"server. The interval must be at least 30 seconds."
-msgstr ""
-"Controla a frecuencia coa que se sincronizan os cambios locais co servidor "
-"de correo remoto. O intervalo debe ser de polo menos 30 segundos."
+msgid "Original message"
+msgstr "Mensaxe orixinal"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
-#: ../mail/evolution-mail.schemas.in.h:30
-msgid "Custom headers to use while checking for junk."
-msgstr "Cabeceiras personalizadas para usar mentres se comproba o correo lixo."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
-#: ../mail/evolution-mail.schemas.in.h:31
 msgid ""
-"Custom headers to use while checking for junk. The list elements are string "
-"in the format \"headername=value\"."
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows"
 msgstr ""
-"Cabeceiras personalizadas para usar mentres se comproba o correo lixo. A "
-"lista de elementos son cadeas no formato Âheadername=valueÂ."
+"O texto inserido ao responder unha mensaxe, informando que a continuaciÃn "
+"vai a mensaxe orixinal"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:9
+msgid "Group Reply replies to list"
+msgstr "A resposta ao grupo responde à lista"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
-#: ../mail/evolution-mail.schemas.in.h:32
-msgid "Default charset in which to compose messages"
-msgstr "Conxunto de caracteres predeterminado para escribir mensaxes"
+#: ../mail/evolution-mail.schemas.in.h:10
+msgid ""
+"Instead of the normal \"Reply to All\" behaviour, this option will make the "
+"'Group Reply' toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you're "
+"replying."
+msgstr ""
+"No lugar do comportamento normal de ÂResponder a todosÂ, esta opciÃn farà "
+"que o botÃn da barra de ferramentas ÂResponder ao grupo tente responder sà "
+"à lista de correo mediante a cal recibiu a copia da mensaxe que està "
+"respondendo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Default charset in which to compose messages."
-msgstr "Conxunto de caracteres predeterminado para escribir mensaxes."
+#: ../mail/evolution-mail.schemas.in.h:13
+msgid "Put the cursor at the bottom of replies"
+msgstr "PoÃer o cursor ao fondo da resposta"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
-#: ../mail/evolution-mail.schemas.in.h:34
-msgid "Default charset in which to display messages"
-msgstr "Conxunto de caracteres predeterminado para mostrar mensaxes"
+#: ../mail/evolution-mail.schemas.in.h:14
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
+msgstr ""
+"Os usuarios teÃen nas sÃas mans determinar onde debe ir o cursor cando se "
+"responde a unha mensaxe. Isto determina se o cursor se sitÃa no inicio da "
+"mensaxe ou no final."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
-#: ../mail/evolution-mail.schemas.in.h:35
-msgid "Default charset in which to display messages."
-msgstr "Conxunto de caracteres predeterminado para mostrar mensaxes."
+#: ../mail/evolution-mail.schemas.in.h:15
+msgid "Always request read receipt"
+msgstr "Requirir sempre a confirmaciÃn de lectura"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
-#: ../mail/evolution-mail.schemas.in.h:36
-msgid "Default forward style"
-msgstr "Estilo de reencamiÃamento predeterminado"
+#: ../mail/evolution-mail.schemas.in.h:16
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr ""
+"Indica se hai que engadir unha solicitude de confirmaciÃn de lectura de "
+"forma predeterminada."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
-#: ../mail/evolution-mail.schemas.in.h:41
-msgid "Default value for thread expand state"
-msgstr "Valor predeterminado para o estado despregado da conversa"
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid "Send HTML mail by default"
+msgstr "Enviar o correo en HTML de forma predeterminada"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
-msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded and \"1\" = collapsed"
-msgstr ""
-"Describe se as cabeceiras dos mensaxes na vista con paneis se deben contraer "
-"ou expandir de maneira predeterminada. Â0Â = expandidas Â1Â = contraÃdas"
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid "Send HTML mail by default."
+msgstr "Enviar o correo en HTML de forma predeterminada."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-#: ../mail/evolution-mail.schemas.in.h:46
-msgid ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
-msgstr ""
-"Determina se hai que buscar enderezos para filtrar correo lixo na axenda de "
-"enderezos local"
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Spell checking color"
+msgstr "Cor da comprobaciÃn ortogrÃfica"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-#: ../mail/evolution-mail.schemas.in.h:47
-msgid "Determines whether to lookup in address book for sender email"
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
-"Determina se hai que buscar o enderezo de correo do remitente na axenda de "
-"enderezos"
+"Cor de subliÃado para as palabras escritas incorrectamente cando se usa a "
+"comprobaciÃn ortogrÃfica en liÃa."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:48
-msgid ""
-"Determines whether to lookup the sender email in address book. If found, it "
-"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote address books (like LDAP) are marked for "
-"autocompletion."
-msgstr ""
-"Determina se hai que buscar o enderezo de correo do remitente na axenda de "
-"enderezos. Se se atopa non se considerarà correo lixo. Busca nas axendas "
-"marcadas para o completado automÃtico. Isto pode ser lento se as axendas de "
-"enderezos remotas (LDAP, por exemplo) estÃn marcadas para o completado "
-"automÃtico."
+#: ../mail/evolution-mail.schemas.in.h:21
+msgid "Spell checking languages"
+msgstr "Idiomas para a comprobaciÃn ortogrÃfica"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
-#: ../mail/evolution-mail.schemas.in.h:49
-msgid "Determines whether to use custom headers to check for junk"
+#: ../mail/evolution-mail.schemas.in.h:22
+msgid "List of dictionary language codes used for spell checking."
 msgstr ""
-"Determina se se deben usar as cabeceiras personalizadas para a detecciÃn de "
-"correo lixo"
+"Lista dos cÃdigos de idioma dos dicionarios usados para a comprobaciÃn "
+"ortogrÃfica."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
-#: ../mail/evolution-mail.schemas.in.h:50
-msgid ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
-msgstr ""
-"Determina se se deben usar as cabeceiras personalizadas para a detecciÃn de "
-"correo lixo. Se esta opciÃn està activada e se mencionan as cabeceiras, "
-"mellorarase a velocidade de detecciÃn do correo lixo."
+#: ../mail/evolution-mail.schemas.in.h:23
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "Mostrar o campo ÂCco ao enviar unha mensaxe de correo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view"
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
 msgstr ""
-"Determina se se debe usar o mesmo tipo de letra para as liÃas ÂDe e "
-"ÂAsunto da columna ÂMensaxes na vista vertical"
+"Mostrar o campo ÂCco ao enviar unha mensaxe de correo. Isto pÃdese "
+"configurar no menà ÂVista cando se selecciona unha conta de correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:51
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
-msgstr ""
-"Determina se se debe usar o mesmo tipo de letra para as liÃas ÂDe e "
-"ÂAsunto da columna ÂMensaxes na vista vertical."
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr "Mostrar o campo ÂCc ao enviar unha mensaxe de correo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-msgid "Digitally sign replies when the original message is signed"
-msgstr "Firmar dixitalmente respostas cando a mensaxe orixinal estea firmada"
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"Mostrar o campo ÂCc ao enviar unha mensaxe de correo. Isto pÃdese "
+"configurar no menà ÂVista cando se selecciona unha conta de correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
-msgid "Directory for loading/attaching files to composer."
-msgstr "Cartafol para cargar/anexar os ficheiros no editor de mensaxes."
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "Mostrar o campo ÂRespostar a ao enviar unha mensaxe de correo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
-#: ../mail/evolution-mail.schemas.in.h:53
-msgid "Directory for saving mail component files."
-msgstr "Cartafol onde gardar os ficheiros enviados por correo."
+#: ../mail/evolution-mail.schemas.in.h:28
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr ""
+"Mostrar o campo ÂResponder a ao enviar unha mensaxe de correo. Isto pÃdese "
+"configurar no menà ÂVista cando se selecciona unha conta de correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
-#: ../mail/evolution-mail.schemas.in.h:54
-msgid "Disable or enable ellipsizing of folder names in side bar"
-msgstr ""
-"Desactivar ou activar a abreviaciÃn dos nomes de cartafol na barra lateral"
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr "Mostrar o campo ÂDe ao enviar unha mensaxe a un grupo de discusiÃn"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-#: ../mail/evolution-mail.schemas.in.h:55
-msgid "Display only message texts not exceeding certain size"
-msgstr "Mostrar sà as mensaxes de texto que non excedan de certo tamaÃo"
+#: ../mail/evolution-mail.schemas.in.h:30
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+"Mostrar o campo ÂDe ao enviar unha mensaxe a un grupo de discusiÃn. Isto "
+"pÃdese configurar no menà ÂVista cando se selecciona unha conta de novas."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
-#: ../mail/evolution-mail.schemas.in.h:56
-msgid "Do not add signature delimiter"
-msgstr "Non engadir un delimitador de sinatura"
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr ""
+"Mostrar o campo ÂRespostar a ao enviar unha mensaxe a un grupo de discusiÃn"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
-#: ../mail/evolution-mail.schemas.in.h:58
-msgid "Draw spelling error indicators on words as you type."
-msgstr "Mostrar os erros de ortografÃa mentres se escribe."
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+"Mostrar o campo ÂResponder a ao enviar unha mensaxe a un grupo de "
+"discusiÃn. Isto pÃdese configurar no menà ÂVista cando se selecciona unha "
+"conta de novas."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
-#: ../mail/evolution-mail.schemas.in.h:59
-msgid "Empty Junk folders on exit"
-msgstr "Baleirar os cartafoles do correo lixo ao saÃr"
+msgid "Digitally sign replies when the original message is signed"
+msgstr "Firmar dixitalmente respostas cando a mensaxe orixinal estea firmada"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
-#: ../mail/evolution-mail.schemas.in.h:60
-msgid "Empty Trash folders on exit"
-msgstr "Baleirar os cartafoles de lixo ao saÃr"
+#: ../mail/evolution-mail.schemas.in.h:12
+msgid ""
+"Automatically enable PGP or S/MIME signatures when replying to a message "
+"which is also PGP or S/MIME signed."
+msgstr ""
+"Activar as firmas PGP ou S/MIME automaticamente ao responder a unha mensaxe "
+"firmada con PGP ou S/MIME."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
-#: ../mail/evolution-mail.schemas.in.h:61
-msgid "Empty all Junk folders when exiting Evolution."
-msgstr "Baleirar todos os cartafoles do correo lixo ao saÃr do Evolution."
+#: ../mail/evolution-mail.schemas.in.h:33 ../mail/mail-config.ui.h:15
+msgid "Encode file names in an Outlook/GMail way"
+msgstr "Codificar os nomes de ficheiro à forma de Outlook/GMail\""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
-#: ../mail/evolution-mail.schemas.in.h:62
-msgid "Empty all Trash folders when exiting Evolution."
-msgstr "Baleirar todos os cartafoles de lixo ao saÃr do Evolution."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 msgstr ""
-"Activar as imaxes animadas no correo HTML. Moitos usuarios atopan as imaxes "
-"animadas molestas e prefiren ver unha mensaxe estÃtica."
+"Codificar os nomes de ficheiro nas cabeceiras dos correos como o fan o "
+"Outlook ou o Gmail, para permitirlles mostrar correctamente os nomes de "
+"ficheiro cos caracteres UTF-8 que usa o Evolution, porque estes non seguen a "
+"RFC 2231 senÃn que usan un estÃndar RFC 2047 incorrecto."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:35
+msgid "Put personalized signatures at the top of replies"
+msgstr "PoÃer sinaturas personalizadas no inicio das respostas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
-#: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr "Activar o modo de cursor para poder ver un cursor ao ler un correo."
+#: ../mail/evolution-mail.schemas.in.h:36
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
+msgstr ""
+"Os usuarios teÃen nas sÃas mans determinar onde debe ir a sÃa sinatura cando "
+"responden a unha mensaxe. Isto determina se a sinatura se sitÃa no inicio da "
+"mensaxe ou no final."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
-#: ../mail/evolution-mail.schemas.in.h:65
-msgid "Enable local folders"
-msgstr "Activar cartafoles locais"
+#: ../mail/evolution-mail.schemas.in.h:37
+msgid "Do not add signature delimiter"
+msgstr "Non engadir un delimitador de sinatura"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
-#: ../mail/evolution-mail.schemas.in.h:66
-msgid "Enable or disable magic space bar"
-msgstr "Activar ou desactivar a barra de espazo mÃxica"
+#: ../mail/evolution-mail.schemas.in.h:38
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+"Estabelecer como verdadeiro no caso de que se queira engadir o delimitador "
+"de sinatura antes da sinatura cando escriba un correo electrÃnico."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "Enable or disable the prompt whilst marking multiple messages."
-msgstr "Activar ou desactivar a confirmaciÃn cando se marcan varias mensaxes."
+#: ../mail/evolution-mail.schemas.in.h:43
+msgid "Ignore list Reply-To:"
+msgstr "Ignorar ÂResponder a:Â para as listas:"
 
+#
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
-#: ../mail/evolution-mail.schemas.in.h:68
-msgid "Enable or disable type ahead search feature"
-msgstr "Activar ou desactivar a caracterÃstica de busca ao teclear"
+#: ../mail/evolution-mail.schemas.in.h:44
+msgid ""
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the 'Reply to List' action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+msgstr ""
+"Algunhas listas de correo estabelecen unha cabeceira ÂResponder a:Â para "
+"forzar os usuarios a responder à lista, incluso cando os usuarios piden que "
+"o Evolution envÃe unha resposta privada. Se se estabelece esta opciÃn como "
+"verdadeiro, intentarà ignorar tales cabeceiras, de tal forma que o Evolution "
+"faga o que se lle pide. Se usa a acciÃn de resposta privada, responderà de "
+"forma privada, mentres que se usa a acciÃn ÂResponder à lista farà isto "
+"mesmo. Funciona comparando a cabeceira ÂResponder a:Â cunha cabeceira "
+"ÂResponder à lista:Â, se existe."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
-#: ../mail/evolution-mail.schemas.in.h:69
-msgid "Enable search folders"
-msgstr "Activar os cartafoles de busca"
+msgid "List of localized 'Re'"
+msgstr "Lista de ÂRe localizados"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid "Enable search folders on startup."
-msgstr "Activar os cartafoles de busca ao iniciar."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:71
 msgid ""
-"Enable the side bar search feature to allow interactive searching of folder "
-"names."
+"Comma-separated list of localized 'Re' abbreviations to skip in a subject "
+"text when replying to a message, as an addition to the standard \"Re\" "
+"prefix. An example is 'SV,AV'."
 msgstr ""
-"Activar a barra de busca lateral para permitir a busca interactiva de nomes "
-"de cartafoles."
+"Lista separada por comas das abreviaciÃns ÂRe traducidas para omitir o "
+"texto de asunto ao respostar a unha mensaxe, como un engadido ao prefixo "
+"estÃndar ÂReÂ. Un exemplo à ÂSV, AVÂ."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:53
+msgid "Show image animations"
+msgstr "Mostrar as imaxes animadas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
 msgstr ""
-"Activar esta opciÃn para usar a barra espazadora para desprazarse pola "
-"mensaxe, na lista de mensaxes e nos cartafoles."
+"Activar as imaxes animadas no correo HTML. Moitos usuarios atopan as imaxes "
+"animadas molestas e prefiren ver unha mensaxe estÃtica."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
-#: ../mail/evolution-mail.schemas.in.h:73
-msgid ""
-"Enable to display only message texts not exceeding size defined in "
-"'message_text_part_limit' key."
-msgstr ""
-"Activar a vista dos textos das mensaxes que non excedan o tamaÃo definido "
-"pola chave 'message_text_part_limit'."
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid "Enable or disable type ahead search feature"
+msgstr "Activar ou desactivar a caracterÃstica de busca ao teclear"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-#: ../mail/evolution-mail.schemas.in.h:74
-msgid "Enable to use a similar message list view settings for all folders"
+#: ../mail/evolution-mail.schemas.in.h:56
+msgid ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 msgstr ""
-"Activar o uso dos axustes de vista da lista de mensaxes similares en todos "
-"os cartafoles"
+"Activar a barra de busca lateral para permitir a busca interactiva de nomes "
+"de cartafoles."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-#: ../mail/evolution-mail.schemas.in.h:75
-msgid "Enable to use a similar message list view settings for all folders."
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
-"Activar o uso dos axustes de vista da lista de mensaxes similares en todos "
-"os cartafoles."
+"Desactivar ou activar a abreviaciÃn dos nomes de cartafol na barra lateral"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-#: ../mail/evolution-mail.schemas.in.h:76
-msgid "Enable/disable caret mode"
-msgstr "Activar/desactivar o modo de cursor"
+#: ../mail/evolution-mail.schemas.in.h:58
+msgid "Whether disable ellipsizing feature of folder names in side bar."
+msgstr ""
+"Indica se hai que desactivar a funcionalidade de abreviaciÃn dos nomes dos "
+"cartafoles na barra lateral."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:77 ../mail/mail-config.ui.h:48
-msgid "Encode file names in an Outlook/GMail way"
-msgstr "Codificar os nomes de ficheiro à forma de Outlook/GMail\""
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid "Enable or disable magic space bar"
+msgstr "Activar ou desactivar a barra de espazo mÃxica"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
-"Encode file names in the mail headers same as Outlook or GMail do, to let "
-"them display correctly file names with UTF-8 letters sent by Evolution, "
-"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
-"standard."
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
 msgstr ""
-"Codificar os nomes de ficheiro nas cabeceiras dos correos como o fan o "
-"Outlook ou o Gmail, para permitirlles mostrar correctamente os nomes de "
-"ficheiro cos caracteres UTF-8 que usa o Evolution, porque estes non seguen a "
-"RFC 2231 senÃn que usan un estÃndar RFC 2047 incorrecto."
+"Activar esta opciÃn para usar a barra espazadora para desprazarse pola "
+"mensaxe, na lista de mensaxes e nos cartafoles."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
-"Cada vez que se inicie o Evolution, comprobar se à o cliente de correo "
-"predeterminado."
+"Activar o uso dos axustes de vista da lista de mensaxes similares en todos "
+"os cartafoles"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-#: ../mail/evolution-mail.schemas.in.h:80
-msgid "Flush Outbox after filtering"
-msgstr "Limpar a caixa de saÃda despois do filtrado"
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr ""
+"Activar o uso dos axustes de vista da lista de mensaxes similares en todos "
+"os cartafoles."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
-msgid "Forward message"
-msgstr "ReencamiÃar mensaxe"
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid "Mark citations in the message \"Preview\""
+msgstr "Marcar citas textuais na ÂVista previa da mensaxe"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
-#: ../mail/evolution-mail.schemas.in.h:83
-msgid "Group Reply replies to list"
-msgstr "A resposta ao grupo responde à lista"
+#: ../mail/evolution-mail.schemas.in.h:64
+msgid "Mark citations in the message \"Preview\"."
+msgstr "Marcar citas textuais na ÂVista previa da mensaxe"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
-#: ../mail/evolution-mail.schemas.in.h:84
-msgid "Height of the message-list pane"
-msgstr "Altura do panel da lista de mensaxes"
+#: ../mail/evolution-mail.schemas.in.h:65
+msgid "Citation highlight color"
+msgstr "Cor de realce das citas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
-#: ../mail/evolution-mail.schemas.in.h:85
-msgid "Height of the message-list pane."
-msgstr "Altura do panel da lista de mensaxes."
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid "Citation highlight color."
+msgstr "Cor de realce das citas."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
-#: ../mail/evolution-mail.schemas.in.h:86
-msgid "Hides the per-folder preview and removes the selection"
-msgstr "Oculta a vista previa por cartafol e elimina a selecciÃn"
+#: ../mail/evolution-mail.schemas.in.h:67
+msgid "Enable/disable caret mode"
+msgstr "Activar/desactivar o modo de cursor"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
-#: ../mail/evolution-mail.schemas.in.h:87
-msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
-msgstr ""
-"Se un usuario tenta abrir 10 ou mÃis mensaxes ao mesmo tempo, pedir a "
-"confirmaciÃn."
+#: ../mail/evolution-mail.schemas.in.h:68
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr "Activar o modo de cursor para poder ver un cursor ao ler un correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
-#: ../mail/evolution-mail.schemas.in.h:88
-msgid ""
-"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
-"any MIME types appearing in this list which map to a Bonobo component viewer "
-"in GNOME's MIME type database may be used for displaying content."
-msgstr ""
-"Se non hai un visualizador integrado no Evolution para un tipo MIME en "
-"particular, poderà usar calquera tipo MIME que apareza nesta lista e que "
-"mapee a un visualizador de compoÃentes Bonobo na base de datos de tipos MIME "
-"do GNOME."
+#: ../mail/evolution-mail.schemas.in.h:69
+msgid "Default charset in which to display messages"
+msgstr "Conxunto de caracteres predeterminado para mostrar mensaxes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
-#: ../mail/evolution-mail.schemas.in.h:89
-msgid "Ignore list Reply-To:"
-msgstr "Ignorar ÂResponder a:Â para as listas:"
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Default charset in which to display messages."
+msgstr "Conxunto de caracteres predeterminado para mostrar mensaxes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
-#: ../mail/evolution-mail.schemas.in.h:102
-msgid ""
-"Instead of the normal \"Reply to All\" behaviour, this option will make the "
-"'Group Reply' toolbar button try to reply only to the mailing list through "
-"which you happened to receive the copy of the message to which you're "
-"replying."
-msgstr ""
-"No lugar do comportamento normal de ÂResponder a todosÂ, esta opciÃn farà "
-"que o botÃn da barra de ferramentas ÂResponder ao grupo tente responder sà "
-"à lista de correo mediante a cal recibiu a copia da mensaxe que està "
-"respondendo."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid "Load images for HTML messages over HTTP"
+msgstr "Cargar as imaxes das mensaxes HTML sobre HTTP"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid ""
-"It disables/enables the repeated prompts to warn that deleting messages from "
-"a search folder permanently deletes the message, not simply removing it from "
-"the search results."
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
 msgstr ""
-"Activa/desactiva as preguntas que avisan de que ao borrar as mensaxes dun "
-"cartafol de busca bÃrranse as mensaxes permanentemente, non sà dos "
-"resultados da busca."
+"Cargar as imaxes das mensaxes HTML sobre HTTP(S). Os valores posÃbeis son: "
+"Â0Â - Non cargar nunca as imaxes de fÃra da rede. Â1Â - Cargar as imaxes nas "
+"mensaxes dos contactos. Â2Â - Cargar sempre as imaxes de fÃra da rede."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
-#: ../mail/evolution-mail.schemas.in.h:104
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"private reply to a message which arrived via a mailing list."
-msgstr ""
-"Activa/desactiva as preguntas que avisan de que està enviando unha resposta "
-"privada a un correo que chegou a travÃs dunha lista de correo."
+#: ../mail/evolution-mail.schemas.in.h:73
+msgid "Show Animations"
+msgstr "Mostrar as animaciÃns"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
-#: ../mail/evolution-mail.schemas.in.h:105
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"reply to many people."
-msgstr ""
-"Activa/desactiva as mensaxes que avisan de que està enviando unha resposta a "
-"moitas persoas."
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid "Show animated images as animations."
+msgstr "Mostrar as imaxes animadas como animaciÃns."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
-#: ../mail/evolution-mail.schemas.in.h:106
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying sending "
-"a private reply to a message which arrived via a mailing list, but the list "
-"sets a Reply-To: header which redirects your reply back to the list"
-msgstr ""
-"Activa/desactiva as mensaxes que avisan de que està tentando enviar unha "
-"resposta privada a un correo que chegou a travÃs dunha lista de correo, pero "
-"a lista estabelece unha cabeceira ÂResponder a:Â que redirecciona a sÃa "
-"resposta de novo à lista."
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "Show all message headers"
+msgstr "Mostrar todas as cabeceiras das mensaxes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
-#: ../mail/evolution-mail.schemas.in.h:107
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying to send "
-"a message to recipients not entered as mail addresses"
-msgstr ""
-"Activa/desactiva as preguntas que avisan de que està tentando enviar unha "
-"mensaxe a destinatarios non insertados como enderezos de correo"
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "Show all the headers when viewing a messages."
+msgstr "Mostrar todas as cabeceiras ao visualizar as mensaxes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
-#: ../mail/evolution-mail.schemas.in.h:108
-msgid "Last time Empty Junk was run"
-msgstr "A Ãltima vez que se baleirou o correo lixo"
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "List of custom headers and whether they are enabled."
+msgstr "Lista de cabeceiras personalizadas e o seu estado de activaciÃn."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
-#: ../mail/evolution-mail.schemas.in.h:109
-msgid "Last time Empty Trash was run"
-msgstr "A Ãltima vez que se baleirou o lixo"
+#: ../mail/evolution-mail.schemas.in.h:78
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
+msgstr ""
+"Esta chave deberÃa conter unha lista de estruturas XML indicando as "
+"cabeceiras personalizadas e indicando se se deben mostrar. O formato da "
+"estrutura XML Ã &lt;header enabled&gt; - defÃnao como activado para mostrar "
+"a cabeceira na vista do correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
-#: ../mail/evolution-mail.schemas.in.h:110
-msgid "Layout style"
-msgstr "Estilo da disposiciÃn"
+#: ../mail/evolution-mail.schemas.in.h:79
+msgid "Show photo of the sender"
+msgstr "Mostrar a fotografÃa do remitente"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
-#: ../mail/evolution-mail.schemas.in.h:111
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Level beyond which the message should be logged."
-msgstr "Nivel a partir do que se deberÃa rexistrar a mensaxe."
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid "Show the photo of the sender in the message reading pane."
+msgstr "Mostrar a fotografÃa do remitente no panel de lectura da mensaxe."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-#: ../mail/evolution-mail.schemas.in.h:112
-msgid "List of Labels and their associated colors"
-msgstr "Lista de etiquetas coas cores asociadas"
+#: ../mail/evolution-mail.schemas.in.h:81
+msgid "Search for the sender photo in local address books"
+msgstr "Buscar a fotografÃa do remitente nas axendas locais de enderezos"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid "This option would help in improving the speed of fetching."
+msgstr "Esta opciÃn poderÃa axudar a mellorar a velocidade de recepciÃn."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr ""
 "Lista dos tipos MIME para os que comprobar os visualizadores de compoÃentes "
 "do Bonobo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
-#: ../mail/evolution-mail.schemas.in.h:117
-msgid "List of custom headers and whether they are enabled."
-msgstr "Lista de cabeceiras personalizadas e o seu estado de activaciÃn."
-
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
-#: ../mail/evolution-mail.schemas.in.h:118
-msgid "List of dictionary language codes used for spell checking."
+#: ../mail/evolution-mail.schemas.in.h:84
+msgid ""
+"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
+"any MIME types appearing in this list which map to a Bonobo component viewer "
+"in GNOME's MIME type database may be used for displaying content."
 msgstr ""
-"Lista dos cÃdigos de idioma dos dicionarios usados para a comprobaciÃn "
-"ortogrÃfica."
+"Se non hai un visualizador integrado no Evolution para un tipo MIME en "
+"particular, poderà usar calquera tipo MIME que apareza nesta lista e que "
+"mapee a un visualizador de compoÃentes Bonobo na base de datos de tipos MIME "
+"do GNOME."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
-#: ../mail/evolution-mail.schemas.in.h:119
-msgid ""
-"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:color where color uses the HTML hex encoding."
-msgstr ""
-"Lista das etiquetas coÃecidas para o compoÃente de correo do Evolution. A "
-"lista contÃn cadeas que conteÃen nome:cor, onde a cor usa a codificaciÃn "
-"hexadecimal HTML."
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid "Mark as Seen after specified timeout"
+msgstr "Marcar como visto despois do tempo de espera indicado"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
-#: ../mail/evolution-mail.schemas.in.h:121
-msgid "Load images for HTML messages over HTTP"
-msgstr "Cargar as imaxes das mensaxes HTML sobre HTTP"
+#: ../mail/evolution-mail.schemas.in.h:86
+msgid "Mark as Seen after specified timeout."
+msgstr "Marcar como visto despois do tempo de espera indicado."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
-#: ../mail/evolution-mail.schemas.in.h:122
-msgid ""
-"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
-"Never load images off the net. \"1\" - Load images in messages from "
-"contacts. \"2\" - Always load images off the net."
-msgstr ""
-"Cargar as imaxes das mensaxes HTML sobre HTTP(S). Os valores posÃbeis son: "
-"Â0Â - Non cargar nunca as imaxes de fÃra da rede. Â1Â - Cargar as imaxes nas "
-"mensaxes dos contactos. Â2Â - Cargar sempre as imaxes de fÃra da rede."
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid "Timeout for marking message as seen"
+msgstr "Tempo de espera para marcar unha mensaxe como vista"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
-#: ../mail/evolution-mail.schemas.in.h:123
-msgid "Log filter actions"
-msgstr "Rexistrar as acciÃns de filtrado"
+#: ../mail/evolution-mail.schemas.in.h:91
+msgid "Timeout for marking message as seen."
+msgstr "Tempo de espera para marcar unha mensaxe como vista."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
-#: ../mail/evolution-mail.schemas.in.h:124
-msgid "Log filter actions to the specified log file."
-msgstr "Rexistrar as acciÃns de filtrado no ficheiro indicado."
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid "Sender email-address column in the message list"
+msgstr "Columna cos enderezos dos remitentes na lista de mensaxes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
-#: ../mail/evolution-mail.schemas.in.h:125
-msgid "Logfile to log filter actions"
-msgstr "Ficheiro de rexistro para as acciÃns de filtrado"
+#: ../mail/evolution-mail.schemas.in.h:88
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr ""
+"Mostrar o enderezo do remitente nunha columna separada na lista de mensaxes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
-#: ../mail/evolution-mail.schemas.in.h:126
-msgid "Logfile to log filter actions."
-msgstr "Ficheiro de rexistro para as acciÃns de filtrado."
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view"
+msgstr ""
+"Determina se se debe usar o mesmo tipo de letra para as liÃas ÂDe e "
+"ÂAsunto da columna ÂMensaxes na vista vertical"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
-#: ../mail/evolution-mail.schemas.in.h:130
-msgid "Mark as Seen after specified timeout"
-msgstr "Marcar como visto despois do tempo de espera indicado"
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+msgstr ""
+"Determina se se debe usar o mesmo tipo de letra para as liÃas ÂDe e "
+"ÂAsunto da columna ÂMensaxes na vista vertical."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
-#: ../mail/evolution-mail.schemas.in.h:131
-msgid "Mark as Seen after specified timeout."
-msgstr "Marcar como visto despois do tempo de espera indicado."
+#: ../mail/evolution-mail.schemas.in.h:92
+msgid "Show deleted messages in the message-list"
+msgstr "Mostrar as mensaxes eliminadas na lista de mensaxes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
-#: ../mail/evolution-mail.schemas.in.h:132
-msgid "Mark citations in the message \"Preview\""
-msgstr "Marcar citas textuais na ÂVista previa da mensaxe"
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr "Mostrar as mensaxes eliminadas (riscadas) na lista de mensaxes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
-#: ../mail/evolution-mail.schemas.in.h:133
-msgid "Mark citations in the message \"Preview\"."
-msgstr "Marcar citas textuais na ÂVista previa da mensaxe"
+#: ../mail/evolution-mail.schemas.in.h:96
+msgid "Enable local folders"
+msgstr "Activar cartafoles locais"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
-#: ../mail/evolution-mail.schemas.in.h:134
-msgid "Message text limit for display"
-msgstr "LÃmite do texto da mensaxe para a vista"
+msgid "Whether to show local folders (On This Computer) in a folder tree"
+msgstr ""
+"Indica se se deben mostrar os cartafoles locais (Neste equipo) nun Ãrbore de "
+"cartafoles"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
-#: ../mail/evolution-mail.schemas.in.h:135
-msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "Estilo de vista da mensaxe (ÂnormalÂ, Âcabeceiras completasÂ, ÂfonteÂ)"
+#: ../mail/evolution-mail.schemas.in.h:94
+msgid "Enable search folders"
+msgstr "Activar os cartafoles de busca"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
-#: ../mail/evolution-mail.schemas.in.h:136
-msgid "Minimum days between emptying the junk on exit"
-msgstr "NÃmero mÃnimo de dÃas antes de baleirar o correo lixo ao saÃr"
+#: ../mail/evolution-mail.schemas.in.h:95
+msgid "Enable search folders on startup."
+msgstr "Activar os cartafoles de busca ao iniciar."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
-#: ../mail/evolution-mail.schemas.in.h:137
-msgid "Minimum days between emptying the trash on exit"
-msgstr "NÃmero mÃnimo de dÃas antes de baleirar o lixo ao saÃr"
+#: ../mail/evolution-mail.schemas.in.h:98
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "Oculta a vista previa por cartafol e elimina a selecciÃn"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
-#: ../mail/evolution-mail.schemas.in.h:138
-msgid "Minimum time between emptying the junk on exit, in days."
-msgstr "Tempo mÃnimo antes de baleirar o correo lixo ao saÃr, en dÃas."
+#: ../mail/evolution-mail.schemas.in.h:99
+msgid ""
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
+msgstr ""
+"Esta chave sà se le unha vez e restabelÃcese como Âfalso despois de a ler. "
+"Isto deselecciona o correo da lista e elimina a vista previa de ese cartafol."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
-#: ../mail/evolution-mail.schemas.in.h:139
-msgid "Minimum time between emptying the trash on exit, in days."
-msgstr "Tempo mÃnimo antes de baleirar o lixo ao saÃr, en dÃas."
+#: ../mail/evolution-mail.schemas.in.h:100
+msgid "Height of the message-list pane"
+msgstr "Altura do panel da lista de mensaxes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "NÃmero de enderezos para mostrar en A/CC/CCO"
+#: ../mail/evolution-mail.schemas.in.h:101
+msgid "Height of the message-list pane."
+msgstr "Altura do panel da lista de mensaxes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
-msgid "Original message"
-msgstr "Mensaxe orixinal"
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "State of message headers in paned view"
+msgstr "Estado das cabeceiras da mensaxe na vista con paneis"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
-#: ../mail/evolution-mail.schemas.in.h:142
-msgid "Path where picture gallery should search for its content"
-msgstr "Ruta onde a galerÃa de imaxes deberÃa buscar o seu contido"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid ""
-"Possible values are: 'never' - to never close browser window, 'always' - to "
-"always close browser window or 'ask' - (or any other value) will ask user."
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded and \"1\" = collapsed"
 msgstr ""
-"Os valores posÃbeis son: Ânunca - non pechar nunca a xanela do buscador, "
-"Âsempre - pechar sempre a xanela do buscador ou Âpreguntar (ou calquera "
-"valor) preguntar ao usuario."
+"Describe se as cabeceiras dos mensaxes na vista con paneis se deben contraer "
+"ou expandir de maneira predeterminada. Â0Â = expandidas Â1Â = contraÃdas"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid "Width of the message-list pane"
+msgstr "Largura do panel da lista de mensaxes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
-#: ../mail/evolution-mail.schemas.in.h:144
-msgid "Prompt before sending to recipients not entered as mail addresses"
-msgstr ""
-"Preguntar antes de enviar a destinatarios non inseridos como enderezos de "
-"correo."
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Width of the message-list pane."
+msgstr "Largura do panel da lista de mensaxes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
-#: ../mail/evolution-mail.schemas.in.h:145
-msgid "Prompt on empty subject"
-msgstr "Avisar cando o ÂAsunto estea baleiro"
+#: ../mail/evolution-mail.schemas.in.h:104
+msgid "Layout style"
+msgstr "Estilo da disposiciÃn"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
-msgid "Prompt the user when he or she tries to empty the trash."
-msgstr "Avisar ao usuario cando tente baleirar o lixo."
+#: ../mail/evolution-mail.schemas.in.h:105
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
+msgstr ""
+"O estilo da disposiciÃn determina onde colocar o panel de vista previa en "
+"relaciÃn coa lista de mensaxes. Â0Â (vista clÃsica) mostra o panel de vista "
+"previa embaixo da lista de mensaxes. Â1Â (vista vertical) mostra o panel de "
+"vista previa ao lado da lista de mensaxes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
-#: ../mail/evolution-mail.schemas.in.h:146
-msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr "Avisar ao usuario cando tente expurgar un cartafol."
+#: ../mail/evolution-mail.schemas.in.h:106
+msgid "Variable width font"
+msgstr "Tipo de letra de largura variÃbel"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
-#: ../mail/evolution-mail.schemas.in.h:147
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
-msgstr "Avisar ao usuario cando tente enviar unha mensaxe sen asunto."
+#: ../mail/evolution-mail.schemas.in.h:107
+msgid "The variable width font for mail display."
+msgstr "O tipo de letra de largura variÃbel para mostrar o correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
-#: ../mail/evolution-mail.schemas.in.h:148
-msgid "Prompt when deleting messages in search folder"
-msgstr "Avisar ao eliminar mensaxes no cartafol de busca"
+#: ../mail/evolution-mail.schemas.in.h:108
+msgid "Terminal font"
+msgstr "Tipo de letra do terminal"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
-msgid "Prompt when emptying the trash"
-msgstr "Avisar ao baleirar o lixo"
+#: ../mail/evolution-mail.schemas.in.h:109
+msgid "The terminal font for mail display."
+msgstr "O tipo de letra do terminal para mostrar o correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
-#: ../mail/evolution-mail.schemas.in.h:149
-msgid "Prompt when mailing list hijacks private replies"
-msgstr "Avisar cando a lista de correo secuestre as respostas privadas"
+#: ../mail/evolution-mail.schemas.in.h:110
+msgid "Use custom fonts"
+msgstr "Usar tipos de letra personalizados"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
-#: ../mail/evolution-mail.schemas.in.h:150
-msgid "Prompt when replying privately to list messages"
-msgstr "Avisar cando se responda de forma privada a correos dunha lista"
+#: ../mail/evolution-mail.schemas.in.h:111
+msgid "Use custom fonts for displaying mail."
+msgstr "Usar tipos de letra personalizados para mostrar o correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid "Prompt when replying to many recipients"
-msgstr "Avisar ao responder a moitos destinatarios"
+#: ../mail/evolution-mail.schemas.in.h:112
+msgid "Compress display of addresses in TO/CC/BCC"
+msgstr "Abreviar a vista de enderezos en A/CC/CCO"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid "Prompt when user expunges"
-msgstr "Avisar cando o usuario expurgue"
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+"Abrevia a vista de enderezos en A/CC/CCO co nÃmero indicado en address_count."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
-#: ../mail/evolution-mail.schemas.in.h:153
-msgid "Prompt when user only fills Bcc"
-msgstr "Avisar cando o usuario encha sà o campo Cco"
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Display only message texts not exceeding certain size"
+msgstr "Mostrar sà as mensaxes de texto que non excedan de certo tamaÃo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
-#: ../mail/evolution-mail.schemas.in.h:154
-msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr "Avisar cando o usuario tente abrir dez ou mÃis mensaxes ao mesmo tempo"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
 msgstr ""
-"Avisar ao enviar mensaxes en HTML a destinatarios que non desexen recibilas."
+"Activar a vista dos textos das mensaxes que non excedan o tamaÃo definido "
+"pola chave 'message_text_part_limit'."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:116
+msgid "Message text limit for display"
+msgstr "LÃmite do texto da mensaxe para a vista"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
-#: ../mail/evolution-mail.schemas.in.h:156
-msgid "Prompt when user tries to send a message with no To or Cc recipients."
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid ""
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
-"Avisar cando o usuario tente enviar unha mensaxe sen cubrir os campos ÂPara "
-"ou ÂCCÂ."
+"Isto decide o tamaÃo mÃximo do texto da mensaxe que se pode mostrar no "
+"Evolution, indicado en KB. O tamaÃo predeterminado à 4096 (4MB). Este valor "
+"Ãsase sà cando a chave 'force_message_limit' està activada."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
-#: ../mail/evolution-mail.schemas.in.h:157
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr "Avisar cando o usuario tente enviar un HTML non desexado"
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr "NÃmero de enderezos para mostrar en A/CC/CCO"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
-#: ../mail/evolution-mail.schemas.in.h:158
-msgid "Prompt while marking multiple messages"
-msgstr "Avisar cando se marquen varias mensaxes"
+#: ../mail/evolution-mail.schemas.in.h:119
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr ""
+"Isto define o nÃmero de enderezos que se mostra na vista da lista de "
+"mensaxes predeterminada, para os restantes mostrarase ÂâÂ."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
-#: ../mail/evolution-mail.schemas.in.h:159
-msgid "Put personalized signatures at the top of replies"
-msgstr "PoÃer sinaturas personalizadas no inicio das respostas"
+#: ../mail/evolution-mail.schemas.in.h:120
+msgid "Thread the message-list based on Subject"
+msgstr "Lista de mensaxes por conversas baseadas no asunto"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
-#: ../mail/evolution-mail.schemas.in.h:160
-msgid "Put the cursor at the bottom of replies"
-msgstr "PoÃer o cursor ao fondo da resposta"
+#: ../mail/evolution-mail.schemas.in.h:121
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+"Indica se debe retroceder no agrupamento de conversas polo asunto cando as "
+"mensaxes non conteÃen cabeceiras ÂEn resposta a ou ÂReferenciasÂ."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
-#: ../mail/evolution-mail.schemas.in.h:161
-msgid "Recognize emoticons in text and replace them with images."
-msgstr "RecoÃecer as emoticonas no texto e substituÃlas con imaxes."
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid "Default value for thread expand state"
+msgstr "Valor predeterminado para o estado despregado da conversa"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
-#: ../mail/evolution-mail.schemas.in.h:162
-msgid "Recognize links in text and replace them."
-msgstr "RecoÃecer as ligazÃns no texto e substituÃlas."
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr ""
+"Esta opciÃn indica se os fÃos deben estar despregadas ou pregadas por "
+"omisiÃn. Ã necesario reiniciar o Evolution."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
-#: ../mail/evolution-mail.schemas.in.h:163
-msgid "Run junk test on incoming mail."
-msgstr "Realizar a proba do correo lixo no correo entrante."
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Whether sort threads based on latest message in that thread"
+msgstr "Indica se ordenar as conversa pola Ãltima mensaxe que aparece"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
-#: ../mail/evolution-mail.schemas.in.h:164
-msgid "Save directory"
-msgstr "Cartafol onde gardar"
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid ""
+"This setting specifies whether the threads should be sorted based on latest "
+"message in each thread, rather than by message's date. Evolution requires a "
+"restart."
+msgstr ""
+"Esta opciÃn indica se as conversas deben estar clasificadas pola Ãltima "
+"mensaxe de cada conversa en vez de pola data das mensaxes. Ã necesario "
+"reiniciar o Evolution."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
-#: ../mail/evolution-mail.schemas.in.h:165
-msgid "Search for the sender photo in local address books"
-msgstr "Buscar a fotografÃa do remitente nas axendas locais de enderezos"
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Sort accounts alphabetically in a folder tree"
+msgstr "Ordenar contas alfabeticamente nun Ãrbore de cartafoles"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
-#: ../mail/evolution-mail.schemas.in.h:166
-msgid "Send HTML mail by default"
-msgstr "Enviar o correo en HTML de forma predeterminada"
+msgid ""
+"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
+"true accounts are sorted alphabetically, with an exception of On This "
+"Computer and Search folders, otherwise accounts are sorted based on an order "
+"given by a user"
+msgstr ""
+"Indica como ordenar contas nunha Ãrbore de cartafoles usado nunha vista de "
+"Correo. Cando està estabelecido a certo as contas ordÃnanse alfabeticamente, "
+"coa excepciÃn de Neste equipo y Cartafoles de busca, pola contra os "
+"cartafoles ordÃnanse pola orde dada polo usuario"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "Send HTML mail by default."
-msgstr "Enviar o correo en HTML de forma predeterminada."
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid "Log filter actions"
+msgstr "Rexistrar as acciÃns de filtrado"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Sender email-address column in the message list"
-msgstr "Columna cos enderezos dos remitentes na lista de mensaxes"
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid "Log filter actions to the specified log file."
+msgstr "Rexistrar as acciÃns de filtrado no ficheiro indicado."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "Server synchronization interval"
-msgstr "Intervalo de sincronizaciÃn do servidor"
+#: ../mail/evolution-mail.schemas.in.h:144
+msgid "Logfile to log filter actions"
+msgstr "Ficheiro de rexistro para as acciÃns de filtrado"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid ""
-"Set to TRUE in case you do not want to add signature delimiter before your "
-"signature when composing a mail."
-msgstr ""
-"Estabelecer como verdadeiro no caso de que se queira engadir o delimitador "
-"de sinatura antes da sinatura cando escriba un correo electrÃnico."
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid "Logfile to log filter actions."
+msgstr "Ficheiro de rexistro para as acciÃns de filtrado."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "Show \"Bcc\" field when sending a mail message"
-msgstr "Mostrar o campo ÂCco ao enviar unha mensaxe de correo"
+#: ../mail/evolution-mail.schemas.in.h:146
+msgid "Flush Outbox after filtering"
+msgstr "Limpar a caixa de saÃda despois do filtrado"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "Show \"Cc\" field when sending a mail message"
-msgstr "Mostrar o campo ÂCc ao enviar unha mensaxe de correo"
+#: ../mail/evolution-mail.schemas.in.h:147
+msgid ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when there was used any 'Forward to' filter action and approximately "
+"one minute after the last action invocation."
+msgstr ""
+"Indica se limpar a ÂCaixa de saÃda despois de que remate o filtrado. A "
+"limpeza da ÂCaixa de saÃda sà acontecerà cando se use calquera acciÃn de "
+"filtrado ÂReencamiÃar a e aproximadamente un minuto despois da invocaciÃn "
+"da Ãltima acciÃn."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "Show \"From\" field when posting to a newsgroup"
-msgstr "Mostrar o campo ÂDe ao enviar unha mensaxe a un grupo de discusiÃn"
+#: ../mail/evolution-mail.schemas.in.h:148
+msgid "Default forward style"
+msgstr "Estilo de reencamiÃamento predeterminado"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "Show \"Reply To\" field when posting to a newsgroup"
-msgstr ""
-"Mostrar o campo ÂRespostar a ao enviar unha mensaxe a un grupo de discusiÃn"
+#: ../mail/evolution-mail.schemas.in.h:150
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr "Estilo de vista da mensaxe (ÂnormalÂ, Âcabeceiras completasÂ, ÂfonteÂ)"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "Show \"Reply To\" field when sending a mail message"
-msgstr "Mostrar o campo ÂRespostar a ao enviar unha mensaxe de correo"
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Prompt on empty subject"
+msgstr "Avisar cando o ÂAsunto estea baleiro"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Show Animations"
-msgstr "Mostrar as animaciÃns"
+#: ../mail/evolution-mail.schemas.in.h:152
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr "Avisar ao usuario cando tente enviar unha mensaxe sen asunto."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
-#: ../mail/evolution-mail.schemas.in.h:177
-msgid "Show all message headers"
-msgstr "Mostrar todas as cabeceiras das mensaxes"
+msgid "Prompt when emptying the trash"
+msgstr "Avisar ao baleirar o lixo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
-#: ../mail/evolution-mail.schemas.in.h:178
-msgid "Show all the headers when viewing a messages."
-msgstr "Mostrar todas as cabeceiras ao visualizar as mensaxes."
+msgid "Prompt the user when he or she tries to empty the trash."
+msgstr "Avisar ao usuario cando tente baleirar o lixo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
-#: ../mail/evolution-mail.schemas.in.h:179
-msgid "Show animated images as animations."
-msgstr "Mostrar as imaxes animadas como animaciÃns."
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid "Prompt when user expunges"
+msgstr "Avisar cando o usuario expurgue"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
-#: ../mail/evolution-mail.schemas.in.h:180
-msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "Mostrar as mensaxes eliminadas (riscadas) na lista de mensaxes."
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr "Avisar ao usuario cando tente expurgar un cartafol."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
-#: ../mail/evolution-mail.schemas.in.h:181
-msgid "Show deleted messages in the message-list"
-msgstr "Mostrar as mensaxes eliminadas na lista de mensaxes"
+#: ../mail/evolution-mail.schemas.in.h:173
+msgid "Prompt before sending to recipients not entered as mail addresses"
+msgstr ""
+"Preguntar antes de enviar a destinatarios non inseridos como enderezos de "
+"correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
-#: ../mail/evolution-mail.schemas.in.h:182
-msgid "Show image animations"
-msgstr "Mostrar as imaxes animadas"
+#: ../mail/evolution-mail.schemas.in.h:174
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a message to recipients not entered as mail addresses"
+msgstr ""
+"Activa/desactiva as preguntas que avisan de que està tentando enviar unha "
+"mensaxe a destinatarios non insertados como enderezos de correo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
-#: ../mail/evolution-mail.schemas.in.h:183
-msgid "Show original \"Date\" header value."
-msgstr "Mostrar o valor orixinal da cabeceira ÂDataÂ."
+#: ../mail/evolution-mail.schemas.in.h:155
+msgid "Prompt when user only fills Bcc"
+msgstr "Avisar cando o usuario encha sà o campo Cco"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
-#: ../mail/evolution-mail.schemas.in.h:184
-msgid "Show photo of the sender"
-msgstr "Mostrar a fotografÃa do remitente"
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+"Avisar cando o usuario tente enviar unha mensaxe sen cubrir os campos ÂPara "
+"ou ÂCCÂ."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
-#: ../mail/evolution-mail.schemas.in.h:185
-msgid ""
-"Show the \"Bcc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"Mostrar o campo ÂCco ao enviar unha mensaxe de correo. Isto pÃdese "
-"configurar no menà ÂVista cando se selecciona unha conta de correo."
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr "Avisar cando o usuario tente enviar un HTML non desexado"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
-"Show the \"Cc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
 msgstr ""
-"Mostrar o campo ÂCc ao enviar unha mensaxe de correo. Isto pÃdese "
-"configurar no menà ÂVista cando se selecciona unha conta de correo."
+"Avisar ao enviar mensaxes en HTML a destinatarios que non desexen recibilas."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
-#: ../mail/evolution-mail.schemas.in.h:187
-msgid ""
-"Show the \"From\" field when posting to a newsgroup. This is controlled from "
-"the View menu when a news account is chosen."
-msgstr ""
-"Mostrar o campo ÂDe ao enviar unha mensaxe a un grupo de discusiÃn. Isto "
-"pÃdese configurar no menà ÂVista cando se selecciona unha conta de novas."
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid "Prompt when user tries to open 10 or more messages at once"
+msgstr "Avisar cando o usuario tente abrir dez ou mÃis mensaxes ao mesmo tempo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
-"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
-"from the View menu when a news account is chosen."
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
 msgstr ""
-"Mostrar o campo ÂResponder a ao enviar unha mensaxe a un grupo de "
-"discusiÃn. Isto pÃdese configurar no menà ÂVista cando se selecciona unha "
-"conta de novas."
+"Se un usuario tenta abrir 10 ou mÃis mensaxes ao mesmo tempo, pedir a "
+"confirmaciÃn."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
-#: ../mail/evolution-mail.schemas.in.h:189
-msgid ""
-"Show the \"Reply To\" field when sending a mail message. This is controlled "
-"from the View menu when a mail account is chosen."
-msgstr ""
-"Mostrar o campo ÂResponder a ao enviar unha mensaxe de correo. Isto pÃdese "
-"configurar no menà ÂVista cando se selecciona unha conta de correo."
+#: ../mail/evolution-mail.schemas.in.h:161
+msgid "Prompt while marking multiple messages"
+msgstr "Avisar cando se marquen varias mensaxes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
-#: ../mail/evolution-mail.schemas.in.h:190
-msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
-msgstr ""
-"Mostrar o enderezo do remitente nunha columna separada na lista de mensaxes."
+#: ../mail/evolution-mail.schemas.in.h:162
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "Activar ou desactivar a confirmaciÃn cando se marcan varias mensaxes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
-#: ../mail/evolution-mail.schemas.in.h:191
-msgid ""
-"Show the original \"Date\" header (with a local time only if the time zone "
-"differs). Otherwise always show \"Date\" header value in a user preferred "
-"format and local time zone."
-msgstr ""
-"Mostrar a cabeceira ÂData orixinal (coa hora local sà se o fuso horario à "
-"distinto). Doutro xeito mostrar o valor da cabeceira ÂData no formato "
-"preferido polo usuario e o fuso de hora local."
+#: ../mail/evolution-mail.schemas.in.h:163
+msgid "Prompt when deleting messages in search folder"
+msgstr "Avisar ao eliminar mensaxes no cartafol de busca"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
-#: ../mail/evolution-mail.schemas.in.h:192
-msgid "Show the photo of the sender in the message reading pane."
-msgstr "Mostrar a fotografÃa do remitente no panel de lectura da mensaxe."
-
-#
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid ""
-"Some mailing lists set a Reply-To: header to trick users into sending "
-"replies to the list, even when they ask Evolution to make a private reply. "
-"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
-"so that Evolution will do as you ask it. If you use the private reply "
-"action, it will reply privately, while if you use the 'Reply to List' action "
-"it will do that. It works by comparing the Reply-To: header with a List-"
-"Post: header, if there is one."
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
 msgstr ""
-"Algunhas listas de correo estabelecen unha cabeceira ÂResponder a:Â para "
-"forzar os usuarios a responder à lista, incluso cando os usuarios piden que "
-"o Evolution envÃe unha resposta privada. Se se estabelece esta opciÃn como "
-"verdadeiro, intentarà ignorar tales cabeceiras, de tal forma que o Evolution "
-"faga o que se lle pide. Se usa a acciÃn de resposta privada, responderà de "
-"forma privada, mentres que se usa a acciÃn ÂResponder à lista farà isto "
-"mesmo. Funciona comparando a cabeceira ÂResponder a:Â cunha cabeceira "
-"ÂResponder à lista:Â, se existe."
+"Activa/desactiva as preguntas que avisan de que ao borrar as mensaxes dun "
+"cartafol de busca bÃrranse as mensaxes permanentemente, non sà dos "
+"resultados da busca."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:165
+msgid "Prompt when replying privately to list messages"
+msgstr "Avisar cando se responda de forma privada a correos dunha lista"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
-#: ../mail/evolution-mail.schemas.in.h:194
-msgid "Sort accounts alphabetically in a folder tree"
-msgstr "Ordenar contas alfabeticamente nun Ãrbore de cartafoles"
+#: ../mail/evolution-mail.schemas.in.h:166
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
+msgstr ""
+"Activa/desactiva as preguntas que avisan de que està enviando unha resposta "
+"privada a un correo que chegou a travÃs dunha lista de correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
-#: ../mail/evolution-mail.schemas.in.h:195
-msgid "Spell check inline"
-msgstr "ComprobaciÃn ortogrÃfica en liÃa"
+#: ../mail/evolution-mail.schemas.in.h:167
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "Avisar cando a lista de correo secuestre as respostas privadas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
-#: ../mail/evolution-mail.schemas.in.h:196
-msgid "Spell checking color"
-msgstr "Cor da comprobaciÃn ortogrÃfica"
+#: ../mail/evolution-mail.schemas.in.h:168
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying sending "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list"
+msgstr ""
+"Activa/desactiva as mensaxes que avisan de que està tentando enviar unha "
+"resposta privada a un correo que chegou a travÃs dunha lista de correo, pero "
+"a lista estabelece unha cabeceira ÂResponder a:Â que redirecciona a sÃa "
+"resposta de novo à lista."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
-#: ../mail/evolution-mail.schemas.in.h:197
-msgid "Spell checking languages"
-msgstr "Idiomas para a comprobaciÃn ortogrÃfica"
+#: ../mail/evolution-mail.schemas.in.h:169
+msgid "Prompt when replying to many recipients"
+msgstr "Avisar ao responder a moitos destinatarios"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
-#: ../mail/evolution-mail.schemas.in.h:198
-msgid "State of message headers in paned view"
-msgstr "Estado das cabeceiras da mensaxe na vista con paneis"
+#: ../mail/evolution-mail.schemas.in.h:170
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr ""
+"Activa/desactiva as mensaxes que avisan de que està enviando unha resposta a "
+"moitas persoas."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid ""
-"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
-"true accounts are sorted alphabetically, with an exception of On This "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user"
-msgstr ""
-"Indica como ordenar contas nunha Ãrbore de cartafoles usado nunha vista de "
-"Correo. Cando està estabelecido a certo as contas ordÃnanse alfabeticamente, "
-"coa excepciÃn de Neste equipo y Cartafoles de busca, pola contra os "
-"cartafoles ordÃnanse pola orde dada polo usuario"
+"Asks whether to close the message window when the user forwards or replies "
+"to the message shown in the window"
+msgstr ""
+"Pregunta se se pecha a xanela da mensaxe cando o usuario reencamiÃa ou "
+"responde à mensaxe mostrada"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
-#: ../mail/evolution-mail.schemas.in.h:200
-msgid "Terminal font"
-msgstr "Tipo de letra do terminal"
+msgid ""
+"Possible values are: 'never' - to never close browser window, 'always' - to "
+"always close browser window or 'ask' - (or any other value) will ask user."
+msgstr ""
+"Os valores posÃbeis son: Ânunca - non pechar nunca a xanela do buscador, "
+"Âsempre - pechar sempre a xanela do buscador ou Âpreguntar (ou calquera "
+"valor) preguntar ao usuario."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
-#: ../mail/evolution-mail.schemas.in.h:201
-msgid "The default plugin for Junk hook"
-msgstr "O engadido predeterminado para o tratamento do correo lixo"
+#: ../mail/evolution-mail.schemas.in.h:175
+msgid "Empty Trash folders on exit"
+msgstr "Baleirar os cartafoles de lixo ao saÃr"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
-#: ../mail/evolution-mail.schemas.in.h:202
-msgid ""
-"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
-msgstr ""
-"A Ãltima vez que se baleirou o correo lixo, en dÃas desde o 1 de xaneiro de "
-"1970 (Epoch)."
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Baleirar todos os cartafoles de lixo ao saÃr do Evolution."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
-#: ../mail/evolution-mail.schemas.in.h:203
-msgid ""
-"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
-msgstr ""
-"A Ãltima vez que se baleirou o lixo, en dÃas desde o 1 de xaneiro de 1970 "
-"(Epoch)."
+#: ../mail/evolution-mail.schemas.in.h:177
+msgid "Minimum days between emptying the trash on exit"
+msgstr "NÃmero mÃnimo de dÃas antes de baleirar o lixo ao saÃr"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
-#: ../mail/evolution-mail.schemas.in.h:204
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the message list. \"0\" (Classic View) places the preview pane below the "
-"message list. \"1\" (Vertical View) places the preview pane next to the "
-"message list."
-msgstr ""
-"O estilo da disposiciÃn determina onde colocar o panel de vista previa en "
-"relaciÃn coa lista de mensaxes. Â0Â (vista clÃsica) mostra o panel de vista "
-"previa embaixo da lista de mensaxes. Â1Â (vista vertical) mostra o panel de "
-"vista previa ao lado da lista de mensaxes."
+#: ../mail/evolution-mail.schemas.in.h:178
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr "Tempo mÃnimo antes de baleirar o lixo ao saÃr, en dÃas."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
-#: ../mail/evolution-mail.schemas.in.h:205
-msgid "The terminal font for mail display."
-msgstr "O tipo de letra do terminal para mostrar o correo."
+#: ../mail/evolution-mail.schemas.in.h:179
+msgid "Last time Empty Trash was run"
+msgstr "A Ãltima vez que se baleirou o lixo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows"
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
-"O texto inserido ao reencamiÃar unha mensaxe, informando que a continuaciÃn "
-"vai a mensaxe reencamiÃada"
+"A Ãltima vez que se baleirou o lixo, en dÃas desde o 1 de xaneiro de 1970 "
+"(Epoch)."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
-msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows"
+#: ../mail/evolution-mail.schemas.in.h:181
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
-"O texto inserido ao responder unha mensaxe, informando que a continuaciÃn "
-"vai a mensaxe orixinal"
+"Tempo (en segundos) durante o que se mostrarà o erro na barra de estado."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author"
-msgstr ""
-"O texto inserido cando se responde unha mensaxe, atribuÃndolle a mensaxe ao "
-"autor orixinal"
+#: ../mail/evolution-mail.schemas.in.h:182
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+msgid "Level beyond which the message should be logged."
+msgstr "Nivel a partir do que se deberÃa rexistrar a mensaxe."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
-#: ../mail/evolution-mail.schemas.in.h:209
-msgid "The variable width font for mail display."
-msgstr "O tipo de letra de largura variÃbel para mostrar o correo."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -9519,245 +9539,237 @@ msgstr ""
 "Isto pode ter tres valores posÃbeis: Â0Â para erros; Â1Â para avisos; Â2Â "
 "para mensaxes de depuraciÃn."
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid "Show original \"Date\" header value."
+msgstr "Mostrar o valor orixinal da cabeceira ÂDataÂ."
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
-"This decides the max size of the message text that will be displayed under "
-"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
-"is used only when 'force_message_limit' key is activated."
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
 msgstr ""
-"Isto decide o tamaÃo mÃximo do texto da mensaxe que se pode mostrar no "
-"Evolution, indicado en KB. O tamaÃo predeterminado à 4096 (4MB). Este valor "
-"Ãsase sà cando a chave 'force_message_limit' està activada."
+"Mostrar a cabeceira ÂData orixinal (coa hora local sà se o fuso horario à "
+"distinto). Doutro xeito mostrar o valor da cabeceira ÂData no formato "
+"preferido polo usuario e o fuso de hora local."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
-#: ../mail/evolution-mail.schemas.in.h:212
-msgid ""
-"This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it won't fall back "
-"to the other available plugins."
-msgstr ""
-"Este à o engadido predeterminado para o correo lixo, aÃnda que hai varios "
-"engadidos activados. Se o engadido predeterminado listado està desactivado "
-"non se usarÃn os outros engadidos dispoÃÃbeis."
+#: ../mail/evolution-mail.schemas.in.h:186
+msgid "List of Labels and their associated colors"
+msgstr "Lista de etiquetas coas cores asociadas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
-"This key is read only once and reset to \"false\" after read. This unselects "
-"the mail in the list and removes the preview for that folder."
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
-"Esta chave sà se le unha vez e restabelÃcese como Âfalso despois de a ler. "
-"Isto deselecciona o correo da lista e elimina a vista previa de ese cartafol."
+"Lista das etiquetas coÃecidas para o compoÃente de correo do Evolution. A "
+"lista contÃn cadeas que conteÃen nome:cor, onde a cor usa a codificaciÃn "
+"hexadecimal HTML."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
-#: ../mail/evolution-mail.schemas.in.h:214
-msgid ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
-msgstr ""
-"Esta chave deberÃa conter unha lista de estruturas XML indicando as "
-"cabeceiras personalizadas e indicando se se deben mostrar. O formato da "
-"estrutura XML Ã &lt;header enabled&gt; - defÃnao como activado para mostrar "
-"a cabeceira na vista do correo."
+#: ../mail/evolution-mail.schemas.in.h:188
+msgid "Check incoming mail being junk"
+msgstr "Comprobar se o correo entrante à correo lixo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
-#: ../mail/evolution-mail.schemas.in.h:215
-msgid ""
-"This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local address book only to exclude "
-"mail sent by known contacts from junk filtering."
-msgstr ""
-"Esta opciÃn està relacionada coa chave lookup_addressbook e Ãsase para "
-"determinar se hai que buscar os enderezos na axenda de enderezos local sà "
-"para excluÃr os correos enviados por contactos coÃecidos desde o filtro de "
-"correo lixo."
+#: ../mail/evolution-mail.schemas.in.h:189
+msgid "Run junk test on incoming mail."
+msgstr "Realizar a proba do correo lixo no correo entrante."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
-#: ../mail/evolution-mail.schemas.in.h:216
-msgid "This option would help in improving the speed of fetching."
-msgstr "Esta opciÃn poderÃa axudar a mellorar a velocidade de recepciÃn."
+#: ../mail/evolution-mail.schemas.in.h:190
+msgid "Empty Junk folders on exit"
+msgstr "Baleirar os cartafoles do correo lixo ao saÃr"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
-#: ../mail/evolution-mail.schemas.in.h:217
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr ""
-"Isto define o nÃmero de enderezos que se mostra na vista da lista de "
-"mensaxes predeterminada, para os restantes mostrarase ÂâÂ."
+#: ../mail/evolution-mail.schemas.in.h:191
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "Baleirar todos os cartafoles do correo lixo ao saÃr do Evolution."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
-msgstr ""
-"Esta opciÃn indica se os fÃos deben estar despregadas ou pregadas por "
-"omisiÃn. Ã necesario reiniciar o Evolution."
+#: ../mail/evolution-mail.schemas.in.h:192
+msgid "Minimum days between emptying the junk on exit"
+msgstr "NÃmero mÃnimo de dÃas antes de baleirar o correo lixo ao saÃr"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
-#: ../mail/evolution-mail.schemas.in.h:219
-msgid ""
-"This setting specifies whether the threads should be sorted based on latest "
-"message in each thread, rather than by message's date. Evolution requires a "
-"restart."
-msgstr ""
-"Esta opciÃn indica se as conversas deben estar clasificadas pola Ãltima "
-"mensaxe de cada conversa en vez de pola data das mensaxes. Ã necesario "
-"reiniciar o Evolution."
+#: ../mail/evolution-mail.schemas.in.h:193
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr "Tempo mÃnimo antes de baleirar o correo lixo ao saÃr, en dÃas."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
-msgid ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder"
-msgstr ""
-"Este valor pode ser unha cadea baleira, isto significa que usarà o cartafol "
-"ÂImaxes do sistema, xeralmente localizado en ~/Imaxes. Este cartafol "
-"usarase tamÃn cando a ruta estabelecida non apunta a un cartafol existente."
+#: ../mail/evolution-mail.schemas.in.h:194
+msgid "Last time Empty Junk was run"
+msgstr "A Ãltima vez que se baleirou o correo lixo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
-#: ../mail/evolution-mail.schemas.in.h:221
-msgid "Thread the message-list based on Subject"
-msgstr "Lista de mensaxes por conversas baseadas no asunto"
+#: ../mail/evolution-mail.schemas.in.h:195
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr ""
+"A Ãltima vez que se baleirou o correo lixo, en dÃas desde o 1 de xaneiro de "
+"1970 (Epoch)."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
-#: ../mail/evolution-mail.schemas.in.h:222
-msgid "Timeout for marking message as seen"
-msgstr "Tempo de espera para marcar unha mensaxe como vista"
+#: ../mail/evolution-mail.schemas.in.h:196
+msgid "The default plugin for Junk hook"
+msgstr "O engadido predeterminado para o tratamento do correo lixo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
-#: ../mail/evolution-mail.schemas.in.h:223
-msgid "Timeout for marking message as seen."
-msgstr "Tempo de espera para marcar unha mensaxe como vista."
+#: ../mail/evolution-mail.schemas.in.h:197
+msgid ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it won't fall back "
+"to the other available plugins."
+msgstr ""
+"Este à o engadido predeterminado para o correo lixo, aÃnda que hai varios "
+"engadidos activados. Se o engadido predeterminado listado està desactivado "
+"non se usarÃn os outros engadidos dispoÃÃbeis."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
-#: ../mail/evolution-mail.schemas.in.h:224
-msgid "UID string of the default account."
-msgstr "Cadea UID para a conta predeterminada."
+#: ../mail/evolution-mail.schemas.in.h:198
+msgid "Determines whether to lookup in address book for sender email"
+msgstr ""
+"Determina se hai que buscar o enderezo de correo do remitente na axenda de "
+"enderezos"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
-#: ../mail/evolution-mail.schemas.in.h:225
-msgid "Underline color for misspelled words when using inline spelling."
-msgstr ""
-"Cor de subliÃado para as palabras escritas incorrectamente cando se usa a "
-"comprobaciÃn ortogrÃfica en liÃa."
+#: ../mail/evolution-mail.schemas.in.h:199
+msgid ""
+"Determines whether to lookup the sender email in address book. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
+msgstr ""
+"Determina se hai que buscar o enderezo de correo do remitente na axenda de "
+"enderezos. Se se atopa non se considerarà correo lixo. Busca nas axendas "
+"marcadas para o completado automÃtico. Isto pode ser lento se as axendas de "
+"enderezos remotas (LDAP, por exemplo) estÃn marcadas para o completado "
+"automÃtico."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
-#: ../mail/evolution-mail.schemas.in.h:226
-msgid "Use custom fonts"
-msgstr "Usar tipos de letra personalizados"
+#: ../mail/evolution-mail.schemas.in.h:200
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+"Determina se hai que buscar enderezos para filtrar correo lixo na axenda de "
+"enderezos local"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
-#: ../mail/evolution-mail.schemas.in.h:227
-msgid "Use custom fonts for displaying mail."
-msgstr "Usar tipos de letra personalizados para mostrar o correo."
+#: ../mail/evolution-mail.schemas.in.h:201
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local address book only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+"Esta opciÃn està relacionada coa chave lookup_addressbook e Ãsase para "
+"determinar se hai que buscar os enderezos na axenda de enderezos local sà "
+"para excluÃr os correos enviados por contactos coÃecidos desde o filtro de "
+"correo lixo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
-#: ../mail/evolution-mail.schemas.in.h:228
-msgid ""
-"Users get all up in arms over where the cursor should go when replying to a "
-"message. This determines whether the cursor is placed at the top of the "
-"message or the bottom."
+#: ../mail/evolution-mail.schemas.in.h:202
+msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
-"Os usuarios teÃen nas sÃas mans determinar onde debe ir o cursor cando se "
-"responde a unha mensaxe. Isto determina se o cursor se sitÃa no inicio da "
-"mensaxe ou no final."
+"Determina se se deben usar as cabeceiras personalizadas para a detecciÃn de "
+"correo lixo"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid ""
-"Users get all up in arms over where their signature should go when replying "
-"to a message. This determines whether the signature is placed at the top of "
-"the message or the bottom."
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
 msgstr ""
-"Os usuarios teÃen nas sÃas mans determinar onde debe ir a sÃa sinatura cando "
-"responden a unha mensaxe. Isto determina se a sinatura se sitÃa no inicio da "
-"mensaxe ou no final."
+"Determina se se deben usar as cabeceiras personalizadas para a detecciÃn de "
+"correo lixo. Se esta opciÃn està activada e se mencionan as cabeceiras, "
+"mellorarase a velocidade de detecciÃn do correo lixo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
-#: ../mail/evolution-mail.schemas.in.h:230
-msgid "Variable width font"
-msgstr "Tipo de letra de largura variÃbel"
+#: ../mail/evolution-mail.schemas.in.h:204
+msgid "Custom headers to use while checking for junk."
+msgstr "Cabeceiras personalizadas para usar mentres se comproba o correo lixo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
-#: ../mail/evolution-mail.schemas.in.h:231
-msgid "Whether a read receipt request gets added to every message by default."
+#: ../mail/evolution-mail.schemas.in.h:205
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
 msgstr ""
-"Indica se hai que engadir unha solicitude de confirmaciÃn de lectura de "
-"forma predeterminada."
+"Cabeceiras personalizadas para usar mentres se comproba o correo lixo. A "
+"lista de elementos son cadeas no formato Âheadername=valueÂ."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
-#: ../mail/evolution-mail.schemas.in.h:232
-msgid ""
-"Whether check for new messages in all active accounts regardless of the "
-"account \"Check for new messages every X minutes\" option when Evolution is "
-"started. This option is used only together with 'send_recv_on_start' option."
-msgstr ""
-"Indica se hai que buscar mensaxes novas nas contas activas ao iniciar o "
-"Evolution aÃnda que estea marcada a opciÃn ÂComprobar se hai mensaxes novas "
-"cada X minutosÂ. Esta opciÃn Ãsase conxuntamente coa opciÃn "
-"'send_recv_on_start'."
+#: ../mail/evolution-mail.schemas.in.h:206
+msgid "UID string of the default account."
+msgstr "Cadea UID para a conta predeterminada."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
-#: ../mail/evolution-mail.schemas.in.h:233
-msgid ""
-"Whether check for new messages when Evolution is started. This includes also "
-"sending messages from Outbox."
-msgstr ""
-"Indica se debe buscar novas mensaxes ao iniciar o Evolution. InclÃe o envÃo "
-"de mensaxes desde a caixa de saÃda."
+#: ../mail/evolution-mail.schemas.in.h:211
+msgid "Save directory"
+msgstr "Cartafol onde gardar"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
-#: ../mail/evolution-mail.schemas.in.h:234
-msgid "Whether disable ellipsizing feature of folder names in side bar."
-msgstr ""
-"Indica se hai que desactivar a funcionalidade de abreviaciÃn dos nomes dos "
-"cartafoles na barra lateral."
+#: ../mail/evolution-mail.schemas.in.h:212
+msgid "Directory for saving mail component files."
+msgstr "Cartafol onde gardar os ficheiros enviados por correo."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
-#: ../mail/evolution-mail.schemas.in.h:235
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
-msgstr ""
-"Indica se debe retroceder no agrupamento de conversas polo asunto cando as "
-"mensaxes non conteÃen cabeceiras ÂEn resposta a ou ÂReferenciasÂ."
+msgid "Composer load/attach directory"
+msgstr "Cartafol para cargar/anexar do editor de mensaxes"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
-#: ../mail/evolution-mail.schemas.in.h:236
-msgid "Whether sort threads based on latest message in that thread"
-msgstr "Indica se ordenar as conversa pola Ãltima mensaxe que aparece"
+msgid "Directory for loading/attaching files to composer."
+msgstr "Cartafol para cargar/anexar os ficheiros no editor de mensaxes."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
-#: ../mail/evolution-mail.schemas.in.h:237
-msgid ""
-"Whether to flush Outbox after filtering is done. Outbox flush will happen "
-"only when there was used any 'Forward to' filter action and approximately "
-"one minute after the last action invocation."
-msgstr ""
-"Indica se limpar a ÂCaixa de saÃda despois de que remate o filtrado. A "
-"limpeza da ÂCaixa de saÃda sà acontecerà cando se use calquera acciÃn de "
-"filtrado ÂReencamiÃar a e aproximadamente un minuto despois da invocaciÃn "
-"da Ãltima acciÃn."
+#: ../mail/evolution-mail.schemas.in.h:219
+msgid "Check for new messages on start"
+msgstr "Comprobar se hai mensaxes novas ao iniciar"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
-msgid "Whether to show local folders (On This Computer) in a folder tree"
+#: ../mail/evolution-mail.schemas.in.h:220
+msgid ""
+"Whether check for new messages when Evolution is started. This includes also "
+"sending messages from Outbox."
 msgstr ""
-"Indica se se deben mostrar os cartafoles locais (Neste equipo) nun Ãrbore de "
-"cartafoles"
+"Indica se debe buscar novas mensaxes ao iniciar o Evolution. InclÃe o envÃo "
+"de mensaxes desde a caixa de saÃda."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
-#: ../mail/evolution-mail.schemas.in.h:239
-msgid "Width of the message-list pane"
-msgstr "Largura do panel da lista de mensaxes"
+#: ../mail/evolution-mail.schemas.in.h:221
+msgid "Check for new messages in all active accounts"
+msgstr "Comprobar se hai mensaxes novas nas contas activas"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:222
+msgid ""
+"Whether check for new messages in all active accounts regardless of the "
+"account \"Check for new messages every X minutes\" option when Evolution is "
+"started. This option is used only together with 'send_recv_on_start' option."
+msgstr ""
+"Indica se hai que buscar mensaxes novas nas contas activas ao iniciar o "
+"Evolution aÃnda que estea marcada a opciÃn ÂComprobar se hai mensaxes novas "
+"cada X minutosÂ. Esta opciÃn Ãsase conxuntamente coa opciÃn "
+"'send_recv_on_start'."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:239
+msgid "Server synchronization interval"
+msgstr "Intervalo de sincronizaciÃn do servidor"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 #: ../mail/evolution-mail.schemas.in.h:240
-msgid "Width of the message-list pane."
-msgstr "Largura do panel da lista de mensaxes."
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+"Controla a frecuencia coa que se sincronizan os cambios locais co servidor "
+"de correo remoto. O intervalo debe ser de polo menos 30 segundos."
 
 #: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:1
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
@@ -9787,49 +9799,49 @@ msgstr ""
 "sincronizados"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
-msgid "Address book to use for storing automatically synced contacts from GAIM"
-msgstr ""
-"Axenda de enderezos a usar para almacenar automaticamente os contactos "
-"sincronizados desde GAIM"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
 msgid "Auto sync GAIM contacts"
 msgstr "Sincronizar automaticamente os contactos GAIM"
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
-msgid "Check interval for GAIM syncing of contacts"
-msgstr "Intervalo de actualizaciÃn para a sincronizaciÃn dos contactos de GAIM"
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
+msgid "Whether GAIM contacts should be automaticall synced"
+msgstr "Indica se se deberÃan sincronizar os contactos de GAIM"
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
 msgid "Enable autocontacts"
 msgstr "Activar autocontactos"
 
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
+msgid ""
+"Whether contacts should be automatically added to the user's addressbook"
+msgstr ""
+"Indica se os contactos deberÃan engadirse automaticamente à axenda de "
+"enderezos do usuario"
+
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
 msgid "GAIM address book source"
 msgstr "Orixe da axenda de enderezos de GAIM"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
-msgid "GAIM check interval"
-msgstr "Intervalo de actualizaciÃn de GAIM"
+msgid "Address book to use for storing automatically synced contacts from GAIM"
+msgstr ""
+"Axenda de enderezos a usar para almacenar automaticamente os contactos "
+"sincronizados desde GAIM"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
-msgid "GAIM last sync MD5"
-msgstr "MD5 da Ãltima actualizaciÃn de GAIM"
+msgid "GAIM check interval"
+msgstr "Intervalo de actualizaciÃn de GAIM"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
-msgid "GAIM last sync time"
-msgstr "Data da Ãltima sincronizaciÃn de GAIM"
+msgid "Check interval for GAIM syncing of contacts"
+msgstr "Intervalo de actualizaciÃn para a sincronizaciÃn dos contactos de GAIM"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
-msgid "Whether GAIM contacts should be automaticall synced"
-msgstr "Indica se se deberÃan sincronizar os contactos de GAIM"
+msgid "GAIM last sync MD5"
+msgstr "MD5 da Ãltima actualizaciÃn de GAIM"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
-msgid ""
-"Whether contacts should be automatically added to the user's addressbook"
-msgstr ""
-"Indica se os contactos deberÃan engadirse automaticamente à axenda de "
-"enderezos do usuario"
+msgid "GAIM last sync time"
+msgstr "Data da Ãltima sincronizaciÃn de GAIM"
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
@@ -9849,25 +9861,25 @@ msgstr ""
 "separados por Â;Â"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
-msgid "Automatically launch editor when key is pressed in the mail composer."
-msgstr ""
-"Iniciar automaticamente o editor ao presionar unha tecla no editor de correo"
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr "Editor externo predeterminado"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:125
-msgid "Automatically launch when a new mail is edited"
-msgstr "Iniciar automaticamente cando se edite un novo correo"
+msgid "The default command that must be used as the editor."
+msgstr "A orde predeterminada que se debe usar co editor."
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
-msgid "Default External Editor"
-msgstr "Editor externo predeterminado"
+#: ../plugins/external-editor/external-editor.c:125
+msgid "Automatically launch when a new mail is edited"
+msgstr "Iniciar automaticamente cando se edite un novo correo"
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:4
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
-msgid "The default command that must be used as the editor."
-msgstr "A orde predeterminada que se debe usar co editor."
+msgid "Automatically launch editor when key is pressed in the mail composer."
+msgstr ""
+"Iniciar automaticamente o editor ao presionar unha tecla no editor de correo"
 
 #: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
@@ -9894,96 +9906,96 @@ msgstr "Indica se eliminar os obxectos iTip procesados"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
-msgid "Beep or play sound file."
-msgstr "Emitir un ton de aviso ou un ficheiro de son."
+msgid "Notify new messages for Inbox only."
+msgstr "Notificar as mensaxes novas sà na caixa de entrada."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
-msgid "Enable D-Bus messages."
-msgstr "Activar as mensaxes D-Bus."
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr ""
+"Indica se avisar das mensaxes novas sà no cartafol da caixa de entrada."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:3
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Enable icon in notification area."
-msgstr "Activar a icona na Ãrea de notificaciÃn."
+msgid "Enable D-Bus messages."
+msgstr "Activar as mensaxes D-Bus."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:4
-msgid "FIXME"
-msgstr "ARRANXAR"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
 msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Xera unha mensaxe D-Bus cando se reciben mensaxes novas."
 
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Enable icon in notification area."
+msgstr "Activar a icona na Ãrea de notificaciÃn."
+
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
-msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Show new mail icon in notification area when new messages arrive."
 msgstr ""
-"Se à Âcerto emitirà un ton de aviso, en caso contrario reproducirà un "
-"ficheiro de son cando cheguen mensaxes novas."
+"Mostrar a icona de correo novo na Ãrea de notificaciÃn cando cheguen "
+"mensaxes novas."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:7
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "Notify new messages for Inbox only."
-msgstr "Notificar as mensaxes novas sà na caixa de entrada."
+msgid "Popup message together with the icon."
+msgstr "Mostrar a mensaxe xunto coa icona."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:8
+msgid "Whether show message over the icon when new messages arrive."
+msgstr ""
+"Indica se  mostrar a mensaxe sobre a icona cando cheguen mensaxes novas."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid "Play sound when new messages arrive."
 msgstr "Reproducir un son cando cheguen mensaxes novas."
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgid "Whether play sound or beep when new messages arrive."
 msgstr ""
-"Reproducir un tema sonoro cando chegue unha mensaxe nova, se non està no "
-"modo de ton de aviso."
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
-msgid "Popup message together with the icon."
-msgstr "Mostrar a mensaxe xunto coa icona."
+"Indica se reproducir un son ou un ton de aviso cando cheguen mensaxes novas."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
-msgid "Show new mail icon in notification area when new messages arrive."
-msgstr ""
-"Mostrar a icona de correo novo na Ãrea de notificaciÃn cando cheguen "
-"mensaxes novas."
+msgid "Beep or play sound file."
+msgstr "Emitir un ton de aviso ou un ficheiro de son."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-msgid "Sound file name to be played."
-msgstr "Nome do ficheiro de son que desexa reproducir."
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr ""
+"Se à Âcerto emitirà un ton de aviso, en caso contrario reproducirà un "
+"ficheiro de son cando cheguen mensaxes novas."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Sound file name to be played."
+msgstr "Nome do ficheiro de son que desexa reproducir."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "Ficheiro de son que desexa reproducir cando chegue unha mensaxe nova, se non "
 "està no modo de ton de aviso."
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
-msgid "Use sound theme"
-msgstr "Usar un tema sonoro"
-
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
-msgid "Whether play sound or beep when new messages arrive."
-msgstr ""
-"Indica se reproducir un son ou un ton de aviso cando cheguen mensaxes novas."
+msgid "FIXME"
+msgstr "ARRANXAR"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
-msgid "Whether show message over the icon when new messages arrive."
-msgstr ""
-"Indica se  mostrar a mensaxe sobre a icona cando cheguen mensaxes novas."
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid "Use sound theme"
+msgstr "Usar un tema sonoro"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
-msgid "Whether to notify new messages in Inbox folder only."
+msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
-"Indica se avisar das mensaxes novas sà no cartafol da caixa de entrada."
+"Reproducir un tema sonoro cando chegue unha mensaxe nova, se non està no "
+"modo de ton de aviso."
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
 msgid "Mode to use when displaying mails"
@@ -10014,86 +10026,90 @@ msgstr ""
 "substitÃa no corpo dunha mensaxe."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
-#: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Default sidebar width"
-msgstr "Largura predeterminada da barra lateral"
+#: ../shell/apps_evolution_shell.schemas.in.h:5
+msgid "Skip development warning dialog"
+msgstr "Saltar o diÃlogo de aviso de desenvolvemento"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
-#: ../shell/apps_evolution_shell.schemas.in.h:10
-msgid "Enable express mode"
-msgstr "Activar o modo express"
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+"Indica se se salta o diÃlogo de aviso nas versiÃns de desenvolvemento do "
+"Evolution."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
-#: ../shell/apps_evolution_shell.schemas.in.h:12
-msgid "Flag that enables a much simplified user interface."
-msgstr "Marca que activa unha interface de usuario moito mÃis simplificada."
+#: ../shell/apps_evolution_shell.schemas.in.h:7
+msgid "Initial attachment view"
+msgstr "VisiÃn inicial do anexo"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
-#: ../shell/apps_evolution_shell.schemas.in.h:17
-msgid "ID or alias of the component to be shown by default at start-up."
+#: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
 msgstr ""
-"ID ou alias do compoÃente que se mostrarà de forma predeterminada ao iniciar."
+"Vista inicial dos trebellos da barra de anexos. Â0Â Ã a vista de iconas, Â1Â "
+"Ã a vista en lista."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
-#: ../shell/apps_evolution_shell.schemas.in.h:19
-msgid "Initial attachment view"
-msgstr "VisiÃn inicial do anexo"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:6
 msgid "Initial file chooser folder"
 msgstr "Cartafol inicial do seleccionador de ficheiros"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:6
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Cartafol inicial para os diÃlogos GtkFileChooser."
 
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:9 ../shell/main.c:317
+msgid "Start in offline mode"
+msgstr "Iniciar en modo sen conexiÃn"
+
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
-#: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid ""
-"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
-"View."
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
-"Vista inicial dos trebellos da barra de anexos. Â0Â Ã a vista de iconas, Â1Â "
-"Ã a vista en lista."
+"Indica se o Evolution se iniciarà en modo sen conexiÃn en vez de en modo "
+"conectado."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
+msgid "Offline folder paths"
+msgstr "Rutas de cartafol en modo desconectado"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage."
 msgstr ""
 "Lista das rutas aos cartafoles que se sincronizarÃn co disco para o uso sen "
 "conexiÃn"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
-msgid "Offline folder paths"
-msgstr "Rutas de cartafol en modo desconectado"
-
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-#: ../shell/apps_evolution_shell.schemas.in.h:31
-msgid "Sidebar is visible"
-msgstr "A barra lateral està visÃbel"
+#: ../shell/apps_evolution_shell.schemas.in.h:61
+msgid "Enable express mode"
+msgstr "Activar o modo express"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
-#: ../shell/apps_evolution_shell.schemas.in.h:32
-msgid "Skip development warning dialog"
-msgstr "Saltar o diÃlogo de aviso de desenvolvemento"
+#: ../shell/apps_evolution_shell.schemas.in.h:62
+msgid "Flag that enables a much simplified user interface."
+msgstr "Marca que activa unha interface de usuario moito mÃis simplificada."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:317
-msgid "Start in offline mode"
-msgstr "Iniciar en modo sen conexiÃn"
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "Window buttons are visible"
+msgstr "Os botÃns da xanela estÃn visÃbeis"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
-#: ../shell/apps_evolution_shell.schemas.in.h:34
-msgid "Statusbar is visible"
-msgstr "A barra de estado à visÃbel"
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Whether the window buttons should be visible."
+msgstr "Indica se os botÃns da xanela estÃn visÃbeis."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
-#: ../shell/apps_evolution_shell.schemas.in.h:40
-msgid "The default width for the sidebar, in pixels."
-msgstr "Largura predeterminada da barra lateral, en pÃxeles."
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Window button style"
+msgstr "Estilo dos botÃns de xanela"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -10104,89 +10120,85 @@ msgstr ""
 "botÃns determinarao a configuraciÃn da barra de ferramentas do GNOME."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Toolbar is visible"
 msgstr "A barra de ferramentas està visÃbel"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
-#: ../shell/apps_evolution_shell.schemas.in.h:54
-msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
-"Indica se o Evolution se iniciarà en modo sen conexiÃn en vez de en modo "
-"conectado."
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+msgid "Whether the toolbar should be visible."
+msgstr "Indica se a barra de ferramentas està visÃbel."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
-#: ../shell/apps_evolution_shell.schemas.in.h:56
-msgid "Whether the sidebar should be visible."
-msgstr "Indica se a barra lateral està visÃbel."
+#: ../shell/apps_evolution_shell.schemas.in.h:28
+msgid "Sidebar is visible"
+msgstr "A barra lateral està visÃbel"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
-#: ../shell/apps_evolution_shell.schemas.in.h:57
-msgid "Whether the status bar should be visible."
-msgstr "Indica se a barra de estado està visÃbel."
+#: ../shell/apps_evolution_shell.schemas.in.h:29
+msgid "Whether the sidebar should be visible."
+msgstr "Indica se a barra lateral està visÃbel."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
-#: ../shell/apps_evolution_shell.schemas.in.h:58
-msgid "Whether the toolbar should be visible."
-msgstr "Indica se a barra de ferramentas està visÃbel."
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+msgid "Statusbar is visible"
+msgstr "A barra de estado à visÃbel"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
-#: ../shell/apps_evolution_shell.schemas.in.h:59
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
-"Indica se se salta o diÃlogo de aviso nas versiÃns de desenvolvemento do "
-"Evolution."
+#: ../shell/apps_evolution_shell.schemas.in.h:31
+msgid "Whether the status bar should be visible."
+msgstr "Indica se a barra de estado està visÃbel."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
-#: ../shell/apps_evolution_shell.schemas.in.h:60
-msgid "Whether the window buttons should be visible."
-msgstr "Indica se os botÃns da xanela estÃn visÃbeis."
+#: ../shell/apps_evolution_shell.schemas.in.h:32
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
+"ID ou alias do compoÃente que se mostrarà de forma predeterminada ao iniciar."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-#: ../shell/apps_evolution_shell.schemas.in.h:61
-msgid "Window button style"
-msgstr "Estilo dos botÃns de xanela"
+#: ../shell/apps_evolution_shell.schemas.in.h:33
+msgid "Default sidebar width"
+msgstr "Largura predeterminada da barra lateral"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
-#: ../shell/apps_evolution_shell.schemas.in.h:62
-msgid "Window buttons are visible"
-msgstr "Os botÃns da xanela estÃn visÃbeis"
+#: ../shell/apps_evolution_shell.schemas.in.h:34
+msgid "The default width for the sidebar, in pixels."
+msgstr "Largura predeterminada da barra lateral, en pÃxeles."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
-msgid "Socket path for SpamAssassin"
-msgstr "Ruta do socket para SpamAssassin"
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use only local spam tests."
+msgstr "Usar sà probas locais de correo lixo."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
-msgid "SpamAssassin client binary"
-msgstr "Binario do cliente de SpamAssassin"
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use only the local spam tests (no DNS)."
+msgstr "Usar sà as probas locais de correo lixo (sen DNS)."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
-msgid "SpamAssassin daemon binary"
-msgstr "Binario do Âdaemon de SpamAssassin"
+msgid "Socket path for SpamAssassin"
+msgstr "Ruta do socket para SpamAssassin"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
 msgid "Use SpamAssassin daemon and client"
 msgstr "Usar o daemon e o cliente SpamAssassin"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Usar o daemon e o cliente SpamAssassin (spamc/spamd)."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
-msgid "Use only local spam tests."
-msgstr "Usar sà probas locais de correo lixo."
+msgid "SpamAssassin client binary"
+msgstr "Binario do cliente de SpamAssassin"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:7
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
-msgid "Use only the local spam tests (no DNS)."
-msgstr "Usar sà as probas locais de correo lixo (sen DNS)."
+msgid "SpamAssassin daemon binary"
+msgstr "Binario do Âdaemon de SpamAssassin"
 
 #: ../em-format/em-format.c:1060 ../em-format/em-format-quote.c:318
-#: ../mail/e-mail-tag-editor.c:327 ../mail/message-list.etspec.h:7
+#: ../mail/e-mail-tag-editor.c:327 ../mail/message-list.etspec.h:5
 #: ../modules/mail/em-mailer-prefs.c:70
 msgid "From"
 msgstr "De"
@@ -10210,12 +10222,12 @@ msgstr "Cco"
 
 #: ../em-format/em-format.c:1065 ../em-format/em-format-quote.c:463
 #: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
+#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:75
 #: ../smime/lib/e-cert.c:1147
 msgid "Subject"
 msgstr "Titular"
 
-#: ../em-format/em-format.c:1066 ../mail/message-list.etspec.h:2
+#: ../em-format/em-format.c:1066 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:523
 #: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
@@ -10226,7 +10238,7 @@ msgid "Newsgroups"
 msgstr "Grupos de discusiÃn"
 
 #: ../em-format/em-format.c:1068 ../modules/mail/em-mailer-prefs.c:78
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Cara"
 
@@ -10274,7 +10286,7 @@ msgstr "Non foi posÃbel analizar a mensaxe PGP: "
 
 #. pseudo-header
 #: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2857
-#: ../modules/mail/em-mailer-prefs.c:1026
+#: ../modules/mail/em-mailer-prefs.c:1025
 msgid "Mailer"
 msgstr "Aplicativo de correo"
 
@@ -10493,9 +10505,9 @@ msgstr "Escribindo Â%sÂ"
 msgid "Writing \"%s\" to %s"
 msgstr "Escribindo Â%s a Â%sÂ"
 
-#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:22
+#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:9
 #: ../plugins/google-account-setup/google-contacts-source.c:388
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
 msgid "weeks"
 msgstr "semanas"
 
@@ -10519,28 +10531,28 @@ msgid "Autogenerated"
 msgstr "Xerado automaticamente"
 
 #: ../e-util/e-system.error.xml.h:1
-msgid "Because \"{1}\"."
-msgstr "Debido a Â{1}Â."
+msgid "File exists \"{0}\"."
+msgstr "O ficheiro xa existe Â{0}Â."
 
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file \"{0}\"."
-msgstr "Non à posÃbel abrir o ficheiro Â{0}Â."
+msgid "Do you wish to overwrite it?"
+msgstr "Desexa sobrescribilo?"
 
-#: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file \"{0}\"."
-msgstr "Non à posÃbel gardar o ficheiro Â{0}Â."
+#: ../e-util/e-system.error.xml.h:3 ../mail/mail.error.xml.h:113
+msgid "_Overwrite"
+msgstr "S_obrescribir"
 
 #: ../e-util/e-system.error.xml.h:4
-msgid "Do you wish to overwrite it?"
-msgstr "Desexa sobrescribilo?"
+msgid "Cannot save file \"{0}\"."
+msgstr "Non à posÃbel gardar o ficheiro Â{0}Â."
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists \"{0}\"."
-msgstr "O ficheiro xa existe Â{0}Â."
+msgid "Because \"{1}\"."
+msgstr "Debido a Â{1}Â."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:163
-msgid "_Overwrite"
-msgstr "S_obrescribir"
+#: ../e-util/e-system.error.xml.h:6
+msgid "Cannot open file \"{0}\"."
+msgstr "Non à posÃbel abrir o ficheiro Â{0}Â."
 
 #: ../e-util/e-util.c:245
 msgid "Could not open the link."
@@ -10685,62 +10697,62 @@ msgstr "Seleccionar un tempo co que comparar"
 msgid "Choose a File"
 msgstr "Seleccionar un ficheiro"
 
-#: ../filter/e-filter-rule.c:666
+#: ../filter/e-filter-rule.c:675
 msgid "R_ule name:"
 msgstr "Nome da r_egra:"
 
-#: ../filter/e-filter-rule.c:696
+#: ../filter/e-filter-rule.c:705
 msgid "Find items that meet the following conditions"
 msgstr "Encontrar os elementos que cumpran as seguintes condiciÃns"
 
-#: ../filter/e-filter-rule.c:721
+#: ../filter/e-filter-rule.c:730
 msgid "If all conditions are met"
 msgstr "Se se cumpren todas as condiciÃns"
 
-#: ../filter/e-filter-rule.c:722
+#: ../filter/e-filter-rule.c:731
 msgid "If any conditions are met"
 msgstr "Se se cumpre calquera condiciÃn"
 
-#: ../filter/e-filter-rule.c:725
+#: ../filter/e-filter-rule.c:734
 msgid "_Find items:"
 msgstr "_Buscar os elementos:"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:754
+#: ../filter/e-filter-rule.c:763
 msgid "None"
 msgstr "Ningunha"
 
-#: ../filter/e-filter-rule.c:755
+#: ../filter/e-filter-rule.c:764
 msgid "All related"
 msgstr "Todos os relacionados"
 
-#: ../filter/e-filter-rule.c:756 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:765 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Respostas"
 
-#: ../filter/e-filter-rule.c:757
+#: ../filter/e-filter-rule.c:766
 msgid "Replies and parents"
 msgstr "Respostas e pais"
 
-#: ../filter/e-filter-rule.c:758
+#: ../filter/e-filter-rule.c:767
 msgid "No reply or parent"
 msgstr "Sen resposta nin pai"
 
-#: ../filter/e-filter-rule.c:761
+#: ../filter/e-filter-rule.c:770
 msgid "I_nclude threads:"
 msgstr "I_ncluÃr fÃos:"
 
-#: ../filter/e-filter-rule.c:786
+#: ../filter/e-filter-rule.c:795
 msgid "A_dd Condition"
 msgstr "Enga_dir unha condiciÃn"
 
-#: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../filter/e-filter-rule.c:1146 ../filter/filter.ui.h:1
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1146 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "SaÃnte"
 
@@ -10753,127 +10765,127 @@ msgid "Edit Rule"
 msgstr "Editar a  regra"
 
 #: ../filter/filter.error.xml.h:1
-msgid "Bad regular expression &quot;{0}&quot;."
-msgstr "ExpresiÃn regular incorrecta Â{0}Â."
+msgid "Missing date."
+msgstr "Falta a data."
 
 #: ../filter/filter.error.xml.h:2
-msgid "Could not compile regular expression &quot;{1}&quot;."
-msgstr "Non foi posÃbel compilar a expresiÃn regular Â{1}Â."
+msgid "You must choose a date."
+msgstr "Debe seleccionar unha data."
 
 #: ../filter/filter.error.xml.h:3
-msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "O ficheiro Â{0} non existe ou non à un ficheiro normal."
+msgid "Missing file name."
+msgstr "Falta o nome do ficheiro."
 
 #: ../filter/filter.error.xml.h:4
-msgid "Missing date."
-msgstr "Falta a data."
+msgid "You must specify a file name."
+msgstr "Debe indicar un nome de ficheiro."
 
 #: ../filter/filter.error.xml.h:5
-msgid "Missing file name."
-msgstr "Falta o nome do ficheiro."
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr "O ficheiro Â{0} non existe ou non à un ficheiro normal."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:89
-msgid "Missing name."
-msgstr "Falta o nome."
+#: ../filter/filter.error.xml.h:6
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr "ExpresiÃn regular incorrecta Â{0}Â."
 
 #: ../filter/filter.error.xml.h:7
-msgid "Name &quot;{0}&quot; already used."
-msgstr "O nome Â{0} xa està en uso."
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr "Non foi posÃbel compilar a expresiÃn regular Â{1}Â."
 
-#: ../filter/filter.error.xml.h:8
-msgid "Please choose another name."
-msgstr "Seleccionar outro nome."
+#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:103
+msgid "Missing name."
+msgstr "Falta o nome."
 
 #: ../filter/filter.error.xml.h:9
-msgid "You must choose a date."
-msgstr "Debe seleccionar unha data."
-
-#: ../filter/filter.error.xml.h:10
 msgid "You must name this filter."
 msgstr "Debe dar un nome a este filtro."
 
+#: ../filter/filter.error.xml.h:10
+msgid "Name &quot;{0}&quot; already used."
+msgstr "O nome Â{0} xa està en uso."
+
 #: ../filter/filter.error.xml.h:11
-msgid "You must specify a file name."
-msgstr "Debe indicar un nome de ficheiro."
+msgid "Please choose another name."
+msgstr "Seleccionar outro nome."
 
-#: ../filter/filter.ui.h:1
-msgid "Compare against"
-msgstr "Comparar con"
+#: ../filter/filter.ui.h:2
+msgid "the current time"
+msgstr "o instante actual"
 
 #: ../filter/filter.ui.h:3
-msgid "Show filters for mail:"
-msgstr "Mostrar os filtros para o correo:"
+msgid "the time you specify"
+msgstr "o instante que indique"
 
 #: ../filter/filter.ui.h:4
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"A data da mensaxe compararase coas\n"
-"12:00am da data indicada."
+msgid "a time relative to the current time"
+msgstr "unha hora relativa à hora actual"
 
-#: ../filter/filter.ui.h:6
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"A data da mensaxe compararase co\n"
-"instante relativo no que se produce o filtrado."
+#: ../filter/filter.ui.h:5
+msgid "seconds"
+msgstr "segundos"
 
-#: ../filter/filter.ui.h:8
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"A data da mensaxe compararase co\n"
-"instante actual no que se produce o filtrado."
+#: ../filter/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "meses"
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:163
-msgid "_Filter Rules"
-msgstr "Regras de _filtro"
+#: ../filter/filter.ui.h:11
+msgid "years"
+msgstr "anos"
 
 #: ../filter/filter.ui.h:12
-msgid "a time relative to the current time"
-msgstr "unha hora relativa à hora actual"
-
-#: ../filter/filter.ui.h:13
 msgid "ago"
 msgstr "hai"
 
-#: ../filter/filter.ui.h:16
+#: ../filter/filter.ui.h:13
 msgid "in the future"
 msgstr "no futuro"
 
-#: ../filter/filter.ui.h:18
-#: ../plugins/publish-calendar/publish-calendar.ui.h:32
-msgid "months"
-msgstr "meses"
+#: ../filter/filter.ui.h:14
+msgid "Show filters for mail:"
+msgstr "Mostrar os filtros para o correo:"
 
-#: ../filter/filter.ui.h:19
-msgid "seconds"
-msgstr "segundos"
+#: ../filter/filter.ui.h:15 ../mail/em-filter-editor.c:163
+msgid "_Filter Rules"
+msgstr "Regras de _filtro"
 
-#: ../filter/filter.ui.h:20
-msgid "the current time"
-msgstr "o instante actual"
+#: ../filter/filter.ui.h:17
+msgid "Compare against"
+msgstr "Comparar con"
 
-#: ../filter/filter.ui.h:21
-msgid "the time you specify"
-msgstr "o instante que indique"
+#: ../filter/filter.ui.h:18
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"A data da mensaxe compararase co\n"
+"instante actual no que se produce o filtrado."
 
-#: ../filter/filter.ui.h:23
-msgid "years"
-msgstr "anos"
+#: ../filter/filter.ui.h:20
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"A data da mensaxe compararase coas\n"
+"12:00am da data indicada."
+
+#: ../filter/filter.ui.h:22
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"A data da mensaxe compararase co\n"
+"instante relativo no que se produce o filtrado."
 
-#: ../mail/e-mail-account-manager.c:404
+#: ../mail/e-mail-account-manager.c:405
 msgid "_Restore Default"
 msgstr "_Restaurar predeterminada"
 
-#: ../mail/e-mail-account-manager.c:417
+#: ../mail/e-mail-account-manager.c:418
 msgid "You can drag and drop account names to reorder them."
 msgstr "Pode arrastrar e soltar nomes de contas para reordenalas."
 
-#: ../mail/e-mail-account-manager.c:462
+#: ../mail/e-mail-account-manager.c:463
 msgid "De_fault"
 msgstr "Prede_finido"
 
@@ -10890,8 +10902,8 @@ msgstr "Nome da conta"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. * other user means other calendars subscribed
-#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3362
-#: ../mail/mail-config.ui.h:32
+#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3403
+#: ../mail/mail-config.ui.h:51
 #: ../plugins/google-account-setup/google-source.c:316
 #: ../plugins/google-account-setup/google-source.c:558
 #: ../plugins/google-account-setup/google-source.c:695
@@ -10899,8 +10911,8 @@ msgid "Default"
 msgstr "predeterminado"
 
 #: ../mail/e-mail-attachment-bar.c:102 ../mail/e-mail-attachment-bar.c:107
-#: ../mail/em-format-html-display.c:1398 ../mail/mail-config.ui.h:14
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:172
+#: ../mail/em-format-html-display.c:1398 ../mail/mail-config.ui.h:58
+#: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-paned.c:172
 #: ../widgets/misc/e-attachment-paned.c:177
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -10996,7 +11008,7 @@ msgid_plural "Saving %d messages"
 msgstr[0] "Gardando %d mensaxe"
 msgstr[1] "Gardando %d mensaxes"
 
-#: ../mail/e-mail-folder-utils.c:1525 ../mail/em-folder-utils.c:629
+#: ../mail/e-mail-folder-utils.c:1525 ../mail/em-folder-utils.c:622
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "O URI do cartafol Â%s non à vÃlido"
@@ -11036,7 +11048,7 @@ msgid "_Later"
 msgstr "_MÃis tarde"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:674
+#: ../modules/mail/e-mail-shell-view-actions.c:705
 msgid "Add Label"
 msgstr "Engadir unha etiqueta"
 
@@ -11073,615 +11085,615 @@ msgstr "Non à posÃbel crear os cartafoles de correo local en Â%sÂ: %s"
 msgid "Please select a folder"
 msgstr "Seleccionar un cartafol"
 
-#: ../mail/e-mail-reader.c:310 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:311 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar ao cartafol"
 
-#: ../mail/e-mail-reader.c:310 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:311 ../mail/em-folder-utils.c:486
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/e-mail-reader.c:825 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:826 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Mover ao cartafol"
 
-#: ../mail/e-mail-reader.c:825 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:826 ../mail/em-folder-utils.c:486
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../mail/e-mail-reader.c:1186 ../mail/e-mail-reader.c:1366
-#: ../mail/e-mail-reader.c:1405
+#: ../mail/e-mail-reader.c:1187 ../mail/e-mail-reader.c:1367
+#: ../mail/e-mail-reader.c:1406
 msgid "_Do not ask me again."
 msgstr "_Non preguntar de novo."
 
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1412
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Ignorar sempre ÂResponder a:Â para as listas de correo."
 
-#: ../mail/e-mail-reader.c:1772
+#: ../mail/e-mail-reader.c:1773
 msgid "A_dd Sender to Address Book"
 msgstr "Enga_dir o remitente à axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:1775
 msgid "Add sender to address book"
 msgstr "Engadir o remitente à axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1779
+#: ../mail/e-mail-reader.c:1780
 msgid "Check for _Junk"
 msgstr "Comprobar se hai correo li_xo"
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:1782
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrar as mensaxes seleccionadas polo estado de correo lixo"
 
-#: ../mail/e-mail-reader.c:1786
+#: ../mail/e-mail-reader.c:1787
 msgid "_Copy to Folder..."
 msgstr "_Copiar ao cartafolâ"
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:1789
 msgid "Copy selected messages to another folder"
 msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:1793
+#: ../mail/e-mail-reader.c:1794
 msgid "_Delete Message"
 msgstr "E_liminar a mensaxe"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1796
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para eliminalas"
 
-#: ../mail/e-mail-reader.c:1800
+#: ../mail/e-mail-reader.c:1801
 msgid "Filter on Mailing _List..."
 msgstr "Filtrar pola _lista de correoâ"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1803
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Crear unha regra para filtrar as mensaxes a esta lista de correo"
 
-#: ../mail/e-mail-reader.c:1807
+#: ../mail/e-mail-reader.c:1808
 msgid "Filter on _Recipients..."
 msgstr "Filtrar polos _destinatariosâ"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:1810
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crear unha regra para filtrar as mensaxes a estes destinatarios"
 
-#: ../mail/e-mail-reader.c:1814
+#: ../mail/e-mail-reader.c:1815
 msgid "Filter on Se_nder..."
 msgstr "Filtrar polo re_mitenteâ"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:1817
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crear unha regra para filtrar as mensaxes deste remitente"
 
-#: ../mail/e-mail-reader.c:1821
+#: ../mail/e-mail-reader.c:1822
 msgid "Filter on _Subject..."
 msgstr "Filtrar polo a_suntoâ"
 
-#: ../mail/e-mail-reader.c:1823
+#: ../mail/e-mail-reader.c:1824
 msgid "Create a rule to filter messages with this subject"
 msgstr "Crear unha regra para filtrar as mensaxes con este asunto"
 
-#: ../mail/e-mail-reader.c:1828
+#: ../mail/e-mail-reader.c:1829
 msgid "A_pply Filters"
 msgstr "_Aplicar os filtros"
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:1831
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplicar as regras de filtrado Ãs mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1835
+#: ../mail/e-mail-reader.c:1836
 msgid "_Find in Message..."
 msgstr "_Buscar na mensaxeâ"
 
-#: ../mail/e-mail-reader.c:1837
+#: ../mail/e-mail-reader.c:1838
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar un texto no corpo da mensaxe mostrada"
 
-#: ../mail/e-mail-reader.c:1842
+#: ../mail/e-mail-reader.c:1843
 msgid "_Clear Flag"
 msgstr "E_liminar a marca"
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:1845
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Eliminar as marcas de seguimento das mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1849
+#: ../mail/e-mail-reader.c:1850
 msgid "_Flag Completed"
 msgstr "_Marcar como completado"
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:1852
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr ""
 "Estabelecer a marca de seguimento como completada nas mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1856
+#: ../mail/e-mail-reader.c:1857
 msgid "Follow _Up..."
 msgstr "Seguimentoâ"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1859
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar as mensaxes seleccionadas para o seguimento"
 
-#: ../mail/e-mail-reader.c:1863
+#: ../mail/e-mail-reader.c:1864
 msgid "_Attached"
 msgstr "_Anexada"
 
-#: ../mail/e-mail-reader.c:1865 ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1866 ../mail/e-mail-reader.c:1873
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ReencamiÃar a mensaxe seleccionada como un anexo"
 
-#: ../mail/e-mail-reader.c:1870
+#: ../mail/e-mail-reader.c:1871
 msgid "Forward As _Attached"
 msgstr "ReencamiÃar como un _anexo"
 
-#: ../mail/e-mail-reader.c:1877
+#: ../mail/e-mail-reader.c:1878
 msgid "_Inline"
 msgstr "_Inserida"
 
-#: ../mail/e-mail-reader.c:1879 ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1880 ../mail/e-mail-reader.c:1887
 msgid "Forward the selected message in the body of a new message"
 msgstr "ReencamiÃar a mensaxe seleccionada no corpo dunha mensaxe nova"
 
-#: ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:1885
 msgid "Forward As _Inline"
 msgstr "ReencamiÃar _inserida"
 
-#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:1892
 msgid "_Quoted"
 msgstr "_Citada"
 
-#: ../mail/e-mail-reader.c:1893 ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1894 ../mail/e-mail-reader.c:1901
 msgid "Forward the selected message quoted like a reply"
 msgstr "ReencamiÃar a mensaxe seleccionada citada como unha resposta"
 
-#: ../mail/e-mail-reader.c:1898
+#: ../mail/e-mail-reader.c:1899
 msgid "Forward As _Quoted"
 msgstr "ReencamiÃar _citada"
 
-#: ../mail/e-mail-reader.c:1905
+#: ../mail/e-mail-reader.c:1906
 msgid "_Load Images"
 msgstr "_Cargar as imaxes"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:1908
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forzar a carga de imaxes no correo HTML"
 
-#: ../mail/e-mail-reader.c:1912
+#: ../mail/e-mail-reader.c:1913
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:1915
 msgid "Mark the selected messages as important"
 msgstr "Marcar as mensaxes seleccionadas como importantes"
 
-#: ../mail/e-mail-reader.c:1919
+#: ../mail/e-mail-reader.c:1920
 msgid "_Junk"
 msgstr "_Correo lixo"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:1922
 msgid "Mark the selected messages as junk"
 msgstr "Marcar as mensaxes seleccionadas como correo lixo"
 
-#: ../mail/e-mail-reader.c:1926
+#: ../mail/e-mail-reader.c:1927
 msgid "_Not Junk"
 msgstr "_Non à correo lixo"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:1929
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar as mensaxes seleccionadas como non lixo"
 
-#: ../mail/e-mail-reader.c:1933
+#: ../mail/e-mail-reader.c:1934
 msgid "_Read"
 msgstr "_Lida"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1936
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar as mensaxes seleccionadas como lidas"
 
-#: ../mail/e-mail-reader.c:1940
+#: ../mail/e-mail-reader.c:1941
 msgid "Uni_mportant"
 msgstr "Non i_mportante"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:1943
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar as mensaxes seleccionadas como non importantes"
 
-#: ../mail/e-mail-reader.c:1947
+#: ../mail/e-mail-reader.c:1948
 msgid "_Unread"
 msgstr "_Sen ler"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:1950
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como non lidas"
 
-#: ../mail/e-mail-reader.c:1954
+#: ../mail/e-mail-reader.c:1955
 msgid "_Edit as New Message..."
 msgstr "_Editar como unha mensaxe novaâ"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:1957
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abrir as mensaxes seleccionadas no editor para editalas"
 
-#: ../mail/e-mail-reader.c:1961
+#: ../mail/e-mail-reader.c:1962
 msgid "Compose _New Message"
 msgstr "Redactar unha mensaxe _nova"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1964
 msgid "Open a window for composing a mail message"
 msgstr "Abrir unha xanela para escribir unha mensaxe de correo"
 
-#: ../mail/e-mail-reader.c:1968
+#: ../mail/e-mail-reader.c:1969
 msgid "_Open in New Window"
 msgstr "Abrir nunha xanela n_ova"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1971
 msgid "Open the selected messages in a new window"
 msgstr "Abrir as mensaxes seleccionadas nunha xanela nova"
 
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:1976
 msgid "_Move to Folder..."
 msgstr "_Mover ao cartafolâ"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1978
 msgid "Move selected messages to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1983
 msgid "_Switch to Folder"
 msgstr "_Cambiar ao cartafol"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1985
 msgid "Display the parent folder"
 msgstr "Mostrar o cartafol pai"
 
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:1990
 msgid "Switch to _next tab"
 msgstr "Cambiar à lapela segui_nte"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1992
 msgid "Switch to the next tab"
 msgstr "Cambiar à lapela seguinte"
 
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:1997
 msgid "Switch to _previous tab"
 msgstr "Cambiar à lapela a_nterior"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:1999
 msgid "Switch to the previous tab"
 msgstr "Cambiar à lapela anterior"
 
-#: ../mail/e-mail-reader.c:2003
+#: ../mail/e-mail-reader.c:2004
 msgid "Cl_ose current tab"
 msgstr "Pe_char a lapela actual"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2006
 msgid "Close current tab"
 msgstr "Pechar a lapela actual"
 
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:2011
 msgid "_Next Message"
 msgstr "Segui_nte mensaxe"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2013
 msgid "Display the next message"
 msgstr "Mostrar a seguinte mensaxe"
 
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:2018
 msgid "Next _Important Message"
 msgstr "Seguinte mensaxe _importante"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2020
 msgid "Display the next important message"
 msgstr "Mostrar a seguinte mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:2025
 msgid "Next _Thread"
 msgstr "Seguin_te conversa"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2027
 msgid "Display the next thread"
 msgstr "Mostrar a seguinte conversa"
 
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:2032
 msgid "Next _Unread Message"
 msgstr "Seguinte mensaxe _sen ler"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2034
 msgid "Display the next unread message"
 msgstr "Mostrar a seguinte mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:2039
 msgid "_Previous Message"
 msgstr "_Mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2041
 msgid "Display the previous message"
 msgstr "Mostrar a mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:2046
 msgid "Pr_evious Important Message"
 msgstr "Ant_erior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2048
 msgid "Display the previous important message"
 msgstr "Mostrar a anterior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:2053
 msgid "Previous T_hread"
 msgstr "_Conversa anterior"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2055
 msgid "Display the previous thread"
 msgstr "Mostrar a conversa anterior"
 
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:2060
 msgid "P_revious Unread Message"
 msgstr "Ante_rior mensaxe sen ler"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2062
 msgid "Display the previous unread message"
 msgstr "Mostrar a anterior mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2069
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2076
 msgid "Preview the message to be printed"
 msgstr "Previsualizar a mensaxe que se vai imprimir"
 
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:2081
 msgid "Re_direct"
 msgstr "Re_direccionar"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2083
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireccionar a alguÃn a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:2088
 msgid "Remo_ve Attachments"
 msgstr "Eliminar os _anexos"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2090
 msgid "Remove attachments"
 msgstr "Eliminar os anexos"
 
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:2095
 msgid "Remove Du_plicate Messages"
 msgstr "Eliminar as mensaxes du_plicadas"
 
-#: ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:2097
 msgid "Checks selected messages for duplicates"
 msgstr "Comprobar se hai mensaxes seleccionadas que estean duplicadas"
 
-#: ../mail/e-mail-reader.c:2101 ../mail/mail.error.xml.h:107
+#: ../mail/e-mail-reader.c:2102 ../mail/mail.error.xml.h:27
 #: ../modules/calendar/e-cal-shell-view-actions.c:1510
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "Responder a t_odos"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2104
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr ""
 "Redactar unha resposta para todos os destinatarios da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2108 ../mail/mail.error.xml.h:108
+#: ../mail/e-mail-reader.c:2109 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Responder à _lista"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2111
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Responder à rolda de correo remitente da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2115
+#: ../mail/e-mail-reader.c:2116
 #: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2118
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Redactar unha resposta para o remitente da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2123
 msgid "_Save as mbox..."
 msgstr "Gardar como mboxâ"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2125
 msgid "Save selected messages as an mbox file"
 msgstr "Gardar as mensaxes seleccionadas como un ficheiro mbox"
 
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2130
 msgid "_Message Source"
 msgstr "Fonte da _mensaxe"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2132
 msgid "Show the raw email source of the message"
 msgstr "Mostrar a fonte en bruto da mensaxe"
 
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2144
 msgid "_Undelete Message"
 msgstr "_Recuperar a mensaxe"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2146
 msgid "Undelete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:2150
+#: ../mail/e-mail-reader.c:2151
 msgid "_Normal Size"
 msgstr "TamaÃo _normal"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2153
 msgid "Reset the text to its original size"
 msgstr "Restabelecer o texto ao seu tamaÃo orixinal"
 
-#: ../mail/e-mail-reader.c:2157
+#: ../mail/e-mail-reader.c:2158
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2160
 msgid "Increase the text size"
 msgstr "Aumentar o tamaÃo do texto"
 
-#: ../mail/e-mail-reader.c:2164
+#: ../mail/e-mail-reader.c:2165
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2167
 msgid "Decrease the text size"
 msgstr "DiminuÃr o tamaÃo do texto"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2174
 msgid "Create R_ule"
 msgstr "Crear unha r_egra"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2181
 msgid "Ch_aracter Encoding"
 msgstr "CodificaciÃn de car_acteres"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2188
 msgid "F_orward As"
 msgstr "ReencamiÃar c_omoâ"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2195
 msgid "_Group Reply"
 msgstr "_Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2202
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2209
 msgid "Mar_k As"
 msgstr "Mar_car como"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2216
 msgid "_Message"
 msgstr "_Mensaxe"
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2223
 msgid "_Zoom"
 msgstr "A_mpliar"
 
-#: ../mail/e-mail-reader.c:2232
+#: ../mail/e-mail-reader.c:2233
 msgid "Search Folder from Mailing _List..."
 msgstr "Cartafol de busca por _lista de correoâ"
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2235
 msgid "Create a search folder for this mailing list"
 msgstr "Crear un cartafol de busca para esta rolda de correo"
 
-#: ../mail/e-mail-reader.c:2239
+#: ../mail/e-mail-reader.c:2240
 msgid "Search Folder from Recipien_ts..."
 msgstr "Cartafol de busca por des_tinatariosâ"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2242
 msgid "Create a search folder for these recipients"
 msgstr "Crear un cartafol de busca para estes destinatarios"
 
-#: ../mail/e-mail-reader.c:2246
+#: ../mail/e-mail-reader.c:2247
 msgid "Search Folder from Sen_der..."
 msgstr "Cartafol de busca por _remitenteâ"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2249
 msgid "Create a search folder for this sender"
 msgstr "Crear un cartafol de busca para este remitente"
 
-#: ../mail/e-mail-reader.c:2253
+#: ../mail/e-mail-reader.c:2254
 msgid "Search Folder from S_ubject..."
 msgstr "Cartafol de busca por as_untoâ"
 
-#: ../mail/e-mail-reader.c:2255
+#: ../mail/e-mail-reader.c:2256
 msgid "Create a search folder for this subject"
 msgstr "Crear un cartafol de busca para este asunto"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2279
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para _seguimentoâ"
 
-#: ../mail/e-mail-reader.c:2286
+#: ../mail/e-mail-reader.c:2287
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2291
 msgid "Mark as _Junk"
 msgstr "Marcar como correo l_ixo"
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2295
 msgid "Mark as _Not Junk"
 msgstr "Desmarcar como correo lixo"
 
-#: ../mail/e-mail-reader.c:2298
+#: ../mail/e-mail-reader.c:2299
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: ../mail/e-mail-reader.c:2302
+#: ../mail/e-mail-reader.c:2303
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como non im_portante"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2307
 msgid "Mark as _Unread"
 msgstr "Marcar como _non lida"
 
-#: ../mail/e-mail-reader.c:2350
+#: ../mail/e-mail-reader.c:2351
 msgid "_Caret Mode"
 msgstr "Activar o _cursor"
 
-#: ../mail/e-mail-reader.c:2352
+#: ../mail/e-mail-reader.c:2353
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Mostrar un cursor intermitente no corpo das mensaxes mostradas"
 
-#: ../mail/e-mail-reader.c:2358
+#: ../mail/e-mail-reader.c:2359
 msgid "All Message _Headers"
 msgstr "Todas as ca_beceiras da mensaxe"
 
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2361
 msgid "Show messages with all email headers"
 msgstr "Mostrar as mensaxes con todas as cabeceiras de correo electrÃnico"
 
-#: ../mail/e-mail-reader.c:2653
+#: ../mail/e-mail-reader.c:2676
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Recuperando a mensaxe Â%sÂ"
 
-#: ../mail/e-mail-reader.c:3555
+#: ../mail/e-mail-reader.c:3596
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "_ReencamiÃar"
 
-#: ../mail/e-mail-reader.c:3556
+#: ../mail/e-mail-reader.c:3597
 msgid "Forward the selected message to someone"
 msgstr "ReencamiÃar a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:3575
+#: ../mail/e-mail-reader.c:3616
 msgid "Group Reply"
 msgstr "Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:3576
+#: ../mail/e-mail-reader.c:3617
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Responder à lista de correo ou a todos os destinatarios"
 
-#: ../mail/e-mail-reader.c:3629 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3670 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/e-mail-reader.c:3662
+#: ../mail/e-mail-reader.c:3703
 #: ../modules/calendar/e-cal-shell-view-actions.c:1356
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../mail/e-mail-reader.c:3666
+#: ../mail/e-mail-reader.c:3707
 #: ../modules/calendar/e-cal-shell-view-actions.c:1349
 #: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:3675 ../mail/mail-dialogs.ui.h:17
+#: ../mail/e-mail-reader.c:3716 ../mail/mail-dialogs.ui.h:20
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/e-mail-reader.c:4362
+#: ../mail/e-mail-reader.c:4417
 #, c-format
 msgid "Folder '%s'"
 msgstr "Cartafol Â%sÂ"
@@ -11692,7 +11704,7 @@ msgstr "Non avisarme de novo."
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:637
+#: ../mail/e-mail-reader-utils.c:639
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -11707,7 +11719,7 @@ msgstr[1] ""
 "O cartafol Â%s contÃn %u mensaxes duplicadas. Ten certeza de que quere "
 "eliminalas?"
 
-#: ../mail/e-mail-reader-utils.c:1014
+#: ../mail/e-mail-reader-utils.c:1016
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Gardar mensaxe"
@@ -11718,91 +11730,91 @@ msgstr[1] "Gardar mensaxes"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1035
+#: ../mail/e-mail-reader-utils.c:1037
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mensaxe"
 msgstr[1] "Mensaxes"
 
-#: ../mail/e-mail-session.c:121 ../mail/em-folder-properties.c:313
+#: ../mail/e-mail-session.c:135 ../mail/em-folder-properties.c:308
 #: ../mail/em-folder-tree-model.c:714
-#: ../modules/mail/e-mail-shell-view-private.c:1069
-#: ../modules/mail/e-mail-shell-view-private.c:1080
+#: ../modules/mail/e-mail-shell-view-private.c:1094
+#: ../modules/mail/e-mail-shell-view-private.c:1105
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../mail/e-mail-session.c:122 ../mail/em-folder-tree-model.c:707
-#: ../modules/mail/e-mail-shell-view-private.c:1067
+#: ../mail/e-mail-session.c:136 ../mail/em-folder-tree-model.c:707
+#: ../modules/mail/e-mail-shell-view-private.c:1092
 msgid "Drafts"
 msgstr "Borradores"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../mail/e-mail-session.c:123 ../mail/em-folder-tree-model.c:718
-#: ../modules/mail/e-mail-shell-view-private.c:1071
+#: ../mail/e-mail-session.c:137 ../mail/em-folder-tree-model.c:718
+#: ../modules/mail/e-mail-shell-view-private.c:1096
 msgid "Outbox"
 msgstr "Caixa de saÃda"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../mail/e-mail-session.c:124 ../mail/em-folder-tree-model.c:722
-#: ../modules/mail/e-mail-shell-view-private.c:1073
+#: ../mail/e-mail-session.c:138 ../mail/em-folder-tree-model.c:722
+#: ../modules/mail/e-mail-shell-view-private.c:1098
 msgid "Sent"
 msgstr "Enviados"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../mail/e-mail-session.c:125 ../mail/em-folder-tree-model.c:710
-#: ../modules/mail/e-mail-shell-view-private.c:1075
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../mail/e-mail-session.c:139 ../mail/em-folder-tree-model.c:710
+#: ../modules/mail/e-mail-shell-view-private.c:1100
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 #: ../plugins/templates/templates.c:1035 ../plugins/templates/templates.c:1335
 #: ../plugins/templates/templates.c:1345
 msgid "Templates"
 msgstr "Modelos"
 
-#: ../mail/e-mail-session.c:850 ../mail/mail-vfolder.c:1116
+#: ../mail/e-mail-session.c:908 ../mail/mail-vfolder.c:1104
 msgid "Search Folders"
 msgstr "Cartafoles de busca"
 
-#: ../mail/e-mail-session.c:1270
+#: ../mail/e-mail-session.c:1361
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introducir a frase de paso para %s"
 
-#: ../mail/e-mail-session.c:1274
+#: ../mail/e-mail-session.c:1365
 msgid "Enter Passphrase"
 msgstr "Introducir a frase de paso"
 
-#: ../mail/e-mail-session.c:1278
+#: ../mail/e-mail-session.c:1369
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introducir o contrasinal para %s"
 
-#: ../mail/e-mail-session.c:1282
+#: ../mail/e-mail-session.c:1373
 msgid "Enter Password"
 msgstr "Introducir o contrasinal"
 
-#: ../mail/e-mail-session.c:1333
+#: ../mail/e-mail-session.c:1424
 #, c-format
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operaciÃn."
 
-#: ../mail/e-mail-session.c:1450
+#: ../mail/e-mail-session.c:1543
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 "Non se proporcionou ningÃn enderezo de destino, o reencamiÃamento cancelouse."
 
-#: ../mail/e-mail-session.c:1459
+#: ../mail/e-mail-session.c:1552
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "Non se atopou ningunha conta que usar, o reencamiÃamento cancelouse."
 
-#: ../mail/e-mail-session.c:1611
+#: ../mail/e-mail-session.c:1706
 #, c-format
 msgid "%s authentication failed"
 msgstr "A autenticaciÃn %s fallou"
 
-#: ../mail/e-mail-session.c:1685
+#: ../mail/e-mail-session.c:1780
 #, c-format
 msgid "No password was provided"
 msgstr "Non se forneceu ningÃn contrasinal"
@@ -11812,13 +11824,13 @@ msgstr "Non se forneceu ningÃn contrasinal"
 msgid "Cannot get transport for account '%s'"
 msgstr "Non à posÃbel obter o servizo de transporte para a conta Â%sÂ"
 
-#: ../mail/e-mail-session-utils.c:499 ../mail/mail-ops.c:646
+#: ../mail/e-mail-session-utils.c:499 ../mail/mail-ops.c:612
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Produciuse un fallo ao aplicar os filtros ao correo saÃnte: %s"
 
 #: ../mail/e-mail-session-utils.c:525 ../mail/e-mail-session-utils.c:559
-#: ../mail/mail-ops.c:665 ../mail/mail-ops.c:701
+#: ../mail/mail-ops.c:631 ../mail/mail-ops.c:667
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -11827,13 +11839,13 @@ msgstr ""
 "Produciuse un fallo ao anexar a %s: %s\n"
 "No seu lugar anexaranse ao cartafol local ÂEnviadosÂ."
 
-#: ../mail/e-mail-session-utils.c:579 ../mail/mail-ops.c:721
+#: ../mail/e-mail-session-utils.c:579 ../mail/mail-ops.c:687
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Produciuse un fallo ao anexar ao cartafol local ÂEnviadosÂ: %s"
 
-#: ../mail/e-mail-session-utils.c:789 ../mail/mail-ops.c:847
-#: ../mail/mail-ops.c:943
+#: ../mail/e-mail-session-utils.c:789 ../mail/mail-ops.c:810
+#: ../mail/mail-ops.c:906
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
@@ -11862,42 +11874,42 @@ msgid "Flag to Follow Up"
 msgstr "Marcar para facer seguimento"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:1581 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:1600 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "NingÃn"
 
-#: ../mail/em-account-editor.c:1663 ../mail/em-account-editor.c:4681
-#: ../mail/em-account-editor.c:4697
+#: ../mail/em-account-editor.c:1682 ../mail/em-account-editor.c:4688
+#: ../mail/em-account-editor.c:4713
 msgid "Never"
 msgstr "Nunca"
 
-#: ../mail/em-account-editor.c:1664
+#: ../mail/em-account-editor.c:1683
 msgid "Always"
 msgstr "Sempre"
 
-#: ../mail/em-account-editor.c:1665
+#: ../mail/em-account-editor.c:1684
 msgid "Ask for each message"
 msgstr "Preguntar para cada mensaxe"
 
-#: ../mail/em-account-editor.c:2407
+#: ../mail/em-account-editor.c:2426
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "NingÃn"
 
-#: ../mail/em-account-editor.c:2809 ../mail/mail-config.ui.h:169
+#: ../mail/em-account-editor.c:2835 ../mail/mail-config.ui.h:164
 msgid "_Path:"
 msgstr "_Ruta:"
 
-#: ../mail/em-account-editor.c:2812
+#: ../mail/em-account-editor.c:2838
 msgid "Fil_e:"
 msgstr "Fich_eiro:"
 
-#: ../mail/em-account-editor.c:2849
+#: ../mail/em-account-editor.c:2875
 msgid "Mail Configuration"
 msgstr "ConfiguraciÃn do correo"
 
-#: ../mail/em-account-editor.c:2850
+#: ../mail/em-account-editor.c:2876
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11907,7 +11919,7 @@ msgstr ""
 "\n"
 "Prema en ÂContinuar para comezar."
 
-#: ../mail/em-account-editor.c:2853
+#: ../mail/em-account-editor.c:2879
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -11917,19 +11929,19 @@ msgstr ""
 "necesitan encherse, a non ser que desexe incluÃr esta informaciÃn no correo "
 "que envÃe."
 
-#: ../mail/em-account-editor.c:2855 ../mail/em-account-editor.c:3047
+#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:3073
 msgid "Receiving Email"
 msgstr "RecepciÃn de correo"
 
-#: ../mail/em-account-editor.c:2856
+#: ../mail/em-account-editor.c:2882
 msgid "Please configure the following account settings."
 msgstr "Configurar os seguintes axustes da conta."
 
-#: ../mail/em-account-editor.c:2858 ../mail/em-account-editor.c:3654
+#: ../mail/em-account-editor.c:2884 ../mail/em-account-editor.c:3680
 msgid "Sending Email"
 msgstr "EnvÃo de correo"
 
-#: ../mail/em-account-editor.c:2859
+#: ../mail/em-account-editor.c:2885
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -11938,22 +11950,22 @@ msgstr ""
 "seguro, pregunte ao administrador do sistema ou provedor de acceso a "
 "Internet."
 
-#: ../mail/em-account-editor.c:2861
+#: ../mail/em-account-editor.c:2887
 msgid "Account Summary"
 msgstr "Resumo da conta"
 
-#: ../mail/em-account-editor.c:2862
+#: ../mail/em-account-editor.c:2888
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 "Este à un resumo da configuraciÃn que se empregarÃn para acceder ao seu "
 "correo."
 
-#: ../mail/em-account-editor.c:2866
+#: ../mail/em-account-editor.c:2892
 msgid "Done"
 msgstr "Feito"
 
-#: ../mail/em-account-editor.c:2867
+#: ../mail/em-account-editor.c:2893
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11968,49 +11980,49 @@ msgstr ""
 "\n"
 "Prema en ÂAplicar para gardar os axustes."
 
-#: ../mail/em-account-editor.c:3412
+#: ../mail/em-account-editor.c:3438
 msgid "Check for _new messages every"
 msgstr "Comprobar automaticamente se hai mensaxes _novas cada"
 
-#: ../mail/em-account-editor.c:3420
+#: ../mail/em-account-editor.c:3446
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:4117 ../mail/mail-config.ui.h:109
+#: ../mail/em-account-editor.c:4143 ../mail/mail-config.ui.h:166
 msgid "Security"
 msgstr "Seguranza"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:4172 ../mail/em-account-editor.c:4274
+#: ../mail/em-account-editor.c:4198 ../mail/em-account-editor.c:4300
 msgid "Receiving Options"
 msgstr "OpciÃns de recepciÃn"
 
-#: ../mail/em-account-editor.c:4173 ../mail/em-account-editor.c:4275
+#: ../mail/em-account-editor.c:4199 ../mail/em-account-editor.c:4301
 msgid "Checking for New Messages"
 msgstr "Comprobando se hai mensaxes novas"
 
-#: ../mail/em-account-editor.c:4677 ../mail/em-account-editor.c:4693
+#: ../mail/em-account-editor.c:4684 ../mail/em-account-editor.c:4709
 msgid "Always (SSL)"
 msgstr "Sempre (SSL)"
 
-#: ../mail/em-account-editor.c:4679 ../mail/em-account-editor.c:4695
+#: ../mail/em-account-editor.c:4686 ../mail/em-account-editor.c:4711
 msgid "When possible (TLS)"
 msgstr "Cando sexa posÃbel (TLS)"
 
-#: ../mail/em-account-editor.c:4711
+#: ../mail/em-account-editor.c:4733
 msgid "Setup Google con_tacts with Evolution"
 msgstr "Configurar os con_tactos de Google con Evolution"
 
-#: ../mail/em-account-editor.c:4712
+#: ../mail/em-account-editor.c:4734
 msgid "Setup Google ca_lendar with Evolution"
 msgstr "Configurar o ca_lendario de Google con Evolution"
 
-#: ../mail/em-account-editor.c:4745
+#: ../mail/em-account-editor.c:4766
 msgid "Setup _Yahoo calendar with Evolution"
 msgstr "Configurar o calendario _Yahoo con Evolution"
 
-#: ../mail/em-account-editor.c:4771
+#: ../mail/em-account-editor.c:4792
 msgid "Yahoo Calen_dar name:"
 msgstr "Nome do calen_dario de Yahoo:"
 
@@ -12030,19 +12042,19 @@ msgstr ""
 msgid "-----Original Message-----"
 msgstr "-----Mensaxe orixinal-----"
 
-#: ../mail/em-composer-utils.c:2359
+#: ../mail/em-composer-utils.c:2416
 msgid "an unknown sender"
 msgstr "un remitente descoÃecido"
 
-#: ../mail/em-composer-utils.c:2761
+#: ../mail/em-composer-utils.c:2811
 msgid "Posting destination"
 msgstr "Destino da publicaciÃn"
 
-#: ../mail/em-composer-utils.c:2762
+#: ../mail/em-composer-utils.c:2812
 msgid "Choose folders to post the message to."
 msgstr "Escolla os cartafoles nos que publicar a mensaxe."
 
-#: ../mail/em-filter-folder-element.c:240
+#: ../mail/em-filter-folder-element.c:243
 msgid "Select Folder"
 msgstr "Seleccionar un cartafol"
 
@@ -12159,7 +12171,7 @@ msgstr "non està estabelecido"
 msgid "is set"
 msgstr "està estabelecido"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:67
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:114
 msgid "Junk"
 msgstr "Correo lixo"
 
@@ -12208,11 +12220,11 @@ msgid "Play Sound"
 msgstr "Reproducir un son"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:19
 msgid "Read"
 msgstr "Ler"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:16
 msgid "Recipients"
 msgstr "Destinatarios"
 
@@ -12240,11 +12252,11 @@ msgstr "retorna menor que"
 msgid "Run Program"
 msgstr "Executar o programa"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:3
 msgid "Score"
 msgstr "PuntuaciÃn"
 
-#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:15
 msgid "Sender"
 msgstr "Remitente"
 
@@ -12319,7 +12331,7 @@ msgstr "Cota de uso (%s):"
 msgid "Quota usage"
 msgstr "Cota de uso"
 
-#: ../mail/em-folder-properties.c:318
+#: ../mail/em-folder-properties.c:313
 msgid "Folder Properties"
 msgstr "Propiedades do cartafol"
 
@@ -12327,49 +12339,49 @@ msgstr "Propiedades do cartafol"
 msgid "<click here to select a folder>"
 msgstr "<prema aquà para seleccionar un cartafol>"
 
-#: ../mail/em-folder-selector.c:436
+#: ../mail/em-folder-selector.c:388
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../mail/em-folder-selector.c:442
+#: ../mail/em-folder-selector.c:394
 msgid "Folder _name:"
 msgstr "_Nome do cartafol:"
 
-#: ../mail/em-folder-tree.c:644
+#: ../mail/em-folder-tree.c:642
 msgid "Folder names cannot contain '/'"
 msgstr "Os nomes dos cartafoles non poden conter o carÃcter Â/Â"
 
-#: ../mail/em-folder-tree.c:780
+#: ../mail/em-folder-tree.c:778
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1603
+#: ../mail/em-folder-tree.c:1601
 msgid "Mail Folder Tree"
 msgstr "Ãrbore de cartafoles de correo"
 
-#: ../mail/em-folder-tree.c:2093 ../mail/em-folder-utils.c:113
+#: ../mail/em-folder-tree.c:2091 ../mail/em-folder-utils.c:113
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movendo o cartafol %s"
 
-#: ../mail/em-folder-tree.c:2096 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2094 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando o cartafol %s"
 
-#: ../mail/em-folder-tree.c:2103 ../mail/message-list.c:2318
+#: ../mail/em-folder-tree.c:2101 ../mail/message-list.c:2296
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo as mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:2107 ../mail/message-list.c:2320
+#: ../mail/em-folder-tree.c:2105 ../mail/message-list.c:2298
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando as mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:2126
+#: ../mail/em-folder-tree.c:2124
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Non à posÃbel soltar as mensaxe(s) no almacenamento do nivel superior"
@@ -12383,19 +12395,19 @@ msgstr "SEN COINCIDENCIAS"
 msgid "Loading..."
 msgstr "Cargandoâ"
 
-#: ../mail/em-folder-utils.c:489
+#: ../mail/em-folder-utils.c:487
 msgid "Move Folder To"
 msgstr "Mover o cartafol a"
 
-#: ../mail/em-folder-utils.c:489
+#: ../mail/em-folder-utils.c:487
 msgid "Copy Folder To"
 msgstr "Copiar o cartafol a"
 
-#: ../mail/em-folder-utils.c:606
+#: ../mail/em-folder-utils.c:599
 msgid "Create Folder"
 msgstr "Crear un cartafol"
 
-#: ../mail/em-folder-utils.c:607
+#: ../mail/em-folder-utils.c:600
 msgid "Specify where to create the folder:"
 msgstr "Indicar onde crear o cartafol:"
 
@@ -12573,7 +12585,7 @@ msgstr ""
 "difÃcil para un intruso ver o contido desta mensaxe dentro dun perÃodo de "
 "tempo razoÃbel."
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:43
 msgid "_View Certificate"
 msgstr "_Visualizar o certificado"
 
@@ -12649,8 +12661,8 @@ msgstr "Su_bscribirse aos mostrados"
 msgid "Subscribe To _All"
 msgstr "Subscribirse a _todos"
 
-#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1826
-#: ../modules/mail/e-mail-shell-view-actions.c:1207
+#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1823
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
 msgid "_Unsubscribe"
 msgstr "Cancelar a s_ubscriciÃn"
 
@@ -12662,56 +12674,56 @@ msgstr "Des_ubscribirse dos ocultos"
 msgid "Unsubscribe From _All"
 msgstr "Desubscribirse de _todo"
 
-#: ../mail/em-subscription-editor.c:1661
+#: ../mail/em-subscription-editor.c:1658
 msgid "Folder Subscriptions"
 msgstr "SubscriciÃns de cartafoles"
 
-#: ../mail/em-subscription-editor.c:1701
+#: ../mail/em-subscription-editor.c:1698
 msgid "_Account:"
 msgstr "Cont_a:"
 
-#: ../mail/em-subscription-editor.c:1716
+#: ../mail/em-subscription-editor.c:1713
 msgid "Clear Search"
 msgstr "Limpar a busca"
 
-#: ../mail/em-subscription-editor.c:1734
+#: ../mail/em-subscription-editor.c:1731
 msgid "Sho_w items that contain:"
 msgstr "Most_rar os elementos que conteÃan:"
 
-#: ../mail/em-subscription-editor.c:1779
+#: ../mail/em-subscription-editor.c:1776
 msgid "Subscribe to the selected folder"
 msgstr "Subscribir o cartafol seleccionado"
 
-#: ../mail/em-subscription-editor.c:1780
+#: ../mail/em-subscription-editor.c:1777
 msgid "Su_bscribe"
 msgstr "Su_bscribir"
 
-#: ../mail/em-subscription-editor.c:1825
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../mail/em-subscription-editor.c:1822
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
 msgid "Unsubscribe from the selected folder"
 msgstr "Cancelar a subscriciÃn ao cartafol seleccionado"
 
-#: ../mail/em-subscription-editor.c:1865
+#: ../mail/em-subscription-editor.c:1862
 msgid "Collapse all folders"
 msgstr "Pregar todos os cartafoles"
 
-#: ../mail/em-subscription-editor.c:1866
+#: ../mail/em-subscription-editor.c:1863
 msgid "C_ollapse All"
 msgstr "Pregar t_odo"
 
-#: ../mail/em-subscription-editor.c:1876
+#: ../mail/em-subscription-editor.c:1873
 msgid "Expand all folders"
 msgstr "Despregar todos os cartafoles"
 
-#: ../mail/em-subscription-editor.c:1877
+#: ../mail/em-subscription-editor.c:1874
 msgid "E_xpand All"
 msgstr "Despre_gar todo"
 
-#: ../mail/em-subscription-editor.c:1887
+#: ../mail/em-subscription-editor.c:1884
 msgid "Refresh the folder list"
 msgstr "Actualizar a lista de cartafoles"
 
-#: ../mail/em-subscription-editor.c:1899
+#: ../mail/em-subscription-editor.c:1896
 msgid "Stop the current operation"
 msgstr "Deter a operaciÃn actual"
 
@@ -12731,11 +12743,11 @@ msgstr[1] "Està seguro de que desexa abrir %d mensaxes à vez?"
 msgid "_Do not show this message again"
 msgstr "_Non mostrar esta mensaxe outra vez"
 
-#: ../mail/em-utils.c:312
+#: ../mail/em-utils.c:316
 msgid "Message Filters"
 msgstr "Filtros de mensaxe"
 
-#: ../mail/em-utils.c:972
+#: ../mail/em-utils.c:976
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensaxes de %s"
@@ -12748,99 +12760,89 @@ msgstr "Carta_foles de busca"
 msgid "Add Folder"
 msgstr "Engadir un cartafol"
 
-#: ../mail/evolution-mail.schemas.in.h:1
-msgid "\"Filter Editor\" window height"
-msgstr "Altura da xanela ÂEditor de filtrosÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:2
-msgid "\"Filter Editor\" window maximize state"
-msgstr "Estado maximizado da xanela ÂEditor de filtrosÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:3
-msgid "\"Filter Editor\" window width"
-msgstr "Largura da xanela ÂEditor de filtrosÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:4
-msgid "\"Folder Subscriptions\" window height"
-msgstr "Altura da xanela ÂSubscriciÃns de cartafolesÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:5
-msgid "\"Folder Subscriptions\" window maximize state"
-msgstr "Estado maximizado da xanela ÂSubscriciÃns de cartafolesÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:6
-msgid "\"Folder Subscriptions\" window width"
-msgstr "Largura da xanela ÂSubscriciÃns de cartafolesÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:7
-msgid "\"Search Folder Editor\" window height"
-msgstr "Altura da xanela ÂEditor de cartafoles de buscaÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:8
-msgid "\"Search Folder Editor\" window maximize state"
-msgstr "Estado maximizado da xanela ÂEditor de cartafoles de buscaÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:9
-msgid "\"Search Folder Editor\" window width"
-msgstr "Largura da xanela ÂEditor de cartafoles de buscaÂ"
-
-#: ../mail/evolution-mail.schemas.in.h:10
-msgid "\"Send and Receive Mail\" window height"
-msgstr "Altura da xanela ÂEnviar e recibir correoÂ"
-
 #: ../mail/evolution-mail.schemas.in.h:11
-msgid "\"Send and Receive Mail\" window maximize state"
-msgstr "Estado maximizado da xanela ÂEnviar e recibir correoÂ"
+msgid "Digitally sign messages when original message signed (PGP or S/MIME)"
+msgstr ""
+"Firmar mensaxes digitalmente cando a mensaxe original estea firmada (PGP o S/"
+"MIME)"
 
-#: ../mail/evolution-mail.schemas.in.h:12
-msgid "\"Send and Receive Mail\" window width"
-msgstr "Largura da xanela ÂEnviar e recibir correoÂ"
+#: ../mail/evolution-mail.schemas.in.h:39
+msgid "Composer Window default width"
+msgstr "Largura predeterminada da xanela do editor de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:16
-msgid "Attribute message."
-msgstr "Mensaxe anexada."
+#: ../mail/evolution-mail.schemas.in.h:40
+msgid "Default width of the Composer Window."
+msgstr "Largura predeterminada da xanela do editor de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Composer Window default height"
 msgstr "Altura predeterminada da xanela do editor de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:26
-msgid "Composer Window default width"
-msgstr "Largura predeterminada da xanela do editor de mensaxes"
-
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Default height of the Composer Window."
 msgstr "Altura predeterminada da xanela do editor de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:38
-msgid "Default height of the mail browser window."
-msgstr "Altura predeterminada da xanela do buscador de correo."
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid "Attribute message."
+msgstr "Mensaxe anexada."
 
-#: ../mail/evolution-mail.schemas.in.h:39
-msgid "Default maximized state of the mail browser window."
-msgstr "Estado maximizado predeterminado da xanela do buscador de correo."
+#: ../mail/evolution-mail.schemas.in.h:46
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author."
+msgstr ""
+"O texto inserido cando se responde unha mensaxe, atribuÃndolle a mensaxe ao "
+"autor orixinal."
 
-#: ../mail/evolution-mail.schemas.in.h:40
-msgid "Default reply style"
-msgstr "Estilo de resposta predeterminado"
+#: ../mail/evolution-mail.schemas.in.h:47
+msgid "Forward message."
+msgstr "ReencamiÃar a mensaxe."
+
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows."
+msgstr ""
+"O texto inserido ao reencamiÃar unha mensaxe, informando que a continuaciÃn "
+"vai a mensaxe reencamiÃada."
+
+#: ../mail/evolution-mail.schemas.in.h:49
+msgid "Original message."
+msgstr "Mensaxe orixinal."
+
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows."
+msgstr ""
+"O texto inserido ao responder unha mensaxe, informando que a continuaciÃn "
+"vai a mensaxe orixinal."
 
-#: ../mail/evolution-mail.schemas.in.h:42
-msgid "Default width of the Composer Window."
-msgstr "Largura predeterminada da xanela do editor de mensaxes."
+#: ../mail/evolution-mail.schemas.in.h:52
+msgid ""
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder."
+msgstr ""
+"Este valor pode ser unha cadea baleira, isto significa que usarà o cartafol "
+"de imaxes do sistema, xeralmente localizado en ~/Imaxes. Este cartafol "
+"usarase tamÃn cando a ruta estabelecida non apunta a un cartafol existente."
 
-#: ../mail/evolution-mail.schemas.in.h:43
-msgid "Default width of the mail browser window."
-msgstr "Largura predeterminada da xanela do buscador de mensaxes."
+#: ../mail/evolution-mail.schemas.in.h:97
+msgid "Whether to show local folders (On This Computer) in a folder tree."
+msgstr ""
+"Indica se se deben mostrar os cartafoles locais (Neste equipo) nun Ãrbore de "
+"cartafoles."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
-"Define the email export format when doing drag'n'drop. Possible values are : "
-"mbox or pdf"
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Requires a restart to apply."
 msgstr ""
-"Define o formato de exportaciÃn de correo-e ao arrastrar e soltar. Os "
-"valores posÃbeis son: mbox ou pdf"
+"Esta opciÃn indica se as conversas deben estar despregadas ou pregadas por "
+"omisiÃn. Ã necesario reiniciar o Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid ""
 "Describes whether message headers in paned view should be collapsed or "
 "expanded by default. \"0\" = expanded \"1\" = collapsed"
@@ -12848,41 +12850,47 @@ msgstr ""
 "Describe se as cabeceiras dos mensaxes na vista con paneis se deben contraer "
 "ou expandir de maneira predeterminada. Â0Â = expandidas Â1Â = contraÃdas"
 
-#: ../mail/evolution-mail.schemas.in.h:52
-msgid "Digitally sign messages when original message signed (PGP or S/MIME)"
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid ""
+"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
+"true accounts are sorted alphabetically, with an exception of On This "
+"Computer and Search folders, otherwise accounts are sorted based on an order "
+"given by a user."
 msgstr ""
-"Firmar mensaxes digitalmente cando a mensaxe original estea firmada (PGP o S/"
-"MIME)"
+"Indica como ordenar contas nunha Ãrbore de cartafoles usado nunha vista de "
+"Correo. Cando està estabelecido a certo as contas ordÃnanse alfabeticamente, "
+"coa excepciÃn de Neste equipo y Cartafoles de busca, pola contra os "
+"cartafoles ordÃnanse pola orde dada polo usuario."
 
-#: ../mail/evolution-mail.schemas.in.h:57
-msgid "Drag'n'drop export format"
-msgstr "Formato de exportaciÃn de Arrastrar e soltar"
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Mail browser width"
+msgstr "Largura do buscador de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:79
-msgid ""
-"Exported file name will be : YYYmmDDHHMMSS_email_title Possible values : 1 "
-"(: email sent date), 2 (: drag'n'drop date)"
-msgstr ""
-"O nome do ficheiro exportado serÃ: YYYmmDDHHMMSS_correo-e_titulo. Os valores "
-"posÃbeis: 1 (: data de envÃo do correo), 2 (: data de arrastre)"
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "Default width of the mail browser window."
+msgstr "Largura predeterminada da xanela do buscador de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:81
-msgid "Format of the drag'n'drop export filename"
-msgstr "Formato do nome do ficheiro exportado por arrastrar e soltar"
+#: ../mail/evolution-mail.schemas.in.h:132
+msgid "Mail browser height"
+msgstr "Altura do buscador de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:82
-msgid "Forward message."
-msgstr "ReencamiÃar a mensaxe."
+#: ../mail/evolution-mail.schemas.in.h:133
+msgid "Default height of the mail browser window."
+msgstr "Altura predeterminada da xanela do buscador de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:90
-msgid ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
-msgstr ""
-"Altura inicial da xanela ÂEditor de filtrosÂ. O valor actualÃzase a medida "
-"que o usuario redimensiona a xanela verticalmente."
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Mail browser maximized"
+msgstr "Buscador de correo maximizado"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid "Default maximized state of the mail browser window."
+msgstr "Estado maximizado predeterminado da xanela do buscador de correo."
+
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid "\"Folder Subscriptions\" window height"
+msgstr "Altura da xanela ÂSubscriciÃns de cartafolesÂ"
+
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid ""
 "Initial height of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window vertically."
@@ -12890,36 +12898,11 @@ msgstr ""
 "Altura inicial da xanela ÂSubscriciÃns de cartafolesÂ. O valor actualÃzase a "
 "medida que o usuario redimensiona a xanela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:92
-msgid ""
-"Initial height of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"Altura inicial da xanela ÂEditor do cartafol de buscaÂ. O valor actualÃzase "
-"a medida que o usuario redimensiona a xanela verticalmente."
-
-#: ../mail/evolution-mail.schemas.in.h:93
-msgid ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"Altura inicial da xanela ÂEnviar e recibir correo electrÃnicoÂ. O valor "
-"actualÃzase a medida que o usuario redimensiona a xanela verticalmente."
-
-#: ../mail/evolution-mail.schemas.in.h:94
-msgid ""
-"Initial maximize state of the \"Filter Editor\" window. The value updates "
-"when the user maximizes or unmaximizes the window. Note, this particular "
-"value is not used by Evolution since the \"Filter Editor\" window cannot be "
-"maximized. This key exists only as an implementation detail."
-msgstr ""
-"Estado inicial maximizado da xanela ÂEditor de filtrosÂ. O valor actualÃzase "
-"cando o usuario maximiza ou restaura a xanela. Nota: este valor en "
-"particular non se usa no Evolution desde que non à posÃbel maximizar a "
-"xanela ÂEditor de filtrosÂ. Esta chave sà existe como un detalle de "
-"implementaciÃn."
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "\"Folder Subscriptions\" window maximize state"
+msgstr "Estado maximizado da xanela ÂSubscriciÃns de cartafolesÂ"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid ""
 "Initial maximize state of the \"Folder Subscriptions\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -12932,42 +12915,11 @@ msgstr ""
 "cartafoles non à maximizÃbel. Esta chave sà existe como un detalle de "
 "implementaciÃn."
 
-#: ../mail/evolution-mail.schemas.in.h:96
-msgid ""
-"Initial maximize state of the \"Search Folder Editor\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Search Folder Editor\" "
-"window cannot be maximized. This key exists only as an implementation detail."
-msgstr ""
-"Estado inicial maximizado da xanela ÂEditor do cartafol de buscaÂ. O valor "
-"actualÃzase cando o usuario maximiza ou restaura a xanela. Nota: este valor "
-"en particular non se usa no Evolution desde que a xanela ÂEditor do cartafol "
-"de busca non à maximizÃbel. Esta chave sà existe como un detalle de "
-"implementaciÃn."
-
-#: ../mail/evolution-mail.schemas.in.h:97
-msgid ""
-"Initial maximize state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
-msgstr ""
-"Estado inicial maximizado da xanela ÂEnviar e recibir correoÂ. O valor "
-"actualÃzase cando o usuario maximiza ou restaura a xanela. Nota: este valor "
-"en particular non se usa no Evolution desde que non à posÃbel maximizar a "
-"xanela ÂEnviar e recibir correoÂ. Esta chave sà existe como un detalle de "
-"implementaciÃn."
-
-#: ../mail/evolution-mail.schemas.in.h:98
-msgid ""
-"Initial width of the \"Filter Editor\" window. The value updates as the user "
-"resizes the window horizontally."
-msgstr ""
-"Largura inicial da xanela ÂEditor de filtrosÂ. O valor actualÃzase a medida "
-"que o usuario redimensiona a xanela horizontalmente."
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid "\"Folder Subscriptions\" window width"
+msgstr "Largura da xanela ÂSubscriciÃns de cartafolesÂ"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "Initial width of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -12975,31 +12927,24 @@ msgstr ""
 "Largura inicial da xanela ÂSubscriciÃns de cartafolesÂ. O valor actualÃzase "
 "a medida que o usuario redimensiona a xanela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:100
-msgid ""
-"Initial width of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"Largura inicial da xanela ÂEditor do cartafol de buscaÂ. O valor actualÃzase "
-"a medida que o usuario redimensiona a xanela horizontalmente."
+#: ../mail/evolution-mail.schemas.in.h:149
+msgid "Default reply style"
+msgstr "Estilo de resposta predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
+"Possible values are: never - to never close browser window always - to "
+"always close browser window ask - (or any other value) will ask user"
 msgstr ""
-"Largura inicial da xanela ÂEnviar e recibir correoÂ. O valor actualÃzase a "
-"medida que o usuario redimensiona a xanela horizontalmente."
-
-#: ../mail/evolution-mail.schemas.in.h:114
-msgid "List of accepted licenses"
-msgstr "Lista de licenzas aceptadas"
+"Os valores posÃbeis son: nunca - non pechar nunca a xanela do buscador     "
+"sempre - pechar sempre a xanela do buscador    preguntar - (ou calquera "
+"valor) preguntar ao usuario"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid "List of accounts"
 msgstr "Lista de contas"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13008,101 +12953,168 @@ msgstr ""
 "contÃn cadeas que nomean subcartafoles relativos a /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:209
+msgid "List of accepted licenses"
+msgstr "Lista de licenzas aceptadas"
+
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nomes de protocolos coa licenza aceptada."
 
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid "Mail browser height"
-msgstr "Altura do buscador de correo"
+#: ../mail/evolution-mail.schemas.in.h:213
+msgid "\"Filter Editor\" window height"
+msgstr "Altura da xanela ÂEditor de filtrosÂ"
 
-#: ../mail/evolution-mail.schemas.in.h:128
-msgid "Mail browser maximized"
-msgstr "Buscador de correo maximizado"
+#: ../mail/evolution-mail.schemas.in.h:214
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr ""
+"Altura inicial da xanela ÂEditor de filtrosÂ. O valor actualÃzase a medida "
+"que o usuario redimensiona a xanela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:129
-msgid "Mail browser width"
-msgstr "Largura do buscador de correo"
+#: ../mail/evolution-mail.schemas.in.h:215
+msgid "\"Filter Editor\" window maximize state"
+msgstr "Estado maximizado da xanela ÂEditor de filtrosÂ"
 
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Original message."
-msgstr "Mensaxe orixinal."
+#: ../mail/evolution-mail.schemas.in.h:216
+msgid ""
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
+msgstr ""
+"Estado inicial maximizado da xanela ÂEditor de filtrosÂ. O valor actualÃzase "
+"cando o usuario maximiza ou restaura a xanela. Nota: este valor en "
+"particular non se usa no Evolution desde que non à posÃbel maximizar a "
+"xanela ÂEditor de filtrosÂ. Esta chave sà existe como un detalle de "
+"implementaciÃn."
+
+#: ../mail/evolution-mail.schemas.in.h:217
+msgid "\"Filter Editor\" window width"
+msgstr "Largura da xanela ÂEditor de filtrosÂ"
+
+#: ../mail/evolution-mail.schemas.in.h:218
+msgid ""
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+msgstr ""
+"Largura inicial da xanela ÂEditor de filtrosÂ. O valor actualÃzase a medida "
+"que o usuario redimensiona a xanela horizontalmente."
+
+#: ../mail/evolution-mail.schemas.in.h:223
+msgid "\"Send and Receive Mail\" window height"
+msgstr "Altura da xanela ÂEnviar e recibir correoÂ"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid ""
-"Possible values are: never - to never close browser window always - to "
-"always close browser window ask - (or any other value) will ask user"
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
 msgstr ""
-"Os valores posÃbeis son: nunca - non pechar nunca a xanela do buscador     "
-"sempre - pechar sempre a xanela do buscador    preguntar - (ou calquera "
-"valor) preguntar ao usuario"
+"Altura inicial da xanela ÂEnviar e recibir correo electrÃnicoÂ. O valor "
+"actualÃzase a medida que o usuario redimensiona a xanela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:225
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "Estado maximizado da xanela ÂEnviar e recibir correoÂ"
+
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
-"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
-"true accounts are sorted alphabetically, with an exception of On This "
-"Computer and Search folders, otherwise accounts are sorted based on an order "
-"given by a user."
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
 msgstr ""
-"Indica como ordenar contas nunha Ãrbore de cartafoles usado nunha vista de "
-"Correo. Cando està estabelecido a certo as contas ordÃnanse alfabeticamente, "
-"coa excepciÃn de Neste equipo y Cartafoles de busca, pola contra os "
-"cartafoles ordÃnanse pola orde dada polo usuario."
+"Estado inicial maximizado da xanela ÂEnviar e recibir correoÂ. O valor "
+"actualÃzase cando o usuario maximiza ou restaura a xanela. Nota: este valor "
+"en particular non se usa no Evolution desde que non à posÃbel maximizar a "
+"xanela ÂEnviar e recibir correoÂ. Esta chave sà existe como un detalle de "
+"implementaciÃn."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:227
+msgid "\"Send and Receive Mail\" window width"
+msgstr "Largura da xanela ÂEnviar e recibir correoÂ"
+
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows."
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
 msgstr ""
-"O texto inserido ao reencamiÃar unha mensaxe, informando que a continuaciÃn "
-"vai a mensaxe reencamiÃada."
+"Largura inicial da xanela ÂEnviar e recibir correoÂ. O valor actualÃzase a "
+"medida que o usuario redimensiona a xanela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:229
+msgid "\"Search Folder Editor\" window height"
+msgstr "Altura da xanela ÂEditor de cartafoles de buscaÂ"
+
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows."
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
 msgstr ""
-"O texto inserido ao responder unha mensaxe, informando que a continuaciÃn "
-"vai a mensaxe orixinal."
+"Altura inicial da xanela ÂEditor do cartafol de buscaÂ. O valor actualÃzase "
+"a medida que o usuario redimensiona a xanela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:231
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "Estado maximizado da xanela ÂEditor de cartafoles de buscaÂ"
+
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
-"O texto inserido cando se responde unha mensaxe, atribuÃndolle a mensaxe ao "
-"autor orixinal."
+"Estado inicial maximizado da xanela ÂEditor do cartafol de buscaÂ. O valor "
+"actualÃzase cando o usuario maximiza ou restaura a xanela. Nota: este valor "
+"en particular non se usa no Evolution desde que a xanela ÂEditor do cartafol "
+"de busca non à maximizÃbel. Esta chave sà existe como un detalle de "
+"implementaciÃn."
 
-#: ../mail/evolution-mail.schemas.in.h:218
+#: ../mail/evolution-mail.schemas.in.h:233
+msgid "\"Search Folder Editor\" window width"
+msgstr "Largura da xanela ÂEditor de cartafoles de buscaÂ"
+
+#: ../mail/evolution-mail.schemas.in.h:234
 msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Requires a restart to apply."
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
 msgstr ""
-"Esta opciÃn indica se as conversas deben estar despregadas ou pregadas por "
-"omisiÃn. Ã necesario reiniciar o Evolution."
+"Largura inicial da xanela ÂEditor do cartafol de buscaÂ. O valor actualÃzase "
+"a medida que o usuario redimensiona a xanela horizontalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:220
+#: ../mail/evolution-mail.schemas.in.h:235
+msgid "Drag'n'drop export format"
+msgstr "Formato de exportaciÃn de Arrastrar e soltar"
+
+#: ../mail/evolution-mail.schemas.in.h:236
 msgid ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder."
+"Define the email export format when doing drag'n'drop. Possible values are : "
+"mbox or pdf"
 msgstr ""
-"Este valor pode ser unha cadea baleira, isto significa que usarà o cartafol "
-"de imaxes do sistema, xeralmente localizado en ~/Imaxes. Este cartafol "
-"usarase tamÃn cando a ruta estabelecida non apunta a un cartafol existente."
+"Define o formato de exportaciÃn de correo-e ao arrastrar e soltar. Os "
+"valores posÃbeis son: mbox ou pdf"
+
+#: ../mail/evolution-mail.schemas.in.h:237
+msgid "Format of the drag'n'drop export filename"
+msgstr "Formato do nome do ficheiro exportado por arrastrar e soltar"
 
 #: ../mail/evolution-mail.schemas.in.h:238
-msgid "Whether to show local folders (On This Computer) in a folder tree."
+msgid ""
+"Exported file name will be : YYYmmDDHHMMSS_email_title Possible values : 1 "
+"(: email sent date), 2 (: drag'n'drop date)"
 msgstr ""
-"Indica se se deben mostrar os cartafoles locais (Neste equipo) nun Ãrbore de "
-"cartafoles."
+"O nome do ficheiro exportado serÃ: YYYmmDDHHMMSS_correo-e_titulo. Os valores "
+"posÃbeis: 1 (: data de envÃo do correo), 2 (: data de arrastre)"
 
 #: ../mail/importers/elm-importer.c:181
 msgid "Importing Elm data"
 msgstr "Importando datos Elm"
 
-#: ../mail/importers/elm-importer.c:351 ../mail/importers/pine-importer.c:456
-#: ../modules/mail/e-mail-shell-view.c:1041
+#: ../mail/importers/elm-importer.c:351 ../mail/importers/pine-importer.c:460
+#: ../modules/mail/e-mail-shell-view.c:1035
 #: ../widgets/misc/e-send-options.c:520
 msgid "Mail"
 msgstr "Correo"
@@ -13120,34 +13132,34 @@ msgstr "Importar correo desde o Elm."
 msgid "_Destination folder:"
 msgstr "Cartafol de _destino:"
 
-#: ../mail/importers/evolution-mbox-importer.c:149
-#: ../plugins/dbx-import/dbx-importer.c:266
-#: ../plugins/pst-import/pst-importer.c:550
+#: ../mail/importers/evolution-mbox-importer.c:148
+#: ../plugins/dbx-import/dbx-importer.c:265
+#: ../plugins/pst-import/pst-importer.c:554
 msgid "Select folder"
 msgstr "Seleccionar un cartafol"
 
-#: ../mail/importers/evolution-mbox-importer.c:150
-#: ../plugins/dbx-import/dbx-importer.c:267
-#: ../plugins/pst-import/pst-importer.c:551
+#: ../mail/importers/evolution-mbox-importer.c:149
+#: ../plugins/dbx-import/dbx-importer.c:266
+#: ../plugins/pst-import/pst-importer.c:555
 msgid "Select folder to import into"
 msgstr "Seleccionar un cartafol ao que importar"
 
-#: ../mail/importers/evolution-mbox-importer.c:437
+#: ../mail/importers/evolution-mbox-importer.c:436
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../mail/importers/evolution-mbox-importer.c:442
+#: ../mail/importers/evolution-mbox-importer.c:441
 msgctxt "mboxImp"
 msgid "From"
 msgstr "De"
 
-#: ../mail/importers/evolution-mbox-importer.c:486
+#: ../mail/importers/evolution-mbox-importer.c:485
 #: ../shell/e-shell-utils.c:195
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Caixa de correo Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:487
+#: ../mail/importers/evolution-mbox-importer.c:486
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de cartafoles no formato caixa de correo de Berkeley"
 
@@ -13157,8 +13169,8 @@ msgstr "Importando a caixa de correo"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:616
-#: ../plugins/pst-import/pst-importer.c:757
+#: ../plugins/dbx-import/dbx-importer.c:615
+#: ../plugins/pst-import/pst-importer.c:761
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importando Â%sÂ"
@@ -13168,20 +13180,20 @@ msgstr "Importando Â%sÂ"
 msgid "Scanning %s"
 msgstr "Examinando %s"
 
-#: ../mail/importers/pine-importer.c:258
+#: ../mail/importers/pine-importer.c:262
 msgid "Importing Pine data"
 msgstr "Importando datos do Pine"
 
-#: ../mail/importers/pine-importer.c:461
+#: ../mail/importers/pine-importer.c:465
 #: ../modules/addressbook/addressbook-config.c:1083
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: ../mail/importers/pine-importer.c:507
+#: ../mail/importers/pine-importer.c:511
 msgid "Evolution Pine importer"
 msgstr "Importador Pine do Evolution"
 
-#: ../mail/importers/pine-importer.c:508
+#: ../mail/importers/pine-importer.c:512
 msgid "Import mail from Pine."
 msgstr "Importar correo do Pine."
 
@@ -13214,7 +13226,7 @@ msgstr "Engadir unha regra de filtrado"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:507
+#: ../mail/mail-autofilter.c:511
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -13232,18 +13244,10 @@ msgstr[1] ""
 "Â%sÂ."
 
 #: ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "InformaciÃn da conta"
+msgid "Set custom junk header"
+msgstr "Estabelecer cabeceira de SPAM personalizada"
 
 #: ../mail/mail-config.ui.h:2
-msgid "Add Ne_w Signature..."
-msgstr "Engadir unha sinatura _novaâ"
-
-#: ../mail/mail-config.ui.h:3
-msgid "Al_ways sign outgoing messages when using this account"
-msgstr "Asinar sem_pre as mensaxes saÃntes cando se use esta conta"
-
-#: ../mail/mail-config.ui.h:4
 msgid ""
 "All new emails with header that matches given content will be automatically "
 "filtered as junk"
@@ -13251,802 +13255,815 @@ msgstr ""
 "TÃdolos correos electrÃnicos novos con cabeceiras que coincidan co contido "
 "dado filtraranse automaticamente como SPAM"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:6
-msgid "Allowing a _mailing list to redirect a private reply to the list"
-msgstr ""
-"Per_mitir que unha lista de correo redirixa as respostas privadas de novo à "
-"lista"
+#: ../mail/mail-config.ui.h:3
+msgid "Header name"
+msgstr "Nome da cabeceira"
 
-#: ../mail/mail-config.ui.h:7
-msgid "Also encrypt to sel_f when sending encrypted messages"
-msgstr "Ci_frar tamÃn para min mesmo cando envÃe correo cifrado"
+#: ../mail/mail-config.ui.h:4
+msgid "Header content"
+msgstr "Contido da cabeceira"
 
-#: ../mail/mail-config.ui.h:8
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Enviar _sempre unha copia de carbÃn (Cc) a:"
+#: ../mail/mail-config.ui.h:5
+msgid "_Add Signature"
+msgstr "_Engadir unha sinatura"
 
-#: ../mail/mail-config.ui.h:9
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Enviar sempre unha copia de carbÃn _oculta (Cco) a:"
+#: ../mail/mail-config.ui.h:6
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+"A saÃda deste script usarase como a sÃa\n"
+"sinatura. O nome que indique usarase\n"
+"sà a efectos de vista. "
 
 #: ../mail/mail-config.ui.h:10
-msgid "Always _trust keys in my keyring when encrypting"
-msgstr "Confia_r sempre nas chaves do meu anel de chaves ao cifrar"
+msgid "_Script:"
+msgstr "_Script:"
 
 #: ../mail/mail-config.ui.h:11
-msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr "Cifrar sempre para min _mesmo ao enviar correo cifrado"
+msgid "Default Behavior"
+msgstr "Comportamento predeterminado:"
 
 #: ../mail/mail-config.ui.h:12
-msgid "Always request rea_d receipt"
-msgstr "Requirir sempre a confirmaciÃn de lec_tura"
+msgid "Format messages in _HTML"
+msgstr "Formatar as mensaxes en _HTML"
 
 #: ../mail/mail-config.ui.h:13
-msgid "Apply the same _view settings to all folders"
-msgstr "Aplicar as mesmas opciÃns de _vista para todos os cartafoles"
-
-#: ../mail/mail-config.ui.h:15
-#: ../modules/addressbook/addressbook-config.c:1090
-msgid "Authentication"
-msgstr "AutenticaciÃn"
-
-#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "Inserir imaxes de _emoticonas automaticamente"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:14
+msgid "Always request rea_d receipt"
+msgstr "Requirir sempre a confirmaciÃn de lec_tura"
+
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "Conxunto de ca_racteres:"
 
+#: ../mail/mail-config.ui.h:17
+msgid "Replies and Forwards"
+msgstr "Respostas e reencamiÃamentos"
+
 #: ../mail/mail-config.ui.h:18
-msgid "Ch_eck for Supported Types"
-msgstr "Comprobar os tipos compatÃb_eis"
+msgid "_Reply style:"
+msgstr "Estilo da _resposta:"
 
 #: ../mail/mail-config.ui.h:19
-msgid "Check cu_stom headers for junk"
-msgstr "Comprobar as cabeceiras personalizada_s para detectar correo lixo"
+msgid "_Forward style:"
+msgstr "Estilo do _reencamiÃamento:"
 
 #: ../mail/mail-config.ui.h:20
-msgid "Check for new _messages on start"
-msgstr "Comprobar se hai _mensaxes novas ao iniciar"
+msgid "Start _typing at the bottom on replying"
+msgstr "Comezar a escribir ao final da respos_ta"
 
 #: ../mail/mail-config.ui.h:21
-msgid "Check for new messa_ges in all active accounts"
-msgstr "Comprobar se hai mensa_xes novas nas contas activas"
+msgid "_Keep signature above the original message on replying"
+msgstr "Ao responder _manter a sinatura por riba da mensaxe orixinal"
 
 #: ../mail/mail-config.ui.h:22
-msgid "Check incoming _messages for junk"
-msgstr "Comprobar as _mensaxes entrantes para detectar correo lixo"
+msgid "Ignore Reply-To: for mailing lists"
+msgstr "Ignorar ÂResponder a:Â para as listas de correo"
 
 #: ../mail/mail-config.ui.h:23
-msgid "Check spelling while I _type"
-msgstr "Comprobar a ortografÃa men_tres escribe"
+msgid "Group Reply goes only to mailing list, if possible"
+msgstr "A resposta ao grupo vai unicamente à lista de correo, se à posÃbel"
 
 #: ../mail/mail-config.ui.h:24
-msgid "Cle_ar"
-msgstr "Limp_ar"
-
-#: ../mail/mail-config.ui.h:25
-msgid "Clea_r"
-msgstr "Limpa_r"
+msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
+msgstr ""
+"_Firmar mensaxes digitalmente cando a mensaxe orixinal estea firmada (PGP ou "
+"S/MIME)"
 
 #: ../mail/mail-config.ui.h:26
-msgid "Color for _misspelled words:"
-msgstr "Cor para as palabras escritas incorrecta_mente:"
-
-#: ../mail/mail-config.ui.h:27
-msgid "Composing Messages"
-msgstr "Escribir unha mensaxe"
+msgid "Sig_natures"
+msgstr "Sinaturas"
 
 #: ../mail/mail-config.ui.h:28
-#: ../modules/plugin-manager/evolution-plugin-manager.c:160
-msgid "Configuration"
-msgstr "ConfiguraciÃn"
+msgid "Signatures"
+msgstr "Sinaturas"
 
 #: ../mail/mail-config.ui.h:29
-msgid "Confirm _when expunging a folder"
-msgstr "Confirmar antes de e_xpurgar un cartafol"
+msgid "_Languages"
+msgstr "I_diomas"
 
 #: ../mail/mail-config.ui.h:30
-msgid "Confirmations"
-msgstr "ConfirmaciÃns"
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Esta lista de idiomas mostra unicamente os idiomas para os cales hai "
+"instalado un dicionario."
 
 #: ../mail/mail-config.ui.h:31
-#: ../modules/addressbook/autocompletion-config.c:188
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
-msgid "Date/Time Format"
-msgstr "Formato da data e da hora"
+msgid "Languages Table"
+msgstr "TÃboa de idiomas"
 
 #: ../mail/mail-config.ui.h:33
-msgid "Default Behavior"
-msgstr "Comportamento predeterminado:"
+msgid "Check spelling while I _type"
+msgstr "Comprobar a ortografÃa men_tres escribe"
 
 #: ../mail/mail-config.ui.h:34
-msgid "Default character e_ncoding:"
-msgstr "CodificaciÃ_n de caracteres predeterminada:"
+msgid "Color for _misspelled words:"
+msgstr "Cor para as palabras escritas incorrecta_mente:"
 
 #: ../mail/mail-config.ui.h:35
-msgid "Delete Mail"
-msgstr "Eliminar o correo"
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
+msgid "Pick a color"
+msgstr "Seleccionar unha cor"
 
 #: ../mail/mail-config.ui.h:36
-msgid "Delete junk messages on e_xit"
-msgstr "Eliminar o correo lixo ao saÃ_r"
+msgid "Spell Checking"
+msgstr "ComprobaciÃn ortogrÃfica"
 
-#: ../mail/mail-config.ui.h:39
-msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
+#: ../mail/mail-config.ui.h:37
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
 msgstr ""
-"_Firmar mensaxes digitalmente cando a mensaxe orixinal estea firmada (PGP ou "
-"S/MIME)"
+"Para evitar accidentes co correo e outras incomodidades pedir a confirmaciÃn "
+"antes de realizar as seguintes acciÃns marcadas:"
 
-#: ../mail/mail-config.ui.h:40
-msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "Asinar dixitalmente as mensaxes saÃnt_es (predeterminado)"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:39
+msgid "Sending a message with an _empty subject line"
+msgstr "Enviar unha m_ensaxe co asunto baleiro"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:41
-msgid "Displayed Message Headers"
-msgstr "Mostrar as cabeceiras da mensaxe"
-
-#: ../mail/mail-config.ui.h:42
-msgid "Do not mar_k messages as junk if sender is in my address book"
-msgstr ""
-"Non ma_rcar as mensaxes como correo lixo se o remitente està na miÃa axenda "
-"de enderezos"
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "Enviar unha mensaxe sà con destinatarios _Bcc definidos"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:43
-msgid "Do not quote"
-msgstr "Non citar"
-
-#: ../mail/mail-config.ui.h:44
-msgid "Drafts _Folder:"
-msgstr "Carta_fol dos borradores:"
+msgid "Sending a _private reply to a mailing list message"
+msgstr "Enviar unha resposta _privada à mensaxes da lista de correo"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:45
-msgid "Email _Address:"
-msgstr "_Enderezo de correo:"
+msgid "Sending a reply to a large _number of recipients"
+msgstr "Enviar unha resposta a un grande _nÃmero de destinatarios"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:47
-msgid "Empty trash folders on e_xit"
-msgstr "Baleirar os cartafoles do lixo ao _saÃr"
+msgid "Allowing a _mailing list to redirect a private reply to the list"
+msgstr ""
+"Per_mitir que unha lista de correo redirixa as respostas privadas de novo à "
+"lista"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:49
-msgid "Encry_ption certificate:"
-msgstr "Certificado de ci_frado:"
+msgid "Sending a message with _recipients not entered as mail addresses"
+msgstr ""
+"Enviar unha mensaxe con _destinatarios non inseridos como enderezos de correo"
 
 #: ../mail/mail-config.ui.h:50
-msgid "Encrypt out_going messages (by default)"
-msgstr "Cifrar as mensaxes saÃn_tes (predeterminado)"
-
-#: ../mail/mail-config.ui.h:51
-msgid "Encryption:"
-msgstr "Cifrado:"
+msgid "Confirmations"
+msgstr "ConfirmaciÃns"
 
 #: ../mail/mail-config.ui.h:52
-msgid "F_all back to threading messages by subject"
-msgstr "Volver agrupar as mensaxes polo _asunto"
+msgid "SHA1"
+msgstr "SHA1"
 
 #: ../mail/mail-config.ui.h:53
-msgid "Fix_ed Width Font:"
-msgstr "Tipo de l_etra de largura fixa:"
+msgid "SHA256"
+msgstr "SHA256"
 
 #: ../mail/mail-config.ui.h:54
-msgid "Format messages in _HTML"
-msgstr "Formatar as mensaxes en _HTML"
+msgid "SHA384"
+msgstr "SHA384"
 
 #: ../mail/mail-config.ui.h:55
-msgid "Full Nam_e:"
-msgstr "Nom_e completo:"
+msgid "SHA512"
+msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:57
-msgid "Group Reply goes only to mailing list, if possible"
-msgstr "A resposta ao grupo vai unicamente à lista de correo, se à posÃbel"
+#: ../mail/mail-config.ui.h:56 ../smime/gui/smime-ui.ui.h:1
+msgid "a"
+msgstr "a"
 
-#: ../mail/mail-config.ui.h:58
-msgid "HTML Messages"
-msgstr "Mensaxes HTML"
+#: ../mail/mail-config.ui.h:57 ../smime/gui/smime-ui.ui.h:2
+msgid "b"
+msgstr "b"
 
 #: ../mail/mail-config.ui.h:59
-msgid "H_TTP Proxy:"
-msgstr "Proxy H_TTP:"
+msgid "Inline (Outlook style)"
+msgstr "Inseridas (estilo Outlook)"
 
 #: ../mail/mail-config.ui.h:60
-msgid "Header content"
-msgstr "Contido da cabeceira"
+msgid "Quoted"
+msgstr "Citado"
 
 #: ../mail/mail-config.ui.h:61
-msgid "Header name"
-msgstr "Nome da cabeceira"
+msgid "Do not quote"
+msgstr "Non citar"
 
 #: ../mail/mail-config.ui.h:62
-msgid "Headers"
-msgstr "Cabeceiras"
+msgid "Inline"
+msgstr "Inseridas"
 
 #: ../mail/mail-config.ui.h:63
-msgid "Highlight _quotations with"
-msgstr "Realzar as _citas con"
+msgid "Proxy Settings"
+msgstr "Axustes da proxy"
 
 #: ../mail/mail-config.ui.h:64
-msgid "Ignore Reply-To: for mailing lists"
-msgstr "Ignorar ÂResponder a:Â para as listas de correo"
+msgid "_Use system defaults"
+msgstr "_Usar as predefiniciÃns do sistema"
 
 #: ../mail/mail-config.ui.h:65
-msgid "Inline"
-msgstr "Inseridas"
+msgid "_Direct connection to the Internet"
+msgstr "ConexiÃn _directa a Internet"
 
 #: ../mail/mail-config.ui.h:66
-msgid "Inline (Outlook style)"
-msgstr "Inseridas (estilo Outlook)"
+msgid "_Manual proxy configuration:"
+msgstr "ConfiguraciÃn _manual do proxy:"
 
-#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
-msgid "Labels"
-msgstr "Etiquetas"
+#: ../mail/mail-config.ui.h:67
+msgid "H_TTP Proxy:"
+msgstr "Proxy H_TTP:"
+
+#: ../mail/mail-config.ui.h:68
+msgid "_Secure HTTP Proxy:"
+msgstr "Proxy HTTP _segura:"
 
 #: ../mail/mail-config.ui.h:69
-msgid "Languages Table"
-msgstr "TÃboa de idiomas"
+msgid "SOC_KS Proxy:"
+msgstr "Proxy SOC_KS:"
 
 #: ../mail/mail-config.ui.h:70
-msgid "Loading Images"
-msgstr "Cargando as imaxes"
+msgid "No _Proxy for:"
+msgstr "Sen pro_xy para:"
 
 #: ../mail/mail-config.ui.h:71
-msgid "Mail Headers Table"
-msgstr "TÃboa de cabeceiras de correo"
+msgid "Port:"
+msgstr "Porto:"
 
 #: ../mail/mail-config.ui.h:72
-msgid "Mailbox location"
-msgstr "LocalizaciÃn da caixa de correo"
+msgid "Use Authe_ntication"
+msgstr "Usar aute_nticaciÃn"
 
 #: ../mail/mail-config.ui.h:73
-msgid "Message Display"
-msgstr "Vista das mensaxes"
+msgid "Us_ername:"
+msgstr "Nom_e do usuario:"
 
 #: ../mail/mail-config.ui.h:74
-msgid "Message Receipts"
-msgstr "ConfirmaciÃns de lectura das mensaxes"
+msgid "Pass_word:"
+msgstr "Con_trasinal:"
+
+#: ../mail/mail-config.ui.h:75
+msgid "Start up"
+msgstr "Iniciar"
 
 #: ../mail/mail-config.ui.h:76
-msgid "No _Proxy for:"
-msgstr "Sen pro_xy para:"
+msgid "Check for new _messages on start"
+msgstr "Comprobar se hai _mensaxes novas ao iniciar"
 
-#: ../mail/mail-config.ui.h:77 ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-msgstr "Sen cifrado"
+#: ../mail/mail-config.ui.h:77
+msgid "Check for new messa_ges in all active accounts"
+msgstr "Comprobar se hai mensa_xes novas nas contas activas"
 
 #: ../mail/mail-config.ui.h:78
-msgid "Option is ignored if a match for custom junk headers is found."
-msgstr ""
-"Ignorarase a opciÃn se se atopa algunha coincidencia para as cabeceiras "
-"personalizadas do correo lixo."
+msgid "Message Display"
+msgstr "Vista das mensaxes"
 
 #: ../mail/mail-config.ui.h:79
-#: ../plugins/publish-calendar/publish-calendar.ui.h:10
-msgid "Optional Information"
-msgstr "InformaciÃn opcional"
+msgid "_Use the same fonts as other applications"
+msgstr "_Usar os mesmos tipos de letra que outros aplicativos"
+
+#: ../mail/mail-config.ui.h:80
+msgid "S_tandard Font:"
+msgstr "Tipo de letra es_tÃndar:"
 
 #: ../mail/mail-config.ui.h:81
-msgid "Or_ganization:"
-msgstr "Organi_zaciÃn:"
+msgid "Select HTML fixed width font"
+msgstr "Seleccionar o tipo de letra de largura fixa para HTML"
 
 #: ../mail/mail-config.ui.h:82
-msgid "PGP/GPG _Key ID:"
-msgstr "ID da _chave PGP/GPG:"
+msgid "Select HTML variable width font"
+msgstr "Seleccionar o tipo de letra de largura variÃbel para HTML"
 
 #: ../mail/mail-config.ui.h:83
-msgid "Pass_word:"
-msgstr "Con_trasinal:"
+msgid "Fix_ed Width Font:"
+msgstr "Tipo de l_etra de largura fixa:"
 
 #: ../mail/mail-config.ui.h:84
-msgid "Personal Details:"
-msgstr "Detalles persoais:"
+msgid "Highlight _quotations with"
+msgstr "Realzar as _citas con"
 
 #: ../mail/mail-config.ui.h:85
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
-msgid "Pick a color"
-msgstr "Seleccionar unha cor"
+msgid "color"
+msgstr "cor"
 
 #: ../mail/mail-config.ui.h:86
-msgid "Port:"
-msgstr "Porto:"
+msgid "Default character e_ncoding:"
+msgstr "CodificaciÃ_n de caracteres predeterminada:"
 
 #: ../mail/mail-config.ui.h:87
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "Pretty Good Privacy (PGP/GPG)"
+msgid "Apply the same _view settings to all folders"
+msgstr "Aplicar as mesmas opciÃns de _vista para todos os cartafoles"
+
+#: ../mail/mail-config.ui.h:88
+msgid "F_all back to threading messages by subject"
+msgstr "Volver agrupar as mensaxes polo _asunto"
 
 #: ../mail/mail-config.ui.h:89
-msgid "Proxy Settings"
-msgstr "Axustes da proxy"
+msgid "Delete Mail"
+msgstr "Eliminar o correo"
 
 #: ../mail/mail-config.ui.h:90
-msgid "Quoted"
-msgstr "Citado"
+msgid "Empty trash folders on e_xit"
+msgstr "Baleirar os cartafoles do lixo ao _saÃr"
 
 #: ../mail/mail-config.ui.h:91
-msgid "Re_member password"
-msgstr "Le_mbrar o contrasinal"
+msgid "Confirm _when expunging a folder"
+msgstr "Confirmar antes de e_xpurgar un cartafol"
 
-#: ../mail/mail-config.ui.h:92
-msgid "Re_ply-To:"
-msgstr "Res_ponder a:"
+#. If enabled, show animation; if disabled, only display a static image without any animation
+#: ../mail/mail-config.ui.h:93
+msgid "_Show animated images"
+msgstr "Mo_strar as imaxes animadas"
 
 #: ../mail/mail-config.ui.h:94
-msgid "Remember _password"
-msgstr "Lembrar o _contrasinal"
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "_Avisar antes de enviar correo HTML aos contactos que non o desexan"
 
 #: ../mail/mail-config.ui.h:95
-msgid "Replies and Forwards"
-msgstr "Respostas e reencamiÃamentos"
+msgid "Loading Images"
+msgstr "Cargando as imaxes"
 
 #: ../mail/mail-config.ui.h:96
-msgid "Required Information"
-msgstr "InformaciÃn solicitada"
+msgid "_Never load images from the Internet"
+msgstr "_Non cargar nunca as imaxes desde Internet"
 
 #: ../mail/mail-config.ui.h:97
-msgid "SHA1"
-msgstr "SHA1"
+msgid "_Load images only in messages from contacts"
+msgstr "Ca_rgar as imaxes sà nas mensaxes dos contactos"
 
 #: ../mail/mail-config.ui.h:98
-msgid "SHA256"
-msgstr "SHA256"
+msgid "_Always load images from the Internet"
+msgstr "C_argar sempre as imaxes desde Internet"
 
 #: ../mail/mail-config.ui.h:99
-msgid "SHA384"
-msgstr "SHA384"
+msgid "HTML Messages"
+msgstr "Mensaxes HTML"
 
-#: ../mail/mail-config.ui.h:100
-msgid "SHA512"
-msgstr "SHA512"
+#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
+msgid "Labels"
+msgstr "Etiquetas"
 
 #: ../mail/mail-config.ui.h:101
-msgid "SOC_KS Proxy:"
-msgstr "Proxy SOC_KS:"
+msgid "Sender Photograph"
+msgstr "FotografÃa do remitente"
 
-#: ../mail/mail-config.ui.h:102 ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "Cifrado SSL"
+#: ../mail/mail-config.ui.h:102
+msgid "_Show the photograph of sender in the message preview"
+msgstr "_Mostrar a fotografÃa do remitente na vista previa das mensaxes"
 
 #: ../mail/mail-config.ui.h:103
-msgid "SSL is not supported in this build of Evolution"
-msgstr "SSL non à compatÃbel con esta versiÃn do Evolution"
-
-#: ../mail/mail-config.ui.h:104
 msgid "S_earch for sender photograph only in local address books"
 msgstr "B_uscar a fotografÃa do remitente sà nas axendas de enderezos locais"
 
+#: ../mail/mail-config.ui.h:104
+msgid "Displayed Message Headers"
+msgstr "Mostrar as cabeceiras da mensaxe"
+
 #: ../mail/mail-config.ui.h:105
-msgid "S_elect..."
-msgstr "S_eleccionarâ"
+msgid "Mail Headers Table"
+msgstr "TÃboa de cabeceiras de correo"
 
 #: ../mail/mail-config.ui.h:106
-msgid "S_end message receipts:"
-msgstr "_Enviar as confirmaciÃns de lectura das mensaxes:"
+#: ../modules/addressbook/autocompletion-config.c:188
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "Date/Time Format"
+msgstr "Formato da data e da hora"
 
 #: ../mail/mail-config.ui.h:107
-msgid "S_tandard Font:"
-msgstr "Tipo de letra es_tÃndar:"
+msgid "Headers"
+msgstr "Cabeceiras"
 
 #: ../mail/mail-config.ui.h:108
-msgid "Secure MIME (S/MIME)"
-msgstr "MIME seguro (S/MIME)"
+msgid "Check incoming _messages for junk"
+msgstr "Comprobar as _mensaxes entrantes para detectar correo lixo"
+
+#: ../mail/mail-config.ui.h:109
+msgid "Delete junk messages on e_xit"
+msgstr "Eliminar o correo lixo ao saÃ_r"
 
 #: ../mail/mail-config.ui.h:110
-msgid "Select HTML fixed width font"
-msgstr "Seleccionar o tipo de letra de largura fixa para HTML"
+msgid "Check cu_stom headers for junk"
+msgstr "Comprobar as cabeceiras personalizada_s para detectar correo lixo"
 
 #: ../mail/mail-config.ui.h:111
-msgid "Select HTML variable width font"
-msgstr "Seleccionar o tipo de letra de largura variÃbel para HTML"
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr ""
+"Non ma_rcar as mensaxes como correo lixo se o remitente està na miÃa axenda "
+"de enderezos"
 
 #: ../mail/mail-config.ui.h:112
-msgid "Sender Photograph"
-msgstr "FotografÃa do remitente"
-
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:115
-msgid "Sending a _private reply to a mailing list message"
-msgstr "Enviar unha resposta _privada à mensaxes da lista de correo"
+msgid "_Lookup in local address book only"
+msgstr "Buscar sà nas axendas de enderezos _locais"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:117
-msgid "Sending a message with _recipients not entered as mail addresses"
+#: ../mail/mail-config.ui.h:113
+msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
-"Enviar unha mensaxe con _destinatarios non inseridos como enderezos de correo"
+"Ignorarase a opciÃn se se atopa algunha coincidencia para as cabeceiras "
+"personalizadas do correo lixo."
+
+#: ../mail/mail-config.ui.h:115 ../modules/addressbook/ldap-config.ui.h:3
+msgid "No encryption"
+msgstr "Sen cifrado"
+
+#: ../mail/mail-config.ui.h:116 ../modules/addressbook/ldap-config.ui.h:1
+msgid "TLS encryption"
+msgstr "Cifrado TLS"
+
+#: ../mail/mail-config.ui.h:117 ../modules/addressbook/ldap-config.ui.h:2
+msgid "SSL encryption"
+msgstr "Cifrado SSL"
+
+#: ../mail/mail-config.ui.h:118
+msgid "Special Folders"
+msgstr "Cartafoles especiais"
 
-#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:119
-msgid "Sending a message with an _empty subject line"
-msgstr "Enviar unha m_ensaxe co asunto baleiro"
+msgid "Drafts _Folder:"
+msgstr "Carta_fol dos borradores:"
+
+#: ../mail/mail-config.ui.h:120
+msgid "Sent _Messages Folder:"
+msgstr "Cartafol das _mensaxes enviadas:"
 
-#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:121
-msgid "Sending a message with only _Bcc recipients defined"
-msgstr "Enviar unha mensaxe sà con destinatarios _Bcc definidos"
+msgid "_Trash Folder:"
+msgstr "Cartafo_l do lixo:"
+
+#: ../mail/mail-config.ui.h:122
+msgid "_Junk Folder:"
+msgstr "Cartafol do coreo _lixo:"
 
-#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:123
-msgid "Sending a reply to a large _number of recipients"
-msgstr "Enviar unha resposta a un grande _nÃmero de destinatarios"
+msgid "Composing Messages"
+msgstr "Escribir unha mensaxe"
 
 #: ../mail/mail-config.ui.h:124
-msgid "Sent _Messages Folder:"
-msgstr "Cartafol das _mensaxes enviadas:"
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Enviar sempre unha copia de carbÃn _oculta (Cco) a:"
 
 #: ../mail/mail-config.ui.h:125
-msgid "Ser_ver requires authentication"
-msgstr "O ser_vidor solicita autenticaciÃn"
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Enviar _sempre unha copia de carbÃn (Cc) a:"
 
 #: ../mail/mail-config.ui.h:126
-msgid "Server Configuration"
-msgstr "ConfiguraciÃn do servidor"
+msgid "Message Receipts"
+msgstr "ConfirmaciÃns de lectura das mensaxes"
 
 #: ../mail/mail-config.ui.h:127
-msgid "Server _Type:"
-msgstr "_Tipo de servidor:"
+msgid "S_end message receipts:"
+msgstr "_Enviar as confirmaciÃns de lectura das mensaxes:"
 
-#: ../mail/mail-config.ui.h:130
-msgid "Set custom junk header"
-msgstr "Estabelecer cabeceira de SPAM personalizada"
+#: ../mail/mail-config.ui.h:128
+msgid "Account Information"
+msgstr "InformaciÃn da conta"
+
+#: ../mail/mail-config.ui.h:129
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+"Indique o nome polo que desexa identificar esta conta.\n"
+"Por exemplo: ÂTraballo ou ÂPersoalÂ"
 
 #: ../mail/mail-config.ui.h:131
-msgid "Si_gning algorithm:"
-msgstr "Algoritmo da si_natura:"
+msgid "Required Information"
+msgstr "InformaciÃn solicitada"
 
 #: ../mail/mail-config.ui.h:132
-msgid "Sig_natures"
-msgstr "Sinaturas"
+msgid "Email _Address:"
+msgstr "_Enderezo de correo:"
 
 #: ../mail/mail-config.ui.h:133
-msgid "Sig_ning certificate:"
-msgstr "Certificado de si_natura:"
+msgid "Full Nam_e:"
+msgstr "Nom_e completo:"
 
 #: ../mail/mail-config.ui.h:134
-msgid "Signat_ure:"
-msgstr "Sinat_ura:"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+msgid "Optional Information"
+msgstr "InformaciÃn opcional"
 
 #: ../mail/mail-config.ui.h:135
-msgid "Signatures"
-msgstr "Sinaturas"
+msgid "Signat_ure:"
+msgstr "Sinat_ura:"
 
 #: ../mail/mail-config.ui.h:136
-msgid "Signing _algorithm:"
-msgstr "_Algoritmo da sinatura:"
+msgid "Add Ne_w Signature..."
+msgstr "Engadir unha sinatura _novaâ"
 
 #: ../mail/mail-config.ui.h:137
-msgid "Special Folders"
-msgstr "Cartafoles especiais"
+msgid "Or_ganization:"
+msgstr "Organi_zaciÃn:"
 
 #: ../mail/mail-config.ui.h:138
-msgid "Spell Checking"
-msgstr "ComprobaciÃn ortogrÃfica"
+msgid "Re_ply-To:"
+msgstr "Res_ponder a:"
 
 #: ../mail/mail-config.ui.h:139
-msgid "Start _typing at the bottom on replying"
-msgstr "Comezar a escribir ao final da respos_ta"
+msgid "_Make this my default account"
+msgstr "Facer desta a _miÃa conta predeterminada"
 
 #: ../mail/mail-config.ui.h:140
-msgid "Start up"
-msgstr "Iniciar"
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr ""
+"Non asinar as solicitudes _de reuniÃn (para a compatibilidade co Outlook)"
 
-#: ../mail/mail-config.ui.h:141 ../modules/addressbook/ldap-config.ui.h:21
-msgid "TLS encryption"
-msgstr "Cifrado TLS"
+#: ../mail/mail-config.ui.h:141
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "Pretty Good Privacy (PGP/GPG)"
 
 #: ../mail/mail-config.ui.h:142
-msgid "T_ype:"
-msgstr "T_ipo:"
+msgid "PGP/GPG _Key ID:"
+msgstr "ID da _chave PGP/GPG:"
 
 #: ../mail/mail-config.ui.h:143
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"Esta lista de idiomas mostra unicamente os idiomas para os cales hai "
-"instalado un dicionario."
+msgid "Si_gning algorithm:"
+msgstr "Algoritmo da si_natura:"
 
 #: ../mail/mail-config.ui.h:144
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
-msgstr ""
-"A saÃda deste script usarase como a sÃa\n"
-"sinatura. O nome que indique usarase\n"
-"sà a efectos de vista. "
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "Asinar sem_pre as mensaxes saÃntes cando se use esta conta"
+
+#: ../mail/mail-config.ui.h:145
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr "Cifrar sempre para min _mesmo ao enviar correo cifrado"
+
+#: ../mail/mail-config.ui.h:146
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr "Confia_r sempre nas chaves do meu anel de chaves ao cifrar"
 
 #: ../mail/mail-config.ui.h:147
-msgid ""
-"To help avoid email accidents and embarrassments, ask for confirmation "
-"before taking the following checkmarked actions:"
-msgstr ""
-"Para evitar accidentes co correo e outras incomodidades pedir a confirmaciÃn "
-"antes de realizar as seguintes acciÃns marcadas:"
+msgid "Secure MIME (S/MIME)"
+msgstr "MIME seguro (S/MIME)"
 
 #: ../mail/mail-config.ui.h:148
-msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
-msgstr ""
-"Indique o nome polo que desexa identificar esta conta.\n"
-"Por exemplo: ÂTraballo ou ÂPersoalÂ"
+msgid "Also encrypt to sel_f when sending encrypted messages"
+msgstr "Ci_frar tamÃn para min mesmo cando envÃe correo cifrado"
+
+#: ../mail/mail-config.ui.h:149
+msgid "Encrypt out_going messages (by default)"
+msgstr "Cifrar as mensaxes saÃn_tes (predeterminado)"
 
 #: ../mail/mail-config.ui.h:150
-msgid "Us_ername:"
-msgstr "Nom_e do usuario:"
+msgid "Digitally sign o_utgoing messages (by default)"
+msgstr "Asinar dixitalmente as mensaxes saÃnt_es (predeterminado)"
 
 #: ../mail/mail-config.ui.h:151
-msgid "Use Authe_ntication"
-msgstr "Usar aute_nticaciÃn"
+msgid "Encry_ption certificate:"
+msgstr "Certificado de ci_frado:"
 
 #: ../mail/mail-config.ui.h:152
-msgid "User _Name:"
-msgstr "_Nome do usuario:"
+msgid "Sig_ning certificate:"
+msgstr "Certificado de si_natura:"
 
-#: ../mail/mail-config.ui.h:154
-msgid "_Add Signature"
-msgstr "_Engadir unha sinatura"
+#: ../mail/mail-config.ui.h:153
+msgid "S_elect..."
+msgstr "S_eleccionarâ"
 
-#: ../mail/mail-config.ui.h:155
-msgid "_Always load images from the Internet"
-msgstr "C_argar sempre as imaxes desde Internet"
+#: ../mail/mail-config.ui.h:154
+msgid "Clea_r"
+msgstr "Limpa_r"
 
-#: ../mail/mail-config.ui.h:156
-msgid "_Authentication Type"
-msgstr "Tipo de _autenticaciÃn"
+#: ../mail/mail-config.ui.h:155
+msgid "Signing _algorithm:"
+msgstr "_Algoritmo da sinatura:"
 
 #: ../mail/mail-config.ui.h:157
-msgid "_Direct connection to the Internet"
-msgstr "ConexiÃn _directa a Internet"
+msgid "Cle_ar"
+msgstr "Limp_ar"
 
 #: ../mail/mail-config.ui.h:158
-msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr ""
-"Non asinar as solicitudes _de reuniÃn (para a compatibilidade co Outlook)"
-
-#: ../mail/mail-config.ui.h:159
-msgid "_Forward style:"
-msgstr "Estilo do _reencamiÃamento:"
+msgid "Server _Type:"
+msgstr "_Tipo de servidor:"
 
 #: ../mail/mail-config.ui.h:160
-msgid "_Junk Folder:"
-msgstr "Cartafol do coreo _lixo:"
+msgid "description"
+msgstr "descriciÃn"
 
 #: ../mail/mail-config.ui.h:161
-msgid "_Keep signature above the original message on replying"
-msgstr "Ao responder _manter a sinatura por riba da mensaxe orixinal"
+#: ../modules/plugin-manager/evolution-plugin-manager.c:160
+msgid "Configuration"
+msgstr "ConfiguraciÃn"
 
 #: ../mail/mail-config.ui.h:162
-msgid "_Languages"
-msgstr "I_diomas"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+msgid "_Server:"
+msgstr "_Servidor:"
 
 #: ../mail/mail-config.ui.h:163
-msgid "_Load images only in messages from contacts"
-msgstr "Ca_rgar as imaxes sà nas mensaxes dos contactos"
-
-#: ../mail/mail-config.ui.h:164
-msgid "_Lookup in local address book only"
-msgstr "Buscar sà nas axendas de enderezos _locais"
+msgid "User _Name:"
+msgstr "_Nome do usuario:"
 
 #: ../mail/mail-config.ui.h:165
-msgid "_Make this my default account"
-msgstr "Facer desta a _miÃa conta predeterminada"
+msgid "Mailbox location"
+msgstr "LocalizaciÃn da caixa de correo"
 
-#: ../mail/mail-config.ui.h:166
-msgid "_Manual proxy configuration:"
-msgstr "ConfiguraciÃn _manual do proxy:"
+#: ../mail/mail-config.ui.h:167
+msgid "_Use secure connection:"
+msgstr "_Usar unha conexiÃn segura:"
 
 #: ../mail/mail-config.ui.h:168
-msgid "_Never load images from the Internet"
-msgstr "_Non cargar nunca as imaxes desde Internet"
+msgid "SSL is not supported in this build of Evolution"
+msgstr "SSL non à compatÃbel con esta versiÃn do Evolution"
 
-#: ../mail/mail-config.ui.h:170 ../modules/addressbook/ldap-config.ui.h:29
-msgid "_Port:"
-msgstr "_Porto:"
+#: ../mail/mail-config.ui.h:169
+msgid "_Authentication Type"
+msgstr "Tipo de _autenticaciÃn"
+
+#: ../mail/mail-config.ui.h:170
+msgid "Ch_eck for Supported Types"
+msgstr "Comprobar os tipos compatÃb_eis"
 
 #: ../mail/mail-config.ui.h:171
-msgid "_Prompt on sending HTML mail to contacts that do not want them"
-msgstr "_Avisar antes de enviar correo HTML aos contactos que non o desexan"
+msgid "Re_member password"
+msgstr "Le_mbrar o contrasinal"
 
 #: ../mail/mail-config.ui.h:172
-msgid "_Reply style:"
-msgstr "Estilo da _resposta:"
+msgid "Server Configuration"
+msgstr "ConfiguraciÃn do servidor"
 
-#: ../mail/mail-config.ui.h:173
-msgid "_Script:"
-msgstr "_Script:"
+#: ../mail/mail-config.ui.h:173 ../modules/addressbook/ldap-config.ui.h:13
+msgid "_Port:"
+msgstr "_Porto:"
 
 #: ../mail/mail-config.ui.h:174
-msgid "_Secure HTTP Proxy:"
-msgstr "Proxy HTTP _segura:"
-
-#: ../mail/mail-config.ui.h:176
-#: ../plugins/publish-calendar/publish-calendar.ui.h:28
-msgid "_Server:"
-msgstr "_Servidor:"
-
-#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:178
-msgid "_Show animated images"
-msgstr "Mo_strar as imaxes animadas"
-
-#: ../mail/mail-config.ui.h:179
-msgid "_Show the photograph of sender in the message preview"
-msgstr "_Mostrar a fotografÃa do remitente na vista previa das mensaxes"
-
-#: ../mail/mail-config.ui.h:180
-msgid "_Trash Folder:"
-msgstr "Cartafo_l do lixo:"
-
-#: ../mail/mail-config.ui.h:181
-msgid "_Use secure connection:"
-msgstr "_Usar unha conexiÃn segura:"
-
-#: ../mail/mail-config.ui.h:182
-msgid "_Use system defaults"
-msgstr "_Usar as predefiniciÃns do sistema"
+msgid "Ser_ver requires authentication"
+msgstr "O ser_vidor solicita autenticaciÃn"
 
-#: ../mail/mail-config.ui.h:183
-msgid "_Use the same fonts as other applications"
-msgstr "_Usar os mesmos tipos de letra que outros aplicativos"
+#: ../mail/mail-config.ui.h:175
+#: ../modules/addressbook/addressbook-config.c:1090
+msgid "Authentication"
+msgstr "AutenticaciÃn"
 
-#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:48
-msgid "a"
-msgstr "a"
+#: ../mail/mail-config.ui.h:176
+msgid "T_ype:"
+msgstr "T_ipo:"
 
-#: ../mail/mail-config.ui.h:185 ../smime/gui/smime-ui.ui.h:49
-msgid "b"
-msgstr "b"
+#: ../mail/mail-config.ui.h:177
+msgid "Remember _password"
+msgstr "Lembrar o _contrasinal"
 
-#: ../mail/mail-config.ui.h:186
-msgid "color"
-msgstr "cor"
+#: ../mail/mail-config.ui.h:178
+msgid "Personal Details:"
+msgstr "Detalles persoais:"
 
 #: ../mail/mail-config.ui.h:187
-msgid "description"
-msgstr "descriciÃn"
+msgid "Encryption:"
+msgstr "Cifrado:"
 
 #: ../mail/mail-config.ui.h:188
-msgid "label"
-msgstr "etiqueta"
-
-#: ../mail/mail-config.ui.h:189
 msgid "none"
 msgstr "ningunha"
 
+#: ../mail/mail-config.ui.h:189
+msgid "label"
+msgstr "etiqueta"
+
 #: ../mail/mail-dialogs.ui.h:1
+msgid "Search Folder Sources"
+msgstr "Fontes do cartafol de busca"
+
+#: ../mail/mail-dialogs.ui.h:2
+msgid "All local folders"
+msgstr "Todos os cartafoles locais"
+
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All active remote folders"
 msgstr "Todos os cartafoles remotos activos"
 
-#: ../mail/mail-dialogs.ui.h:2
+#: ../mail/mail-dialogs.ui.h:4
 msgid "All local and active remote folders"
 msgstr "Todos os cartafoles locais e remotos activos"
 
-#: ../mail/mail-dialogs.ui.h:3
-msgid "All local folders"
-msgstr "Todos os cartafoles locais"
+#: ../mail/mail-dialogs.ui.h:5
+msgid "Specific folders"
+msgstr "Cartafoles especÃficos"
 
-#: ../mail/mail-dialogs.ui.h:4
-msgid "Call"
-msgstr "Chamar"
+#: ../mail/mail-dialogs.ui.h:6
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"As mensaxes que seleccionou para o seguimento lÃstanse embaixo.\n"
+"Seleccione unha acciÃn de seguimento no menà ÂMarcarÂ."
+
+#: ../mail/mail-dialogs.ui.h:8
+msgid "_Flag:"
+msgstr "_Marca:"
+
+#: ../mail/mail-dialogs.ui.h:9
+msgid "_Due By:"
+msgstr "Vencemento po_r:"
 
 #. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Co_mpleted"
 msgstr "Ter_minado"
 
-#: ../mail/mail-dialogs.ui.h:7
-msgid "Digital Signature"
-msgstr "Sinatura dixital"
+#: ../mail/mail-dialogs.ui.h:12
+msgid "Call"
+msgstr "Chamar"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:13
 msgid "Do Not Forward"
 msgstr "Non reencamiÃar"
 
-#: ../mail/mail-dialogs.ui.h:9
-msgid "Encryption"
-msgstr "Cifrado"
-
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:14
 msgid "Follow-Up"
 msgstr "Seguimento"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:15
 msgid "For Your Information"
 msgstr "Para a sÃa informaciÃn"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:16
 msgid "Forward"
 msgstr "ReencamiÃar"
 
-#: ../mail/mail-dialogs.ui.h:13
-msgid "License Agreement"
-msgstr "Acordo de licenza"
-
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:17
 msgid "No Response Necessary"
 msgstr "Non à necesaria unha resposta"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Review"
 msgstr "Revisar"
 
-#: ../mail/mail-dialogs.ui.h:20
-msgid "Search Folder Sources"
-msgstr "Fontes do cartafol de busca"
-
-#: ../mail/mail-dialogs.ui.h:21
-msgid "Security Information"
-msgstr "InformaciÃn de seguranza"
-
-#: ../mail/mail-dialogs.ui.h:22
-msgid "Specific folders"
-msgstr "Cartafoles especÃficos"
-
 #: ../mail/mail-dialogs.ui.h:23
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"As mensaxes que seleccionou para o seguimento lÃstanse embaixo.\n"
-"Seleccione unha acciÃn de seguimento no menà ÂMarcarÂ."
+msgid "License Agreement"
+msgstr "Acordo de licenza"
+
+#: ../mail/mail-dialogs.ui.h:24
+msgid "_Tick this to accept the license agreement"
+msgstr "Marque is_to para aceptar o acordo de licenza"
 
 #: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr "_Aceptar a licenza"
 
 #: ../mail/mail-dialogs.ui.h:26
-msgid "_Due By:"
-msgstr "Vencemento po_r:"
+msgid "Security Information"
+msgstr "InformaciÃn de seguranza"
 
 #: ../mail/mail-dialogs.ui.h:27
-msgid "_Flag:"
-msgstr "_Marca:"
+msgid "Digital Signature"
+msgstr "Sinatura dixital"
 
 #: ../mail/mail-dialogs.ui.h:28
-msgid "_Tick this to accept the license agreement"
-msgstr "Marque is_to para aceptar o acordo de licenza"
+msgid "Encryption"
+msgstr "Cifrado"
 
 #: ../mail/mail.error.xml.h:1
-msgid "\"Check Junk\" Failed"
-msgstr "Produciuse un fallo na comprobaciÃn do correo lixo"
+msgid "Invalid authentication"
+msgstr "A autenticaciÃn non à vÃlida"
 
 #: ../mail/mail.error.xml.h:2
-msgid "\"Report Junk\" Failed"
-msgstr "Produciuse un fallo ao informar do correo lixo"
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+"Este servidor non à compatÃbel con este tipo de autenticaciÃn e quizais non "
+"permita ningÃn tipo de autenticaciÃn."
 
 #: ../mail/mail.error.xml.h:3
-msgid "\"Report Not Junk\" Failed"
-msgstr "Produciuse un fallo ao informar do que non à correo lixo"
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "Produciuse un fallo ao iniciar a sesiÃn no servidor Â{0}Â como Â{0}Â."
 
 #: ../mail/mail.error.xml.h:4
-msgid "A folder named \"{0}\" already exists. Please use a different name."
-msgstr "Xa existe un cartafol co nome Â{0}Â. Use un nome diferente."
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"Comprobe que o seu contrasinal estea escrito correctamente. Lembre que "
+"moitos contrasinais diferencian maiÃsculas de minÃsculas, a sÃa tecla Bloq "
+"MaiÃs pode estar activada."
 
 #: ../mail/mail.error.xml.h:5
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Xa existe un cartafol co nome Â{1}Â. Use un nome diferente."
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Està seguro de que desexa enviar unha mensaxe en formato HTML?"
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A non-empty folder at \"{1}\" already exists.\n"
-"\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
-msgstr ""
-"Xa existe un cartafol non baleiro en Â{1}Â.\n"
-"\n"
-"Pode escoller entre ignorar este cartafol, sobrescribilo, anexar os seus "
-"contidos ou saÃr."
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}"
+msgstr ""
+"AsegÃrese de que os seguintes destinatarios desexan e poden recibir mensaxes "
+"HTML:\n"
+"{0}"
 
 #: ../mail/mail.error.xml.h:9
-msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
-msgstr "Xa existe unha sinatura co nome Â{0}Â. Use un nome diferente."
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "Està seguro de que desexa enviar unha mensaxe sen un asunto?"
 
 #: ../mail/mail.error.xml.h:10
 msgid ""
@@ -14057,720 +14074,715 @@ msgstr ""
 "destinatarios unha idea sobre o contido do correo."
 
 #: ../mail/mail.error.xml.h:11
-msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr "Està seguro de que desexa eliminar esta conta e todos os seus proxies?"
-
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to delete this account?"
-msgstr "Està seguro de que desexa eliminar esta conta?"
-
-#: ../mail/mail.error.xml.h:13
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
-"Està seguro de que desexa desactivar esta conta e eliminar todos os seus "
-"proxies?"
+"Està seguro de que desexa enviar unha mensaxe sà con destinatarios Cco?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:12
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"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 ""
-"Està seguro de que desexa eliminar permanentemente todas as mensaxes "
-"eliminadas de todos os cartafoles?"
+"A lista de contactos que està enviando està configurada para ocultar os "
+"destinatarios\n"
+"\n"
+"Moitos sistemas de correo engaden unha cabeceira ÂApparently-To Ãs mensaxes "
+"que sà teÃen destinatarios Cco. Esta cabeceira mostrarà todos os "
+"destinatarios da sÃa mensaxe. Para evitar isto, deberÃa engadir polo menos "
+"un destinatario a ÂPara:Â ou ÂCc:Â. "
 
 #: ../mail/mail.error.xml.h:15
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder \"{0}\"?"
+"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 ""
-"Està seguro de que desexa eliminar permanentemente todas as mensaxes "
-"eliminadas do cartafol Â{0}Â?"
+"Moitos sistemas de correo engaden unha cabeceira ÂApparently-To Ãs mensaxes "
+"que sà teÃen destinatarios Cco. Esta cabeceira, se se engade, mostrarà todos "
+"os destinatarios na sÃa mensaxe. Para evitar isto deberÃa engadir polo menos "
+"un destinatario ÂPara:Â ou ÂCC:Â."
 
 #: ../mail/mail.error.xml.h:16
-msgid "Are you sure you want to send a message in HTML format?"
-msgstr "Està seguro de que desexa enviar unha mensaxe en formato HTML?"
-
-#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr ""
 "Està seguro de que desexa enviar unha mensaxe con un enderezo incorrecto?"
 
-#: ../mail/mail.error.xml.h:18
-msgid "Are you sure you want to send a message with invalid addresses?"
+#: ../mail/mail.error.xml.h:17
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
 msgstr ""
-"Està seguro de que desexa enviar unha mensaxe con enderezos incorrectos?"
+"O seguinte destinatario non foi recoÃecido como un enderezo de correo "
+"electrÃnico correcto:\n"
+"{0}"
 
 #: ../mail/mail.error.xml.h:19
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr ""
-"Està seguro de que desexa enviar unha mensaxe sà con destinatarios Cco?"
+"Està seguro de que desexa enviar unha mensaxe con enderezos incorrectos?"
 
 #: ../mail/mail.error.xml.h:20
-msgid "Are you sure you want to send a message without a subject?"
-msgstr "Està seguro de que desexa enviar unha mensaxe sen un asunto?"
-
-#: ../mail/mail.error.xml.h:21
-msgid "Blank Signature"
-msgstr "Sinatura en branco"
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
+msgstr ""
+"Os seguintes destinatarios non foron recoÃecidos como enderezos de correo "
+"electrÃnico correctos:\n"
+"{0}"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Cannot add Search Folder \"{0}\"."
-msgstr "Non à posÃbel engadir o cartafol de busca Â{0}Â."
+msgid "Send private reply?"
+msgstr "Desexa enviar unha resposta privada?"
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Non à posÃbel copiar o cartafol Â{0} a Â{1}Â."
+msgid ""
+"You are replying privately to a message which arrived via a mailing list, "
+"but the list is trying to redirect your reply to go back to the list. Are "
+"you sure you want to proceed?"
+msgstr ""
+"Està respondendo de forma privada a un correo electrÃnico que chegou "
+"mediante unha lista de correo, pero a lista està tentando redireccionar a "
+"sÃa resposta de novo à lista. Està seguro que desexa continuar?"
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot create folder \"{0}\"."
-msgstr "Non à posÃbel crear o cartafol Â{0}Â."
-
-#: ../mail/mail.error.xml.h:25
-msgid "Cannot create temporary save directory."
-msgstr "Non à posÃbel crear o cartafol de gardado temporal."
+msgid "Reply _Privately"
+msgstr "Responder de forma _privada"
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Non à posÃbel crear o cartafol de gardado porque Â{1}Â"
-
-#: ../mail/mail.error.xml.h:27
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Non à posÃbel eliminar o cartafol Â{0}Â."
+msgid ""
+"You are replying to a message which arrived via a mailing list, but you are "
+"replying privately to the sender; not to the list. Are you sure you want to "
+"proceed?"
+msgstr ""
+"Està respondendo a un correo electrÃnico que chegou mediante unha lista de "
+"correo, pero està respondendo de forma privada ao remitente, non à lista. "
+"Està seguro que desexa continuar?"
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Non à posÃbel eliminar o cartafol do sistema Â{0}Â."
+msgid "Send reply to all recipients?"
+msgstr "Desexa enviar unha resposta a todos os destinatarios?"
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr "Non à posÃbel editar o cartafol de busca Â{0} porque non existe."
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
+msgstr ""
+"Està respondendo a un correo electrÃnico que se enviou a moitos "
+"destinatarios. Està seguro que desexa responder a TODOS eles?"
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Non à posÃbel mover o cartafol Â{0} a Â{1}Â."
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
+"Non à posÃbel enviar esta mensaxe porque non indicou ningÃn destinatario"
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot open source \"{1}\"."
-msgstr "Non à posÃbel abrir a fonte Â{1}Â."
+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 ""
+"Introduza un enderezo de correo correcto no campo ÂPara:Â. Pode buscar "
+"enderezos de correo premendo no botÃn ÂPara:Â ao lado da caixa da entrada."
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source \"{2}\"."
-msgstr "Non à posÃbel abrir a fonte Â{2}Â."
+msgid "Use default drafts folder?"
+msgstr "Desexa usar o cartafol de borradores predeterminado?"
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open target \"{2}\"."
-msgstr "Non à posÃbel abrir o destino Â{2}Â."
-
-#: ../mail/mail.error.xml.h:34
 msgid ""
-"Cannot read the license file \"{0}\", due to an installation problem. You "
-"will not be able to use this provider until you can accept its license."
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
 msgstr ""
-"Non à posÃbel ler o ficheiro de licenza Â{0} debido a un problema de "
-"instalaciÃn. Non poderà usar este provedor atà que acepte a sÃa licenza."
+"Non à posÃbel abrir o cartafol de borradores desta conta. Desexa usar no seu "
+"lugar o cartafol de borradores do sistema?"
+
+#: ../mail/mail.error.xml.h:34
+msgid "Use _Default"
+msgstr "Usar o pre_definido"
 
 #: ../mail/mail.error.xml.h:35
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "Non à posÃbel renomear Â{0} como Â{1}Â."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
+msgstr ""
+"Està seguro de que desexa eliminar permanentemente todas as mensaxes "
+"eliminadas do cartafol Â{0}Â?"
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Non à posÃbel renomear ou mover o cartafol do sistema Â{0}Â."
+msgid "If you continue, you will not be able to recover these messages."
+msgstr "Se continÃa non poderà recuperar estas mensaxes."
 
 #: ../mail/mail.error.xml.h:37
-msgid "Cannot save changes to account."
-msgstr "Non à posÃbel gardar as modificaciÃns na conta."
+msgid "_Expunge"
+msgstr "_Compactar"
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Non à posÃbel gardar no cartafol Â{0}Â."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+"Està seguro de que desexa eliminar permanentemente todas as mensaxes "
+"eliminadas de todos os cartafoles?"
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to file \"{0}\"."
-msgstr "Non à posÃbel gardar no ficheiro Â{0}Â."
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
+msgid "_Empty Trash"
+msgstr "_Baleirar o lixo"
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Non à posÃbel estabelecer o script de sinatura Â{0}Â."
+msgid "Opening too many messages at once may take a long time."
+msgstr "Abrir demasiadas mensaxes à vez pode levar moito tempo."
 
 #: ../mail/mail.error.xml.h:41
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"Comprobe que o seu contrasinal estea escrito correctamente. Lembre que "
-"moitos contrasinais diferencian maiÃsculas de minÃsculas, a sÃa tecla Bloq "
-"MaiÃs pode estar activada."
+msgid "_Open Messages"
+msgstr "_Abrir as mensaxes"
 
 #: ../mail/mail.error.xml.h:42
-msgid "Close message window."
-msgstr "Pechar a xanela da mensaxe."
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Ten mensaxes sen enviar. Desexa saÃr de todas formas?"
 
 #: ../mail/mail.error.xml.h:43
-msgid "Could not save signature file."
-msgstr "Non foi posÃbel gardar o ficheiro da sinatura."
-
-#: ../mail/mail.error.xml.h:45
-msgid "Do _Not Disable"
-msgstr "_Non desactivar"
-
-#: ../mail/mail.error.xml.h:46
-msgid "Do _Not Synchronize"
-msgstr "_Non sincronizar"
-
-#: ../mail/mail.error.xml.h:47
 msgid ""
-"Do you want to locally synchronize the folders that are marked for offline "
-"usage?"
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 msgstr ""
-"Desexa sincronizar localmente os cartafoles que estÃn marcados para o uso "
-"sen conexiÃn?"
+"Se sae do aplicativo, estas mensaxes non se enviarÃn atà que o Evolution se "
+"inicie de novo."
+
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:47
+msgid "Error while {0}."
+msgstr "Produciuse un erro ao {0}."
 
 #: ../mail/mail.error.xml.h:48
-msgid "Do you want to mark all messages as read?"
-msgstr "Desexa marcar todas as mensaxes como lidas?"
+msgid "Error while performing operation."
+msgstr "Produciuse un erro ao efectuar a operaciÃn."
 
 #: ../mail/mail.error.xml.h:49
-msgid "Do you wish to save your changes?"
-msgstr "Desexa gardar as modificaciÃns?"
-
-#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Introduza o contrasinal."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Error loading filter definitions."
 msgstr "Produciuse un erro ao cargar as definiciÃns dos filtros."
 
-#: ../mail/mail.error.xml.h:52
-msgid "Error while performing operation."
-msgstr "Produciuse un erro ao efectuar a operaciÃn."
+#: ../mail/mail.error.xml.h:51
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Non à posÃbel gardar no cartafol Â{0}Â."
+
+#: ../mail/mail.error.xml.h:52
+msgid "Cannot save to file \"{0}\"."
+msgstr "Non à posÃbel gardar no ficheiro Â{0}Â."
+
+#: ../mail/mail.error.xml.h:53
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Non à posÃbel crear o cartafol de gardado porque Â{1}Â"
+
+#: ../mail/mail.error.xml.h:54
+msgid "Cannot create temporary save directory."
+msgstr "Non à posÃbel crear o cartafol de gardado temporal."
+
+#: ../mail/mail.error.xml.h:55
+msgid "File exists but cannot overwrite it."
+msgstr "O ficheiro existe pero non à posÃbel sobrescribilo."
 
-#. Translators: the {0} is replaced with an operation name, which failed.
-#. It can be basically anything run asynchronously, like "Fetching Mail",
-#. "Sending message" and others, mostly from mail-ops.c file.
 #: ../mail/mail.error.xml.h:56
-msgid "Error while {0}."
-msgstr "Produciuse un erro ao {0}."
+msgid "File exists but is not a regular file."
+msgstr "O ficheiro existe pero non à un ficheiro normal."
 
 #: ../mail/mail.error.xml.h:57
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Non à posÃbel eliminar o cartafol Â{0}Â."
+
+#: ../mail/mail.error.xml.h:58
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Non à posÃbel eliminar o cartafol do sistema Â{0}Â."
+
+#: ../mail/mail.error.xml.h:59
 msgid ""
-"Evolution's local mail format has changed from mbox to Maildir. Your local "
-"mail must be migrated to the new format before Evolution can proceed. Do you "
-"want to migrate now?\n"
-"\n"
-"An mbox account will be created to preserve the old mbox folders. You can "
-"delete the account after ensuring the data is safely migrated. Please make "
-"sure there is enough disk space if you choose to migrate now."
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
 msgstr ""
-"O formato de almacenamento local predeterminado foi cambiado do formato mbox "
-"a maildir. O seu correo electrÃnico local debe ser migrado ao novo formato "
-"antes de que Evolution poida seguir. Desexa facer a migraciÃn agora?\n"
-"\n"
-"Crearase unha conta mbox para conservar os cartafoles mbox antigos. Pode "
-"eliminala despois de asegurarse que a migraciÃn se fixo de forma correcta. "
-"Se escolle a migraciÃn comprobe con anterioridade que haxa suficiente espazo "
-"libre no seu disco."
+"O Evolution precisa os cartafoles do sistema para funcionar correctamente e "
+"non à posÃbel renomealos, movelos ou eliminalos."
 
 #: ../mail/mail.error.xml.h:60
-msgid "Evolution's local mail format has changed."
-msgstr "O formato de correo electrÃnico local de Evolution cambiou."
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Non à posÃbel renomear ou mover o cartafol do sistema Â{0}Â."
 
 #: ../mail/mail.error.xml.h:61
-msgid "Failed to download messages for offline viewing."
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
-"Produciuse un fallo ao descargar as mensaxes para traballar sen conexiÃn"
+"Està seguro de que desexa eliminar o cartafol Â{0} e todos os seus "
+"subcartafoles?"
 
 #: ../mail/mail.error.xml.h:62
-msgid "Failed to find duplicate messages."
-msgstr "Produciuse un fallo ao buscar as mensaxes duplicadas."
-
-#: ../mail/mail.error.xml.h:63
-msgid "Failed to open folder."
-msgstr "Produciuse un erro ao abrir o cartafol."
-
-#: ../mail/mail.error.xml.h:64
 msgid ""
-"Failed to query server for a list of supported authentication mechanisms."
+"If you delete the folder, all of its contents and its subfolders' contents "
+"will be deleted permanently."
 msgstr ""
-"Produciuse un fallo ao solicitar a lista de mecanismos de autenticaciÃn "
-"admitidos polo servidor."
+"Se elimina o cartafol, todo o seu contido e o dos seus subcartafoles "
+"eliminarase permanentemente."
+
+#: ../mail/mail.error.xml.h:64
+msgid "Really delete folder \"{0}\"?"
+msgstr "Desexa confirmar o borrado do cartafol Â{0}Â?"
 
 #: ../mail/mail.error.xml.h:65
-msgid "Failed to remove attachments from messages."
-msgstr "Produciuse un fallo ao quitar os anexos das mensaxes."
+msgid ""
+"If you delete the folder, all of its contents will be deleted permanently."
+msgstr "Se elimina o cartafol, eliminarase permanentemente todo o seu contido."
 
 #: ../mail/mail.error.xml.h:66
-msgid "Failed to retrieve messages."
-msgstr "Produciuse un fallo ao obter as mensaxes."
+msgid "These messages are not copies."
+msgstr "Estes mensaxes non son copias."
 
 #: ../mail/mail.error.xml.h:67
-msgid "Failed to save messages to disk."
-msgstr "Produciuse un fallo ao gardar as mensaxes ao disco."
+msgid ""
+"Messages shown in Search Folders are not copies. Deleting them from a Search "
+"Folder will delete the actual messages from the folder or folders in which "
+"they physically reside. Do you really want to delete these messages?"
+msgstr ""
+"As mensaxes mostradas nos cartafoles de busca non son copias. Se os borra do "
+"cartafol de busca borraranse do cartafol ou cartafoles nos que estea "
+"fisicamente.\n"
+"Està seguro de que desexa facer isto?"
 
 #: ../mail/mail.error.xml.h:68
-msgid "Failed to unsubscribe from folder."
-msgstr "Produciuse un fallo ao eliminar a subscriciÃn do cartafol."
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "Non à posÃbel renomear Â{0} como Â{1}Â."
 
 #: ../mail/mail.error.xml.h:69
-msgid "File exists but cannot overwrite it."
-msgstr "O ficheiro existe pero non à posÃbel sobrescribilo."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "Xa existe un cartafol co nome Â{1}Â. Use un nome diferente."
 
 #: ../mail/mail.error.xml.h:70
-msgid "File exists but is not a regular file."
-msgstr "O ficheiro existe pero non à un ficheiro normal."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Non à posÃbel mover o cartafol Â{0} a Â{1}Â."
+
+#: ../mail/mail.error.xml.h:71
+msgid "Cannot open source \"{2}\"."
+msgstr "Non à posÃbel abrir a fonte Â{2}Â."
 
-#. Translators: {0} is replaced with a folder name
 #: ../mail/mail.error.xml.h:72
-msgid "Folder '{0}' doesn't contain any duplicate message."
-msgstr "O cartafol Â{0}Â non contÃn ningunha mensaxe duplicada."
+msgid "Cannot open target \"{2}\"."
+msgstr "Non à posÃbel abrir o destino Â{2}Â."
 
 #: ../mail/mail.error.xml.h:73
-msgid "Hidden file is attached."
-msgstr "Existe un ficheiro oculto adxunto."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Non à posÃbel copiar o cartafol Â{0} a Â{1}Â."
 
 #: ../mail/mail.error.xml.h:74
-msgid "If you continue, you will not be able to recover these messages."
-msgstr "Se continÃa non poderà recuperar estas mensaxes."
+msgid "Cannot create folder \"{0}\"."
+msgstr "Non à posÃbel crear o cartafol Â{0}Â."
 
 #: ../mail/mail.error.xml.h:75
-msgid ""
-"If you delete the folder, all of its contents and its subfolders' contents "
-"will be deleted permanently."
-msgstr ""
-"Se elimina o cartafol, todo o seu contido e o dos seus subcartafoles "
-"eliminarase permanentemente."
+msgid "Cannot open source \"{1}\"."
+msgstr "Non à posÃbel abrir a fonte Â{1}Â."
 
 #: ../mail/mail.error.xml.h:76
-msgid ""
-"If you delete the folder, all of its contents will be deleted permanently."
-msgstr "Se elimina o cartafol, eliminarase permanentemente todo o seu contido."
+msgid "Cannot save changes to account."
+msgstr "Non à posÃbel gardar as modificaciÃns na conta."
 
 #: ../mail/mail.error.xml.h:77
-msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "Se continÃa, as contas proxy eliminaranse permanentemente."
+msgid "You have not filled in all of the required information."
+msgstr "Non encheu toda a informaciÃn requirida."
 
 #: ../mail/mail.error.xml.h:78
-msgid ""
-"If you proceed, the account information and\n"
-"all proxy information will be deleted permanently."
-msgstr ""
-"Se continÃa, a informaciÃn da conta e toda a\n"
-"informaciÃn do proxy eliminarase permanentemente."
+msgid "You may not create two accounts with the same name."
+msgstr "Non pode crear dÃas contas co mesmo nome."
+
+#: ../mail/mail.error.xml.h:79
+msgid "Are you sure you want to delete this account?"
+msgstr "Està seguro de que desexa eliminar esta conta?"
 
 #: ../mail/mail.error.xml.h:80
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Se continÃa, a informaciÃn da conta eliminarase permanentemente."
 
 #: ../mail/mail.error.xml.h:81
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
-"Se sae do aplicativo, estas mensaxes non se enviarÃn atà que o Evolution se "
-"inicie de novo."
+msgid "Are you sure you want to delete this account and all its proxies?"
+msgstr "Està seguro de que desexa eliminar esta conta e todos os seus proxies?"
 
 #: ../mail/mail.error.xml.h:82
-msgid "Ignore"
-msgstr "Ignorar"
-
-#: ../mail/mail.error.xml.h:83
-msgid "Invalid authentication"
-msgstr "A autenticaciÃn non à vÃlida"
+msgid ""
+"If you proceed, the account information and\n"
+"all proxy information will be deleted permanently."
+msgstr ""
+"Se continÃa, a informaciÃn da conta e toda a\n"
+"informaciÃn do proxy eliminarase permanentemente."
 
 #: ../mail/mail.error.xml.h:84
-msgid "Mail Deletion Failed"
-msgstr "Produciuse un fallo na eliminaciÃn do correo"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr ""
+"Està seguro de que desexa desactivar esta conta e eliminar todos os seus "
+"proxies?"
 
 #: ../mail/mail.error.xml.h:85
-msgid "Mail filters automatically updated."
-msgstr "Filtros de correo actualizados automaticamente."
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr "Se continÃa, as contas proxy eliminaranse permanentemente."
 
 #: ../mail/mail.error.xml.h:86
-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 ""
-"Moitos sistemas de correo engaden unha cabeceira ÂApparently-To Ãs mensaxes "
-"que sà teÃen destinatarios Cco. Esta cabeceira, se se engade, mostrarà todos "
-"os destinatarios na sÃa mensaxe. Para evitar isto deberÃa engadir polo menos "
-"un destinatario ÂPara:Â ou ÂCC:Â."
+msgid "Do _Not Disable"
+msgstr "_Non desactivar"
 
 #: ../mail/mail.error.xml.h:87
-msgid ""
-"Messages shown in Search Folders are not copies. Deleting them from a Search "
-"Folder will delete the actual messages from the folder or folders in which "
-"they physically reside. Do you really want to delete these messages?"
-msgstr ""
-"As mensaxes mostradas nos cartafoles de busca non son copias. Se os borra do "
-"cartafol de busca borraranse do cartafol ou cartafoles nos que estea "
-"fisicamente.\n"
-"Està seguro de que desexa facer isto?"
+#: ../plugins/publish-calendar/publish-calendar.c:611
+msgid "_Disable"
+msgstr "_Desactivar"
 
 #: ../mail/mail.error.xml.h:88
-msgid "Missing folder."
-msgstr "Falta o cartafol."
+msgid "Could not save signature file."
+msgstr "Non foi posÃbel gardar o ficheiro da sinatura."
+
+#: ../mail/mail.error.xml.h:89
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Non à posÃbel estabelecer o script de sinatura Â{0}Â."
 
 #: ../mail/mail.error.xml.h:90
-msgid "N_ever"
-msgstr "N_unca"
+msgid "The script file must exist and be executable."
+msgstr "O ficheiro do script debe existir e ser executÃbel."
 
 #: ../mail/mail.error.xml.h:91
-msgid "No duplicate messages found."
-msgstr "Non se atoparon mensaxes duplicadas."
+msgid "Do you wish to save your changes?"
+msgstr "Desexa gardar as modificaciÃns?"
 
 #: ../mail/mail.error.xml.h:92
-msgid "No sources selected."
-msgstr "Non se seleccionou ningunha fonte."
+msgid "This signature has been changed, but has not been saved."
+msgstr "Modificouse esta sinatura pero non se gardou."
 
 #: ../mail/mail.error.xml.h:93
-msgid "Opening too many messages at once may take a long time."
-msgstr "Abrir demasiadas mensaxes à vez pode levar moito tempo."
+msgid "_Discard changes"
+msgstr "_Rexeitar as modificaciÃns"
 
 #: ../mail/mail.error.xml.h:94
-msgid "Please check your account settings and try again."
-msgstr "Comprobe os axustes da conta e tÃnteo outra vez."
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "Non à posÃbel editar o cartafol de busca Â{0} porque non existe."
 
 #: ../mail/mail.error.xml.h:95
-msgid "Please enable the account or send using another account."
-msgstr "Active a conta ou faga o envÃo usando outra conta."
-
-#: ../mail/mail.error.xml.h:96
 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."
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
-"Introduza un enderezo de correo correcto no campo ÂPara:Â. Pode buscar "
-"enderezos de correo premendo no botÃn ÂPara:Â ao lado da caixa da entrada."
+"Ã posÃbel que este cartafol se engadise implicitamente,\n"
+"se à necesario, vaia ao editor de cartafoles de busca para engadilo "
+"explicitamente."
 
 #: ../mail/mail.error.xml.h:97
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
-"{0}"
-msgstr ""
-"AsegÃrese de que os seguintes destinatarios desexan e poden recibir mensaxes "
-"HTML:\n"
-"{0}"
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "Non à posÃbel engadir o cartafol de busca Â{0}Â."
+
+#: ../mail/mail.error.xml.h:98
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "Xa existe un cartafol co nome Â{0}Â. Use un nome diferente."
 
 #: ../mail/mail.error.xml.h:99
-msgid "Please provide an unique name to identify this signature."
-msgstr "Introduza un nome Ãnico para identificar esta sinatura."
+msgid "Search Folders automatically updated."
+msgstr "Os cartafoles de busca actualizÃronse automaticamente."
 
 #: ../mail/mail.error.xml.h:100
-msgid "Please wait."
-msgstr "Agarde."
+msgid "Mail filters automatically updated."
+msgstr "Filtros de correo actualizados automaticamente."
 
 #: ../mail/mail.error.xml.h:101
-msgid "Problem migrating old mail folder \"{0}\"."
-msgstr "Produciuse un problema ao migrar o cartafol de correo antigo Â{0}Â."
+msgid "Missing folder."
+msgstr "Falta o cartafol."
 
 #: ../mail/mail.error.xml.h:102
-msgid "Querying server for a list of supported authentication mechanisms."
-msgstr ""
-"Estase solicitando do servidor unha lista de mecanismos de autenticaciÃn "
-"compatÃbeis."
-
-#: ../mail/mail.error.xml.h:103
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr ""
-"Està seguro de que desexa eliminar o cartafol Â{0} e todos os seus "
-"subcartafoles?"
+msgid "You must specify a folder."
+msgstr "Debe indicar un cartafol."
 
 #: ../mail/mail.error.xml.h:104
-msgid "Really delete folder \"{0}\"?"
-msgstr "Desexa confirmar o borrado do cartafol Â{0}Â?"
+msgid "You must name this Search Folder."
+msgstr "Debe dar un nome a este cartafol de busca."
 
 #: ../mail/mail.error.xml.h:105
-msgid "Remove duplicate messages?"
-msgstr "Desexa eliminar as mensaxes duplicadas?"
+msgid "No sources selected."
+msgstr "Non se seleccionou ningunha fonte."
 
 #: ../mail/mail.error.xml.h:106
-msgid "Reply _Privately"
-msgstr "Responder de forma _privada"
-
-#: ../mail/mail.error.xml.h:109
-msgid "Search Folders automatically updated."
-msgstr "Os cartafoles de busca actualizÃronse automaticamente."
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
+msgstr ""
+"Debe indicar polo menos un cartafol como fonte.\n"
+"FÃgao seleccionando os cartafoles individualmente, ou seleccionando todos os "
+"cartafoles locais, todos os cartafoles remotos ou ambos."
 
-#: ../mail/mail.error.xml.h:110
-msgid "Send private reply?"
-msgstr "Desexa enviar unha resposta privada?"
+#: ../mail/mail.error.xml.h:108
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "Produciuse un problema ao migrar o cartafol de correo antigo Â{0}Â."
 
-#: ../mail/mail.error.xml.h:111
-msgid "Send reply to all recipients?"
-msgstr "Desexa enviar unha resposta a todos os destinatarios?"
+#: ../mail/mail.error.xml.h:109
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
+msgstr ""
+"Xa existe un cartafol non baleiro en Â{1}Â.\n"
+"\n"
+"Pode escoller entre ignorar este cartafol, sobrescribilo, anexar os seus "
+"contidos ou saÃr."
 
 #: ../mail/mail.error.xml.h:112
-msgid "Signature Already Exists"
-msgstr "A sinatura xa existe"
-
-#: ../mail/mail.error.xml.h:113
-msgid "Synchronize folders locally for offline usage?"
-msgstr "Desxa sincronizar os cartafoles localmente para o uso sen conexiÃn?"
+msgid "Ignore"
+msgstr "Ignorar"
 
 #: ../mail/mail.error.xml.h:114
-msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
-msgstr ""
-"O Evolution precisa os cartafoles do sistema para funcionar correctamente e "
-"non à posÃbel renomealos, movelos ou eliminalos."
+msgid "_Append"
+msgstr "_Anexar"
 
 #: ../mail/mail.error.xml.h:115
-msgid ""
-"The attachment named {0} is a hidden file and may contain sensitive data. "
-"Please review it before sending."
-msgstr ""
-"O anexo co nome {0} Ã un ficheiro oculto e pode conter datos sensÃbeis. "
-"RevÃseo antes de envialo."
+msgid "Evolution's local mail format has changed."
+msgstr "O formato de correo electrÃnico local de Evolution cambiou."
 
 #: ../mail/mail.error.xml.h:116
 msgid ""
-"The contact list you are sending to is configured to hide list recipients.\n"
+"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"mail must be migrated to the new format before Evolution can proceed. Do you "
+"want to migrate now?\n"
 "\n"
-"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. "
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
 msgstr ""
-"A lista de contactos que està enviando està configurada para ocultar os "
-"destinatarios\n"
+"O formato de almacenamento local predeterminado foi cambiado do formato mbox "
+"a maildir. O seu correo electrÃnico local debe ser migrado ao novo formato "
+"antes de que Evolution poida seguir. Desexa facer a migraciÃn agora?\n"
 "\n"
-"Moitos sistemas de correo engaden unha cabeceira ÂApparently-To Ãs mensaxes "
-"que sà teÃen destinatarios Cco. Esta cabeceira mostrarà todos os "
-"destinatarios da sÃa mensaxe. Para evitar isto, deberÃa engadir polo menos "
-"un destinatario a ÂPara:Â ou ÂCc:Â. "
+"Crearase unha conta mbox para conservar os cartafoles mbox antigos. Pode "
+"eliminala despois de asegurarse que a migraciÃn se fixo de forma correcta. "
+"Se escolle a migraciÃn comprobe con anterioridade que haxa suficiente espazo "
+"libre no seu disco."
 
 #: ../mail/mail.error.xml.h:119
-msgid ""
-"The following recipient was not recognized as a valid mail address:\n"
-"{0}"
-msgstr ""
-"O seguinte destinatario non foi recoÃecido como un enderezo de correo "
-"electrÃnico correcto:\n"
-"{0}"
+msgid "_Exit Evolution"
+msgstr "_SaÃr do Evolution"
+
+#: ../mail/mail.error.xml.h:120
+msgid "_Migrate Now"
+msgstr "_Migrar agora"
 
 #: ../mail/mail.error.xml.h:121
+msgid "Unable to read license file."
+msgstr "Non à posÃbel ler o ficheiro da licenza."
+
+#: ../mail/mail.error.xml.h:122
 msgid ""
-"The following recipients were not recognized as valid mail addresses:\n"
-"{0}"
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
 msgstr ""
-"Os seguintes destinatarios non foron recoÃecidos como enderezos de correo "
-"electrÃnico correctos:\n"
-"{0}"
+"Non à posÃbel ler o ficheiro de licenza Â{0} debido a un problema de "
+"instalaciÃn. Non poderà usar este provedor atà que acepte a sÃa licenza."
+
+#: ../mail/mail.error.xml.h:123
+msgid "Please wait."
+msgstr "Agarde."
 
 #: ../mail/mail.error.xml.h:124
-msgid "The script file must exist and be executable."
-msgstr "O ficheiro do script debe existir e ser executÃbel."
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr ""
+"Estase solicitando do servidor unha lista de mecanismos de autenticaciÃn "
+"compatÃbeis."
 
 #: ../mail/mail.error.xml.h:125
-msgid "These messages are not copies."
-msgstr "Estes mensaxes non son copias."
-
-#: ../mail/mail.error.xml.h:126
 msgid ""
-"This folder may have been added implicitly,\n"
-"go to the Search Folder editor to add it explicitly, if required."
+"Failed to query server for a list of supported authentication mechanisms."
 msgstr ""
-"Ã posÃbel que este cartafol se engadise implicitamente,\n"
-"se à necesario, vaia ao editor de cartafoles de busca para engadilo "
-"explicitamente."
+"Produciuse un fallo ao solicitar a lista de mecanismos de autenticaciÃn "
+"admitidos polo servidor."
+
+#: ../mail/mail.error.xml.h:126
+msgid "Unable to connect to the GroupWise server."
+msgstr "Non foi posÃbel conectar co servidor GroupWise."
+
+#: ../mail/mail.error.xml.h:127
+msgid "Please check your account settings and try again."
+msgstr "Comprobe os axustes da conta e tÃnteo outra vez."
 
 #: ../mail/mail.error.xml.h:128
-msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
-msgstr ""
-"Non à posÃbel enviar esta mensaxe porque a conta que escolleu para enviala "
-"non està activada"
+msgid "Synchronize folders locally for offline usage?"
+msgstr "Desxa sincronizar os cartafoles localmente para o uso sen conexiÃn?"
 
 #: ../mail/mail.error.xml.h:129
 msgid ""
-"This message cannot be sent because you have not specified any recipients"
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
 msgstr ""
-"Non à posÃbel enviar esta mensaxe porque non indicou ningÃn destinatario"
+"Desexa sincronizar localmente os cartafoles que estÃn marcados para o uso "
+"sen conexiÃn?"
 
 #: ../mail/mail.error.xml.h:130
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"Este servidor non à compatÃbel con este tipo de autenticaciÃn e quizais non "
-"permita ningÃn tipo de autenticaciÃn."
+msgid "Do _Not Synchronize"
+msgstr "_Non sincronizar"
 
 #: ../mail/mail.error.xml.h:131
-msgid "This signature has been changed, but has not been saved."
-msgstr "Modificouse esta sinatura pero non se gardou."
+msgid "_Synchronize"
+msgstr "_Sincronizar"
 
 #: ../mail/mail.error.xml.h:132
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
-msgstr ""
-"Isto marcarà todas as mensaxes como lidas no cartafol seleccionado e nos "
-"seus subcartafoles."
+msgid "Do you want to mark all messages as read?"
+msgstr "Desexa marcar todas as mensaxes como lidas?"
 
 #: ../mail/mail.error.xml.h:133
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Isto marcarà todas as mensaxes como lidas no cartafol seleccionado."
 
 #: ../mail/mail.error.xml.h:134
-msgid "Unable to connect to the GroupWise server."
-msgstr "Non foi posÃbel conectar co servidor GroupWise."
-
-#: ../mail/mail.error.xml.h:135
 msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
 msgstr ""
-"Non à posÃbel abrir o cartafol de borradores desta conta. Desexa usar no seu "
-"lugar o cartafol de borradores do sistema?"
+"Isto marcarà todas as mensaxes como lidas no cartafol seleccionado e nos "
+"seus subcartafoles."
+
+#: ../mail/mail.error.xml.h:135
+msgid "Close message window."
+msgstr "Pechar a xanela da mensaxe."
 
 #: ../mail/mail.error.xml.h:136
-msgid "Unable to read license file."
-msgstr "Non à posÃbel ler o ficheiro da licenza."
+msgid "Would you like to close the message window?"
+msgstr "Desexa pechar a xanela da mensaxe?"
 
 #: ../mail/mail.error.xml.h:137
-msgid "Unable to retrieve message."
-msgstr "Non foi posÃbel obter a mensaxe."
+msgid "_Yes"
+msgstr "_Si"
 
 #: ../mail/mail.error.xml.h:138
-msgid "Use _Default"
-msgstr "Usar o pre_definido"
+msgid "_No"
+msgstr "_Non"
 
 #: ../mail/mail.error.xml.h:139
-msgid "Use default drafts folder?"
-msgstr "Desexa usar o cartafol de borradores predeterminado?"
+msgid "_Always"
+msgstr "_Sempre"
 
 #: ../mail/mail.error.xml.h:140
-msgid "Would you like to close the message window?"
-msgstr "Desexa pechar a xanela da mensaxe?"
+msgid "N_ever"
+msgstr "N_unca"
 
 #: ../mail/mail.error.xml.h:141
-msgid ""
-"You are replying privately to a message which arrived via a mailing list, "
-"but the list is trying to redirect your reply to go back to the list. Are "
-"you sure you want to proceed?"
-msgstr ""
-"Està respondendo de forma privada a un correo electrÃnico que chegou "
-"mediante unha lista de correo, pero a lista està tentando redireccionar a "
-"sÃa resposta de novo à lista. Està seguro que desexa continuar?"
+msgid "Signature Already Exists"
+msgstr "A sinatura xa existe"
 
 #: ../mail/mail.error.xml.h:142
 msgid ""
-"You are replying to a message which arrived via a mailing list, but you are "
-"replying privately to the sender; not to the list. Are you sure you want to "
-"proceed?"
-msgstr ""
-"Està respondendo a un correo electrÃnico que chegou mediante unha lista de "
-"correo, pero està respondendo de forma privada ao remitente, non à lista. "
-"Està seguro que desexa continuar?"
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr "Xa existe unha sinatura co nome Â{0}Â. Use un nome diferente."
 
 #: ../mail/mail.error.xml.h:143
-msgid ""
-"You are replying to a message which was sent to many recipients. Are you "
-"sure you want to reply to ALL of them?"
-msgstr ""
-"Està respondendo a un correo electrÃnico que se enviou a moitos "
-"destinatarios. Està seguro que desexa responder a TODOS eles?"
+msgid "Blank Signature"
+msgstr "Sinatura en branco"
 
 #: ../mail/mail.error.xml.h:144
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "Non ten os permisos suficientes para eliminar este correo."
+msgid "Please provide an unique name to identify this signature."
+msgstr "Introduza un nome Ãnico para identificar esta sinatura."
 
-#: ../mail/mail.error.xml.h:145
-msgid "You have not filled in all of the required information."
-msgstr "Non encheu toda a informaciÃn requirida."
+#: ../mail/mail.error.xml.h:145
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr ""
+"Non à posÃbel enviar esta mensaxe porque a conta que escolleu para enviala "
+"non està activada"
 
 #: ../mail/mail.error.xml.h:146
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Ten mensaxes sen enviar. Desexa saÃr de todas formas?"
+msgid "Please enable the account or send using another account."
+msgstr "Active a conta ou faga o envÃo usando outra conta."
 
 #: ../mail/mail.error.xml.h:147
-msgid "You may not create two accounts with the same name."
-msgstr "Non pode crear dÃas contas co mesmo nome."
+msgid "Mail Deletion Failed"
+msgstr "Produciuse un fallo na eliminaciÃn do correo"
 
 #: ../mail/mail.error.xml.h:148
-msgid "You must name this Search Folder."
-msgstr "Debe dar un nome a este cartafol de busca."
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "Non ten os permisos suficientes para eliminar este correo."
 
 #: ../mail/mail.error.xml.h:149
-msgid "You must specify a folder."
-msgstr "Debe indicar un cartafol."
+msgid "\"Check Junk\" Failed"
+msgstr "Produciuse un fallo na comprobaciÃn do correo lixo"
 
 #: ../mail/mail.error.xml.h:150
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local "
-"folders, all remote folders, or both."
-msgstr ""
-"Debe indicar polo menos un cartafol como fonte.\n"
-"FÃgao seleccionando os cartafoles individualmente, ou seleccionando todos os "
-"cartafoles locais, todos os cartafoles remotos ou ambos."
+msgid "\"Report Junk\" Failed"
+msgstr "Produciuse un fallo ao informar do correo lixo"
+
+#: ../mail/mail.error.xml.h:151
+msgid "\"Report Not Junk\" Failed"
+msgstr "Produciuse un fallo ao informar do que non à correo lixo"
 
 #: ../mail/mail.error.xml.h:152
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Produciuse un fallo ao iniciar a sesiÃn no servidor Â{0}Â como Â{0}Â."
+msgid "Remove duplicate messages?"
+msgstr "Desexa eliminar as mensaxes duplicadas?"
 
 #: ../mail/mail.error.xml.h:153
-msgid "_Always"
-msgstr "_Sempre"
-
-#: ../mail/mail.error.xml.h:154
-msgid "_Append"
-msgstr "_Anexar"
+msgid "No duplicate messages found."
+msgstr "Non se atoparon mensaxes duplicadas."
 
+#. Translators: {0} is replaced with a folder name
 #: ../mail/mail.error.xml.h:155
-#: ../plugins/publish-calendar/publish-calendar.c:611
-msgid "_Disable"
-msgstr "_Desactivar"
+msgid "Folder '{0}' doesn't contain any duplicate message."
+msgstr "O cartafol Â{0}Â non contÃn ningunha mensaxe duplicada."
 
 #: ../mail/mail.error.xml.h:156
-msgid "_Discard changes"
-msgstr "_Rexeitar as modificaciÃns"
-
-#: ../mail/mail.error.xml.h:157
-#: ../modules/mail/e-mail-shell-view-actions.c:1109
-msgid "_Empty Trash"
-msgstr "_Baleirar o lixo"
+msgid "Failed to unsubscribe from folder."
+msgstr "Produciuse un fallo ao eliminar a subscriciÃn do cartafol."
 
 #: ../mail/mail.error.xml.h:158
-msgid "_Exit Evolution"
-msgstr "_SaÃr do Evolution"
+msgid "Unable to retrieve message."
+msgstr "Non foi posÃbel obter a mensaxe."
 
 #: ../mail/mail.error.xml.h:159
-msgid "_Expunge"
-msgstr "_Compactar"
+msgid "{0}"
+msgstr "{0}"
 
 #: ../mail/mail.error.xml.h:160
-msgid "_Migrate Now"
-msgstr "_Migrar agora"
+msgid "Failed to open folder."
+msgstr "Produciuse un erro ao abrir o cartafol."
 
 #: ../mail/mail.error.xml.h:161
-msgid "_No"
-msgstr "_Non"
+msgid "Failed to find duplicate messages."
+msgstr "Produciuse un fallo ao buscar as mensaxes duplicadas."
 
 #: ../mail/mail.error.xml.h:162
-msgid "_Open Messages"
-msgstr "_Abrir as mensaxes"
+msgid "Failed to retrieve messages."
+msgstr "Produciuse un fallo ao obter as mensaxes."
+
+#: ../mail/mail.error.xml.h:163
+msgid "Failed to remove attachments from messages."
+msgstr "Produciuse un fallo ao quitar os anexos das mensaxes."
+
+#: ../mail/mail.error.xml.h:164
+msgid "Failed to download messages for offline viewing."
+msgstr ""
+"Produciuse un fallo ao descargar as mensaxes para traballar sen conexiÃn"
 
 #: ../mail/mail.error.xml.h:165
-msgid "_Synchronize"
-msgstr "_Sincronizar"
+msgid "Failed to save messages to disk."
+msgstr "Produciuse un fallo ao gardar as mensaxes ao disco."
 
 #: ../mail/mail.error.xml.h:166
-msgid "_Yes"
-msgstr "_Si"
+msgid "Hidden file is attached."
+msgstr "Existe un ficheiro oculto adxunto."
 
 #: ../mail/mail.error.xml.h:167
-msgid "{0}"
-msgstr "{0}"
+msgid ""
+"The attachment named {0} is a hidden file and may contain sensitive data. "
+"Please review it before sending."
+msgstr ""
+"O anexo co nome {0} Ã un ficheiro oculto e pode conter datos sensÃbeis. "
+"RevÃseo antes de envialo."
 
-#: ../mail/mail-folder-cache.c:883
+#: ../mail/mail-folder-cache.c:885
 #, c-format
 msgid "Pinging %s"
 msgstr "Facendo ping a %s"
@@ -14783,90 +14795,90 @@ msgstr "Filtrando as mensaxes seleccionadas"
 msgid "Fetching Mail"
 msgstr "Recibindo o correo"
 
-#: ../mail/mail-ops.c:858
+#: ../mail/mail-ops.c:821
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: ../mail/mail-ops.c:906
+#: ../mail/mail-ops.c:869
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Produciuse un fallo ao enviar %d de %d mensaxes"
 
-#: ../mail/mail-ops.c:910 ../mail/mail-send-recv.c:846
+#: ../mail/mail-ops.c:873 ../mail/mail-send-recv.c:872
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:912 ../mail/mail-send-recv.c:848
+#: ../mail/mail-ops.c:875 ../mail/mail-send-recv.c:874
 msgid "Complete."
 msgstr "Completado."
 
-#: ../mail/mail-ops.c:1027
+#: ../mail/mail-ops.c:987
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Movendo as mensaxes a Â%sÂ"
 
-#: ../mail/mail-ops.c:1028
+#: ../mail/mail-ops.c:988
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copiando as mensaxes a Â%sÂ"
 
-#: ../mail/mail-ops.c:1146
+#: ../mail/mail-ops.c:1105
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gardando o cartafol Â%sÂ"
 
-#: ../mail/mail-ops.c:1222
+#: ../mail/mail-ops.c:1178
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expurgando e gardando a conta Â%sÂ"
 
-#: ../mail/mail-ops.c:1223
+#: ../mail/mail-ops.c:1179
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Gardando a conta Â%sÂ"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1241
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Actualizando o cartafol Â%sÂ"
 
-#: ../mail/mail-ops.c:1494
+#: ../mail/mail-ops.c:1457
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Expurgando o cartafol Â%sÂ"
 
-#: ../mail/mail-ops.c:1585
+#: ../mail/mail-ops.c:1550
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Baleirando o lixo de Â%sÂ"
 
-#: ../mail/mail-ops.c:1687
+#: ../mail/mail-ops.c:1646
 #, c-format
 msgid "Disconnecting %s"
 msgstr "Desconectando %s"
 
-#: ../mail/mail-send-recv.c:201
+#: ../mail/mail-send-recv.c:200
 msgid "Canceling..."
 msgstr "Cancelandoâ"
 
-#: ../mail/mail-send-recv.c:457
+#: ../mail/mail-send-recv.c:523
 msgid "Send & Receive Mail"
 msgstr "Enviar e recibir o correo"
 
-#: ../mail/mail-send-recv.c:477
+#: ../mail/mail-send-recv.c:539
 msgid "Cancel _All"
 msgstr "Cancel_ar todo"
 
-#: ../mail/mail-send-recv.c:601 ../mail/mail-send-recv.c:994
+#: ../mail/mail-send-recv.c:639 ../mail/mail-send-recv.c:1016
 msgid "Updating..."
 msgstr "Actualizandoâ"
 
-#: ../mail/mail-send-recv.c:601 ../mail/mail-send-recv.c:696
+#: ../mail/mail-send-recv.c:639 ../mail/mail-send-recv.c:725
 msgid "Waiting..."
 msgstr "Agardandoâ"
 
-#: ../mail/mail-send-recv.c:973
+#: ../mail/mail-send-recv.c:996
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando se hai correo novo"
@@ -14890,12 +14902,12 @@ msgstr "Mensaxe reencamiÃada - %s"
 msgid "Forwarded message"
 msgstr "Mensaxe reencamiÃada"
 
-#: ../mail/mail-vfolder.c:82
+#: ../mail/mail-vfolder.c:79
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Configurando o cartafol de busca: %s"
 
-#: ../mail/mail-vfolder.c:222
+#: ../mail/mail-vfolder.c:216
 #, c-format
 msgid "Updating Search Folders for '%s' : %s"
 msgstr "Actualizando os cartafoles de busca para Â%s : %s"
@@ -14905,7 +14917,7 @@ msgstr "Actualizando os cartafoles de busca para Â%s : %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:556
+#: ../mail/mail-vfolder.c:559
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -14923,102 +14935,102 @@ msgstr[1] ""
 "Â%s modificÃronse debido a que se eliminou o cartafol\n"
 "Â%sÂ."
 
-#: ../mail/mail-vfolder.c:1191
+#: ../mail/mail-vfolder.c:1179
 msgid "Edit Search Folder"
 msgstr "Editar o cartafol de busca"
 
-#: ../mail/mail-vfolder.c:1294
+#: ../mail/mail-vfolder.c:1284
 msgid "New Search Folder"
 msgstr "Novo cartafol de busca"
 
-#: ../mail/message-list.c:1273
+#: ../mail/message-list.c:1269
 msgid "Unseen"
 msgstr "Sen ler"
 
-#: ../mail/message-list.c:1274
+#: ../mail/message-list.c:1270
 msgid "Seen"
 msgstr "Lida"
 
-#: ../mail/message-list.c:1275
+#: ../mail/message-list.c:1271
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1276
+#: ../mail/message-list.c:1272
 msgid "Forwarded"
 msgstr "ReencamiÃada"
 
-#: ../mail/message-list.c:1277
+#: ../mail/message-list.c:1273
 msgid "Multiple Unseen Messages"
 msgstr "MÃltiples mensaxes sen ler"
 
-#: ../mail/message-list.c:1278
+#: ../mail/message-list.c:1274
 msgid "Multiple Messages"
 msgstr "MÃltiples mensaxes"
 
-#: ../mail/message-list.c:1282
+#: ../mail/message-list.c:1278
 msgid "Lowest"
 msgstr "A mÃis baixa"
 
-#: ../mail/message-list.c:1283
+#: ../mail/message-list.c:1279
 msgid "Lower"
 msgstr "Inferior"
 
-#: ../mail/message-list.c:1287
+#: ../mail/message-list.c:1283
 msgid "Higher"
 msgstr "Superior"
 
-#: ../mail/message-list.c:1288
+#: ../mail/message-list.c:1284
 msgid "Highest"
 msgstr "A mÃis alta"
 
-#: ../mail/message-list.c:1921 ../widgets/table/e-cell-date.c:51
+#: ../mail/message-list.c:1901 ../widgets/table/e-cell-date.c:51
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1928 ../plugins/itip-formatter/itip-view.c:204
+#: ../mail/message-list.c:1908 ../plugins/itip-formatter/itip-view.c:204
 msgid "Today %l:%M %p"
 msgstr "Hoxe Ãs %l:%M %p"
 
-#: ../mail/message-list.c:1937
+#: ../mail/message-list.c:1917
 msgid "Yesterday %l:%M %p"
 msgstr "Onte Ãs %l:%M %p"
 
 # (pofilter) variables: do not translate: %a, %l, %p
-#: ../mail/message-list.c:1949
+#: ../mail/message-list.c:1929
 msgid "%a %l:%M %p"
 msgstr "O %a Ãs %l:%M %p"
 
 # (pofilter) variables: do not translate: %b, %l, %p
-#: ../mail/message-list.c:1957
+#: ../mail/message-list.c:1937
 msgid "%b %d %l:%M %p"
 msgstr "O %b %d Ãs %l:%M %p"
 
 # (pofilter) variables: do not translate: %b
-#: ../mail/message-list.c:1959
+#: ../mail/message-list.c:1939
 msgid "%b %d %Y"
 msgstr "O %b %d de %Y"
 
-#: ../mail/message-list.c:2766
+#: ../mail/message-list.c:2738
 msgid "Select all visible messages"
 msgstr "Seleccionar todas as mensaxes visÃbeis"
 
-#: ../mail/message-list.c:2902 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2874 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Mensaxes"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4115
+#: ../mail/message-list.c:4087
 msgid "Follow-up"
 msgstr "Seguimento"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4630 ../mail/message-list.c:5050
+#: ../mail/message-list.c:4624 ../mail/message-list.c:5044
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
-#: ../mail/message-list.c:4867
+#: ../mail/message-list.c:4861
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15026,71 +15038,71 @@ msgstr ""
 "Non hai mensaxes que satisfagan os seus criterios de busca. Limpe a busca no "
 "menà Buscar->Limpar ou cÃmbiea."
 
-#: ../mail/message-list.c:4869
+#: ../mail/message-list.c:4863
 msgid "There are no messages in this folder."
 msgstr "Non hai mensaxes neste cartafol."
 
-#: ../mail/message-list.etspec.h:3
-msgid "Due By"
-msgstr "Vencemento por"
+#: ../mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr "Marcada"
+
+#: ../mail/message-list.etspec.h:8
+msgid "Received"
+msgstr "Recibido"
+
+#: ../mail/message-list.etspec.h:10
+#: ../widgets/misc/e-attachment-tree-view.c:572
+msgid "Size"
+msgstr "TamaÃo"
 
-#: ../mail/message-list.etspec.h:4
+#: ../mail/message-list.etspec.h:11
 msgid "Flag Status"
 msgstr "Estado das marcas"
 
-#: ../mail/message-list.etspec.h:5
-msgid "Flagged"
-msgstr "Marcada"
-
-#: ../mail/message-list.etspec.h:6
+#: ../mail/message-list.etspec.h:12
 msgid "Follow Up Flag"
 msgstr "Marca de seguimento"
 
-#: ../mail/message-list.etspec.h:11
-msgid "Received"
-msgstr "Recibido"
+#: ../mail/message-list.etspec.h:13
+msgid "Due By"
+msgstr "Vencemento por"
 
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:18
 msgid "Sent Messages"
 msgstr "Mensaxes enviadas"
 
-#: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:572
-msgid "Size"
-msgstr "TamaÃo"
-
-#: ../mail/message-list.etspec.h:19
+#: ../mail/message-list.etspec.h:20
 msgid "Subject - Trimmed"
 msgstr "Asunto - Recortado"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1549
-msgid "Body contains"
-msgstr "O corpo contÃn"
+msgid "Subject or Addresses contains"
+msgstr "O asunto ou os enderezos conteÃen"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1556
-msgid "Message contains"
-msgstr "A mensaxe contÃn"
-
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1563
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "Recipients contain"
 msgstr "Os destinatarios conteÃen"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1570
-msgid "Sender contains"
-msgstr "O remitente contÃn"
+#: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
+msgid "Message contains"
+msgstr "A mensaxe contÃn"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1577
+#: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1622
 msgid "Subject contains"
 msgstr "O asunto contÃn"
 
+#: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1615
+msgid "Sender contains"
+msgstr "O remitente contÃn"
+
 #: ../mail/searchtypes.xml.h:6
-msgid "Subject or Addresses contains"
-msgstr "O asunto ou os enderezos conteÃen"
+#: ../modules/mail/e-mail-shell-view-actions.c:1594
+msgid "Body contains"
+msgstr "O corpo contÃn"
 
 #: ../modules/addressbook/addressbook-config.c:204
 msgid ""
@@ -15163,7 +15175,7 @@ msgid "Server Information"
 msgstr "InformaciÃn do servidor"
 
 #: ../modules/addressbook/addressbook-config.c:1093
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Details"
 msgstr "InformaciÃn"
 
@@ -15184,15 +15196,15 @@ msgstr "Propiedades da axenda de enderezos"
 msgid "New Address Book"
 msgstr "Nova axenda de enderezos"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "EFolderList XML para a lista de completado dos URIs"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "EFolderList XML para a lista de completado dos URIs."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid ""
 "The UID of the selected (or \"primary\") address book in the sidebar of the "
 "\"Contacts\" view."
@@ -15200,7 +15212,11 @@ msgstr ""
 "O UID da axenda de enderezos seleccionada (ou a primaria) na barra lateral "
 "da vista de ÂContactosÂ."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
+msgid "Whether to show maps in preview pane."
+msgstr "Indica se se mostran os mapas no panel de vista previa."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:22
 msgid ""
 "Whether addresses should be formatted according to standard in their "
 "destination country."
@@ -15208,13 +15224,9 @@ msgstr ""
 "Indica se se deben formatar os enderezos segundo o estÃndar do paÃs de "
 "destino."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:21
-msgid "Whether to show maps in preview pane."
-msgstr "Indica se se mostran os mapas no panel de vista previa."
-
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:194
-#: ../modules/mail/em-mailer-prefs.c:1047
+#: ../modules/mail/em-mailer-prefs.c:1046
 msgid "_Table column:"
 msgstr "Columna da _tÃboa:"
 
@@ -15358,7 +15370,7 @@ msgstr ""
 #: ../modules/calendar/e-cal-shell-view-actions.c:1405
 #: ../modules/calendar/e-memo-shell-view-actions.c:640
 #: ../modules/calendar/e-task-shell-view-actions.c:764
-#: ../modules/mail/e-mail-shell-view-actions.c:1186
+#: ../modules/mail/e-mail-shell-view-actions.c:1231
 msgid "_Rename..."
 msgstr "_Renomearâ"
 
@@ -15439,7 +15451,7 @@ msgstr "_AcciÃns"
 #: ../modules/addressbook/e-book-shell-view-actions.c:944
 #: ../modules/calendar/e-memo-shell-view-actions.c:677
 #: ../modules/calendar/e-task-shell-view-actions.c:829
-#: ../modules/mail/e-mail-shell-view-actions.c:1344
+#: ../modules/mail/e-mail-shell-view-actions.c:1389
 msgid "_Preview"
 msgstr "Vista _previa"
 
@@ -15477,7 +15489,7 @@ msgstr "Mostrar mapas na xanela de vista previa de contactos"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1022
 #: ../modules/calendar/e-memo-shell-view-actions.c:747
 #: ../modules/calendar/e-task-shell-view-actions.c:911
-#: ../modules/mail/e-mail-shell-view-actions.c:1459
+#: ../modules/mail/e-mail-shell-view-actions.c:1504
 msgid "_Classic View"
 msgstr "Vista _clÃsica"
 
@@ -15488,7 +15500,7 @@ msgstr "Mostrar a vista previa do contacto embaixo da lista de contactos"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1029
 #: ../modules/calendar/e-memo-shell-view-actions.c:754
 #: ../modules/calendar/e-task-shell-view-actions.c:918
-#: ../modules/mail/e-mail-shell-view-actions.c:1466
+#: ../modules/mail/e-mail-shell-view-actions.c:1511
 msgid "_Vertical View"
 msgstr "Vista _vertical"
 
@@ -15514,7 +15526,7 @@ msgstr "Sen coincidencias"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1727
 #: ../modules/calendar/e-memo-shell-view-actions.c:781
 #: ../modules/calendar/e-task-shell-view-actions.c:980
-#: ../modules/mail/e-mail-shell-view-actions.c:1542
+#: ../modules/mail/e-mail-shell-view-actions.c:1587
 #: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "Busca avanzada"
@@ -15570,102 +15582,102 @@ msgstr "Enviar unha _mensaxe à lista"
 msgid "_Send Message to Contact"
 msgstr "Enviar unha _mensaxe ao contacto"
 
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "1"
-msgstr "1"
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
-msgid "5"
-msgstr "5"
-
-#: ../modules/addressbook/ldap-config.ui.h:5
 msgid "Anonymously"
 msgstr "Anonimamente"
 
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:7
-msgid "B_rowse this book until limit reached"
-msgstr "Examina_r esta axenda de enderezos atà alcanzar o lÃmite"
+#: ../modules/addressbook/ldap-config.ui.h:5
+msgid "Using email address"
+msgstr "Usando enderezo de correo"
 
-#: ../modules/addressbook/ldap-config.ui.h:8
-msgid "Lo_gin:"
-msgstr "_Iniciar a sesiÃn:"
+#: ../modules/addressbook/ldap-config.ui.h:6
+msgid "Using distinguished name (DN)"
+msgstr "Empregar o nome distintivo (DN)"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:11
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "One"
 msgstr "Un"
 
-#: ../modules/addressbook/ldap-config.ui.h:13
-msgid "S_earch filter:"
-msgstr "_Filtro de busca:"
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:10
+msgid "Sub"
+msgstr "Do"
+
+#: ../modules/addressbook/ldap-config.ui.h:11
+msgid "Supported Search Bases"
+msgstr "Bases de busca compatÃbeis"
 
 #: ../modules/addressbook/ldap-config.ui.h:14
-msgid "Search Filter"
-msgstr "Filtro de busca"
+msgid "Ser_ver:"
+msgstr "Ser_vidor:"
 
 #: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Search _base:"
-msgstr "_Base de busca:"
+msgid "Use secure _connection:"
+msgstr "Usar unha _conexiÃn segura:"
 
 #: ../modules/addressbook/ldap-config.ui.h:16
-msgid ""
-"Search filter is the type of object to be searched for. If this is not "
-"modified, the default search will be performed on the type \"person\"."
-msgstr ""
-"Filtro de busca à o tipo de obxecto que buscar. Se isto non se modifica, a "
-"busca predeterminada realizarase no tipo ÂpersoaÂ."
+msgid "_Login method:"
+msgstr "MÃtodo de _inicio de sesiÃn:"
 
 #: ../modules/addressbook/ldap-config.ui.h:17
-msgid "Ser_ver:"
-msgstr "Ser_vidor:"
+msgid "Lo_gin:"
+msgstr "_Iniciar a sesiÃn:"
+
+#: ../modules/addressbook/ldap-config.ui.h:18
+msgid "Search _base:"
+msgstr "_Base de busca:"
 
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
 #: ../modules/addressbook/ldap-config.ui.h:19
-msgid "Sub"
-msgstr "Do"
+msgid "_Search scope:"
+msgstr "Ãmbito da bu_sca:"
 
 #: ../modules/addressbook/ldap-config.ui.h:20
-msgid "Supported Search Bases"
-msgstr "Bases de busca compatÃbeis"
+msgid "_Find Possible Search Bases"
+msgstr "_Procurar as bases de busca posÃbeis"
+
+#: ../modules/addressbook/ldap-config.ui.h:21
+msgid "S_earch filter:"
+msgstr "_Filtro de busca:"
 
 #: ../modules/addressbook/ldap-config.ui.h:22
-msgid "Use secure _connection:"
-msgstr "Usar unha _conexiÃn segura:"
+msgid "Search Filter"
+msgstr "Filtro de busca"
 
 #: ../modules/addressbook/ldap-config.ui.h:23
-msgid "Using distinguished name (DN)"
-msgstr "Empregar o nome distintivo (DN)"
-
-#: ../modules/addressbook/ldap-config.ui.h:24
-msgid "Using email address"
-msgstr "Usando enderezo de correo"
+msgid ""
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
+msgstr ""
+"Filtro de busca à o tipo de obxecto que buscar. Se isto non se modifica, a "
+"busca predeterminada realizarase no tipo ÂpersoaÂ."
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:25
-msgid "_Download limit:"
-msgstr "LÃmite de _descarga:"
-
-#: ../modules/addressbook/ldap-config.ui.h:26
-msgid "_Find Possible Search Bases"
-msgstr "_Procurar as bases de busca posÃbeis"
+msgid "1"
+msgstr "1"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:27
-msgid "_Login method:"
-msgstr "MÃtodo de _inicio de sesiÃn:"
+msgid "5"
+msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:30
-msgid "_Search scope:"
-msgstr "Ãmbito da bu_sca:"
+msgid "cards"
+msgstr "tarxetas"
 
 #: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Timeout:"
 msgstr "_Tempo de espera:"
 
 #: ../modules/addressbook/ldap-config.ui.h:32
-msgid "cards"
-msgstr "tarxetas"
+msgid "_Download limit:"
+msgstr "LÃmite de _descarga:"
+
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../modules/addressbook/ldap-config.ui.h:34
+msgid "B_rowse this book until limit reached"
+msgstr "Examina_r esta axenda de enderezos atà alcanzar o lÃmite"
 
 #: ../modules/bogofilter/evolution-bogofilter.c:145
 #, c-format
@@ -15693,70 +15705,48 @@ msgstr "Converter o texto da mensaxe a _Unicode"
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "Cor de fondo para as tarefas que vencen hoxe, no formato Â#rrggbbÂ."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "Cor de fondo para as tarefas atrasadas, no formato Â#rrggbbÂ."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
-msgid "Calendars to run reminders for"
-msgstr "Os calendarios nos que se activarÃn os recordatorios"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
 msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr ""
-"Cor para debuxar a liÃa de Marcus Bains na barra de tempo (baleiro para a "
-"predeterminada)."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "Cor para debuxar a liÃa de Marcus Bains na vista diaria."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
-msgid "Days on which the start and end of work hours should be indicated."
-msgstr "DÃas nos que debe indicarse o inicio e fin das horas de traballo."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Free/busy server URLs"
-msgstr "Os URLs dos servidores de dispoÃibilidade"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
 msgstr ""
-"Hora do fin da xornada laboral, en formato de vinte e catro horas, de 0 a 23."
+"UID do calendario seleccionado ou primario na barra lateral da vista de "
+"ÂCalendariosÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
-msgid "If \"true\", show the memo preview pane in the main window."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
-"Se à verdadeiro, mÃstrase o panel de vista previa das notas na xanela "
-"principal."
+"Fuso horario predeterminado para usar nas datas e horas do calendario, como "
+"unha localizaciÃn sen traducir da base de datos de fusos horarios Olsen, p."
+"e:ÂAmerica/New YorkÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
-msgid "If \"true\", show the task preview pane in the main window."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr ""
-"Se à verdadeiro, mÃstrase o panel de vista previa de tarefas na xanela "
-"principal."
+"Usar o fuso horario do sistema en vez do fuso horario seleccionado no "
+"Evolution."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
-msgid "Intervals shown in Day and Work Week views, in minutes."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
 msgstr ""
-"Os intervalos de tempo mostrados nas vistas diaria e de semana laboral, en "
-"minutos."
+"Mostra os fusos horarios secundarios nunha vista diaria se està "
+"estabelecido. O valor à semellante ao usado na chave ÂtimezoneÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
 msgid "List of recently used second time zones in a Day View."
 msgstr ""
 "Lista dos fusos horarios secundarios usados recentemente cunha vista diaria."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
-msgid "List of server URLs for free/busy publishing."
-msgstr "Lista dos URLs do servidor para publicaciÃn de dispoÃibilidade."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+msgid "Maximum number of recently used timezones to remember."
+msgstr ""
+"O nÃmero mÃximo de fusos horarios usados recentemente que hai que recordar."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -15764,24 +15754,29 @@ msgstr ""
 "O nÃmero mÃximo de fusos horarios usados recentemente para recordar nunha "
 "lista 'day_second_zones'."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
-msgid "Maximum number of recently used timezones to remember."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
-"O nÃmero mÃximo de fusos horarios usados recentemente que hai que recordar."
+"Indica se se mostran as horas en formato de vinte e catro horas en vez de "
+"usar am/pm."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
-msgid "Number of units for determining a birthday or anniversary reminder."
-msgstr "NÃmero de unidades para determinar un aviso de aniversario."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgstr "O dÃa no que comeza a semana, desde o domingo (0) ata o sÃbado (6)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
-msgid "Number of units for determining a default reminder."
-msgstr "NÃmero de unidades para determinar un aviso predeterminado."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr ""
+"Hora do fin da xornada laboral, en formato de vinte e catro horas, de 0 a 23."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
-msgid "Number of units for determining when to hide tasks."
-msgstr "NÃmero de unidades para determinar cando ocultar as tarefas."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr ""
+"Os intervalos de tempo mostrados nas vistas diaria e de semana laboral, en "
+"minutos."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -15789,7 +15784,19 @@ msgstr ""
 "PosiciÃn do panel horizontal entre o navegador de datas do calendario e a "
 "lista de tarefas cando non està na vista mensual, en pÃxeles."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+msgid "Vertical pane position"
+msgstr "PosiciÃn vertical do panel"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+"PosiciÃn do panel vertical entre a vista, o navegador de datas do calendario "
+"e a lista de tarefas cando non està na vista mensual, en pÃxeles."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -15797,57 +15804,110 @@ msgstr ""
 "PosiciÃn do panel horizontal entre a visualizaciÃn, o navegador de datas do "
 "calendario e a lista de tarefas na vista mensual, en pÃxeles."
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"PosiciÃn do panel vertical entre a vista, o navegador de datas do calendario "
+"e a lista de tarefas na vista mensual, en pÃxeles."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr ""
+"PosiciÃn do panel vertical entre as listas do calendario e o navegador de "
+"datas do calendario."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+"O estilo da disposiciÃn determina onde dispoÃer o panel de vista previa en "
+"relaciÃn coa lista de notas. Â0Â (vista clÃsica) mostra o panel de vista "
+"previa embaixo da lista de notas. Â1Â (vista vertical) mostra o panel de "
+"vista previa ao lado da lista de notas."
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
-msgid "Position of the memo preview pane when oriented vertically."
+msgid "If \"true\", show the memo preview pane in the main window."
 msgstr ""
-"PosiciÃn do panel de vista previa de notas cando està orientado "
-"verticalmente."
+"Se à verdadeiro, mÃstrase o panel de vista previa das notas na xanela "
+"principal."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr ""
 "PosiciÃn do panel de vista previa de tarefas cando està orientado "
 "horizontalmente."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr ""
+"PosiciÃn do panel de vista previa de notas cando està orientado "
+"verticalmente."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+"O estilo de disposiciÃn determina onde dispoÃer o panel de vista previa en "
+"relaciÃn coa lista de tarefas. Â0Â (vista clÃsica) mostra o panel de vista "
+"previa embaixo da lista de tarefas. Â1Â (vista vertical) mostra o panel de "
+"vista previa ao lado da lista de tarefas."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr ""
+"Se à verdadeiro, mÃstrase o panel de vista previa de tarefas na xanela "
+"principal."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
 msgid "Position of the task preview pane when oriented vertically."
 msgstr ""
 "PosiciÃn do panel de vista previa de tarefas cando està orientado "
 "verticalmente."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
 msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
 msgstr ""
-"PosiciÃn do panel vertical entre as listas do calendario e o navegador de "
-"datas do calendario."
+"Indica se se comprimen as fins de semana na vista mensual. Isto pon o sÃbado "
+"e o domingo no mesmo espazo que un dÃa laborÃbel."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
+msgid "Whether to display the end time of events in the week and month views."
+msgstr ""
+"Indica se se mostra a hora de finalizaciÃn das actividades nas vistas "
+"semanais e mensuais."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr "DÃas nos que debe indicarse o inicio e fin das horas de traballo."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
 msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
-"PosiciÃn do panel vertical entre a vista, o navegador de datas do calendario "
-"e a lista de tarefas na vista mensual, en pÃxeles."
+"Indica se se debuxa a liÃa Marcus Bains (liÃa na hora actual) no calendario."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr "Cor para debuxar a liÃa de Marcus Bains na vista diaria."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
 msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
-"PosiciÃn do panel vertical entre a vista, o navegador de datas do calendario "
-"e a lista de tarefas cando non està na vista mensual, en pÃxeles."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
-msgid "Programs that are allowed to be run by reminders."
-msgstr "Programas que se poden executar desde os recordatorios"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
-msgid "Scroll Month View by a week"
-msgstr "Desprazar a vista mensual unha semana"
+"Cor para debuxar a liÃa de Marcus Bains na barra de tempo (baleiro para a "
+"predeterminada)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
 msgid "Show days with recurrent events in italic font in bottom left calendar."
 msgstr ""
 "Mostrar en cursiva os dÃas con actividades con repeticiÃns no calendario "
@@ -15855,29 +15915,13 @@ msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
 msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
-msgstr ""
-"Mostra os fusos horarios secundarios nunha vista diaria se està "
-"estabelecido. O valor à semellante ao usado na chave ÂtimezoneÂ."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view."
-msgstr ""
-"UID do calendario seleccionado ou primario na barra lateral da vista de "
-"ÂCalendariosÂ."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
-msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view."
 msgstr ""
 "UID da lista de notas seleccionada ou primaria da barra lateral da vista de "
 "ÂNotasÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
 msgid ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view."
@@ -15885,159 +15929,127 @@ msgstr ""
 "UID da lista de tarefas seleccionada ou primaria na barra lateral da vista "
 "de ÂTarefasÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
-#, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"Modelo URL para usar na recuperaciÃn de datos de dispoÃibilidade: %u "
-"substitÃese pola parte de usuario do enderezo de correo, e %d substitÃese "
-"polo dominio."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr "Indica se se ocultan as tarefas terminadas na vista de tarefas."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
 msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
-"Fuso horario predeterminado para usar nas datas e horas do calendario, como "
-"unha localizaciÃn sen traducir da base de datos de fusos horarios Olsen, p."
-"e:ÂAmerica/New YorkÂ."
+"Unidades para determinar cando ocultar as tarefas: ÂminutosÂ, Âhoras ou "
+"ÂdÃasÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
-msgstr ""
-"O estilo da disposiciÃn determina onde dispoÃer o panel de vista previa en "
-"relaciÃn coa lista de notas. Â0Â (vista clÃsica) mostra o panel de vista "
-"previa embaixo da lista de notas. Â1Â (vista vertical) mostra o panel de "
-"vista previa ao lado da lista de notas."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:86
+msgid "Number of units for determining when to hide tasks."
+msgstr "NÃmero de unidades para determinar cando ocultar as tarefas."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr "Cor de fondo para as tarefas que vencen hoxe, no formato Â#rrggbbÂ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
-msgstr ""
-"O estilo de disposiciÃn determina onde dispoÃer o panel de vista previa en "
-"relaciÃn coa lista de tarefas. Â0Â (vista clÃsica) mostra o panel de vista "
-"previa embaixo da lista de tarefas. Â1Â (vista vertical) mostra o panel de "
-"vista previa ao lado da lista de tarefas."
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr "Cor de fondo para as tarefas atrasadas, no formato Â#rrggbbÂ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
-msgstr ""
-"Isto pode ter tres valores diferentes: 0 para erros, 1 para avisos e 2 para "
-"as mensaxes de depuraciÃn."
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr "Indica se se solicita confirmaciÃn ao eliminar unha cita ou tarefa."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last reminder ran, in time_t."
-msgstr "A hora na que se executou o Ãltimo recordatorio, en time_t."
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr ""
+"Indica se se solicita a confirmaciÃn antes de expurgar as citas ou as "
+"tarefas."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\"."
-msgstr "Unidades para os avisos de aniversario, ÂminutosÂ, Âhoras ou ÂdÃasÂ."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
+msgid "Whether to set a default reminder for appointments."
+msgstr "Indica se se estabelece un aviso predeterminado para as citas."
 
-# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "Unidades para un aviso predeterminado:  ÂminutosÂ, Âhoras ou ÂdÃasÂ."
+msgid "Number of units for determining a default reminder."
+msgstr "NÃmero de unidades para determinar un aviso predeterminado."
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Unidades para determinar cando ocultar as tarefas: ÂminutosÂ, Âhoras ou "
-"ÂdÃasÂ."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
-msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr ""
-"Usar o fuso horario do sistema en vez do fuso horario seleccionado no "
-"Evolution."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr "Unidades para un aviso predeterminado:  ÂminutosÂ, Âhoras ou ÂdÃasÂ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
-msgid "Vertical pane position"
-msgstr "PosiciÃn vertical do panel"
+msgid "Whether to set a reminder for birthdays and anniversaries."
+msgstr "Indica se se estabelece un aviso para os aniversarios."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "O dÃa no que comeza a semana, desde o domingo (0) ata o sÃbado (6)."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display reminders."
-msgstr ""
-"Indica se se debe usar a bandexa de notificaciÃn para mostrar os "
-"recordatorios."
+msgid "Number of units for determining a birthday or anniversary reminder."
+msgstr "NÃmero de unidades para determinar un aviso de aniversario."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
-msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "Indica se se solicita confirmaciÃn ao eliminar unha cita ou tarefa."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
-msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr ""
-"Indica se se solicita a confirmaciÃn antes de expurgar as citas ou as "
-"tarefas."
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\"."
+msgstr "Unidades para os avisos de aniversario, ÂminutosÂ, Âhoras ou ÂdÃasÂ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
+msgid "Whether to show week numbers in various places in the Calendar."
 msgstr ""
-"Indica se se comprimen as fins de semana na vista mensual. Isto pon o sÃbado "
-"e o domingo no mesmo espazo que un dÃa laborÃbel."
+"Indica se se mostran os nÃmeros de semana en diferentes lugares do "
+"calendario."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
-msgid "Whether to display the end time of events in the week and month views."
-msgstr ""
-"Indica se se mostra a hora de finalizaciÃn das actividades nas vistas "
-"semanais e mensuais."
+msgid "Scroll Month View by a week"
+msgstr "Desprazar a vista mensual unha semana"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr ""
-"Indica se se debuxa a liÃa Marcus Bains (liÃa na hora actual) no calendario."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
-msgid "Whether to hide completed tasks in the tasks view."
-msgstr "Indica se se ocultan as tarefas terminadas na vista de tarefas."
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "Indica se se despraza a vista mensual por semana e non por mes."
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
+msgid "Time the last reminder ran, in time_t."
+msgstr "A hora na que se executou o Ãltimo recordatorio, en time_t."
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
-msgid "Whether to set a default reminder for appointments."
-msgstr "Indica se se estabelece un aviso predeterminado para as citas."
+msgid "Calendars to run reminders for"
+msgstr "Os calendarios nos que se activarÃn os recordatorios"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
-msgid "Whether to set a reminder for birthdays and anniversaries."
-msgstr "Indica se se estabelece un aviso para os aniversarios."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
+msgid "Programs that are allowed to be run by reminders."
+msgstr "Programas que se poden executar desde os recordatorios"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
+msgid "Whether or not to use the notification tray for display reminders."
+msgstr ""
+"Indica se se debe usar a bandexa de notificaciÃn para mostrar os "
+"recordatorios."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
+msgid "Free/busy server URLs"
+msgstr "Os URLs dos servidores de dispoÃibilidade"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
+msgid "List of server URLs for free/busy publishing."
+msgstr "Lista dos URLs do servidor para publicaciÃn de dispoÃibilidade."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
+#, no-c-format
 msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
 msgstr ""
-"Indica se se mostran as horas en formato de vinte e catro horas en vez de "
-"usar am/pm."
+"Modelo URL para usar na recuperaciÃn de datos de dispoÃibilidade: %u "
+"substitÃese pola parte de usuario do enderezo de correo, e %d substitÃese "
+"polo dominio."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week numbers in various places in the Calendar."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
 msgstr ""
-"Indica se se mostran os nÃmeros de semana en diferentes lugares do "
-"calendario."
+"Isto pode ter tres valores diferentes: 0 para erros, 1 para avisos e 2 para "
+"as mensaxes de depuraciÃn."
 
 #: ../modules/calendar/e-cal-attachment-handler.c:312
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:32
 msgid "I_mport"
 msgstr "I_mportar"
 
@@ -16058,231 +16070,231 @@ msgid "I_mport to Tasks"
 msgstr "_Importar Ãs tarefas"
 
 #: ../modules/calendar/e-calendar-preferences.c:461
-msgid "Selected Calendars for Reminders"
-msgstr "Calendarios seleccionados para os recordatorios"
-
-#: ../modules/calendar/e-calendar-preferences.c:885
-msgid "Ti_me and date:"
-msgstr "_Hora e data:"
-
-#: ../modules/calendar/e-calendar-preferences.c:886
-msgid "_Date only:"
-msgstr "SÃ a _data:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:2
-#, no-c-format
-msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr ""
-"%u e %d substituiranse polo usuario e o dominio do enderezo de correo "
-"electrÃnico."
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:3
-msgid "(Shown in a Day View)"
-msgstr "(Mostrado nunha vista diaria)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:4
-msgid "05 minutes"
-msgstr "5 minutos"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:5
-msgid "10 minutes"
-msgstr "10 minutos"
+msgid "Selected Calendars for Reminders"
+msgstr "Calendarios seleccionados para os recordatorios"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:6
-msgid "15 minutes"
-msgstr "15 minutos"
+#: ../modules/calendar/e-calendar-preferences.c:885
+msgid "Ti_me and date:"
+msgstr "_Hora e data:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:7
-msgid "30 minutes"
-msgstr "30 minutos"
+#: ../modules/calendar/e-calendar-preferences.c:886
+msgid "_Date only:"
+msgstr "SÃ a _data:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:8
-msgid "60 minutes"
-msgstr "60 minutos"
+msgid "Minutes"
+msgstr "Minutos"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alerts"
-msgstr "Alertas"
+msgid "Hours"
+msgstr "Horas"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
+msgid "Days"
+msgstr "DÃas"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
-msgid "Day _ends:"
-msgstr "A xornada _finaliza Ãs:"
+msgid "60 minutes"
+msgstr "60 minutos"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:12
-msgid "Days"
-msgstr "DÃas"
+msgid "30 minutes"
+msgstr "30 minutos"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:13
-msgid "Default Free/Busy Server"
-msgstr "Servidor predeterminado de dispoÃibilidade"
+msgid "15 minutes"
+msgstr "15 minutos"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:14
-msgid "Display"
-msgstr "Mostrar"
+msgid "10 minutes"
+msgstr "10 minutos"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:15
-msgid "Display reminders in _notification area only"
-msgstr "Mostrar os recordatorios sà na Ãrea de _notificaciÃn"
+msgid "05 minutes"
+msgstr "5 minutos"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
-msgid "Highlight _overdue tasks"
-msgstr "Realzar tarefas _vencidas"
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../widgets/misc/e-dateedit.c:592
+msgid "Time"
+msgstr "Hora"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
-msgid "Highlight t_asks due today"
-msgstr "Realzar tarefas que _vencen hoxe"
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
+msgid "Se_cond zone:"
+msgstr "Fuso se_cundario:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
-msgid "Hours"
-msgstr "Horas"
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
+msgid "(Shown in a Day View)"
+msgstr "(Mostrado nunha vista diaria)"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:21
-msgid "Minutes"
-msgstr "Minutos"
+msgid "Use s_ystem time zone"
+msgstr "Empregar o fuso horario do s_istema"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+msgid "Time format:"
+msgstr "Formato horario:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+msgid "_12 hour (AM/PM)"
+msgstr "_12 horas (AM/PM)"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:24
-msgid "Publishing Information"
-msgstr "InformaciÃn de publicaciÃn"
+msgid "_24 hour"
+msgstr "_24 horas"
 
-#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+msgid "Work Week"
+msgstr "Semana laboral"
+
+#. A weekday like "Monday" follows
 #: ../modules/calendar/e-calendar-preferences.ui.h:27
-msgid "S_un"
-msgstr "_Dom"
+msgid "Wee_k starts on:"
+msgstr "A _semana comeza en:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Sc_roll Month View by a week"
-msgstr "Desp_razar a vista mensual unha semana"
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Work days:"
+msgstr "DÃas laborÃbeis:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:30
-msgid "Se_cond zone:"
-msgstr "Fuso se_cundario:"
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
+msgid "_Day begins:"
+msgstr "A _xornada comeza Ãs:"
 
+#. Monday
 #: ../modules/calendar/e-calendar-preferences.ui.h:31
-msgid "Select the calendars for reminder notification"
-msgstr "Seleccionar os calendarios para a notificaciÃn de recordatorios"
+msgid "_Mon"
+msgstr "_Lun"
 
-#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#. Tuesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:33
-msgid "Sh_ow a reminder"
-msgstr "M_ostrar un aviso"
+msgid "_Tue"
+msgstr "_Mar"
 
-#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#. Wednesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:35
-msgid "Show a _reminder"
-msgstr "Most_rar un aviso"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
-msgid "Show r_ecurring events in italic in bottom left calendar"
-msgstr ""
-"Mostrar en cursiva as actividades con _repeticiÃns no calendario inferior "
-"esquerdo"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
-msgid "Show week _numbers"
-msgstr "Mostrar os _nÃmeros das semanas"
+msgid "_Wed"
+msgstr "MÃ_r"
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "T_hu"
 msgstr "_Xov"
 
+#. Friday
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
+msgid "_Fri"
+msgstr "_Ven"
+
+#. Saturday
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
+msgid "_Sat"
+msgstr "_SÃb"
+
+#. Sunday
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
-msgid "Template:"
-msgstr "Modelo:"
+msgid "S_un"
+msgstr "_Dom"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+msgid "Day _ends:"
+msgstr "A xornada _finaliza Ãs:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:45
-#: ../widgets/misc/e-dateedit.c:592
-msgid "Time"
-msgstr "Hora"
+msgid "Alerts"
+msgstr "Alertas"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
-msgid "Time format:"
-msgstr "Formato horario:"
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
+msgid "_Ask for confirmation when deleting items"
+msgstr "_Pedir a confirmaciÃn antes de eliminar elementos"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
+msgid "_Time divisions:"
+msgstr "Di_visiÃns horarias:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:49
-msgid "Use s_ystem time zone"
-msgstr "Empregar o fuso horario do s_istema"
+msgid "_Show appointment end times in week and month view"
+msgstr "_Mostrar as horas finais das citas nas vistas semanal e mensual"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
+msgid "_Compress weekends in month view"
+msgstr "_Comprimir as fins de semana na vista mensual"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
+msgid "Show week _numbers"
+msgstr "Mostrar os _nÃmeros das semanas"
 
-#. A weekday like "Monday" follows
 #: ../modules/calendar/e-calendar-preferences.ui.h:52
-msgid "Wee_k starts on:"
-msgstr "A _semana comeza en:"
+msgid "Show r_ecurring events in italic in bottom left calendar"
+msgstr ""
+"Mostrar en cursiva as actividades con _repeticiÃns no calendario inferior "
+"esquerdo"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:53
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
-msgid "Work Week"
-msgstr "Semana laboral"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
-msgid "Work days:"
-msgstr "DÃas laborÃbeis:"
+msgid "Sc_roll Month View by a week"
+msgstr "Desp_razar a vista mensual unha semana"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:55
-msgid "_12 hour (AM/PM)"
-msgstr "_12 horas (AM/PM)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
-msgid "_24 hour"
-msgstr "_24 horas"
+msgid "Display"
+msgstr "Mostrar"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:57
-msgid "_Ask for confirmation when deleting items"
-msgstr "_Pedir a confirmaciÃn antes de eliminar elementos"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "_Compress weekends in month view"
-msgstr "_Comprimir as fins de semana na vista mensual"
+msgid "Highlight t_asks due today"
+msgstr "Realzar tarefas que _vencen hoxe"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:59
-msgid "_Day begins:"
-msgstr "A _xornada comeza Ãs:"
-
-#. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
-msgid "_Fri"
-msgstr "_Ven"
+msgid "Highlight _overdue tasks"
+msgstr "Realzar tarefas _vencidas"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar as tarefas terminadas despois de"
 
-#. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:64
-msgid "_Mon"
-msgstr "_Lun"
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+msgid "Display reminders in _notification area only"
+msgstr "Mostrar os recordatorios sà na Ãrea de _notificaciÃn"
 
-#. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
-msgid "_Sat"
-msgstr "_SÃb"
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
+msgid "Sh_ow a reminder"
+msgstr "M_ostrar un aviso"
 
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
 #: ../modules/calendar/e-calendar-preferences.ui.h:67
-msgid "_Show appointment end times in week and month view"
-msgstr "_Mostrar as horas finais das citas nas vistas semanal e mensual"
+msgid "before every appointment"
+msgstr "antes de cada cita"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:68
-msgid "_Time divisions:"
-msgstr "Di_visiÃns horarias:"
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:69
+msgid "Show a _reminder"
+msgstr "Most_rar un aviso"
 
-#. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:70
-msgid "_Tue"
-msgstr "_Mar"
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:71
+msgid "before every anniversary/birthday"
+msgstr "antes de cada aniversario"
 
-#. Wednesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:72
-msgid "_Wed"
-msgstr "MÃ_r"
+msgid "Select the calendars for reminder notification"
+msgstr "Seleccionar os calendarios para a notificaciÃn de recordatorios"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
+msgid "Default Free/Busy Server"
+msgstr "Servidor predeterminado de dispoÃibilidade"
 
-#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
 #: ../modules/calendar/e-calendar-preferences.ui.h:74
-msgid "before every anniversary/birthday"
-msgstr "antes de cada aniversario"
+msgid "Template:"
+msgstr "Modelo:"
 
-#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
 #: ../modules/calendar/e-calendar-preferences.ui.h:76
-msgid "before every appointment"
-msgstr "antes de cada cita"
+#, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr ""
+"%u e %d substituiranse polo usuario e o dominio do enderezo de correo "
+"electrÃnico."
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
+msgid "Publishing Information"
+msgstr "InformaciÃn de publicaciÃn"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:123
@@ -17044,11 +17056,11 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
-#: ../modules/mail/em-account-prefs.c:204
+#: ../modules/mail/em-account-prefs.c:205
 msgid "Evolution Account Assistant"
 msgstr "Asistente de contas do Evolution"
 
-#: ../modules/mail/em-account-prefs.c:248
+#: ../modules/mail/em-account-prefs.c:249
 msgid "Account Editor"
 msgstr "Editor de contas"
 
@@ -17059,411 +17071,411 @@ msgstr "Editor de contas"
 msgid "%d attached messages"
 msgstr "%d mensaxes anexadas"
 
-#: ../modules/mail/e-mail-shell-backend.c:197
+#: ../modules/mail/e-mail-shell-backend.c:199
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensaxe de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:201
 msgid "Compose a new mail message"
 msgstr "Escribir unha mensaxe de correo nova"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:209
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Carta_fol de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:209
+#: ../modules/mail/e-mail-shell-backend.c:211
 msgid "Create a new mail folder"
 msgstr "Crear un novo cartafol de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:424
+#: ../modules/mail/e-mail-shell-backend.c:426
 msgid "Mail Accounts"
 msgstr "Contas de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:432
+#: ../modules/mail/e-mail-shell-backend.c:434
 msgid "Mail Preferences"
 msgstr "Preferencias de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:440
+#: ../modules/mail/e-mail-shell-backend.c:442
 msgid "Composer Preferences"
 msgstr "Preferencias do editor"
 
-#: ../modules/mail/e-mail-shell-backend.c:448
+#: ../modules/mail/e-mail-shell-backend.c:450
 msgid "Network Preferences"
 msgstr "Preferencias de rede"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1102
-#: ../modules/mail/e-mail-shell-view.c:950
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
+#: ../modules/mail/e-mail-shell-view.c:944
 msgid "_Disable Account"
 msgstr "_Desactivar a conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1104
+#: ../modules/mail/e-mail-shell-view-actions.c:1149
 msgid "Disable this account"
 msgstr "Desactivar esta conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1111
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr ""
 "Eliminar permanentemente todas as mensaxes eliminadas de todos os cartafoles"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1116
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
 msgid "_Download Messages for Offline Usage"
 msgstr "_Descargar as mensaxes para o uso sen conexiÃn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1118
+#: ../modules/mail/e-mail-shell-view-actions.c:1163
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Descargar as mensaxes das contas e cartafoles marcados para uso sen conexiÃn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
 msgid "Fl_ush Outbox"
 msgstr "Lim_par a caixa de saÃda"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1130
+#: ../modules/mail/e-mail-shell-view-actions.c:1175
 msgid "_Copy Folder To..."
 msgstr "_Copiar o cartafol aâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1132
+#: ../modules/mail/e-mail-shell-view-actions.c:1177
 msgid "Copy the selected folder into another folder"
 msgstr "Copiar o cartafol seleccionado noutro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1139
+#: ../modules/mail/e-mail-shell-view-actions.c:1184
 msgid "Permanently remove this folder"
 msgstr "Eliminar permanentemente este cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1144
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "E_xpunge"
 msgstr "Com_pactar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1146
+#: ../modules/mail/e-mail-shell-view-actions.c:1191
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Eliminar permanentemente as mensaxes eliminadas deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
 msgid "Mar_k All Messages as Read"
 msgstr "Ma_rcar todas as mensaxes como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
+#: ../modules/mail/e-mail-shell-view-actions.c:1198
 msgid "Mark all messages in the folder as read"
 msgstr "Marcar todas as mensaxes do cartafol como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
 msgid "_Move Folder To..."
 msgstr "_Mover o cartafol aâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1160
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
 msgid "Move the selected folder into another folder"
 msgstr "Mover o cartafol seleccionado a outro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1165
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
 msgid "_New..."
 msgstr "_Novoâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1167
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Create a new folder for storing mail"
 msgstr "Crear un cartafol novo para gardar o correo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1174
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Change the properties of this folder"
 msgstr "Modificar as propiedades deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1181
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Refresh the folder"
 msgstr "Actualizar o cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1188
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Change the name of this folder"
 msgstr "Modificar o nome deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1193
+#: ../modules/mail/e-mail-shell-view-actions.c:1238
 msgid "Select Message _Thread"
 msgstr "Seleccionar a _conversa desta mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1195
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Seleccionar todas as mensaxes da mesma conversa que a mensaxe seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1200
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
 msgid "Select Message S_ubthread"
 msgstr "Seleccionar a conversa sec_undaria desta mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1202
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Select all replies to the currently selected message"
 msgstr "Seleccionar todas as respostas à mensaxe seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1214
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "Empty _Trash"
 msgstr "Baleirar o _lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr ""
 "Eliminar permanentemente todas as mensaxes eliminadas de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1221
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "_New Label"
 msgstr "Etiqueta _nova"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "N_one"
 msgstr "Nin_gÃn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "_Manage Subscriptions"
 msgstr "Xestionar as _subscriciÃns"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1246
-#: ../modules/mail/e-mail-shell-view-actions.c:1323
+#: ../modules/mail/e-mail-shell-view-actions.c:1291
+#: ../modules/mail/e-mail-shell-view-actions.c:1368
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 "Subscribir ou eliminar as subscriciÃns a cartafoles en servidores remotos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
 msgid "Send / _Receive"
 msgstr "Enviar / _Recibir"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1253
+#: ../modules/mail/e-mail-shell-view-actions.c:1298
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar os elementos da cola e obter os elementos novos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
 msgid "R_eceive All"
 msgstr "R_ecibir todos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1260
+#: ../modules/mail/e-mail-shell-view-actions.c:1305
 msgid "Receive new items from all accounts"
 msgstr "Recibir os elementos novos de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1265
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
 msgid "_Send All"
 msgstr "_Enviar todos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1267
+#: ../modules/mail/e-mail-shell-view-actions.c:1312
 msgid "Send queued items in all accounts"
 msgstr "Enviar os elementos da cola de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 #: ../widgets/misc/e-activity-proxy.c:310
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1295
+#: ../modules/mail/e-mail-shell-view-actions.c:1340
 msgid "Cancel the current mail operation"
 msgstr "Cancelar a operaciÃn de correo actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 msgid "Collapse All _Threads"
 msgstr "Pregar todos as _conversas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1302
+#: ../modules/mail/e-mail-shell-view-actions.c:1347
 msgid "Collapse all message threads"
 msgstr "Pregar todos as conversas da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
 msgid "E_xpand All Threads"
 msgstr "D_espregar todas as conversas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1309
+#: ../modules/mail/e-mail-shell-view-actions.c:1354
 msgid "Expand all message threads"
 msgstr "Despregar todas as conversas da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1359
 msgid "_Message Filters"
 msgstr "Filtros de _mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1316
+#: ../modules/mail/e-mail-shell-view-actions.c:1361
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crear ou editar regras para o filtrado do correo novo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1321
+#: ../modules/mail/e-mail-shell-view-actions.c:1366
 msgid "_Subscriptions..."
 msgstr "_SubscriciÃnsâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1375
 msgid "F_older"
 msgstr "Cartaf_ol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1382
 msgid "_Label"
 msgstr "_Etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1354
+#: ../modules/mail/e-mail-shell-view-actions.c:1399
 msgid "C_reate Search Folder From Search..."
 msgstr "C_rear un cartafol de busca a partir da buscaâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1361
+#: ../modules/mail/e-mail-shell-view-actions.c:1406
 msgid "Search F_olders"
 msgstr "Cartaf_oles de busca"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1363
+#: ../modules/mail/e-mail-shell-view-actions.c:1408
 msgid "Create or edit search folder definitions"
 msgstr "Crear ou editar as definiciÃns dos cartafoles de busca"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1394
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
 msgid "_New Folder..."
 msgstr "Cartafol _novoâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1422
+#: ../modules/mail/e-mail-shell-view-actions.c:1467
 msgid "Show Message _Preview"
 msgstr "Mostrar a vista _previa da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1424
+#: ../modules/mail/e-mail-shell-view-actions.c:1469
 msgid "Show message preview pane"
 msgstr "Mostrar o panel de vista previa das mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1430
+#: ../modules/mail/e-mail-shell-view-actions.c:1475
 msgid "Show _Deleted Messages"
 msgstr "Mostrar as mensaxes _eliminadas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1432
+#: ../modules/mail/e-mail-shell-view-actions.c:1477
 msgid "Show deleted messages with a line through them"
 msgstr "Mostrar as mensaxes eliminadas riscÃndoas."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1438
+#: ../modules/mail/e-mail-shell-view-actions.c:1483
 msgid "_Group By Threads"
 msgstr "A_grupar por conversas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1440
+#: ../modules/mail/e-mail-shell-view-actions.c:1485
 msgid "Threaded message list"
 msgstr "Lista de mensaxes por conversas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1461
+#: ../modules/mail/e-mail-shell-view-actions.c:1506
 msgid "Show message preview below the message list"
 msgstr "Mostrar a vista previa da mensaxe embaixo da lista de mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1468
+#: ../modules/mail/e-mail-shell-view-actions.c:1513
 msgid "Show message preview alongside the message list"
 msgstr "Mostrar a vista previa da mensaxe a carÃn da lista de mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1476
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "All Messages"
 msgstr "Todas as mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1483
+#: ../modules/mail/e-mail-shell-view-actions.c:1528
 msgid "Important Messages"
 msgstr "Mensaxes importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1490
+#: ../modules/mail/e-mail-shell-view-actions.c:1535
 msgid "Last 5 Days' Messages"
 msgstr "Mensaxes dos Ãltimos 5 dÃas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1497
+#: ../modules/mail/e-mail-shell-view-actions.c:1542
 msgid "Messages Not Junk"
 msgstr "Mensaxes que non son lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1504
+#: ../modules/mail/e-mail-shell-view-actions.c:1549
 msgid "Messages with Attachments"
 msgstr "Mensaxes con anexos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1511
+#: ../modules/mail/e-mail-shell-view-actions.c:1556
 msgid "No Label"
 msgstr "Sen etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1518
+#: ../modules/mail/e-mail-shell-view-actions.c:1563
 msgid "Read Messages"
 msgstr "Mensaxes lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1525
+#: ../modules/mail/e-mail-shell-view-actions.c:1570
 msgid "Recent Messages"
 msgstr "Mensaxes recentes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1532
+#: ../modules/mail/e-mail-shell-view-actions.c:1577
 msgid "Unread Messages"
 msgstr "Mensaxes sen ler"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1584
+#: ../modules/mail/e-mail-shell-view-actions.c:1629
 msgid "Subject or Addresses contain"
 msgstr "O asunto ou os enderezos conteÃen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1594
+#: ../modules/mail/e-mail-shell-view-actions.c:1639
 msgid "All Accounts"
 msgstr "Todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1601
+#: ../modules/mail/e-mail-shell-view-actions.c:1646
 msgid "Current Account"
 msgstr "Conta actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1608
+#: ../modules/mail/e-mail-shell-view-actions.c:1653
 msgid "Current Folder"
 msgstr "Cartafol actual"
 
-#: ../modules/mail/e-mail-shell-view.c:565
+#: ../modules/mail/e-mail-shell-view.c:560
 msgid "All Account Search"
 msgstr "Buscar en todas as contas"
 
-#: ../modules/mail/e-mail-shell-view.c:726
+#: ../modules/mail/e-mail-shell-view.c:721
 msgid "Account Search"
 msgstr "Buscar na conta"
 
-#: ../modules/mail/e-mail-shell-view.c:948
+#: ../modules/mail/e-mail-shell-view.c:942
 msgid "Proxy _Logout"
 msgstr "_Terminar a sesiÃn proxy"
 
-#: ../modules/mail/e-mail-shell-view-private.c:997
+#: ../modules/mail/e-mail-shell-view-private.c:1022
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionada, "
 msgstr[1] "%d seleccionadas, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1008
+#: ../modules/mail/e-mail-shell-view-private.c:1033
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d eliminada"
 msgstr[1] "%d eliminadas"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1014
-#: ../modules/mail/e-mail-shell-view-private.c:1021
+#: ../modules/mail/e-mail-shell-view-private.c:1039
+#: ../modules/mail/e-mail-shell-view-private.c:1046
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d correo lixo"
 msgstr[1] "%d correos lixo"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1027
+#: ../modules/mail/e-mail-shell-view-private.c:1052
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1033
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d sen enviar"
 msgstr[1] "%d sen enviar"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1039
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1051
+#: ../modules/mail/e-mail-shell-view-private.c:1076
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d sen ler, "
 msgstr[1] "%d sen ler, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1054
+#: ../modules/mail/e-mail-shell-view-private.c:1079
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1077
+#: ../modules/mail/e-mail-shell-view-private.c:1102
 msgid "Trash"
 msgstr "Lixo"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1547
+#: ../modules/mail/e-mail-shell-view-private.c:1578
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
@@ -17496,11 +17508,11 @@ msgid "Contains Value"
 msgstr "ContÃn o valor"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1049
+#: ../modules/mail/em-mailer-prefs.c:1048
 msgid "_Date header:"
 msgstr "_Cabeceira da data:"
 
-#: ../modules/mail/em-mailer-prefs.c:1050
+#: ../modules/mail/em-mailer-prefs.c:1049
 msgid "Show _original header value"
 msgstr "Mostrar o valor _orixinal da cabeceira"
 
@@ -17523,36 +17535,36 @@ msgstr "A mensaxe a %s sobre Â%s o %s leuse."
 msgid "Delivery Notification for \"%s\""
 msgstr "NotificaciÃn de recepciÃn para Â%sÂ"
 
-#: ../modules/mdn/evolution-mdn.c:448
+#: ../modules/mdn/evolution-mdn.c:447
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "Enviar unha confirmaciÃn de recepciÃn a Â%sÂ"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:453
+#: ../modules/mdn/evolution-mdn.c:452
 msgid "_Notify Sender"
 msgstr "_Notificar ao emisor"
 
 #: ../modules/mdn/evolution-mdn.error.xml.h:1
-msgid "Sender has been notified that you have read this message."
-msgstr "NotificÃuselle ao remitente de que xa leu esta mensaxe."
-
-#: ../modules/mdn/evolution-mdn.error.xml.h:2
 msgid "Sender wants to be notified when you have read this message."
 msgstr "O remitente quere que se lle notifique cando teÃa lido esta mensaxe."
 
+#: ../modules/mdn/evolution-mdn.error.xml.h:2
+msgid "Sender has been notified that you have read this message."
+msgstr "NotificÃuselle ao remitente de que xa leu esta mensaxe."
+
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+msgid "Evolution is currently offline."
+msgstr "O Evolution està actualmente sen conexiÃn."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
 msgid "Click 'Work Online' to return to online mode."
 msgstr "Premer en ÂTraballar con conexiÃn para volver ao modo conectado."
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
 msgid "Evolution is currently offline due to a network outage."
 msgstr "O Evolution està actualmente sen conexiÃn por mor dun corte na rede."
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
-msgid "Evolution is currently offline."
-msgstr "O Evolution està actualmente sen conexiÃn."
-
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
 msgid ""
 "Evolution will return to online mode once a network connection is "
@@ -17619,13 +17631,13 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Engadido de proba do cargador Eplugin para Python."
 
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Hello Python"
-msgstr "Ola Python"
-
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
 msgid "Python Plugin Loader tests"
 msgstr "Probas do cargador de engadidos de Python"
 
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Hello Python"
+msgstr "Ola Python"
+
 #: ../modules/spamassassin/evolution-spamassassin.c:190
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
@@ -17711,13 +17723,13 @@ msgid "Loading accounts..."
 msgstr "Cargando contasâ"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Add local address books to Evolution."
-msgstr "Engadir axendas de enderezos locais ao Evolution."
-
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
 msgid "Local Address Books"
 msgstr "Axendas de enderezos locais"
 
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Add local address books to Evolution."
+msgstr "Engadir axendas de enderezos locais ao Evolution."
+
 #: ../plugins/attachment-reminder/attachment-reminder.c:126
 msgid "_Do not show this message again."
 msgstr "_Non mostrar esta mensaxe outra vez."
@@ -17728,6 +17740,10 @@ msgid "Keywords"
 msgstr "Palabras chave"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid "Message has no attachments"
+msgstr "A mensaxe non contÃn ningÃn anexo"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
@@ -17735,10 +17751,6 @@ msgstr ""
 "O Evolution atopou algunhas palabras chave que indican que esta mensaxe "
 "deberÃa conter un anexo, pero non atopou ningÃn."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
-msgid "Message has no attachments"
-msgstr "A mensaxe non contÃn ningÃn anexo"
-
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add Attachment..."
 msgstr "Eng_adir anexoâ"
@@ -17939,41 +17951,18 @@ msgstr ""
 "Evolution."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
-msgid "Are you sure you want to close Evolution?"
-msgstr "Està seguro de que desexa pechar o Evolution?"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
-msgstr ""
-"Ten certeza de que quere restaurar Evolution desde o ficheiro de respaldo "
-"seleccionado?"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Close and Back up Evolution"
-msgstr "Pechar e facer unha copia de seguranza do Evolution"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-msgid "Close and Restore Evolution"
-msgstr "Pechar e restabelecer o Evolution"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Insufficient Permissions"
-msgstr "Permisos insuficientes"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Invalid Evolution backup file"
 msgstr "Ficheiro de respaldo de Evolution non vÃlido"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
 msgid "Please select a valid backup file to restore."
 msgstr "Seleccione un ficheiro de respaldo vÃlido que restaurar."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "The selected folder is not writable."
-msgstr "O cartafol seleccionado non à escribÃbel."
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid "Are you sure you want to close Evolution?"
+msgstr "Està seguro de que desexa pechar o Evolution?"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
 msgid ""
 "To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
@@ -17981,7 +17970,18 @@ msgstr ""
 "Para facer unha copia de seguranza dos seus datos e axustes, primeiro debe "
 "pechar o Evolution. AsegÃrese de gardar todos os datos antes de continuar."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Close and Back up Evolution"
+msgstr "Pechar e facer unha copia de seguranza do Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr ""
+"Ten certeza de que quere restaurar Evolution desde o ficheiro de respaldo "
+"seleccionado?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid ""
 "To restore your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding. This will delete "
@@ -17993,37 +17993,49 @@ msgstr ""
 "eliminarà todos os datos e axustes actuais do Evolution e restaurarÃos desde "
 "o seu respaldo."
 
-#: ../plugins/bbdb/bbdb.c:667 ../plugins/bbdb/bbdb.c:676
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid "Close and Restore Evolution"
+msgstr "Pechar e restabelecer o Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid "Insufficient Permissions"
+msgstr "Permisos insuficientes"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+msgid "The selected folder is not writable."
+msgstr "O cartafol seleccionado non à escribÃbel."
+
+#: ../plugins/bbdb/bbdb.c:666 ../plugins/bbdb/bbdb.c:675
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactos automÃticos"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:691
+#: ../plugins/bbdb/bbdb.c:690
 msgid "Create _address book entries when sending mails"
 msgstr "Crear _as entradas da axenda de enderezos ao enviar as mensaxes"
 
-#: ../plugins/bbdb/bbdb.c:697
+#: ../plugins/bbdb/bbdb.c:696
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccionar a axenda de enderezos para contactos automÃticos"
 
-#: ../plugins/bbdb/bbdb.c:712
+#: ../plugins/bbdb/bbdb.c:711
 msgid "Instant Messaging Contacts"
 msgstr "Contactos de mensaxerÃa instantÃnea"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:727
+#: ../plugins/bbdb/bbdb.c:726
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "_Sincronizar a informaciÃn e as imaxes de contactos desde a lista de amigos "
 "do Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:733
+#: ../plugins/bbdb/bbdb.c:732
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Seleccionar a axenda de enderezos para a lista de amigos do Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:744
+#: ../plugins/bbdb/bbdb.c:743
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar coa lista de _amigos agora"
 
@@ -18181,13 +18193,13 @@ msgid "Re_fresh:"
 msgstr "Actuali_zar:"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "Add CalDAV support to Evolution."
-msgstr "Engadir a compatibilidade de CalDAV con Evolution."
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
 msgid "CalDAV Support"
 msgstr "Compatibilidade de CalDAV"
 
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "Add CalDAV support to Evolution."
+msgstr "Engadir a compatibilidade de CalDAV con Evolution."
+
 #: ../plugins/calendar-file/calendar-file.c:134
 msgid "_Customize options"
 msgstr "Op_ciÃns de personalizaciÃn"
@@ -18217,25 +18229,25 @@ msgid "Force read _only"
 msgstr "Forzar s_Ã lectura"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Add local calendars to Evolution."
-msgstr "Engadir calendarios locais ao Evolution."
-
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
 msgid "Local Calendars"
 msgstr "Calendarios locais"
 
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+msgid "Add local calendars to Evolution."
+msgstr "Engadir calendarios locais ao Evolution."
+
 #: ../plugins/calendar-http/calendar-http.c:207
 msgid "Userna_me:"
 msgstr "No_me do usuario:"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "Add web calendars to Evolution."
-msgstr "Engadir calendarios web ao Evolution."
-
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 msgid "Web Calendars"
 msgstr "Calendarios web"
 
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+msgid "Add web calendars to Evolution."
+msgstr "Engadir calendarios web ao Evolution."
+
 #: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Fog"
 msgstr "Tempo: nÃboa"
@@ -18296,29 +18308,29 @@ msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Anglo-saxÃn (Fahrenheit, polgadas etc.)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Add weather calendars to Evolution."
-msgstr "Engadir calendarios meteorolÃxicos ao Evolution."
-
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "Calendarios meteorolÃxicos"
 
-#: ../plugins/dbx-import/dbx-importer.c:290
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
+msgid "Add weather calendars to Evolution."
+msgstr "Engadir calendarios meteorolÃxicos ao Evolution."
+
+#: ../plugins/dbx-import/dbx-importer.c:289
 msgid "Importing Outlook Express data"
 msgstr "Importando os datos do Outlook Express"
 
 #: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
-msgid "Import Outlook Express messages from DBX file"
-msgstr "Importar as mensaxes do Outlook desde un ficheiro DBX"
-
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
 msgid "Outlook DBX import"
 msgstr "Importar o DBX do Outlook"
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "Cartafol persoal do Outlook Express 5/6 (.dbx)"
 
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+msgid "Import Outlook Express messages from DBX file"
+msgstr "Importar as mensaxes do Outlook desde un ficheiro DBX"
+
 #: ../plugins/default-source/default-source.c:169
 msgid "Mark as _default address book"
 msgstr "Marcar como axenda de enderezos pre_definida"
@@ -18410,20 +18422,20 @@ msgstr "Chave"
 msgid "Values"
 msgstr "Valores"
 
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:1
+msgid "Custom Header"
+msgstr "Cabeceira personalizada"
+
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Add custom headers to outgoing mail messages."
 msgstr "Engadir cabeceiras personalizadas Ãs mensaxes de correo saÃntes."
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
-msgid "Custom Header"
-msgstr "Cabeceira personalizada"
-
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
 msgid "Email Custom Header"
 msgstr "Cabeceira personalizada de correo electrÃnico"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr ""
 "Iniciar automaticamente o editor ao presionar unha tecla no editor de correo"
@@ -18455,14 +18467,22 @@ msgstr ""
 "Usar un editor externo para escribir as mensaxes de correo en texto plano."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
-msgid "Cannot create Temporary File"
-msgstr "Non à posÃbel crear un cartafol temporal"
-
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
 msgstr "O editor non à iniciÃbel"
 
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"Non à posÃbel iniciar o editor externo configurado nas sÃas preferencias. "
+"Tente configurar un editor diferente."
+
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
+msgid "Cannot create Temporary File"
+msgstr "Non à posÃbel crear un cartafol temporal"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
@@ -18470,11 +18490,11 @@ msgstr ""
 "O Evolution non à capaz de crear un ficheiro temporal para gardar o seu "
 "correo. TÃnteo de novo mÃis tarde."
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
 msgid "External editor still running"
 msgstr "AÃnda està en execuciÃn o editor externo"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor is still running. The mail composer window cannot be "
 "closed as long as the editor is active."
@@ -18482,14 +18502,6 @@ msgstr ""
 "AÃnda està en execuciÃn o editor externo. Non à posÃbel pechar a xanela do "
 "editor de correo mentres o editor estea activo."
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
-msgid ""
-"The external editor set in your plugin preferences cannot be launched. Try "
-"setting a different editor."
-msgstr ""
-"Non à posÃbel iniciar o editor externo configurado nas sÃas preferencias. "
-"Tente configurar un editor diferente."
-
 #: ../plugins/face/face.c:292
 msgid "Select a Face Picture"
 msgstr "Seleccionar unha imaxe facial"
@@ -18510,7 +18522,7 @@ msgstr "Cargar unha imaxe nova da _cara"
 msgid "Include _Face"
 msgstr "I_ncluÃr a cara"
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Attach a small picture of your face to outgoing messages."
 msgstr "Anexar unha pequena imaxe da sÃa cara Ãs mensaxes saÃntes."
 
@@ -18519,20 +18531,20 @@ msgid "Failed Read"
 msgstr "Fallou a lectura"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:2
-msgid "Invalid Image Size"
-msgstr "O tamaÃo da imaxe non à vÃlido"
+msgid "The file cannot be read"
+msgstr "Non à posÃbel ler o ficheiro"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:3
-msgid "Not an image"
-msgstr "Non à unha imaxe"
+msgid "Invalid Image Size"
+msgstr "O tamaÃo da imaxe non à vÃlido"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
 msgid "Please select an image of size 48 * 48"
 msgstr "Seleccione unha imaxe dun tamaÃo de 48 * 48"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
-msgid "The file cannot be read"
-msgstr "Non à posÃbel ler o ficheiro"
+msgid "Not an image"
+msgstr "Non à unha imaxe"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:6
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
@@ -18576,13 +18588,13 @@ msgid "Retrieve _List"
 msgstr "Obter a _lista"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "Add Google Calendars to Evolution."
-msgstr "Engadir calendarios de Google ao Evolution."
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google Calendars"
 msgstr "Calendarios de Google"
 
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Add Google Calendars to Evolution."
+msgstr "Engadir calendarios de Google ao Evolution."
+
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "Imaxe inserida"
@@ -18592,30 +18604,16 @@ msgid "View image attachments directly in mail messages."
 msgstr "Mostrar as imaxes anexadas directamente nas mensaxes de correo."
 
 #: ../plugins/imap-features/imap-headers.c:335
-#: ../plugins/imap-features/imap-headers.ui.h:2
+#: ../plugins/imap-features/imap-headers.ui.h:10
 msgid "Custom Headers"
 msgstr "Cabeceiras personalizadas"
 
 #: ../plugins/imap-features/imap-headers.c:347
-#: ../plugins/imap-features/imap-headers.ui.h:5
+#: ../plugins/imap-features/imap-headers.ui.h:7
 msgid "IMAP Headers"
 msgstr "Cabeceiras IMAP"
 
-#: ../plugins/imap-features/imap-headers.ui.h:1
-msgid "Basic and _Mailing List Headers (Default)"
-msgstr "Cabeceiras bÃsicas e de lista de _correo (predeterminada)"
-
-#: ../plugins/imap-features/imap-headers.ui.h:3
-msgid ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
-"You can ignore this if you choose \"All Headers\"."
-msgstr ""
-"Indique as cabeceiras adicionais que necesita obter ademais das cabeceiras "
-"estÃndar superiores. \n"
-"Pode ignorar isto se selecciona ÂTodas as cabeceirasÂ."
-
-#: ../plugins/imap-features/imap-headers.ui.h:6
+#: ../plugins/imap-features/imap-headers.ui.h:1
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -18623,7 +18621,11 @@ msgstr ""
 "Seleccione as preferencias da cabeceira IMAP. \n"
 "Cantas mÃis cabeceiras teÃa mÃis tempo levarà descargalas."
 
-#: ../plugins/imap-features/imap-headers.ui.h:8
+#: ../plugins/imap-features/imap-headers.ui.h:3
+msgid "_Fetch All Headers"
+msgstr "Obter to_das as cabeceiras"
+
+#: ../plugins/imap-features/imap-headers.ui.h:4
 msgid ""
 "_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -18631,18 +18633,28 @@ msgstr ""
 "Cabeceiras _bÃsicas - (rÃpido) \n"
 "Use isto se non ten filtros baseados en roldas de correo"
 
-#: ../plugins/imap-features/imap-headers.ui.h:10
-msgid "_Fetch All Headers"
-msgstr "Obter to_das as cabeceiras"
+#: ../plugins/imap-features/imap-headers.ui.h:6
+msgid "Basic and _Mailing List Headers (Default)"
+msgstr "Cabeceiras bÃsicas e de lista de _correo (predeterminada)"
 
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "Fine-tune your IMAP accounts."
-msgstr "Axuste fino das sÃas contas IMAP."
+#: ../plugins/imap-features/imap-headers.ui.h:8
+msgid ""
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
+"You can ignore this if you choose \"All Headers\"."
+msgstr ""
+"Indique as cabeceiras adicionais que necesita obter ademais das cabeceiras "
+"estÃndar superiores. \n"
+"Pode ignorar isto se selecciona ÂTodas as cabeceirasÂ."
 
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
 msgid "IMAP Features"
 msgstr "CaracterÃsticas IMAP"
 
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+msgid "Fine-tune your IMAP accounts."
+msgstr "Axuste fino das sÃas contas IMAP."
+
 #. Translators: The first '%s' is replaced with a calendar name,
 #. * the second '%s' with an error message
 #: ../plugins/itip-formatter/itip-formatter.c:496
@@ -19356,27 +19368,27 @@ msgid "_Memos:"
 msgstr "_Notas:"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "Mostrar as partes MIME do texto/calendario nas mensaxes de correo."
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
 msgstr "Formatador iTip"
 
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "Mostrar as partes MIME do texto/calendario nas mensaxes de correo."
+
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
-msgstr "Â{0}Â delegou a reuniÃn. Desexa engadir o delegado Â{1}Â?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr ""
+"Esta resposta non à dun participante actual. Desexa engadir o remitente como "
+"un participante?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr "Esta xuntanza foi delegada"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
-msgstr ""
-"Esta resposta non à dun participante actual. Desexa engadir o remitente como "
-"un participante?"
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr "Â{0}Â delegou a reuniÃn. Desexa engadir o delegado Â{1}Â?"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:345
 msgid "Get List _Archive"
@@ -19447,31 +19459,17 @@ msgstr "AcciÃn non dispoÃÃbel"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
-"\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
+"This message does not contain the header information required for this "
+"action."
 msgstr ""
-"Enviarase unha mensaxe de correo ao URL Â{0}Â. Pode enviar a mensaxe "
-"automaticamente ou revisala e modificala primeiro.\n"
-"\n"
-"DeberÃa recibir unha resposta desde a rolda de correo pouco despois de que "
-"se envÃe esta mensaxe."
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
-msgid "Malformed header"
-msgstr "Cabeceira construÃda incorrectamente"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
-msgid "No e-mail action"
-msgstr "Sen acciÃn de correo"
+"Esta mensaxe non contÃn a informaciÃn da cabeceira requirida para esta "
+"acciÃn."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:3
 msgid "Posting not allowed"
 msgstr "Non se permite a publicaciÃn"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:4
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
@@ -19480,23 +19478,37 @@ msgstr ""
 "lista de correo sà de lectura. Contacte co propietario da lista para mÃis "
 "informaciÃn."
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Send e-mail message to mailing list?"
 msgstr "Desexa enviar unha mensaxe à lista de correo?"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
 msgid ""
-"The action could not be performed. The header for this action did not "
-"contain any action that could be processed.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
 "\n"
-"Header: {0}"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
 msgstr ""
-"Non foi posÃbel efectuar a acciÃn. A cabeceira para esta acciÃn non contÃn "
-"ningunha acciÃn que se poida procesar.\n"
+"Enviarase unha mensaxe de correo ao URL Â{0}Â. Pode enviar a mensaxe "
+"automaticamente ou revisala e modificala primeiro.\n"
 "\n"
-"Cabeceira: {0}"
+"DeberÃa recibir unha resposta desde a rolda de correo pouco despois de que "
+"se envÃe esta mensaxe."
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+msgid "_Send message"
+msgstr "_Enviar a mensaxe"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+msgid "_Edit message"
+msgstr "_Editar a mensaxe"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:11
+msgid "Malformed header"
+msgstr "Cabeceira construÃda incorrectamente"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:12
 msgid ""
 "The {0} header of this message is malformed and could not be processed.\n"
 "\n"
@@ -19507,21 +19519,21 @@ msgstr ""
 "\n"
 "Cabeceira: {1}"
 
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
+msgid "No e-mail action"
+msgstr "Sen acciÃn de correo"
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
-"This message does not contain the header information required for this "
-"action."
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
+"\n"
+"Header: {0}"
 msgstr ""
-"Esta mensaxe non contÃn a informaciÃn da cabeceira requirida para esta "
-"acciÃn."
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
-msgid "_Edit message"
-msgstr "_Editar a mensaxe"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
-msgid "_Send message"
-msgstr "_Enviar a mensaxe"
+"Non foi posÃbel efectuar a acciÃn. A cabeceira para esta acciÃn non contÃn "
+"ningunha acciÃn que se poida procesar.\n"
+"\n"
+"Cabeceira: {0}"
 
 #: ../plugins/mail-notification/mail-notification.c:384
 #, c-format
@@ -19782,15 +19794,15 @@ msgstr "Marcar todo como lido"
 msgid "Mark all messages in a folder as read."
 msgstr "Marcar todas as mensaxes dun cartafol como lidas."
 
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
+msgid "Prefer Plain Text"
+msgstr "Preferir texto simple"
+
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
 msgid "Plain Text Mode"
 msgstr "Modo de texto simple"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
-msgid "Prefer Plain Text"
-msgstr "Preferir texto simple"
-
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Ver as mensaxes de correo como texto plano aÃnda que conteÃan HTML."
@@ -19836,42 +19848,42 @@ msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
-msgid "Import Outlook messages from PST file"
-msgstr "Importar as mensaxes do Outlook desde un ficheiro PST"
-
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
 msgid "Outlook PST import"
 msgstr "ImportaciÃn do PST do Outlook"
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
 msgid "Outlook personal folders (.pst)"
 msgstr "Cartafoles persoais do Outlook (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:540
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Import Outlook messages from PST file"
+msgstr "Importar as mensaxes do Outlook desde un ficheiro PST"
+
+#: ../plugins/pst-import/pst-importer.c:542
 msgid "_Mail"
 msgstr "_Correo"
 
-#: ../plugins/pst-import/pst-importer.c:560
+#: ../plugins/pst-import/pst-importer.c:564
 msgid "Destination folder:"
 msgstr "Cartafol de destino:"
 
-#: ../plugins/pst-import/pst-importer.c:568
+#: ../plugins/pst-import/pst-importer.c:572
 msgid "_Address Book"
 msgstr "_Axenda de enderezos"
 
-#: ../plugins/pst-import/pst-importer.c:573
+#: ../plugins/pst-import/pst-importer.c:577
 msgid "A_ppointments"
 msgstr "Ci_tas"
 
-#: ../plugins/pst-import/pst-importer.c:578 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:582 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "_Tarefas"
 
-#: ../plugins/pst-import/pst-importer.c:583
+#: ../plugins/pst-import/pst-importer.c:587
 msgid "_Journal entries"
 msgstr "Entradas do _xornal"
 
-#: ../plugins/pst-import/pst-importer.c:694
+#: ../plugins/pst-import/pst-importer.c:698
 msgid "Importing Outlook data"
 msgstr "ImportaciÃn de datos do Outlook"
 
@@ -19917,7 +19929,7 @@ msgid "Mount of %s failed:"
 msgstr "Produciuse un fallo ao montar %s:"
 
 #: ../plugins/publish-calendar/publish-calendar.c:611
-#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "A_ctivar"
 
@@ -19936,93 +19948,93 @@ msgstr "Non foi posÃbel crear a conversa para publicar."
 msgid "_Publish Calendar Information"
 msgstr "_Publicar a informaciÃn do calendario"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-msgid "Custom Location"
-msgstr "LocalizaciÃn personalizada"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+msgid "iCal"
+msgstr "iCal"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:3
 msgid "Daily"
 msgstr "Diariamente"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:5
-msgid "FTP (with login)"
-msgstr "FTP (con inicio de sesiÃn)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "Weekly"
+msgstr "Semanalmente"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
 msgid "Manual (via Actions menu)"
 msgstr "Manual (vÃa menà de acciÃns)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:11
-msgid "P_ort:"
-msgstr "P_orto:"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+msgid "Secure FTP (SFTP)"
+msgstr "FTP seguro (SFTP)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Public FTP"
 msgstr "FTP pÃblico"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:13
-msgid "Publishing Location"
-msgstr "LocalizaciÃn da publicaciÃn"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
+msgid "FTP (with login)"
+msgstr "FTP (con inicio de sesiÃn)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:14
-msgid "Publishing _Frequency:"
-msgstr "_Frecuencia da publicaciÃn:"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+msgid "Windows share"
+msgstr "ComparticiÃn con Windows"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:15
-msgid "Secure FTP (SFTP)"
-msgstr "FTP seguro (SFTP)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (HTTP)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Secure WebDAV (HTTPS)"
 msgstr "WebDAV seguro (HTTPS)"
 
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Custom Location"
+msgstr "LocalizaciÃn personalizada"
+
 #: ../plugins/publish-calendar/publish-calendar.ui.h:17
-msgid "Service _type:"
-msgstr "_Tipo de servizo:"
+msgid "_Publish as:"
+msgstr "_Publicar como:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:18
-msgid "Sources"
-msgstr "Fontes"
+msgid "Publishing _Frequency:"
+msgstr "_Frecuencia da publicaciÃn:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
 msgstr "_DuraciÃn temporal:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:20
-msgid "WebDAV (HTTP)"
-msgstr "WebDAV (HTTP)"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Weekly"
-msgstr "Semanalmente"
+msgid "Sources"
+msgstr "Fontes"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:22
-msgid "Windows share"
-msgstr "ComparticiÃn con Windows"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+msgid "Service _type:"
+msgstr "_Tipo de servizo:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_File:"
 msgstr "_Ficheiro:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+msgid "P_ort:"
+msgstr "P_orto:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:28
+msgid "_Username:"
+msgstr "_Nome do usuario:"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Password:"
 msgstr "_Contrasinal:"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:26
-msgid "_Publish as:"
-msgstr "_Publicar como:"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "_Remember password"
 msgstr "_Lembrar o contrasinal"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:29
-msgid "_Username:"
-msgstr "_Nome do usuario:"
-
 #: ../plugins/publish-calendar/publish-calendar.ui.h:31
-msgid "iCal"
-msgstr "iCal"
+msgid "Publishing Location"
+msgstr "LocalizaciÃn da publicaciÃn"
 
 #: ../plugins/publish-calendar/publish-format-fb.c:94
 #: ../plugins/publish-calendar/publish-format-ical.c:91
@@ -20163,7 +20175,7 @@ msgstr "Gardar a lista de notas seleccionada no disco"
 msgid "Save the selected task list to disk"
 msgstr "Gardar a lista de tarefas seleccionada no disco"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
 "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
@@ -20186,13 +20198,13 @@ msgid "Save as Template"
 msgstr "Gardar como un modelo"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
-msgstr "Descodificar os anexos TNEF (winmail.dat) de Microsoft Outlook."
-
-#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Decoder"
 msgstr "Descodificador TNEF"
 
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr "Descodificar os anexos TNEF (winmail.dat) de Microsoft Outlook."
+
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
 msgid "Inline vCards"
 msgstr "vCards inseridas"
@@ -20228,13 +20240,13 @@ msgid "Save in Address Book"
 msgstr "Gardar na axenda de enderezos"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "Add WebDAV contacts to Evolution."
-msgstr "Engadir contactos WebDAV ao Evolution."
-
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "Contactos WebDAV"
 
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "Add WebDAV contacts to Evolution."
+msgstr "Engadir contactos WebDAV ao Evolution."
+
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
@@ -20247,103 +20259,58 @@ msgstr "URL:"
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Evit_ar o IfMatch (necesario no Apache < 2.2.8)"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "Authenticate proxy server connections"
-msgstr "Autenticar as conexiÃns co servidor proxy"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
-msgid "Automatic proxy configuration URL"
-msgstr "URL de configuraciÃn automÃtica do proxy"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
-msgid "Default window X coordinate"
-msgstr "Coordenada X predeterminada da xanela"
+#: ../shell/apps_evolution_shell.schemas.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+"Lista das rutas aos cartafoles que se sincronizarÃn co disco para o uso sen "
+"conexiÃn"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "Default window Y coordinate"
 msgstr "Coordenada Y predeterminada da xanela"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
-msgid "Default window height"
-msgstr "Altura predeterminada da xanela"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:8
-msgid "Default window state"
-msgstr "Estado predeterminado da xanela"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:9
-msgid "Default window width"
-msgstr "Largura predeterminada da xanela"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:11
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr "Activa os axustes do proxy ao acceder a HTTP/HTTP seguro na Internet."
-
 #: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "HTTP proxy host name"
-msgstr "Nome do servidor proxy HTTP"
+msgid "The default Y coordinate for the main window."
+msgstr "A coordenada Y predeterminada da xanela principal."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:14
-msgid "HTTP proxy password"
-msgstr "Contrasinal do proxy HTTP"
+msgid "Default window X coordinate"
+msgstr "Coordenada X predeterminada da xanela"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
-msgid "HTTP proxy port"
-msgstr "Porto do proxy HTTP"
+msgid "The default X coordinate for the main window."
+msgstr "A coordenada X predeterminada da xanela principal."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid "HTTP proxy username"
-msgstr "Nome de usuario para o proxy HTTP"
+msgid "Default window width"
+msgstr "Largura predeterminada da xanela"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "The default width for the main window, in pixels."
+msgstr "Largura predeterminada da xanela principal, en pÃxeles."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr ""
-"Se à ÂverdadeiroÂ, entÃn as conexiÃns co servidor proxy requiren "
-"autenticaciÃn. O nome do usuario obtense da chave GConf \"/apps/evolution/"
-"shell/network_config/authentication_user\" e o contrasinal obtense do gnome-"
-"keyring ou do ficheiro de contrasinais ~/.gnome2_private/Evolution."
+msgid "Default window height"
+msgstr "Altura predeterminada da xanela"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr ""
-"Lista das rutas aos cartafoles que se sincronizarÃn co disco para o uso sen "
-"conexiÃn"
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "The default height for the main window, in pixels."
+msgstr "Altura predeterminada da xanela principal, en pÃxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
-msgid "Non-proxy hosts"
-msgstr "Servidores que non usan proxy"
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "Default window state"
+msgstr "Estado predeterminado da xanela"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr "Contrasinal requirido como autenticaciÃn ao usar o proxy HTTP."
+#: ../shell/apps_evolution_shell.schemas.in.h:21
+msgid "Whether or not the window should be maximized."
+msgstr "Indica se a xanela deberÃa ou non estar maximizada."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "Proxy configuration mode"
 msgstr "Modo de configuraciÃn do proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
-msgid "SOCKS proxy host name"
-msgstr "Nome do servidor do proxy SOCKS"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:27
-msgid "SOCKS proxy port"
-msgstr "Porto do proxy SOCKS"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "Secure HTTP proxy host name"
-msgstr "Nome do servidor do proxy HTTP seguro"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid "Secure HTTP proxy port"
-msgstr "Porto do proxy HTTP seguro"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -20355,35 +20322,11 @@ msgstr ""
 "configuraciÃn manual do proxy e Âusar a configuraciÃn do proxy fornecida no "
 "url autoconfigurado respectivamente."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
-msgid "The default X coordinate for the main window."
-msgstr "A coordenada X predeterminada da xanela principal."
-
 #: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid "The default Y coordinate for the main window."
-msgstr "A coordenada Y predeterminada da xanela principal."
+msgid "HTTP proxy port"
+msgstr "Porto do proxy HTTP"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
-msgid "The default height for the main window, in pixels."
-msgstr "Altura predeterminada da xanela principal, en pÃxeles."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:39
-msgid "The default width for the main window, in pixels."
-msgstr "Largura predeterminada da xanela principal, en pÃxeles."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:42
-msgid "The machine name to proxy HTTP through."
-msgstr "Nome da mÃquina a travÃs da que usar o proxy HTTP."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid "The machine name to proxy secure HTTP through."
-msgstr "Nome da mÃquina a travÃs da que usar o proxy HTTP seguro."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:44
-msgid "The machine name to proxy socks through."
-msgstr "Nome da mÃquina a travÃs da que usar o proxy socks."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -20391,7 +20334,19 @@ msgstr ""
 "Porto da mÃquina definido en Â/apps/evolution/shell/network_config/"
 "http_host  a travÃs do que usar o proxy ."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:39
+msgid "HTTP proxy host name"
+msgstr "Nome do servidor proxy HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:40
+msgid "The machine name to proxy HTTP through."
+msgstr "Nome da mÃquina a travÃs da que usar o proxy HTTP."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:41
+msgid "Secure HTTP proxy port"
+msgstr "Porto do proxy HTTP seguro"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -20399,7 +20354,19 @@ msgstr ""
 "Porto da mÃquina definido en Â/apps/evolution/shell/network_config/"
 "secure_host a travÃs do que usar o proxy ."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:43
+msgid "Secure HTTP proxy host name"
+msgstr "Nome do servidor do proxy HTTP seguro"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:44
+msgid "The machine name to proxy secure HTTP through."
+msgstr "Nome da mÃquina a travÃs da que usar o proxy HTTP seguro."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "SOCKS proxy port"
+msgstr "Porto do proxy SOCKS"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -20407,7 +20374,60 @@ msgstr ""
 "Porto da mÃquina definido en Â/apps/evolution/shell/network_config/"
 "socks_host a travÃs do que usar o proxy ."
 
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "SOCKS proxy host name"
+msgstr "Nome do servidor do proxy SOCKS"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:48
+msgid "The machine name to proxy socks through."
+msgstr "Nome da mÃquina a travÃs da que usar o proxy socks."
+
 #: ../shell/apps_evolution_shell.schemas.in.h:49
+msgid "Use HTTP proxy"
+msgstr "Usar proxy HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:50
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr "Activa os axustes do proxy ao acceder a HTTP/HTTP seguro na Internet."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:51
+msgid "Authenticate proxy server connections"
+msgstr "Autenticar as conexiÃns co servidor proxy"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:52
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
+"Se à ÂverdadeiroÂ, entÃn as conexiÃns co servidor proxy requiren "
+"autenticaciÃn. O nome do usuario obtense da chave GConf \"/apps/evolution/"
+"shell/network_config/authentication_user\" e o contrasinal obtense do gnome-"
+"keyring ou do ficheiro de contrasinais ~/.gnome2_private/Evolution."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:53
+msgid "HTTP proxy username"
+msgstr "Nome de usuario para o proxy HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:54
+msgid "Username to pass as authentication when doing HTTP proxying."
+msgstr "Nome do usuario para pasar como autenticaciÃn ao usar un proxy HTTP."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:55
+msgid "HTTP proxy password"
+msgstr "Contrasinal do proxy HTTP"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:56
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr "Contrasinal requirido como autenticaciÃn ao usar o proxy HTTP."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:57
+msgid "Non-proxy hosts"
+msgstr "Servidores que non usan proxy"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -20420,22 +20440,14 @@ msgstr ""
 "inicial como *.foo.com), enderezos IP de servidores (tanto IPv4 como IPv6) e "
 "enderezos de rede cunha mÃscara (do tipo 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:59
+msgid "Automatic proxy configuration URL"
+msgstr "URL de configuraciÃn automÃtica do proxy"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "URL that provides proxy configuration values."
 msgstr "O URL que proporciona os valores de configuraciÃn de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
-msgid "Use HTTP proxy"
-msgstr "Usar proxy HTTP"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:53
-msgid "Username to pass as authentication when doing HTTP proxying."
-msgstr "Nome do usuario para pasar como autenticaciÃn ao usar un proxy HTTP."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "Whether or not the window should be maximized."
-msgstr "Indica se a xanela deberÃa ou non estar maximizada."
-
 #: ../shell/e-shell.c:312
 msgid "Preparing to go offline..."
 msgstr "Preparando a desconexiÃnâ"
@@ -20444,7 +20456,7 @@ msgstr "Preparando a desconexiÃnâ"
 msgid "Preparing to go online..."
 msgstr "Preparando a conexiÃnâ"
 
-#: ../shell/e-shell.c:435
+#: ../shell/e-shell.c:436
 msgid "Preparing to quit..."
 msgstr "Preparando a saÃdaâ"
 
@@ -20908,19 +20920,35 @@ msgstr ""
 "%s: --force-online e --offline non poden usarse à vez.\n"
 "  Use Â%s --help para mÃis informaciÃn.\n"
 
-#: ../shell/shell.error.xml.h:1
-msgid "Are you sure you want to forget all remembered passwords?"
-msgstr "Està seguro de que desexa esquecer todos os contrasinais memorizados?"
+#: ../shell/shell.error.xml.h:2
+msgid "Upgrade from previous version failed:"
+msgstr "Produciuse un fallo ao anovar desde a versiÃn anterior:"
+
+#: ../shell/shell.error.xml.h:3
+msgid ""
+"{0}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+"{0}\n"
+"\n"
+"Se escolle continuar, pode que non teÃa acceso a algÃns dos seus datos "
+"antigos.\n"
+
+#: ../shell/shell.error.xml.h:7
+msgid "Continue Anyway"
+msgstr "Continuar de todas formas"
+
+#: ../shell/shell.error.xml.h:8
+msgid "Quit Now"
+msgstr "SaÃr agora"
 
-#: ../shell/shell.error.xml.h:2
+#: ../shell/shell.error.xml.h:9
 msgid "Cannot upgrade directly from version {0}"
 msgstr "Non à posÃbel anovar directamente desde a versiÃn {0}"
 
-#: ../shell/shell.error.xml.h:3
-msgid "Continue Anyway"
-msgstr "Continuar de todas formas"
-
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "Evolution no longer supports upgrading directly from version {0}. However as "
 "a workaround you might try first upgrading to Evolution 2, and then "
@@ -20930,7 +20958,11 @@ msgstr ""
 "PorÃn, como soluciÃn pode intentar actualizar primeiro a Evolution 2 e "
 "despois a Evolution 3."
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:11
+msgid "Are you sure you want to forget all remembered passwords?"
+msgstr "Està seguro de que desexa esquecer todos os contrasinais memorizados?"
+
+#: ../shell/shell.error.xml.h:12
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -20938,30 +20970,10 @@ msgstr ""
 "Ao esquecer os seus contrasinais memorizados eliminarà todos os contrasinais "
 "gardados. VolverÃselle preguntar a prÃxima vez que sexan necesarios."
 
-#: ../shell/shell.error.xml.h:7
-msgid "Quit Now"
-msgstr "SaÃr agora"
-
-#: ../shell/shell.error.xml.h:8
-msgid "Upgrade from previous version failed:"
-msgstr "Produciuse un fallo ao anovar desde a versiÃn anterior:"
-
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:13
 msgid "_Forget"
 msgstr "_Esquecer"
 
-#: ../shell/shell.error.xml.h:10
-msgid ""
-"{0}\n"
-"\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
-msgstr ""
-"{0}\n"
-"\n"
-"Se escolle continuar, pode que non teÃa acceso a algÃns dos seus datos "
-"antigos.\n"
-
 #: ../shell/test/e-test-shell-backend.c:52
 msgctxt "New"
 msgid "_Test Item"
@@ -21069,7 +21081,7 @@ msgid "Issued To Organizational Unit"
 msgstr "Expedido à unidade organizativa (OU)"
 
 #: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
-#: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:32
+#: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:12
 #: ../smime/lib/e-cert.c:565
 msgid "Serial Number"
 msgstr "NÃmero de serie"
@@ -21080,7 +21092,7 @@ msgid "Purposes"
 msgstr "PropÃsitos"
 
 #: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
-#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:15
 msgid "Issued By"
 msgstr "Emitido por"
 
@@ -21109,13 +21121,13 @@ msgstr "Caduca"
 
 #: ../smime/gui/certificate-manager.c:83
 #: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:17
 msgid "SHA1 Fingerprint"
 msgstr "ImpresiÃn dixital SHA1"
 
 #: ../smime/gui/certificate-manager.c:84
 #: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:18
 msgid "MD5 Fingerprint"
 msgstr "ImpresiÃn dixital MD5"
 
@@ -21210,159 +21222,159 @@ msgstr ""
 msgid "Select certificate"
 msgstr "Seleccionar un certificado"
 
-#: ../smime/gui/smime-ui.ui.h:1
-msgid "<Not Part of Certificate>"
-msgstr "<Non à parte do certificado>"
-
-#: ../smime/gui/smime-ui.ui.h:2
-msgid "Authorities"
-msgstr "Autoridades"
-
-#: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup _All"
-msgstr "Facer copia de seguranza de _todo"
+#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:825
+msgid "SSL Client Certificate"
+msgstr "Certificado de cliente SSL"
 
-#: ../smime/gui/smime-ui.ui.h:4
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
-msgstr ""
-"Antes de confiar nesta EA para calquera propÃsito, deberÃa examinar o seu "
-"certificado e as sÃas directrices e procedementos (se estÃn dispoÃÃbeis)."
+#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:829
+msgid "SSL Server Certificate"
+msgstr "Certificado de servidor SSL"
 
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1093
-msgid "Certificate"
-msgstr "Certificado"
+#: ../smime/gui/smime-ui.ui.h:5
+msgid "Email Signer Certificate"
+msgstr "Certificado do asinante do correo"
 
 #: ../smime/gui/smime-ui.ui.h:6
-msgid "Certificate Authority Trust"
-msgstr "Confianza na entidade de acreditaciÃn"
+msgid "Email Recipient Certificate"
+msgstr "Certificado do destinatario do correo"
 
 #: ../smime/gui/smime-ui.ui.h:7
-msgid "Certificate Fields"
-msgstr "Campos do certificado"
+msgid "This certificate has been verified for the following uses:"
+msgstr "Este certificado comprobouse para os seguintes usos:"
 
 #: ../smime/gui/smime-ui.ui.h:8
-msgid "Certificate Hierarchy"
-msgstr "XerarquÃa do certificado"
+msgid "Issued To"
+msgstr "Emitido a"
 
 #: ../smime/gui/smime-ui.ui.h:9
-msgid "Certificate details"
-msgstr "InformaciÃn do certificado"
+msgid "Common Name (CN)"
+msgstr "Nome comÃn (NC)"
 
 #: ../smime/gui/smime-ui.ui.h:10
-msgid "Certificates Table"
-msgstr "TÃboa de certificados"
+msgid "Organization (O)"
+msgstr "OrganizaciÃn (O)"
 
 #: ../smime/gui/smime-ui.ui.h:11
-msgid "Common Name (CN)"
-msgstr "Nome comÃn (NC)"
+msgid "Organizational Unit (OU)"
+msgstr "Unidade organizativa (UO)"
 
-#: ../smime/gui/smime-ui.ui.h:12
-msgid "Contact Certificates"
-msgstr "Certificados de contactos"
+#: ../smime/gui/smime-ui.ui.h:13
+msgid "Issued On"
+msgstr "Emitido o"
 
 #: ../smime/gui/smime-ui.ui.h:14
-msgid "Do not trust the authenticity of this certificate"
-msgstr "Non confiar na autenticidade deste certificado"
-
-#: ../smime/gui/smime-ui.ui.h:15
-msgid "Email Certificate Trust Settings"
-msgstr "Axustes de confianza de certificados de correo"
-
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Email Recipient Certificate"
-msgstr "Certificado do destinatario do correo"
-
-#: ../smime/gui/smime-ui.ui.h:17
-msgid "Email Signer Certificate"
-msgstr "Certificado do asinante do correo"
-
-#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "Caduca o"
 
+#: ../smime/gui/smime-ui.ui.h:16
+msgid "Fingerprints"
+msgstr "ImpresiÃns dixitais"
+
 #: ../smime/gui/smime-ui.ui.h:19
-msgid "Field Value"
-msgstr "Valor do campo"
+msgid "<Not Part of Certificate>"
+msgstr "<Non à parte do certificado>"
 
 #: ../smime/gui/smime-ui.ui.h:20
-msgid "Fingerprints"
-msgstr "ImpresiÃns dixitais"
+msgid "Validity"
+msgstr "Validez"
+
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "Certificate Hierarchy"
+msgstr "XerarquÃa do certificado"
+
+#: ../smime/gui/smime-ui.ui.h:23
+msgid "Certificate Fields"
+msgstr "Campos do certificado"
 
 #: ../smime/gui/smime-ui.ui.h:24
-msgid "Issued On"
-msgstr "Emitido o"
+msgid "Field Value"
+msgstr "Valor do campo"
 
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "Issued To"
-msgstr "Emitido a"
+#: ../smime/gui/smime-ui.ui.h:26
+msgid "You have certificates from these organizations that identify you:"
+msgstr "Ten certificados destas organizaciÃns que o identifican:"
 
 #: ../smime/gui/smime-ui.ui.h:27
-msgid "Organization (O)"
-msgstr "OrganizaciÃn (O)"
-
-#: ../smime/gui/smime-ui.ui.h:28
-msgid "Organizational Unit (OU)"
-msgstr "Unidade organizativa (UO)"
+msgid "Certificates Table"
+msgstr "TÃboa de certificados"
 
-#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:825
-msgid "SSL Client Certificate"
-msgstr "Certificado de cliente SSL"
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:30
+msgid "_Backup"
+msgstr "_Copia de seguranza"
 
-#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:829
-msgid "SSL Server Certificate"
-msgstr "Certificado de servidor SSL"
+#: ../smime/gui/smime-ui.ui.h:31
+msgid "Backup _All"
+msgstr "Facer copia de seguranza de _todo"
 
 #: ../smime/gui/smime-ui.ui.h:33
-msgid "This certificate has been verified for the following uses:"
-msgstr "Este certificado comprobouse para os seguintes usos:"
+msgid "Your Certificates"
+msgstr "Os seus certificados"
 
 #: ../smime/gui/smime-ui.ui.h:34
-msgid "Trust the authenticity of this certificate"
-msgstr "Confiar na autenticidade deste certificado"
+msgid "You have certificates on file that identify these people:"
+msgstr "Ten os certificados que identifican a estas persoas nun ficheiro:"
 
 #: ../smime/gui/smime-ui.ui.h:35
-msgid "Trust this CA to identify _email users."
-msgstr "Confiar nesta AC para identificar a usuarios de _correo-e."
+msgid "Contact Certificates"
+msgstr "Certificados de contactos"
 
 #: ../smime/gui/smime-ui.ui.h:36
-msgid "Trust this CA to identify _software developers."
-msgstr "Confiar nesta AC para identificar a desenvolvedores de _software."
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
+msgstr ""
+"Ten os certificados que identifican a estas entidades de acreditaciÃn nun "
+"ficheiro:"
 
 #: ../smime/gui/smime-ui.ui.h:37
-msgid "Trust this CA to identify _websites."
-msgstr "Confiar nesta AC para identificar sitios _web."
+msgid "Authorities"
+msgstr "Autoridades"
 
 #: ../smime/gui/smime-ui.ui.h:38
-msgid "Validity"
-msgstr "Validez"
+msgid "Certificate Authority Trust"
+msgstr "Confianza na entidade de acreditaciÃn"
 
 #: ../smime/gui/smime-ui.ui.h:39
-msgid "You have certificates from these organizations that identify you:"
-msgstr "Ten certificados destas organizaciÃns que o identifican:"
+msgid "Trust this CA to identify _websites."
+msgstr "Confiar nesta AC para identificar sitios _web."
 
 #: ../smime/gui/smime-ui.ui.h:40
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
-msgstr ""
-"Ten os certificados que identifican a estas entidades de acreditaciÃn nun "
-"ficheiro:"
+msgid "Trust this CA to identify _email users."
+msgstr "Confiar nesta AC para identificar a usuarios de _correo-e."
 
 #: ../smime/gui/smime-ui.ui.h:41
-msgid "You have certificates on file that identify these people:"
-msgstr "Ten os certificados que identifican a estas persoas nun ficheiro:"
+msgid "Trust this CA to identify _software developers."
+msgstr "Confiar nesta AC para identificar a desenvolvedores de _software."
 
 #: ../smime/gui/smime-ui.ui.h:42
-msgid "Your Certificates"
-msgstr "Os seus certificados"
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+"Antes de confiar nesta EA para calquera propÃsito, deberÃa examinar o seu "
+"certificado e as sÃas directrices e procedementos (se estÃn dispoÃÃbeis)."
 
-#. This is a verb, as in "make a backup".
-#: ../smime/gui/smime-ui.ui.h:44
-msgid "_Backup"
-msgstr "_Copia de seguranza"
+#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1093
+msgid "Certificate"
+msgstr "Certificado"
 
 #: ../smime/gui/smime-ui.ui.h:45
+msgid "Certificate details"
+msgstr "InformaciÃn do certificado"
+
+#: ../smime/gui/smime-ui.ui.h:46
+msgid "Email Certificate Trust Settings"
+msgstr "Axustes de confianza de certificados de correo"
+
+#: ../smime/gui/smime-ui.ui.h:47
+msgid "Trust the authenticity of this certificate"
+msgstr "Confiar na autenticidade deste certificado"
+
+#: ../smime/gui/smime-ui.ui.h:48
+msgid "Do not trust the authenticity of this certificate"
+msgstr "Non confiar na autenticidade deste certificado"
+
+#: ../smime/gui/smime-ui.ui.h:49
 msgid "_Edit CA Trust"
 msgstr "_Editar a confianza na EA"
 
@@ -21566,52 +21578,52 @@ msgid "Imported Certificate"
 msgstr "Certificado importado"
 
 #: ../views/addressbook/galview.xml.h:1
-msgid "By _Company"
-msgstr "Por _empresa"
-
-#: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
 msgstr "T_arxetas de enderezos"
 
-#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:2 ../views/calendar/galview.xml.h:5
 msgid "_List View"
 msgstr "Vista de _lista"
 
-#: ../views/calendar/galview.xml.h:1
-msgid "W_eek View"
-msgstr "Vista s_emanal"
+#: ../views/addressbook/galview.xml.h:3
+msgid "By _Company"
+msgstr "Por _empresa"
 
-#: ../views/calendar/galview.xml.h:2
+#: ../views/calendar/galview.xml.h:1
 msgid "_Day View"
 msgstr "Vista _diaria"
 
+#: ../views/calendar/galview.xml.h:2
+msgid "_Work Week View"
+msgstr "Vista de semana _laboral"
+
+#: ../views/calendar/galview.xml.h:3
+msgid "W_eek View"
+msgstr "Vista s_emanal"
+
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "Vista _mensual"
 
-#: ../views/calendar/galview.xml.h:5
-msgid "_Work Week View"
-msgstr "Vista de semana _laboral"
-
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "Como _cartafol de enviados para vista ampla"
+msgid "_Messages"
+msgstr "_Mensaxes"
 
 #: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "Como _cartafol de enviados"
 
 #: ../views/mail/galview.xml.h:3
-msgid "By S_tatus"
-msgstr "Polo es_tado"
+msgid "By Su_bject"
+msgstr "Polo _asunto"
 
 #: ../views/mail/galview.xml.h:4
 msgid "By Se_nder"
 msgstr "Polo _remitente"
 
 #: ../views/mail/galview.xml.h:5
-msgid "By Su_bject"
-msgstr "Polo _asunto"
+msgid "By S_tatus"
+msgstr "Polo es_tado"
 
 #: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
@@ -21622,18 +21634,18 @@ msgid "For _Wide View"
 msgstr "Para a vista _ampla"
 
 #: ../views/mail/galview.xml.h:8
-msgid "_Messages"
-msgstr "_Mensaxes"
+msgid "As Sent Folder for Wi_de View"
+msgstr "Como _cartafol de enviados para vista ampla"
 
 #: ../views/memos/galview.xml.h:1
 msgid "_Memos"
 msgstr "_Notas"
 
-#: ../views/tasks/galview.xml.h:1
+#: ../views/tasks/galview.xml.h:2
 msgid "With _Due Date"
 msgstr "Con _data de vencemento"
 
-#: ../views/tasks/galview.xml.h:2
+#: ../views/tasks/galview.xml.h:3
 msgid "With _Status"
 msgstr "Con e_stado"
 
@@ -21650,15 +21662,7 @@ msgstr "UTC"
 msgid "Select a Time Zone"
 msgstr "Seleccionar un fuso horario"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
-msgid "Time Zones"
-msgstr "Fusos horarios"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
-msgid "Timezone drop-down combination box"
-msgstr "Caixa de combinaciÃn despregÃbel para o fuso horario"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -21668,10 +21672,18 @@ msgstr ""
 "fuso horario.\n"
 "Use o botÃn dereito para reducir."
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
+msgid "Time Zones"
+msgstr "Fusos horarios"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid "_Selection"
 msgstr "_SelecciÃn"
 
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6
+msgid "Timezone drop-down combination box"
+msgstr "Caixa de combinaciÃn despregÃbel para o fuso horario"
+
 #: ../widgets/menus/gal-define-views-dialog.c:359
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
@@ -21713,13 +21725,13 @@ msgid "Name of new view:"
 msgstr "Nome da nova vista:"
 
 #: ../widgets/menus/gal-view-new-dialog.ui.h:2
-msgid "Type of View"
-msgstr "Tipo de vista"
-
-#: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of view:"
 msgstr "Tipo de vista:"
 
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
+msgid "Type of View"
+msgstr "Tipo de vista"
+
 #: ../widgets/misc/ea-calendar-item.c:306
 #: ../widgets/misc/ea-calendar-item.c:315
 msgid "%d %B %Y"
@@ -22167,136 +22179,136 @@ msgstr "Alcanzouse o inicio da pÃxina, continÃase desde o final"
 msgid "When de_leted:"
 msgstr "Ao e_liminar:"
 
-#: ../widgets/misc/e-send-options.ui.h:1
-msgid "A_uto-delete sent item"
-msgstr "Eliminar a_utomaticamente o elemento enviado"
-
 #: ../widgets/misc/e-send-options.ui.h:3
-msgid "Creat_e a sent item to track information"
-msgstr "Cr_ear un elemento enviado para seguir a informaciÃn"
-
-#: ../widgets/misc/e-send-options.ui.h:4
-msgid "Deli_vered and opened"
-msgstr "_Entregado e aberto"
-
-#: ../widgets/misc/e-send-options.ui.h:5
-msgid "Delivery Options"
-msgstr "OpciÃns de entrega"
+msgid "Standard"
+msgstr "EstÃndar"
 
 #: ../widgets/misc/e-send-options.ui.h:6
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "_AtÃ"
-
-#: ../widgets/misc/e-send-options.ui.h:7
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "_Despois"
+msgid "Proprietary"
+msgstr "Propietario"
 
 #: ../widgets/misc/e-send-options.ui.h:8
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "dÃas"
+msgid "Secret"
+msgstr "Secreto"
 
 #: ../widgets/misc/e-send-options.ui.h:9
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "Den_tro"
+msgid "Top Secret"
+msgstr "Alto secreto"
 
 #: ../widgets/misc/e-send-options.ui.h:10
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "dÃas"
-
-#: ../widgets/misc/e-send-options.ui.h:11
 msgid "For Your Eyes Only"
 msgstr "SÃ para os seus ollos"
 
+#. Translators: Used in send options dialog
 #: ../widgets/misc/e-send-options.ui.h:12
-msgid "Gene_ral Options"
-msgstr "OpciÃns _xerais"
+msgctxt "send-options"
+msgid "None"
+msgstr "NingÃn"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../widgets/misc/e-send-options.ui.h:13
 msgid "Mail Receipt"
 msgstr "Destinatario do correo"
 
+#: ../widgets/misc/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "R_esposta solicitada"
+
+#: ../widgets/misc/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "Den_tro"
+
 #: ../widgets/misc/e-send-options.ui.h:17
-msgid "Proprietary"
-msgstr "Propietario"
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "dÃas"
 
 #: ../widgets/misc/e-send-options.ui.h:18
-msgid "R_eply requested"
-msgstr "R_esposta solicitada"
+msgid "_When convenient"
+msgstr "_Cando sexa conveniente"
 
 #: ../widgets/misc/e-send-options.ui.h:20
-msgid "Return Notification"
-msgstr "Devolver notificaciÃn"
+msgid "_Delay message delivery"
+msgstr "_Atrasar a entrega da mensaxe"
 
 #: ../widgets/misc/e-send-options.ui.h:21
-msgid "Secret"
-msgstr "Secreto"
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_Despois"
+
+#: ../widgets/misc/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "dÃas"
 
 #: ../widgets/misc/e-send-options.ui.h:23
-msgid "Sta_tus Tracking"
-msgstr "Seguimento de es_tado"
+msgid "_Set expiration date"
+msgstr "_Estabelecer a data de vencemento"
 
 #: ../widgets/misc/e-send-options.ui.h:24
-msgid "Standard"
-msgstr "EstÃndar"
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_AtÃ"
 
 #: ../widgets/misc/e-send-options.ui.h:25
-msgid "Status Tracking"
-msgstr "Seguimento de estado"
+msgid "Delivery Options"
+msgstr "OpciÃns de entrega"
 
-#: ../widgets/misc/e-send-options.ui.h:26
-msgid "Top Secret"
-msgstr "Alto secreto"
+#: ../widgets/misc/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "_ClasificaciÃn:"
 
 #: ../widgets/misc/e-send-options.ui.h:28
-msgid "When acce_pted:"
-msgstr "Ao ace_ptar:"
+msgid "Gene_ral Options"
+msgstr "OpciÃns _xerais"
 
 #: ../widgets/misc/e-send-options.ui.h:29
-msgid "When co_mpleted:"
-msgstr "Ao co_mpletar:"
+msgid "Creat_e a sent item to track information"
+msgstr "Cr_ear un elemento enviado para seguir a informaciÃn"
 
 #: ../widgets/misc/e-send-options.ui.h:30
-msgid "When decli_ned:"
-msgstr "Ao _rexeitar:"
+msgid "_Delivered"
+msgstr "_Entregada"
 
 #: ../widgets/misc/e-send-options.ui.h:31
-msgid "_All information"
-msgstr "Toda _a informaciÃn"
+msgid "Deli_vered and opened"
+msgstr "_Entregado e aberto"
 
 #: ../widgets/misc/e-send-options.ui.h:32
-msgid "_Classification:"
-msgstr "_ClasificaciÃn:"
+msgid "_All information"
+msgstr "Toda _a informaciÃn"
 
 #: ../widgets/misc/e-send-options.ui.h:33
-msgid "_Delay message delivery"
-msgstr "_Atrasar a entrega da mensaxe"
+msgid "A_uto-delete sent item"
+msgstr "Eliminar a_utomaticamente o elemento enviado"
 
 #: ../widgets/misc/e-send-options.ui.h:34
-msgid "_Delivered"
-msgstr "_Entregada"
+msgid "Status Tracking"
+msgstr "Seguimento de estado"
+
+#: ../widgets/misc/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "_Ao abrir:"
 
 #: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Set expiration date"
-msgstr "_Estabelecer a data de vencemento"
+msgid "When decli_ned:"
+msgstr "Ao _rexeitar:"
 
 #: ../widgets/misc/e-send-options.ui.h:37
-msgid "_When convenient"
-msgstr "_Cando sexa conveniente"
+msgid "When co_mpleted:"
+msgstr "Ao co_mpletar:"
 
 #: ../widgets/misc/e-send-options.ui.h:38
-msgid "_When opened:"
-msgstr "_Ao abrir:"
+msgid "When acce_pted:"
+msgstr "Ao ace_ptar:"
+
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "Devolver notificaciÃn"
 
-#. Translators: Used in send options dialog
 #: ../widgets/misc/e-send-options.ui.h:40
-msgctxt "send-options"
-msgid "None"
-msgstr "NingÃn"
+msgid "Sta_tus Tracking"
+msgstr "Seguimento de es_tado"
 
 #: ../widgets/misc/e-signature-editor.c:138
 #: ../widgets/misc/e-signature-editor.c:564
@@ -22449,7 +22461,7 @@ msgid "No grouping"
 msgstr "Sen agrupar"
 
 #: ../widgets/table/e-table-config.c:666
-#: ../widgets/table/e-table-config.ui.h:11
+#: ../widgets/table/e-table-config.ui.h:1
 msgid "Show Fields"
 msgstr "Mostrar os campos"
 
@@ -22457,87 +22469,87 @@ msgstr "Mostrar os campos"
 msgid "Available Fields"
 msgstr "Campos dispoÃÃbeis"
 
-#: ../widgets/table/e-table-config.ui.h:1
+#: ../widgets/table/e-table-config.ui.h:2
 msgid "A_vailable Fields:"
 msgstr "Campos _dispoÃÃbeis:"
 
-#: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1721
-msgid "Ascending"
-msgstr "Ascendente"
-
 #: ../widgets/table/e-table-config.ui.h:3
-msgid "Clear All"
-msgstr "Limpar todo"
+msgid "_Show these fields in order:"
+msgstr "_Mostrar estes campos por orde:"
 
 #: ../widgets/table/e-table-config.ui.h:4
-msgid "Clear _All"
-msgstr "Limp_ar todo"
+msgid "Move _Up"
+msgstr "Mover _arriba"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1721
-msgid "Descending"
-msgstr "Descendente"
+msgid "Move _Down"
+msgstr "Mover _abaixo"
 
-#: ../widgets/table/e-table-config.ui.h:8
-msgid "Group Items By"
-msgstr "Agrupar os elementos por"
+#: ../widgets/table/e-table-config.ui.h:7
+msgid "_Remove"
+msgstr "Elimina_r"
 
 #: ../widgets/table/e-table-config.ui.h:9
-msgid "Move _Down"
-msgstr "Mover _abaixo"
+msgid "_Show field in View"
+msgstr "Mo_strar o campo na vista"
 
 #: ../widgets/table/e-table-config.ui.h:10
-msgid "Move _Up"
-msgstr "Mover _arriba"
+#: ../widgets/table/e-table-header-item.c:1721
+msgid "Ascending"
+msgstr "Ascendente"
+
+#: ../widgets/table/e-table-config.ui.h:11
+#: ../widgets/table/e-table-header-item.c:1721
+msgid "Descending"
+msgstr "Descendente"
 
 #: ../widgets/table/e-table-config.ui.h:12
+msgid "Group Items By"
+msgstr "Agrupar os elementos por"
+
+#: ../widgets/table/e-table-config.ui.h:13
 msgid "Show _field in View"
 msgstr "M_ostrar o campo na vista"
 
-#: ../widgets/table/e-table-config.ui.h:13
+#: ../widgets/table/e-table-config.ui.h:14
+msgid "Then By"
+msgstr "Despois por"
+
+#: ../widgets/table/e-table-config.ui.h:15
 msgid "Show field i_n View"
 msgstr "Mos_trar o campo na vista"
 
-#: ../widgets/table/e-table-config.ui.h:14
+#: ../widgets/table/e-table-config.ui.h:16
 msgid "Show field in _View"
 msgstr "Mostrar o campo na _visualizaciÃn"
 
-#: ../widgets/table/e-table-config.ui.h:15
+#: ../widgets/table/e-table-config.ui.h:17
+msgid "Clear _All"
+msgstr "Limp_ar todo"
+
+#: ../widgets/table/e-table-config.ui.h:18
 msgid "Sort"
 msgstr "Ordenar"
 
-#: ../widgets/table/e-table-config.ui.h:16
+#: ../widgets/table/e-table-config.ui.h:19
 msgid "Sort Items By"
 msgstr "Ordenar os elementos por"
 
-#: ../widgets/table/e-table-config.ui.h:17
-msgid "Then By"
-msgstr "Despois por"
-
-#: ../widgets/table/e-table-config.ui.h:19
-msgid "_Fields Shown..."
-msgstr "_Campos mostradosâ"
-
 #: ../widgets/table/e-table-config.ui.h:20
-msgid "_Group By..."
-msgstr "_Agrupar porâ"
+msgid "Clear All"
+msgstr "Limpar todo"
 
 #: ../widgets/table/e-table-config.ui.h:21
-msgid "_Remove"
-msgstr "Elimina_r"
+msgid "_Sort..."
+msgstr "_Ordenarâ"
 
 #: ../widgets/table/e-table-config.ui.h:22
-msgid "_Show field in View"
-msgstr "Mo_strar o campo na vista"
+msgid "_Group By..."
+msgstr "_Agrupar porâ"
 
 #: ../widgets/table/e-table-config.ui.h:23
-msgid "_Show these fields in order:"
-msgstr "_Mostrar estes campos por orde:"
-
-#: ../widgets/table/e-table-config.ui.h:24
-msgid "_Sort..."
-msgstr "_Ordenarâ"
+msgid "_Fields Shown..."
+msgstr "_Campos mostradosâ"
 
 #: ../widgets/table/e-table-field-chooser.c:153
 msgid ""



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]