[evolution] Updated Galician Translation

From: Ignacio Casal Quinteiro <icq src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [evolution] Updated Galician Translation
Date: Thu, 11 Feb 2010 15:45:36 +0000 (UTC)
commit a4e3b363294861415139f0cc7d304d33b3080020
Author: Fran DiÃ©guez <frandieguez ubuntu com>
Date:   Thu Feb 11 16:45:15 2010 +0100

    Updated Galician Translation

 po/gl.po |22182 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 11849 insertions(+), 10333 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 03b273e..e174f61 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -18,15 +18,16 @@
 # Suso Baleato <suso baleato xunta es>, 2009.
 # Fran DiÃ©guez <fran dieguez mabishu com>, 2009.
 # AntÃ³n MÃ©ixome <meixome mancomun org>, 2009.
-#: ../shell/main.c:631
+# Fran DiÃ©guez <frandieguez ubuntu com>, 2010.
+#: ../shell/main.c:512
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.gnome-2-28\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-19 14:45+0200\n"
-"PO-Revision-Date: 2009-08-18 10:56+0200\n"
-"Last-Translator: AntÃ³n MÃ©ixome <meixome mancomun org>\n"
-"Language-Team: Galician <gnome mancomun org>\n"
+"POT-Creation-Date: 2010-02-11 16:45+0100\n"
+"PO-Revision-Date: 2010-02-05 13:12+0100\n"
+"Last-Translator: Fran DiÃ©guez <frandieguez ubuntu com>\n"
+"Language-Team: Gallician <proxecto trasno net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,314 +35,6 @@ msgstr ""
 "Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../a11y/addressbook/ea-addressbook-view.c:94
-#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:178
-msgid "evolution address book"
-msgstr "axenda de enderezos do Evolution"
-
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:208
-msgid "New Contact"
-msgstr "Contacto novo"
-
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:216
-msgid "New Contact List"
-msgstr "Lista de contactos nova"
-
-#: ../a11y/addressbook/ea-minicard-view.c:161
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "o cartafol de axendas de enderezos actual %s ten %d tarxeta"
-msgstr[1] "o cartafol de axendas de enderezos actual %s ten %d tarxetas"
-
-#: ../a11y/addressbook/ea-minicard.c:31
-msgid "Open"
-msgstr "Abrir"
-
-#: ../a11y/addressbook/ea-minicard.c:141
-msgid "Contact List: "
-msgstr "Lista de contactos: "
-
-#: ../a11y/addressbook/ea-minicard.c:142
-msgid "Contact: "
-msgstr "Contacto: "
-
-#: ../a11y/addressbook/ea-minicard.c:168
-msgid "evolution minicard"
-msgstr "minitarxeta do Evolution"
-
-#: ../a11y/calendar/ea-cal-view-event.c:263
-msgid "It has alarms."
-msgstr "Ten alarmas."
-
-#: ../a11y/calendar/ea-cal-view-event.c:266
-msgid "It has recurrences."
-msgstr "Ten recorrencias."
-
-#: ../a11y/calendar/ea-cal-view-event.c:269
-msgid "It is a meeting."
-msgstr "Ã? unha cita."
-
-#: ../a11y/calendar/ea-cal-view-event.c:275
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "Evento de calendario: o resumo Ã© %s."
-
-#: ../a11y/calendar/ea-cal-view-event.c:277
-msgid "Calendar Event: It has no summary."
-msgstr "Evento de calendario: non ten resumo."
-
-#: ../a11y/calendar/ea-cal-view-event.c:297
-msgid "calendar view event"
-msgstr "visualizaciÃ³n de actividades de calendario"
-
-#: ../a11y/calendar/ea-cal-view-event.c:525
-msgid "Grab Focus"
-msgstr "Obter o foco"
-
-#: ../a11y/calendar/ea-cal-view.c:299
-msgid "New Appointment"
-msgstr "Nova cita"
-
-#: ../a11y/calendar/ea-cal-view.c:300
-msgid "New All Day Event"
-msgstr "Novo actividade de dÃa completo"
-
-#: ../a11y/calendar/ea-cal-view.c:301
-msgid "New Meeting"
-msgstr "Nova cita"
-
-#: ../a11y/calendar/ea-cal-view.c:302
-msgid "Go to Today"
-msgstr "Ir a hoxe"
-
-#: ../a11y/calendar/ea-cal-view.c:303
-msgid "Go to Date"
-msgstr "Ir Ã¡ data"
-
-#: ../a11y/calendar/ea-day-view-main-item.c:300
-#: ../a11y/calendar/ea-week-view-main-item.c:297
-msgid "a table to view and select the current time range"
-msgstr "unha tÃ¡boa para ver e seleccionar o intervalo de tempo actual"
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
-#, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] "Ten %d actividade."
-msgstr[1] "Ten %d eventos."
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
-msgid "It has no events."
-msgstr "Non ten eventos."
-
-#. To translators: First %s is the week, for example "July 10th -
-#. July 14th, 2006". Second %s is the number of events in this work
-#. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:159
-#, c-format
-msgid "Work Week View: %s. %s"
-msgstr "VisualizaciÃ³n de semana laboral: %s. %s"
-
-#. To translators: First %s is the day, for example "Thursday July
-#. 13th, 2006". Second %s is the number of events on this day, for
-#. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:165
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "VisualizaciÃ³n diaria: %s. %s"
-
-#: ../a11y/calendar/ea-day-view.c:196
-msgid "calendar view for a work week"
-msgstr "visualizaciÃ³n de calendario para unha semana laboral"
-
-#: ../a11y/calendar/ea-day-view.c:198
-msgid "calendar view for one or more days"
-msgstr "visualizaciÃ³n de calendario para un ou mÃ¡is dÃas"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:771
-msgid "%A %d %b %Y"
-msgstr "%A, %d de %b de %Y"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:774
-#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1593
-#: ../calendar/gui/e-week-view-main-item.c:368
-msgid "%a %d %b"
-msgstr "%a, %d de %b"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../a11y/calendar/ea-gnome-calendar.c:196
-#: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:776
-#: ../calendar/gui/calendar-component.c:781
-#: ../calendar/gui/calendar-component.c:783
-msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:215
-#: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../a11y/calendar/ea-gnome-calendar.c:227
-#: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:795
-#: ../calendar/gui/calendar-component.c:802
-#: ../calendar/gui/calendar-component.c:808
-#: ../calendar/gui/calendar-component.c:810
-msgid "%d %b %Y"
-msgstr "%d de %b de %Y"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:800
-#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1609
-#: ../calendar/gui/e-week-view-main-item.c:382
-msgid "%d %b"
-msgstr "%d de %b"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:245
-#: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:782
-msgid "Gnome Calendar"
-msgstr "Calendario do Gnome"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:288
-msgid "search bar"
-msgstr "barra de busca"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:289
-msgid "evolution calendar search bar"
-msgstr "barra de busca do calendario do Evolution"
-
-#: ../a11y/calendar/ea-jump-button.c:146
-msgid "Jump button"
-msgstr "BotÃ³n de salto"
-
-#: ../a11y/calendar/ea-jump-button.c:155
-msgid "Click here, you can find more events."
-msgstr "Prema aquÃ para localizar mÃ¡is eventos."
-
-#: ../a11y/calendar/ea-week-view.c:154
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "VisualizaciÃ³n mensual: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:158
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "VisualizaciÃ³n semanal: %s. %s"
-
-#: ../a11y/calendar/ea-week-view.c:189
-msgid "calendar view for a month"
-msgstr "VisualizaciÃ³n de calendario para un mes"
-
-#: ../a11y/calendar/ea-week-view.c:191
-msgid "calendar view for one or more weeks"
-msgstr "visualizaciÃ³n de calendario para unha ou mÃ¡is semanas"
-
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "emerxente"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
-msgid "popup a child"
-msgstr "emerxer un fillo"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "editar"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
-msgid "begin editing this cell"
-msgstr "comezar a editar esta cela"
-
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "alternar o estado"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
-msgid "toggle the cell"
-msgstr "alternar o estado da cela"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "expandir"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:211
-msgid "expands the row in the ETree containing this cell"
-msgstr "expande a fila no ETree que contÃ©n esta cela"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "contraer"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:217
-msgid "collapses the row in the ETree containing this cell"
-msgstr "contrae a fila no ETree que contÃ©n esta cela"
-
-#: ../a11y/e-table/gal-a11y-e-cell.c:120
-msgid "Table Cell"
-msgstr "Cela da tÃ¡boa"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
-#: ../widgets/table/e-table-click-to-add.c:578
-msgid "click to add"
-msgstr "prema para engadir"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
-msgid "click"
-msgstr "premer"
-
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
-msgid "sort"
-msgstr "ordenar"
-
-#: ../a11y/widgets/ea-calendar-item.c:295
-#: ../a11y/widgets/ea-calendar-item.c:301
-msgid "%d %B %Y"
-msgstr "%d de %B de %Y"
-
-#: ../a11y/widgets/ea-calendar-item.c:303
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Calendario: dende %s atÃ© %s"
-
-#: ../a11y/widgets/ea-calendar-item.c:338
-msgid "evolution calendar item"
-msgstr "elemento de calendario do Evolution"
-
-#: ../a11y/widgets/ea-combo-button.c:56
-msgid "Combo Button"
-msgstr "BotÃ³n de combinaciÃ³n"
-
-#: ../a11y/widgets/ea-combo-button.c:66
-msgid "Activate Default"
-msgstr "Activar os predeterminados"
-
-#: ../a11y/widgets/ea-combo-button.c:68
-msgid "Popup Menu"
-msgstr "MenÃº emerxente"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -358,7 +51,7 @@ msgid ""
 "with the same address anyway?"
 msgstr ""
 "Xa existe un contacto con ese enderezo. Quere, aÃnda asÃ, engadir unha "
-"tarxeta novo co mesmo enderezo?"
+"tarxeta nova co mesmo enderezo?"
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
@@ -366,11 +59,11 @@ msgstr "O enderezo '{0}' xa existe."
 
 #: ../addressbook/addressbook.error.xml.h:5
 msgid "Cannot add new contact"
-msgstr "Non se pode engadir un contacto novo"
+msgstr "Non Ã© posÃbel engadir un contacto novo"
 
 #: ../addressbook/addressbook.error.xml.h:6
 msgid "Cannot move contact."
-msgstr "Non se pode mover o contacto."
+msgstr "Non Ã© posÃbel mover o contacto."
 
 #: ../addressbook/addressbook.error.xml.h:7
 msgid "Category editor not available."
@@ -389,11 +82,11 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
-msgstr "Non se pode obter o esquema de informaciÃ³n para o servidor LDAP."
+msgstr "Non Ã© posÃbel obter o esquema de informaciÃ³n para o servidor LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:10
 msgid "Could not remove address book."
-msgstr "Non se pode eliminar a axenda de enderezos."
+msgstr "Non Ã© posÃbel eliminar a axenda de enderezos."
 
 #: ../addressbook/addressbook.error.xml.h:11
 msgid ""
@@ -402,7 +95,7 @@ msgid ""
 "GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
 "Actualmente vostede sÃ³ pode acceder Ã¡ axenda de enderezos do sistema "
-"GropuWise dende o Evolution. Empregue unha vez o seu cliente de Correo "
+"GropuWise desde o Evolution. Empregue unha vez o seu cliente de Correo "
 "GroupWise para obter os seus contactos frecuentes do Groupwise e os seus "
 "cartafoles de contactos persoais do GroupWise."
 
@@ -411,52 +104,43 @@ msgid "Delete address book '{0}'?"
 msgstr "Quere eliminar a axenda de enderezos '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading address book."
-msgstr "Erro ao cargar a axenda de enderezos."
-
-#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
-msgstr "Erro ao gardar {0} en {1}: {2}"
+msgstr "Produciuse un erro ao gardar {0} en {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Failed to authenticate with LDAP server."
-msgstr "Fallo ao autenticarse no servidor LDAP."
+msgstr "Produciuse un fallo ao autenticarse no servidor LDAP."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
 msgid "Failed to delete contact"
-msgstr "Fallo ao eliminar o contacto"
+msgstr "Produciuse un fallo ao eliminar o contacto"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "GroupWise Address book creation:"
 msgstr "CreaciÃ³n da axenda de enderezos do GroupWise:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "LDAP server did not respond with valid schema information."
 msgstr "O servidor LDAP non respondeu cunha informaciÃ³n vÃ¡lida do esquema."
 
-#: ../addressbook/addressbook.error.xml.h:19
-#: ../calendar/calendar.error.xml.h:54
-msgid "Server Version"
-msgstr "VersiÃ³n do servidor"
-
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Algunhas caracterÃsticas pode que non funcionen apropiadamente co servidor "
 "actual"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "A axenda de enderezos do Evolution saÃu inesperadamente."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:20
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "A imaxe que seleccionou Ã© grande. Quere redimensionala e almacenala?"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:21
 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 "
@@ -466,16 +150,16 @@ msgstr ""
 "permite esta funcionalidade ou que estÃ¡ mal configurada. Pida bases de busca "
 "compatÃbeis ao seu administrador de sistema."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This address book could not be opened."
 msgstr "Non Ã© posÃbel abrir esta axenda de enderezos."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:23
 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:26
+#: ../addressbook/addressbook.error.xml.h:24
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -484,31 +168,31 @@ msgstr ""
 "servidor pode estar escrito incorrectamente, ou a sÃºa conexiÃ³n de rede pode "
 "estar caÃda."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This address book will be removed permanently."
 msgstr "Esta axenda de enderezos eliminarase permanentemente."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 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:29
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to open address book"
 msgstr "Non Ã© posÃbel abrir a axenda de enderezos"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to perform search."
 msgstr "Non Ã© posÃbel realizar a busca."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
 msgstr "Non Ã© posÃbel gardar {0}."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Would you like to save your changes?"
 msgstr "Quere gardar os cambios?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:31
 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?"
@@ -516,7 +200,7 @@ msgstr ""
 "EstÃ¡ tentando mover un contacto dunha axenda de enderezos a outra mais non "
 "se pode eliminar da orixe. Quere gardar unha copia en seu lugar?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -526,1059 +210,429 @@ msgstr ""
 "problemas ao usar o Evolution. Para ter os mellores resultados o servidor "
 "deberÃa ser actualizado a unha versiÃ³n compatÃbel"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "You do not have permission to delete contacts in this address book."
-msgstr "Non ten permisos para eliminar contactos desta axenda de enderezos."
+msgstr ""
+"Vostede non ten permisos para eliminar contactos de esta axenda de enderezos."
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
-msgstr "Fixo modificaciÃ³ns neste contacto. Quere gardar essas modificaciÃ³ns?"
+msgstr "Fixo modificaciÃ³ns neste contacto. Quere gardar esas modificaciÃ³ns?"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Os seus contactos para {0} non estarÃ¡n dispoÃ±Ãbeis atÃ© que o Evolution sexa "
 "reiniciado."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
-#: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../plugins/groupwise-features/junk-settings.ui.h:4
+#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "Eng_adir"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "_Discard"
 msgstr "Re_xeitar"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Do not save"
 msgstr "Non gar_dar"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Resize"
 msgstr "_Redimensionar"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Use as it is"
 msgstr "_Usar tal como estÃ¡"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:143
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:46
+#: ../addressbook/addressbook.error.xml.h:44
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:590
+#: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
-msgstr "Enderezo de sincronizaciÃ³n predeterminado:"
+msgstr "Enderezo de sincronizaciÃ³n predefinido:"
 
-#: ../addressbook/conduit/address-conduit.c:1613
-#: ../addressbook/conduit/address-conduit.c:1614
+#: ../addressbook/conduit/address-conduit.c:1631
+#: ../addressbook/conduit/address-conduit.c:1632
 msgid "Could not load address book"
-msgstr "Non se puido cargar a axenda de enderezos"
+msgstr "Non foi posÃbel cargar a axenda de enderezos"
 
-#: ../addressbook/conduit/address-conduit.c:1691
-#: ../addressbook/conduit/address-conduit.c:1694
+#: ../addressbook/conduit/address-conduit.c:1709
+#: ../addressbook/conduit/address-conduit.c:1712
 msgid "Could not read pilot's Address application block"
-msgstr "Non se puido ler o bloque de Aplicativo de enderezos do pilot"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "C_ontacts"
-msgstr "C_ontactos"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Certificados"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure contacts and autocompletion here"
-msgstr "Configurar aquÃ os contactos e o completado automÃ¡tico"
-
-#. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:579
-msgid "Contacts"
-msgstr "Contactos"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Address Book"
-msgstr "Axenda de enderezos do Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Address Book address popup"
-msgstr "MenÃº emerxente de enderezos da axenda de enderezos do Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address viewer"
-msgstr "Visualizador de enderezos da axenda de enderezos do Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Address Book card viewer"
-msgstr "Visualizador de tarxetas da axenda de enderezos do Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Address Book component"
-msgstr "CompoÃ±ente da axenda de enderezos do Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution S/MIME Certificate Management Control"
-msgstr "Control de xestiÃ³n de certificados S/MIME do Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution folder settings configuration control"
-msgstr "Control de configuraciÃ³n das propiedades dos cartafoles do Evolution"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Manage your S/MIME certificates here"
-msgstr "Xestione os seus certificados S/MIME aquÃ"
-
-#. create the local source group
-#. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:97
-#: ../addressbook/gui/component/addressbook-migrate.c:499
-#: ../calendar/gui/calendar-component.c:192
-#: ../calendar/gui/memos-component.c:151 ../calendar/gui/migration.c:474
-#: ../calendar/gui/migration.c:576 ../calendar/gui/migration.c:1090
-#: ../calendar/gui/tasks-component.c:148 ../mail/em-folder-tree-model.c:191
-#: ../mail/em-folder-tree-model.c:193 ../mail/em-migrate.c:2890
-#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
-#: ../mail/message-list.c:1515
-msgid "On This Computer"
-msgstr "Neste computador"
-
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:98
-#: ../addressbook/gui/component/addressbook-migrate.c:517
-msgid "On LDAP Servers"
-msgstr "En servidores LDAP"
-
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. ensure the source name is in current locale, not read from configuration
-#. Create the default Person addressbook
-#. orange
-#: ../addressbook/gui/component/addressbook-component.c:135
-#: ../addressbook/gui/component/addressbook-component.c:138
-#: ../addressbook/gui/component/addressbook-migrate.c:507
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
-#: ../calendar/gui/calendar-component.c:232
-#: ../calendar/gui/calendar-component.c:238
-#: ../calendar/gui/memos-component.c:189 ../calendar/gui/memos-component.c:193
-#: ../calendar/gui/migration.c:484 ../calendar/gui/migration.c:584
-#: ../calendar/gui/migration.c:1098 ../calendar/gui/tasks-component.c:186
-#: ../calendar/gui/tasks-component.c:190 ../mail/em-migrate.c:960
-#: ../plugins/email-custom-header/email-custom-header.c:337
-msgid "Personal"
-msgstr "Persoal"
-
-#: ../addressbook/gui/component/addressbook-component.c:209
-msgctxt "New"
-msgid "_Contact"
-msgstr "_Contacto"
-
-#: ../addressbook/gui/component/addressbook-component.c:210
-msgid "Create a new contact"
-msgstr "Crear un contacto novo"
-
-#: ../addressbook/gui/component/addressbook-component.c:217
-msgctxt "New"
-msgid "Contact _List"
-msgstr "_Lista de contactos"
-
-#: ../addressbook/gui/component/addressbook-component.c:218
-msgid "Create a new contact list"
-msgstr "Crear unha lista de contactos nova"
-
-#: ../addressbook/gui/component/addressbook-component.c:224
-#: ../addressbook/gui/component/addressbook-config.c:1245
-msgid "New Address Book"
-msgstr "Nova axenda de enderezos"
-
-#: ../addressbook/gui/component/addressbook-component.c:225
-msgctxt "New"
-msgid "Address _Book"
-msgstr "_Axenda de enderezos"
-
-#: ../addressbook/gui/component/addressbook-component.c:226
-msgid "Create a new address book"
-msgstr "Crear unha axenda de enderezos nova"
-
-#: ../addressbook/gui/component/addressbook-component.c:389
-msgid "Failed upgrading Address Book settings or folders."
-msgstr ""
-"Fallo ao actualizar a configuraciÃ³n ou os cartafoles da axenda de enderezos."
-
-#: ../addressbook/gui/component/addressbook-config.c:217
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"Seleccionar esta opciÃ³n significa que o Evolution sÃ³ conectarÃ¡ co seu "
-"servidor LDAP se o seu servidor LDAP Ã© compatÃbel con SSL."
-
-#: ../addressbook/gui/component/addressbook-config.c:219
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"Seleccionar esta opciÃ³n significa que o Evolution sÃ³ conectarÃ¡ co seu "
-"servidor LDAP se o seu servidor LDAP Ã© compatÃbel TLS."
-
-#: ../addressbook/gui/component/addressbook-config.c:221
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"Seleccionar esta opciÃ³n significa que o seu servidor non permite nin SSL nin "
-"TLS. Isto significa que a sÃºa conexiÃ³n serÃ¡ insegura e que vostede serÃ¡ "
-"vulnerÃ¡bel a fallos de seguranza."
-
-#: ../addressbook/gui/component/addressbook-config.c:346
-msgid "Base"
-msgstr "Base"
-
-#: ../addressbook/gui/component/addressbook-config.c:547
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-msgid "_Type:"
-msgstr "_Tipo:"
-
-#: ../addressbook/gui/component/addressbook-config.c:648
-msgid "Copy _book content locally for offline operation"
-msgstr ""
-"Copiar o contido da a_xenda de enderezos localmente para unha operaciÃ³n sen "
-"conexiÃ³n"
-
-#: ../addressbook/gui/component/addressbook-config.c:759
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"Este Ã© o porto do servidor LDAP ao que o Evolution tentarÃ¡ conectarse. "
-"Proporcionouse unha lista de portos estÃ¡ndar. Pregunte ao seu administrador "
-"do sistema que porto deberÃa especificar."
-
-#: ../addressbook/gui/component/addressbook-config.c:837
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"Este Ã© o mÃ©todo que o Evolution usarÃ¡ para autenticalo a vostede. Note que "
-"definir isto como \"Enderezo de correo\" require o acceso anÃ³nimo ao "
-"servidor LDAP."
-
-#: ../addressbook/gui/component/addressbook-config.c:916
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"O Ã¡mbito de busca define atÃ© que profundidade quere que a busca se estenda "
-"ao longo dunha Ã¡rbore de directorios. Un Ã¡mbito de busca de \"sub\" incluirÃ¡ "
-"todas as entradas por debaixo da sÃºa base de busca. Un Ã¡mbito \"un\" sÃ³ "
-"incluirÃ¡ as entradas un nivel por debaixo da sÃºa base."
-
-#: ../addressbook/gui/component/addressbook-config.c:1020
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../smime/gui/smime-ui.glade.h:28
-msgid "General"
-msgstr "Xeral"
-
-#: ../addressbook/gui/component/addressbook-config.c:1021
-#: ../addressbook/gui/widgets/e-addressbook-view.c:554
-#: ../mail/importers/pine-importer.c:383
-msgid "Address Book"
-msgstr "Axenda de enderezos"
-
-#: ../addressbook/gui/component/addressbook-config.c:1025
-msgid "Server Information"
-msgstr "InformaciÃ³n do servidor"
-
-#: ../addressbook/gui/component/addressbook-config.c:1027
-msgid "Authentication"
-msgstr "AutenticaciÃ³n"
-
-#: ../addressbook/gui/component/addressbook-config.c:1030
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../smime/gui/smime-ui.glade.h:20
-msgid "Details"
-msgstr "Detalles"
-
-#: ../addressbook/gui/component/addressbook-config.c:1031
-#: ../mail/em-folder-browser.c:1021
-msgid "Searching"
-msgstr "Buscando"
-
-#: ../addressbook/gui/component/addressbook-config.c:1033
-msgid "Downloading"
-msgstr "Descargando"
-
-#: ../addressbook/gui/component/addressbook-config.c:1243
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "Address Book Properties"
-msgstr "Propiedades da axenda de enderezos"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
-msgid "Migrating..."
-msgstr "Migrando..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
-#, c-format
-msgid "Migrating '%s':"
-msgstr "Migrando '%s':"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:645
-msgid "LDAP Servers"
-msgstr "Servidores LDAP"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:760
-msgid "Autocompletion Settings"
-msgstr "ConfiguraciÃ³n do completado automÃ¡tico"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1136
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"A localizaciÃ³n e a xerarquÃa dos cartafoles de contactos do Evolution "
-"modificouse dende o Evolution 1.x.\n"
-"\n"
-"Sexa paciente mentres o Evolution migra os seus cartafoles..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1150
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Modificouse o formato dos contactos da lista de correo.\n"
-"\n"
-"Sexa paciente mentres o Evolution migra os seus cartafoles..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1159
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Modificouse a maneira en que o Evolution almacena algÃºns nÃºmeros de "
-"telÃ©fono.\n"
-"\n"
-"Sexa paciente mentres o Evolution migra os seus cartafoles..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1169
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Modificouse o rexistro de modificaciÃ³ns e os ficheiros de mapa no Palm Sync "
-"do Evolution.\n"
-"\n"
-"Sexa paciente mentres o Evolution migra os seus datos Pilot Sync..."
-
-#: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:453
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Renomear o cartafol \"%s\" como:"
-
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:455
-msgid "Rename Folder"
-msgstr "Renomear o cartafol"
-
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:461
-msgid "Folder names cannot contain '/'"
-msgstr "Os nomes dos cartafoles non poden conter o carÃ¡cter '/'"
-
-#: ../addressbook/gui/component/addressbook-view.c:949
-msgid "_New Address Book"
-msgstr "_Nova axenda de enderezos"
-
-#: ../addressbook/gui/component/addressbook-view.c:950
-msgid "Save As vCard..."
-msgstr "Gardar como vCard..."
-
-#: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:628
-#: ../calendar/gui/memos-component.c:479 ../calendar/gui/tasks-component.c:472
-#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "_Renomear..."
-
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-#: ../calendar/gui/calendar-component.c:631
-#: ../calendar/gui/e-calendar-table.c:1613
-#: ../calendar/gui/e-calendar-view.c:1828 ../calendar/gui/e-memo-table.c:949
-#: ../calendar/gui/memos-component.c:482 ../calendar/gui/tasks-component.c:475
-#: ../mail/em-folder-tree.c:2119 ../mail/em-folder-view.c:1340
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
-#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "E_liminar"
-
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:636
-#: ../calendar/gui/memos-component.c:487 ../calendar/gui/tasks-component.c:480
-#: ../mail/em-folder-tree.c:2127 ../ui/evolution-addressbook.xml.h:59
-#: ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "_Propiedades"
-
-#: ../addressbook/gui/component/addressbook-view.c:1223
-msgid "Contact Source Selector"
-msgstr "Selector de orixe de contactos"
-
-#: ../addressbook/gui/component/addressbook.c:102
-msgid "Accessing LDAP Server anonymously"
-msgstr "Accedendo anonimamente ao servidor LDAP"
-
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
-msgid "Failed to authenticate.\n"
-msgstr "Fallou ao autenticarse.\n"
-
-#: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Introduza o contrasinal para %s (usuario %s)"
-
-#: ../addressbook/gui/component/addressbook.c:222
-#: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:500
-#: ../plugins/publish-calendar/publish-calendar.c:216
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "Introduza o contrasinal"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr "Lonxitude do completado automÃ¡tico"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
-msgid "EFolderList XML for the list of completion URIs"
-msgstr "XML EFolderList para a lista de completado dos URI"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "XML EFolderList para a lista de completado dos URI."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
-msgid ""
-"Position of the vertical pane, between the card and list views and the "
-"preview pane, in pixels."
-msgstr ""
-"PosiciÃ³n do panel vertical, entre as visualizaciÃ³ns de tarxeta e de lista e "
-"o panel de previsualizaciÃ³n, en pÃxeles."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
-msgid "Show autocompleted name with an address"
-msgstr "Mostrar o nome completado automaticamente cun enderezo"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
-msgid "Show preview pane"
-msgstr "Mostrar o panel de previsualizaciÃ³n"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
-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."
-
-#: ../addressbook/gui/component/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"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
-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."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
-msgid "Vertical pane position"
-msgstr "PosiciÃ³n vertical do panel"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr ""
-"Se hai que forzar que se mostre o enderezo de correo co nome do contacto "
-"completado automaticamente na entrada."
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
-msgid "Whether to show the preview pane."
-msgstr "Indica se se mostra o panel de previsualizaciÃ³n."
-
-#: ../addressbook/gui/component/autocompletion-config.c:175
-msgid "Autocompletion"
-msgstr "Completado automÃ¡tico"
-
-#: ../addressbook/gui/component/autocompletion-config.c:177
-msgid "Always _show address of the autocompleted contact"
-msgstr "Mo_strar sempre o enderezo do contacto completado automaticamente"
-
-#: ../addressbook/gui/component/autocompletion-config.c:182
-msgid "Date/Time Format"
-msgstr "Data/Formato de hora"
-
-#: ../addressbook/gui/component/autocompletion-config.c:185
-#: ../mail/em-mailer-prefs.c:1456
-msgid "Table column:"
-msgstr "Columna da tÃ¡boa:"
+msgstr "Non foi posÃbel ler o bloque de Aplicativo de enderezos do pilot"
 
-#: ../addressbook/gui/component/autocompletion-config.c:187
-msgid "Look up in address books"
-msgstr "Buscar nas axendas de enderezos"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:1
-msgid "1"
-msgstr "1"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid ""
-"389\n"
-"636\n"
-"3268"
-msgstr ""
-"389\n"
-"636\n"
-"3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "5"
-msgstr "5"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:6
-msgid "<b>Authentication</b>"
-msgstr "<b>AutenticaciÃ³n</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Downloading</b>"
-msgstr "<b>Descargando</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
-msgid "<b>Searching</b>"
-msgstr "<b>Buscando</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid ""
-"Anonymously\n"
-"Using email address\n"
-"Using distinguished name (DN)"
-msgstr ""
-"Anonimamente\n"
-"Empregar enderezo de correo\n"
-"Empregar nome distintivo (DN)"
-
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:14
-msgid "B_rowse this book until limit reached"
-msgstr "Examina_r esta axenda de enderezos atÃ© atinxir o lÃmite"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr ""
-"O Evolution empregarÃ¡ este enderezo de correo para autenticalo no servidor."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Lo_gin:"
-msgstr "_Iniciar a sesiÃ³n:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid ""
-"One\n"
-"Sub"
-msgstr ""
-"Un\n"
-"Sub"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid ""
-"SSL encryption\n"
-"TLS encryption\n"
-"No encryption"
-msgstr ""
-"Cifrado SSL\n"
-"Cifrado TLS\n"
-"Sen cifrado"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-msgid "Search Filter"
-msgstr "Filtro de busca"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-msgid "Search _base:"
-msgstr "_Base de busca:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "Search _filter:"
-msgstr "_Filtro de busca:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-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 dos obxectos buscados mentres se realiza a busca. "
-"Se isto non se modifica, a busca por omisiÃ³n realizarase sobre a clase de "
-"obxectos do tipo \"persoa\"."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Supported Search Bases"
-msgstr "Bases de busca compatÃbeis"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-msgstr ""
-"A base de busca Ã© o nome distintivo (DN) da entrada onde comezarÃ¡n as "
-"buscas. Se deixa isto en branco a busca comezarÃ¡ na raÃz da Ã¡rbore de "
-"directorios."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:30
-msgid ""
-"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
-"\"."
-msgstr ""
-"Este Ã© o nome completo do seu servidor LDAP. Por exemplo: \"ldap."
-"amiÃ±aempresa.com\"."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
-msgstr ""
-"Este Ã© o nÃºmero mÃ¡ximo de entradas para descargar. Configuralo cun nÃºmero "
-"demasiado grande poderÃa ralentizar a sÃºa axenda de enderezos."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
-msgstr ""
-"Este Ã© o nome que identificarÃ¡ este servidor na lista de cartafoles do "
-"Evolution. Ã? sÃ³ para poder mostralo no monitor. "
-
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid "_Download limit:"
-msgstr "LÃmite de _descarga:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid "_Find Possible Search Bases"
-msgstr "_Localizar bases de busca posÃbeis"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid "_Login method:"
-msgstr "MÃ©todo de _inicio de sesiÃ³n:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-#: ../calendar/gui/dialogs/calendar-setup.c:226
-#: ../mail/mail-config.glade.h:175
-#: ../plugins/groupwise-features/properties.glade.h:11
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-msgid "_Name:"
-msgstr "_Nome:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
-msgid "_Port:"
-msgstr "_Porto:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-msgid "_Search scope:"
-msgstr "Ã?mbito da bu_sca:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
-#: ../mail/mail-config.glade.h:184
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
-msgid "_Server:"
-msgstr "_Servidor:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid "_Timeout:"
-msgstr "_Tempo de espera:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid "_Use secure connection:"
-msgstr "_Usar unha conexiÃ³n segura:"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-msgid "cards"
-msgstr "tarxetas"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../plugins/caldav/caldav-source.c:448
-#: ../plugins/calendar-file/calendar-file.c:286
-#: ../plugins/calendar-http/calendar-http.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:523
-#: ../plugins/google-account-setup/google-source.c:720
-#: ../plugins/google-account-setup/google-contacts-source.c:330
-msgid "minutes"
-msgstr "minutos"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "<b>Email</b>"
-msgstr "<b>Correo electrÃ³nico</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "<b>Home</b>"
-msgstr "<b>Enderezo</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "<b>Instant Messaging</b>"
-msgstr "<b>MensaxerÃa instantÃ¡nea</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "<b>Job</b>"
-msgstr "<b>ProfesiÃ³n</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Varios</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
-msgid "<b>Notes</b>"
-msgstr "<b>Notas</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "<b>Other</b>"
-msgstr "<b>Outro</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "<b>Telephone</b>"
-msgstr "<b>TelÃ©fono</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "<b>Web Addresses</b>"
-msgstr "<b>Enderezos Web</b>"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../calendar/gui/e-calendar-view.c:1987
+msgid "Anniversary"
+msgstr "Aniversario"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "<b>Work</b>"
-msgstr "<b>Traballo</b>"
+#. 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:582
+#: ../calendar/gui/e-calendar-view.c:1986 ../shell/main.c:111
+msgid "Birthday"
+msgstr "Aniversario"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorÃas..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Calendar:"
+msgstr "_Calendario:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2496
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:811
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+msgid "Email"
+msgstr "Correo ElectrÃ³nico"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+msgid "Free/Busy:"
+msgstr "_DispoÃ±ibilidade:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 msgid "Full _Name..."
 msgstr "_Nome completo..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:70
+msgid "Home"
+msgstr "Enderezo"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+msgid "Home Page:"
+msgstr "PÃ¡xina de _inicio:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Image"
 msgstr "Imaxe"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+msgid "Instant Messaging"
+msgstr "<b>MensaxarÃa instantÃ¡nea</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+msgid "Job"
+msgstr "Traballo"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Mailing Address"
 msgstr "Enderezo de correo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../calendar/gui/dialogs/task-details-page.ui.h:11
+msgid "Miscellaneous"
+msgstr "Varios"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Nic_kname:"
 msgstr "_Alcume:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: ../calendar/gui/migration.c:1225
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../modules/calendar/e-memo-shell-migrate.c:250
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 msgid "Notes"
 msgstr "Notas"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:71
+#: ../addressbook/gui/widgets/eab-contact-display.c:460
+#: ../calendar/gui/e-calendar-view.c:1695
+msgid "Other"
+msgstr "Outros"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Personal Information"
 msgstr "Datos persoais"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Telephone"
 msgstr "TelÃ©fono"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+msgid "Video Chat:"
+msgstr "_Videoconferencia:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+msgid "Web Addresses"
+msgstr "<b>Enderezos Web</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+msgid "Web Log:"
+msgstr "Rexistro _web:"
+
+#. red
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../mail/e-mail-migrate.c:961
+msgid "Work"
+msgstr "Traballo"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 msgid "_Address:"
 msgstr "_Enderezo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Anniversary:"
 msgstr "_Aniversario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Assistant:"
 msgstr "_Asistente:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Birthday:"
 msgstr "_Aniversario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../calendar/gui/dialogs/event-page.c:820
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1910
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../plugins/itip-formatter/itip-view.c:1909
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Company:"
 msgstr "_Empresa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_Country:"
 msgstr "_PaÃs:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_File under:"
 msgstr "_Arquivar como:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Free/Busy:"
 msgstr "_DispoÃ±ibilidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Home Page:"
 msgstr "PÃ¡xina de _inicio:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Manager:"
 msgstr "_Xestor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_PO Box:"
 msgstr "_Apdo. de correos:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Profession:"
 msgstr "_ProfesiÃ³n:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Spouse:"
 msgstr "_CÃ³nxuxe:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fullname.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_TÃtulo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Video Chat:"
 msgstr "_Videoconferencia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_Quere recibir correo en HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Web Log:"
 msgstr "Rexistro _web:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "_Onde:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_CÃ³digo Postal:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:473
-#: ../plugins/exchange-operations/exchange-delegates.c:951
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
+#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1159
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:315
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:61
+#: ../widgets/menus/gal-view-new-dialog.c:60
 msgid "Name"
 msgstr "Nome"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:324
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
+#: ../addressbook/gui/widgets/e-addressbook-model.c:522
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
+#: ../addressbook/gui/widgets/e-minicard-view.c:548
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
-#: ../widgets/text/e-text.c:3675
+#: ../widgets/table/e-cell-text.c:1655 ../widgets/text/e-text.c:3429
+#: ../widgets/text/e-text.c:3430
 msgid "Editable"
 msgstr "EditÃ¡bel"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:603
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:604
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skype"
 
-#. red
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
-#: ../mail/em-migrate.c:959
-msgid "Work"
-msgstr "Traballo"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
+msgid "Error adding contact"
+msgstr "Produciuse un erro ao engadir o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
-msgid "Home"
-msgstr "Enderezo"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
+msgid "Error modifying contact"
+msgstr "Produciuse un erro ao modificar o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:516
-#: ../calendar/gui/e-calendar-view.c:2289
-msgid "Other"
-msgstr "Outros"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
+msgid "Error removing contact"
+msgstr "Produciuse un erro ao eliminar o contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Source Book"
 msgstr "Axenda de enderezos de orixe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
 msgid "Target Book"
 msgstr "Axenda de enderezos de destino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
 msgid "Is New Contact"
 msgstr "Ã? un contacto novo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
 msgid "Writable Fields"
 msgstr "Campos que se poden escribir"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
 msgid "Required Fields"
 msgstr "Campos requiridos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
 msgid "Changed"
 msgstr "Modificado"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2491
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de Contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2888
 msgid "Please select an image for this contact"
 msgstr "Escolla unha imaxe para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2889
 msgid "_No image"
 msgstr "_Sen imaxe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3162
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -1586,200 +640,195 @@ msgstr ""
 "Os datos de contacto non son vÃ¡lidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3166
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ten un formato non vÃ¡lido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3173
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ten un formato non vÃ¡lido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' estÃ¡ baleiro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3213
 msgid "Invalid contact."
 msgstr "Contacto non vÃ¡lido."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
 msgid "Contact Quick-Add"
 msgstr "AdiciÃ³n rÃ¡pida de contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
 msgid "_Edit Full"
 msgstr "_Editar completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
 msgid "_Full name"
 msgstr "Nome _completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
 msgid "E_mail"
 msgstr "Correo _electrÃ³nico"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "_Select Address Book"
 msgstr "_Seleccione a axenda de enderezos"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact list (%s)?"
-msgstr ""
-"EstÃ¡ seguro de que quere\n"
-"eliminar a lista de contactos (%s)?"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
-msgid ""
-"Are you sure you want\n"
-"to delete these contact lists?"
-msgstr ""
-"EstÃ¡ seguro de que quere\n"
-"eliminar estas listas de contactos?"
+#: ../addressbook/gui/contact-editor/eab-editor.c:167
+#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
+msgid "Shell"
+msgstr "Terminal"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
-msgstr ""
-"EstÃ¡ seguro de que quere\n"
-"eliminar o contacto (%s)?"
+#: ../addressbook/gui/contact-editor/eab-editor.c:168
+#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
+msgid "The EShell singleton"
+msgstr "O singleton de EShell"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"EstÃ¡ seguro de que quere\n"
-"eliminar estes contactos?"
+#: ../addressbook/gui/contact-editor/fullname.ui.h:1
+msgid "Dr."
+msgstr "Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr."
-msgstr ""
-"\n"
-"Sr.\n"
-"Sra.\n"
-"Srto.\n"
-"Srta.\n"
-"Dr."
+#: ../addressbook/gui/contact-editor/fullname.ui.h:2
+msgid "Esq."
+msgstr "Esq."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq."
-msgstr ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.ui.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:4
+msgid "I"
+msgstr "I"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:5
+msgid "II"
+msgstr "II"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:6
+msgid "III"
+msgstr "III"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:7
+msgid "Jr."
+msgstr "Jr."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:8
+msgid "Miss"
+msgstr "Srta."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:9
+msgid "Mr."
+msgstr "Sr."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:10
+msgid "Mrs."
+msgstr "Sra."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:11
+msgid "Ms."
+msgstr "Srta."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:12
+msgid "Sr."
+msgstr "Sr."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "_Nome:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
 msgid "_Last:"
 msgstr "_Apelido 2:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "_Apelido 1:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgid "_Suffix:"
 msgstr "_Sufixo:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "<b>Members</b>"
-msgstr "<b>Integrantes</b>"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
 msgid "Contact List Editor"
 msgstr "Editor da lista de contactos"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:212
-#: ../calendar/gui/e-day-view-time-item.c:812
-#: ../calendar/gui/e-timezone-entry.c:118
-msgid "Select..."
-msgstr "Seleccionar..."
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+msgid "Members"
+msgstr "_Integrantes"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ocultar os enderezos cando se envÃe correo a esta lista"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../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.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+#: ../mail/mail-config.ui.h:154
+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 abaixo:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
 msgid "Contact List Members"
 msgstr "Membros da lista de contactos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
 msgid "_Members"
 msgstr "_Integrantes"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:310
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
-#: ../addressbook/gui/widgets/e-addressbook-view.c:211
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:530
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+msgid "Error adding list"
+msgstr "Produciuse un erro ao engadir a lista"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+msgid "Error modifying list"
+msgstr "Produciuse un erro ao modificar a lista"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+msgid "Error removing list"
+msgstr "Produciuse un erro ao eliminar a lista"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+#: ../addressbook/gui/widgets/e-addressbook-model.c:512
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: ../addressbook/gui/widgets/e-minicard-view.c:534
 msgid "Book"
 msgstr "Axenda de enderezos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
 msgid "Is New List"
 msgstr "Ã? unha lista nova"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Contacto modificado:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
 msgid "Conflicting Contact:"
 msgstr "Contacto en conflito:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../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.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
@@ -1787,15 +836,15 @@ msgstr ""
 "O nome ou o enderezo de correo electrÃ³nico deste contacto xa existe neste "
 "cartafol. Quere engadilo de todas as formas?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
 msgstr "Contacto novo:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
 msgid "Original Contact:"
 msgstr "Contacto orixinal:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../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?"
@@ -1803,183 +852,153 @@ msgstr ""
 "O nome ou enderezo de correo deste contacto xa existe neste\n"
 "cartafol. Quere engadilo de todas as formas?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:213
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:231
 msgid "_Merge"
 msgstr "_Combinar"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:198
+#: ../addressbook/gui/merging/eab-contact-merging.c:216
 msgid "Merge Contact"
 msgstr "Combinar contacto"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:266
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../addressbook/gui/widgets/eab-contact-display.c:589
-#: ../addressbook/gui/widgets/eab-contact-display.c:868
-#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
-msgid "Email"
-msgstr "Correo ElectrÃ³nico"
-
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:79 ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
+#: ../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:901
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:970
 msgid "Any field contains"
 msgstr "Calquera campo contÃ©n"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../modules/addressbook/e-book-shell-view-actions.c:908
 msgid "Email begins with"
 msgstr "O correo comeza por"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../modules/addressbook/e-book-shell-view-actions.c:915
 msgid "Name contains"
 msgstr "O nome contÃ©n"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:162
+#: ../addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No contacts"
 msgstr "Sen contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:165
+#: ../addressbook/gui/widgets/e-addressbook-model.c:146
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contacto"
 msgstr[1] "%d contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:317
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
-#: ../addressbook/gui/widgets/e-addressbook-view.c:225
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:537
+#: ../addressbook/gui/widgets/e-addressbook-model.c:307
+msgid "Error getting book view"
+msgstr "Produciuse un erro ao obter a visualizaciÃ³n da axenda de enderezos"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:532
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: ../addressbook/gui/widgets/e-minicard-view.c:541
 msgid "Query"
 msgstr "Consulta"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:460
-msgid "Error getting book view"
-msgstr "Erro ao obter a visualizaciÃ³n da axenda de enderezos"
+#: ../addressbook/gui/widgets/e-addressbook-model.c:706
+msgid "Search Interrupted"
+msgstr "BÃºsqueda interrompida"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
-#: ../widgets/table/e-table-click-to-add.c:507
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
+#: ../addressbook/gui/widgets/e-addressbook-view.c:758
+#: ../calendar/gui/e-memo-table.c:1048 ../calendar/gui/e-task-table.c:1347
+#: ../modules/calendar/e-memo-shell-content.c:607
+#: ../modules/calendar/e-task-shell-content.c:629
+#: ../widgets/table/e-table-click-to-add.c:511
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3344
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
-#: ../widgets/text/e-text.c:3542
+#: ../widgets/table/e-table.c:3359
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3296
+#: ../widgets/text/e-text.c:3297
 msgid "Model"
 msgstr "Modelo"
 
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
-msgstr "Erro ao modificar a tarxeta"
+msgstr "Produciuse un erro ao modificar a tarxeta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:158
-msgid "Name begins with"
-msgstr "O nome comeza por"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+msgid "Cut selected contacts to the clipboard"
+msgstr "Cortar o texto seleccionado para o portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:218
-msgid "Source"
-msgstr "Orixe"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+msgid "Copy selected contacts to the clipboard"
+msgstr "Copiar o texto seleccionado ao portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:564
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
-msgid "Type"
-msgstr "Tipo"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+msgid "Paste contacts from the clipboard"
+msgstr "Pegar os contactos desde o portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1971
-msgid "Save as vCard..."
-msgstr "Gardar como vCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
+msgid "Delete selected contacts"
+msgstr "Eliminar os contactos seleccionados"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
-#: ../calendar/gui/e-calendar-table.c:1591
-#: ../calendar/gui/e-calendar-view.c:1806 ../calendar/gui/e-memo-table.c:932
-#: ../ui/evolution-addressbook.xml.h:56
-msgid "_Open"
-msgstr "_Abrir"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+msgid "Select all visible contacts"
+msgstr "Seleccionar todos os contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
-msgid "_New Contact..."
-msgstr "Contacto _novo..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:774
+#: ../calendar/gui/e-memo-table.c:1065 ../calendar/gui/e-task-table.c:1364
+msgid "Shell View"
+msgstr "VisualizaciÃ³n de terminal"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-msgid "New Contact _List..."
-msgstr "_Lista de contactos nova..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:785
+msgid "Source"
+msgstr "Orixe"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
-msgid "_Save as vCard..."
-msgstr "_Gardar como vCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+msgid "Are you sure you want to delete these contact lists?"
+msgstr "EstÃ¡ seguro de que quere eliminar estas listas de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "_Forward Contact"
-msgstr "_Reenviar contacto"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+msgid "Are you sure you want to delete this contact list?"
+msgstr "EstÃ¡ seguro de que quere eliminar estas listas de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "_Forward Contacts"
-msgstr "_Reenviar contactos"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#, c-format
+msgid "Are you sure you want to delete this contact list (%s)?"
+msgstr "EstÃ¡ seguro de que quere eliminar a lista de contactos (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "Send _Message to Contact"
-msgstr "Enviar unha _mensaxe ao contacto"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+msgid "Are you sure you want to delete these contacts?"
+msgstr "EstÃ¡ seguro de que quere eliminar estes contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-msgid "Send _Message to List"
-msgstr "Enviar unha _mensaxe Ã¡ lista"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+msgid "Are you sure you want to delete this contact?"
+msgstr "EstÃ¡ seguro de que quere eliminar estes contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
-msgid "Send _Message to Contacts"
-msgstr "Enviar unha _mensaxe aos contactos"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#, c-format
+msgid "Are you sure you want to delete this contact (%s)?"
+msgstr "EstÃ¡ seguro de que quere eliminar o contacto (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
-msgid "_Print"
-msgstr "Im_primir"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
-msgid "Cop_y to Address Book..."
-msgstr "Copia_r Ã¡ axenda de enderezos..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
-msgid "Mo_ve to Address Book..."
-msgstr "Mo_ver Ã¡ axenda de enderezos..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
-msgid "Cu_t"
-msgstr "Cor_tar"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/e-calendar-table.c:1599
-#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:940
-#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1325
-#: ../mail/message-list.c:2109 ../ui/evolution-addressbook.xml.h:46
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-msgid "P_aste"
-msgstr "Col_ar"
-
-#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1534
-#: ../calendar/gui/cal-search-bar.c:624 ../calendar/gui/cal-search-bar.c:667
-#: ../calendar/gui/cal-search-bar.c:686
-msgid "Any Category"
-msgstr "Calquera categorÃa"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"Ao abrir %d contacto abrirÃ¡ tamÃ©n %d novas xanelas.\n"
+"EstÃ¡ seguro de que quere mostrar este contacto?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
-msgid "Unmatched"
-msgstr "Sen equivalencia"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+msgid "_Don't Display"
+msgstr "_Non mostrar"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+msgid "Display _All Contacts"
+msgstr "Mostrar _todos os contactos"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Assistant"
 msgstr "Axudante"
 
@@ -2008,8 +1027,7 @@ msgid "Car Phone"
 msgstr "TelÃ©fono do automÃ³bil"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:8
-#: ../calendar/gui/e-cal-component-memo-preview.c:135
+#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -2017,7 +1035,7 @@ msgid "Categories"
 msgstr "CategorÃas"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:619
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
 msgid "Company"
 msgstr "Empresa"
 
@@ -2066,22 +1084,22 @@ msgid "Journal"
 msgstr "Diario"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
 msgid "Manager"
 msgstr "Xestor"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:644
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
 msgid "Mobile Phone"
 msgstr "TelÃ©fono mÃ³bil"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:532
 msgid "Nickname"
 msgstr "Alcume"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Note"
 msgstr "Nota"
 
@@ -2110,14 +1128,13 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:576
+#: ../calendar/gui/e-meeting-list-view.c:578
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "Rol"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
+#: ../addressbook/gui/widgets/eab-contact-display.c:584
 msgid "Spouse"
 msgstr "CÃ³nxuxe"
 
@@ -2136,6 +1153,7 @@ msgid "Telex"
 msgstr "TÃ©lex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../shell/e-shell-view.c:748
 msgid "Title"
 msgstr "TÃtulo"
 
@@ -2150,29 +1168,27 @@ msgstr "Sitio Web"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/misc/e-reflow.c:1421 ../widgets/misc/e-reflow.c:1422
-#: ../widgets/table/e-table-click-to-add.c:521
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-group-container.c:994
-#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-click-to-add.c:525
+#: ../widgets/table/e-table-col.c:121
+#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-container.c:1003
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
-#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
+#: ../widgets/table/e-table-item.c:2879 ../widgets/table/e-table-item.c:2880
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Width"
 msgstr "Largura"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/misc/e-reflow.c:1428 ../widgets/misc/e-reflow.c:1429
-#: ../widgets/table/e-table-click-to-add.c:528
-#: ../widgets/table/e-table-group-container.c:987
-#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-click-to-add.c:532
+#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-group-container.c:996
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
-#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
+#: ../widgets/table/e-table-item.c:2885 ../widgets/table/e-table-item.c:2886
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
 msgid "Height"
 msgstr "Altura"
 
@@ -2197,11 +1213,11 @@ msgstr "Modelo de texto"
 msgid "Max field name length"
 msgstr "Lonxitude mÃ¡xima do campo"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
 msgid "Column Width"
 msgstr "Largura da columna"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:177
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -2211,7 +1227,7 @@ msgstr ""
 "\n"
 "Buscando os contactos..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -2225,7 +1241,7 @@ msgstr ""
 "\n"
 "ou prema dÃºas veces aquÃ para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -2239,7 +1255,7 @@ msgstr ""
 "\n"
 "Prema aquÃ dÃºas veces para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -2249,7 +1265,7 @@ msgstr ""
 "\n"
 "Buscar o contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -2259,7 +1275,7 @@ msgstr ""
 "\n"
 "Non hai elementos para mostrar nesta visualizaciÃ³n."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:523
+#: ../addressbook/gui/widgets/e-minicard-view.c:527
 msgid "Adapter"
 msgstr "Adaptador"
 
@@ -2272,7 +1288,7 @@ msgid "Home Email"
 msgstr "Correo electrÃ³nico particular"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:825
+#: ../addressbook/gui/widgets/e-minicard.c:797
 msgid "Other Email"
 msgstr "Outro correo electrÃ³nico"
 
@@ -2284,230 +1300,280 @@ msgstr "Seleccionado"
 msgid "Has Cursor"
 msgstr "PosÃºe cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
-msgid "_Open Link in Browser"
-msgstr "_Abrir ligazÃ³n no navegador"
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
+#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+msgid "evolution address book"
+msgstr "axenda de enderezos do Evolution"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2694
-msgid "_Copy Link Location"
-msgstr "_Copiar a localizaciÃ³n da ligazÃ³n"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+msgid "New Contact"
+msgstr "Contacto novo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
-msgid "_Send New Message To..."
-msgstr "_Enviar unha mensaxe nova a..."
+#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+msgid "New Contact List"
+msgstr "Lista de contactos nova"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "o cartafol de axendas de enderezos actual %s ten %d tarxeta"
+msgstr[1] "o cartafol de axendas de enderezos actual %s ten %d tarxetas"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:31
+msgid "Open"
+msgstr "Abrir"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:153
+msgid "Contact List: "
+msgstr "Lista de contactos: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:154
+msgid "Contact: "
+msgstr "Contacto: "
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#: ../addressbook/gui/widgets/ea-minicard.c:180
+msgid "evolution minicard"
+msgstr "minitarxeta do Evolution"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
 msgid "Copy _Email Address"
 msgstr "Copiar enderezo de _correo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:286
-#: ../addressbook/gui/widgets/eab-contact-display.c:360
-#: ../addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../widgets/misc/e-web-view.c:370
+msgid "Copy the email address to the clipboard"
+msgstr "Copia obxectos no portapapeis."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:181
+#: ../widgets/misc/e-web-view.c:375
+msgid "_Send New Message To..."
+msgstr "_Enviar unha mensaxe nova a..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:183
+#: ../widgets/misc/e-web-view.c:377
+msgid "Send a mail message to this address"
+msgstr "Converte unha mensaxe nunha tarefa."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:258
+#: ../addressbook/gui/widgets/eab-contact-display.c:260
 msgid "(map)"
 msgstr "(mapa)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:380
-#: ../addressbook/gui/widgets/eab-contact-display.c:391
+#: ../addressbook/gui/widgets/eab-contact-display.c:278
+#: ../addressbook/gui/widgets/eab-contact-display.c:289
 msgid "map"
 msgstr "mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:475
-#: ../addressbook/gui/widgets/eab-contact-display.c:835
+#: ../addressbook/gui/widgets/eab-contact-display.c:415
+#: ../addressbook/gui/widgets/eab-contact-display.c:778
 msgid "List Members"
 msgstr "Listar integrantes"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Department"
 msgstr "Departamento"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Profession"
 msgstr "ProfesiÃ³n"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Position"
 msgstr "Cargo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
 msgid "Video Chat"
 msgstr "Videoconferencia"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
-#: ../calendar/gui/calendar-commands.c:89
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
 #: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/gnome-cal.c:2548
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:572
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
-#: ../plugins/hula-account-setup/camel-hula-listener.c:372
-#: ../plugins/hula-account-setup/camel-hula-listener.c:400
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
+#: ../modules/calendar/e-cal-shell-view.c:465
+#: ../plugins/groupwise-features/camel-gw-listener.c:420
+#: ../plugins/groupwise-features/camel-gw-listener.c:445
+#: ../plugins/groupwise-features/camel-gw-listener.c:560
+#: ../plugins/hula-account-setup/camel-hula-listener.c:371
+#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
 msgid "Calendar"
 msgstr "Calendario"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "DispoÃ±ibilidade"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Phone"
 msgstr "TelÃ©fono"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
+#: ../addressbook/gui/widgets/eab-contact-display.c:565
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
 msgid "Address"
 msgstr "Enderezo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Home Page"
 msgstr "PÃ¡xina persoal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
 msgid "Web Log"
 msgstr "Blogue"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
-#: ../calendar/gui/e-calendar-view.c:2580
-msgid "Birthday"
-msgstr "Aniversario"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-#: ../calendar/gui/e-calendar-view.c:2581
-msgid "Anniversary"
-msgstr "Aniversario"
+#. orange
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person memo list
+#. Create the default Person task list
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../mail/e-mail-migrate.c:962
+#: ../modules/addressbook/e-book-shell-backend.c:175
+#: ../modules/addressbook/e-book-shell-migrate.c:507
+#: ../modules/calendar/e-cal-shell-backend.c:171
+#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../modules/calendar/e-memo-shell-backend.c:154
+#: ../modules/calendar/e-memo-shell-migrate.c:112
+#: ../modules/calendar/e-task-shell-backend.c:158
+#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../plugins/email-custom-header/email-custom-header.c:320
+msgid "Personal"
+msgstr "Persoal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:853
+#: ../addressbook/gui/widgets/eab-contact-display.c:796
 msgid "Job Title"
 msgstr "Posto de traballo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:889
+#: ../addressbook/gui/widgets/eab-contact-display.c:833
 msgid "Home page"
 msgstr "PÃ¡xina de inicio"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:897
+#: ../addressbook/gui/widgets/eab-contact-display.c:842
 msgid "Blog"
 msgstr "Blogue"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:1031
+#: ../widgets/misc/e-web-view.c:750
+#, c-format
+msgid "Click to mail %s"
+msgstr "Prema para enviar un correo a %s"
+
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Success"
 msgstr "Ã?xito"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Backend busy"
 msgstr "Backend ocupado"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Address Book does not exist"
 msgstr "A axenda de enderezos non existe"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "No Self Contact defined"
 msgstr "NingÃºn contacto propio definido"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Contact not found"
 msgstr "Contacto non encontrado"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Contact ID already exists"
 msgstr "O ID de contacto xa existe"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Protocol not supported"
 msgstr "O protocolo non Ã© compatÃbel"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-cal-model-tasks.c:363
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:238
-#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2548
+#. To Translators: This is task status
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-model-tasks.c:465
+#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/print.c:2651
 msgid "Canceled"
 msgstr "Cancelado"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Could not cancel"
-msgstr "Non se puido cancelar"
+msgstr "Non foi posÃbel cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Authentication Failed"
 msgstr "Fallou a autenticaciÃ³n"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:426
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Authentication Required"
 msgstr "AutenticaciÃ³n requirida"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "TLS not Available"
 msgstr "TLS non dispoÃ±Ãbel"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "No such source"
 msgstr "Non existe esa orixe"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Not available in offline mode"
 msgstr "Non dispoÃ±Ãbel en modo sen conexiÃ³n"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Other error"
 msgstr "Outro erro"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Invalid server version"
 msgstr "VersiÃ³n do servidor non vÃ¡lida"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "Unsupported authentication method"
 msgstr "MÃ©todo de autenticaciÃ³n non incompatÃbel"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -2518,7 +1584,7 @@ msgstr ""
 "para o seu uso sen conexiÃ³n. Cargue unha vez a axenda de enderezos no modo "
 "con conexiÃ³n para descargar os seus contidos."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -2527,7 +1593,7 @@ msgstr ""
 "Non Ã© posÃbel abrir esta axenda de enderezos. Verifique que o camiÃ±o %s "
 "existe e que estÃ¡n definidos os permisos para acceder a ela."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -2536,7 +1602,7 @@ msgstr ""
 "usar o LDAP no Evolution ten que ter instalado un paquete do Evolution con "
 "capacidades LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -2544,11 +1610,11 @@ msgstr ""
 "Esta axenda de enderezos non se pode abrir. Isto pode significar que se "
 "introduciu un URI incorrecto ou que o servidor non Ã© atinxÃbel."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:145
 msgid "Detailed error message:"
 msgstr "Mensaxe de erro detallada:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:168
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2560,7 +1626,7 @@ msgstr ""
 "Faga unha busca mÃ¡is especÃfica ou eleve o lÃmite de resultados\n"
 "nas preferencias do servidor de directorio para esta axenda de enderezos."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:174
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -2573,193 +1639,96 @@ msgstr ""
 "servidor\n"
 "de directorio para esta axenda de enderezos."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:180
 msgid "The backend for this address book was unable to parse this query."
 msgstr "O backend desta axenda de enderezos non puido analizar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book refused to perform this query."
 msgstr "O backend desta axenda de enderezos rexeitou efectuar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "This query did not complete successfully."
 msgstr "Esta consulta non terminou con Ã©xito."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid "Error adding list"
-msgstr "Erro ao engadir a lista"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:685
-msgid "Error adding contact"
-msgstr "Erro ao engadir o contacto"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying list"
-msgstr "Erro ao modificar a lista"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying contact"
-msgstr "Erro ao modificar o contacto"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-msgid "Error removing list"
-msgstr "Erro ao eliminar a lista"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:635
-msgid "Error removing contact"
-msgstr "Erro ao eliminar o contacto"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-#, c-format
-msgid ""
-"Opening %d contact will open %d new window as well.\n"
-"Do you really want to display this contact?"
-msgid_plural ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr[0] ""
-"Ao abrir %d contacto abrirÃ¡ tamÃ©n %d nova xanela.\n"
-"EstÃ¡ seguro de que quere mostrar este contacto?"
-msgstr[1] ""
-"Ao abrir %d contactos abrirÃ¡ %d novas xanelas tamÃ©n.\n"
-"EstÃ¡ seguro de que quere mostrar este contacto?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
-msgid "_Don't Display"
-msgstr "_Non mostrar"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
-msgid "Display _All Contacts"
-msgstr "Mostrar _todos os contactos"
-
-#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:350
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s xa existe\n"
-"Quere sobrescribilo?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:354
-msgid "Overwrite"
-msgstr "Sobrescribir"
-
-#. more than one, finding the total number of contacts might
-#. * hit performance while saving large number of contacts
-#.
-#: ../addressbook/gui/widgets/eab-gui-util.c:394
-#: ../addressbook/gui/widgets/eab-gui-util.c:397
-msgid "contact"
-msgid_plural "contacts"
-msgstr[0] "contacto"
-msgstr[1] "contactos"
-
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:443
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:480
+#: ../addressbook/gui/widgets/eab-gui-util.c:244
 msgid "Select Address Book"
 msgstr "Seleccione a axenda de enderezos"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:746
+#: ../addressbook/gui/widgets/eab-gui-util.c:432
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:434
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:751
+#: ../addressbook/gui/widgets/eab-gui-util.c:437
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:439
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:901
-msgid "Multiple vCards"
-msgstr "MÃºltiples vCards"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:908
-#, c-format
-msgid "vCard for %s"
-msgstr "vCard para %s"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:920
-#: ../addressbook/gui/widgets/eab-gui-util.c:946
-#, c-format
-msgid "Contact information"
-msgstr "InformaciÃ³n de contacto"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:948
-#, c-format
-msgid "Contact information for %s"
-msgstr "InformaciÃ³n de contacto de %s"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:291
-msgid "Querying Address Book..."
-msgstr "Consultando a axenda de enderezos..."
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "VisualizaciÃ³n de tarxeta"
 
-#: ../addressbook/importers/evolution-csv-importer.c:660
-#: ../addressbook/importers/evolution-ldif-importer.c:512
-#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-ldif-importer.c:516
+#: ../addressbook/importers/evolution-vcard-importer.c:253
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
 msgid "Importing..."
 msgstr "Importando..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:861
+#: ../addressbook/importers/evolution-csv-importer.c:858
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:862
+#: ../addressbook/importers/evolution-csv-importer.c:859
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:870
+#: ../addressbook/importers/evolution-csv-importer.c:867
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:871
+#: ../addressbook/importers/evolution-csv-importer.c:868
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:879
+#: ../addressbook/importers/evolution-csv-importer.c:876
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:880
+#: ../addressbook/importers/evolution-csv-importer.c:877
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV e importador Tab"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:679
+#: ../addressbook/importers/evolution-ldif-importer.c:689
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de intercambio de datos LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:690
 msgid "Evolution LDIF importer"
 msgstr "Importador de LDIF do Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:556
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:557
 msgid "Evolution vCard Importer"
 msgstr "Importador de vCard do Evolution"
 
@@ -2767,11 +1736,11 @@ msgstr "Importador de vCard do Evolution"
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
-msgstr "Non se puido abrir o ficheiro"
+msgstr "Non foi posÃbel abrir o ficheiro"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
 msgid "Couldn't get list of address books"
-msgstr "Non se puido obter unha lista de axendas de enderezos"
+msgstr "Non foi posÃbel obter unha lista de axendas de enderezos"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
@@ -2807,34 +1776,58 @@ msgid ""
 "100."
 msgstr ""
 "NÃºmero de cartas nun ficheiro de saÃda en modo asÃncrono. O tamaÃ±o "
-"predeterminado Ã© 100."
+"predefinido Ã© 100."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "NÃ?MERO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:99
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
-"Erro nos argumentos da liÃ±a de comandos. Use a opciÃ³n --help para ver o uso."
+"Erro nos argumentos da liÃ±a de ordes. Use a opciÃ³n --help para ver o uso."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:113
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "SÃ³ permite os formatos csv ou vcard."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "En modo asÃncrono a saÃda debe ser un ficheiro."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:130
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "En modo normal non Ã© necesaria a opciÃ³n de tamaÃ±o."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:161
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "Erro inmanexÃ¡bel"
 
+#: ../addressbook/util/addressbook.c:103
+msgid "Accessing LDAP Server anonymously"
+msgstr "Accedendo anonimamente ao servidor LDAP"
+
+#: ../addressbook/util/addressbook.c:210
+#: ../plugins/groupwise-features/camel-gw-listener.c:525
+msgid "Failed to authenticate.\n"
+msgstr "Fallou ao autenticarse.\n"
+
+#: ../addressbook/util/addressbook.c:217
+#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Introduza o contrasinal para %s (usuario %s)"
+
+#: ../addressbook/util/addressbook.c:225
+#: ../calendar/common/authentication.c:51
+#: ../plugins/caldav/caldav-browse-server.c:809
+#: ../plugins/google-account-setup/google-source.c:440
+#: ../plugins/publish-calendar/publish-calendar.c:328
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "Introduza o contrasinal"
+
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
@@ -2922,96 +1915,100 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "EstÃ¡ seguro de que quere eliminar a cita titulada '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "EstÃ¡ seguro de que quere eliminar a cita titulada '{0}'?"
+
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "EstÃ¡ seguro de que quere eliminar a nota '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "EstÃ¡ seguro de que quere eliminar estas {0} citas?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "EstÃ¡ seguro de que quere eliminar estas {0} notas?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "EstÃ¡ seguro de que quere eliminar estas {0} tarefas?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete this appointment?"
 msgstr "EstÃ¡ seguro de que quere eliminar esta cita?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:182
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:191
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "EstÃ¡ seguro de que quere eliminar esta cita?"
 
-#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:188
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:197
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "EstÃ¡ seguro de que quere eliminar esta nota?"
 
-#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:185
+#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/gui/dialogs/delete-comp.c:194
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "EstÃ¡ seguro de que quere eliminar esta tarefa?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "EstÃ¡ seguro que quere gardar a nota sen un resumo?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "EstÃ¡ seguro de que quere enviar a cita sen un resumo?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:28
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "EstÃ¡ seguro de que quere enviar a tarefa sen un resumo?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Calendar repository is offline."
 msgstr "O repositorio de calendarios estÃ¡ desconectado."
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
-msgstr "Non se pode crear un novo actividade"
+msgstr "Non Ã© posÃbel crear un novo actividade"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Cannot save event"
 msgstr "Non Ã© posÃbel gardar o actividade"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete calendar '{0}'?"
 msgstr "Quere eliminar o calendario '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete memo list '{0}'?"
 msgstr "Quere eliminar a lista de notas '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Delete task list '{0}'?"
 msgstr "Quere eliminar a lista de tarefas '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Do _not Send"
 msgstr "_Non enviar"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Hai unha descarga en progreso. Quere gardar a cita?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Hai unha descarga en progreso. Quere gardar a tarefa?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid "Editor could not be loaded."
-msgstr "Non se puido cargar o editor."
+msgstr "Non foi posÃbel cargar o editor."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -3019,31 +2016,31 @@ msgstr ""
 "Enviaranse convites por correo electrÃ³nico a todos os participantes e "
 "permitirÃ¡selles aceptar esta tarefa."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 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 confirmalos."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading calendar"
-msgstr "Erro ao cargar o calendario"
+msgstr "Produciuse un erro ao cargar o calendario"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading memo list"
-msgstr "Erro ao cargar a lista de notas"
+msgstr "Produciuse un erro ao cargar a lista de notas"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
 msgid "Error loading task list"
-msgstr "Erro ao cargar a lista de tarefas"
+msgstr "Produciuse un erro ao cargar a lista de tarefas"
 
 #. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
 msgid "Error on '{0}'"
 msgstr "Erro en '{0}'"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -3051,7 +2048,7 @@ 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:46
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -3059,7 +2056,7 @@ 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:47
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -3067,23 +2064,11 @@ 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:48
+#: ../calendar/calendar.error.xml.h:49
 msgid "No response from the server."
 msgstr "Non hai resposta do servidor."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "Save Appointment"
-msgstr "Gardar cita"
-
 #: ../calendar/calendar.error.xml.h:50
-msgid "Save Memo"
-msgstr "Gardar Nota"
-
-#: ../calendar/calendar.error.xml.h:51
-msgid "Save Task"
-msgstr "Gardar tarefa"
-
-#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -3091,7 +2076,7 @@ msgstr ""
 "Ao enviar informaciÃ³n actualizada permite que outros participantes manteÃ±an "
 "os seus calendarios ao dÃa."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -3099,7 +2084,7 @@ msgstr ""
 "Ao enviar informaciÃ³n actualizada permÃtese que outros participantes "
 "manteÃ±an a sÃºa lista de tarefas ao dÃa."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -3107,7 +2092,7 @@ msgstr ""
 "Estanse descargando algÃºns anexos. Gardar a cita farÃ¡ que se perdan eses "
 "anexos."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -3115,94 +2100,98 @@ msgstr ""
 "Estanse descargando algÃºns anexos. Gardar a tarefa farÃ¡ que se perdan eses "
 "anexos."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:54
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Pode que algunhas caracterÃsticas non funcionen apropiadamente co servidor "
 "actual."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "O calendario do Evolution saÃu inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Os calendarios do Evolution saÃron inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "As notas do Evolution saÃron inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "As tarefas do Evolution saÃron inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
 msgid "The calendar is not marked for offline usage."
 msgstr "O calendario non estÃ¡ marcado para o uso sen conexiÃ³n."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:60
 msgid "The memo list is not marked for offline usage."
 msgstr "A lista de notas non estÃ¡ marcada para o uso no modo sen conexiÃ³n."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
 msgid "The task list is not marked for offline usage."
 msgstr "A lista de tarefas non estÃ¡ marcada para o uso sen conexiÃ³n."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:62
 msgid "This calendar will be removed permanently."
 msgstr "Este calendario eliminarase permanentemente."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:63
 msgid "This memo list will be removed permanently."
 msgstr "Esta lista de notas vaise eliminar permanentemente."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:64
 msgid "This task list will be removed permanently."
 msgstr "Esta lista de tarefas vaise eliminar permanentemente."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:65
 msgid "Unable to load the calendar"
 msgstr "Non Ã© posÃbel cargar o calendario"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Quere gardar as modificaciÃ³ns feitas nesta cita?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:67
+msgid "Would you like to save your changes to this meeting?"
+msgstr "Quere gardar as modificaciÃ³ns feitas nesta nota?"
+
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to save your changes to this memo?"
 msgstr "Quere gardar as modificaciÃ³ns feitas nesta nota?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this task?"
 msgstr "Quere gardar as modificaciÃ³ns feitas nesta tarefa?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Quere enviar unha notificaciÃ³n de cancelaciÃ³n para esta nota?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr ""
 "Quere enviar a todos os participantes unha notificaciÃ³n de cancelaciÃ³n?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Quere enviar convites para a cita aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send this task to participants?"
 msgstr "Quere enviar esta tarefa aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Quere enviar informaciÃ³n actualizada da cita aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send updated task information to participants?"
 msgstr "Quere enviar informaciÃ³n actualizada das tarefas aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:76
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -3212,282 +2201,209 @@ msgstr ""
 "problemas ao usar o Evolution. Para os mellores resultados, o servidor "
 "deberÃa actualizarse a unha versiÃ³n compatÃbel."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:77
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Modificou esta cita, mais aÃnda non a gardou."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:78
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "Modificou esta tarefa, mais aÃnda non a gardou."
+
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this task, but not yet saved it."
 msgstr "Modificou esta tarefa, mais aÃnda non a gardou."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Realizou modificaciÃ³ns nesta nota, mais aÃnda non as gardou."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:81
 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/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:82
 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."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:83
 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:85
-#: ../composer/mail-composer.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:84
+#: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "_Rexeitar as modificaciÃ³ns"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
+#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
 msgid "_Save"
 msgstr "_Gardar"
 
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:86
 msgid "_Save Changes"
 msgstr "_Gardar modificaciÃ³ns"
 
-#: ../calendar/calendar.error.xml.h:88
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:87
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:88
 msgid "_Send Notice"
 msgstr "_Enviar notificaciÃ³n"
 
-#: ../calendar/calendar.error.xml.h:90
+#: ../calendar/calendar.error.xml.h:89
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:248
+#: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "Dividir eventos de dÃas mÃºltiples:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1513
-#: ../calendar/conduits/calendar/calendar-conduit.c:1514
-#: ../calendar/conduits/memo/memo-conduit.c:807
-#: ../calendar/conduits/memo/memo-conduit.c:808
-#: ../calendar/conduits/todo/todo-conduit.c:1007
-#: ../calendar/conduits/todo/todo-conduit.c:1008
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
+#: ../calendar/conduits/calendar/calendar-conduit.c:1533
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/memo/memo-conduit.c:822
+#: ../calendar/conduits/todo/todo-conduit.c:1022
+#: ../calendar/conduits/todo/todo-conduit.c:1023
 msgid "Could not start evolution-data-server"
-msgstr "Non se puido iniciar o evolution-data-server"
+msgstr "Non foi posÃbel iniciar o evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1621
-#: ../calendar/conduits/calendar/calendar-conduit.c:1624
+#: ../calendar/conduits/calendar/calendar-conduit.c:1640
+#: ../calendar/conduits/calendar/calendar-conduit.c:1643
 msgid "Could not read pilot's Calendar application block"
-msgstr "Non se puido ler o bloque do Aplicativo de Calendario do pilot"
+msgstr "Non foi posÃbel ler o bloque do Aplicativo de Calendario do pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:901
-#: ../calendar/conduits/memo/memo-conduit.c:904
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
-msgstr "Non se puido ler o bloque do Aplicativo Memo do pilot"
+msgstr "Non foi posÃbel ler o bloque do Aplicativo Memo do pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:948
-#: ../calendar/conduits/memo/memo-conduit.c:951
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
-msgstr "Non se puido escribir o bloque do Aplicativo Memo do pilot"
+msgstr "Non foi posÃbel escribir o bloque do Aplicativo Memo do pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:227
+#: ../calendar/conduits/todo/todo-conduit.c:231
 msgid "Default Priority:"
-msgstr "Prioridade predeterminada:"
+msgstr "Prioridade predefinida:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1091
-#: ../calendar/conduits/todo/todo-conduit.c:1094
+#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1109
 msgid "Could not read pilot's ToDo application block"
-msgstr "Non se puido ler o bloque do Aplicativo Tarefas pendentes do pilot"
+msgstr "Non foi posÃbel ler o bloque do Aplicativo Tarefas pendentes do pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1136
-#: ../calendar/conduits/todo/todo-conduit.c:1139
+#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1154
 msgid "Could not write pilot's ToDo application block"
 msgstr ""
-"Non se puido escribir o bloque do Aplicativo Tarefas pendentes do pilot"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2549
-msgid "Calendar and Tasks"
-msgstr "Calendario e tarefas"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:819
-#: ../calendar/gui/calendar-component.c:1238
-msgid "Calendars"
-msgstr "Calendarios"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure aquÃ o seu fuso horario, calendario e lista de tarefas "
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Calendario e tarefas do Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Control de configuraciÃ³n do calendario do Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visualizador de mensaxes de programaciÃ³n do calendario do Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor de Calendario/Tarefas do Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution's Calendar component"
-msgstr "CompoÃ±ente de calendario do Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Memos component"
-msgstr "CompoÃ±ente de notas do Evolution"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Tasks component"
-msgstr "CompoÃ±ente de tarefas do Evolution"
+"Non foi posÃbel escribir o bloque do Aplicativo Tarefas pendentes do pilot"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Memo_s"
-msgstr "Nota_s"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1123
-#: ../calendar/gui/gnome-cal.c:1846 ../calendar/gui/memos-component.c:564
-#: ../calendar/gui/memos-component.c:882 ../calendar/gui/memos-control.c:386
-#: ../calendar/gui/memos-control.c:402
-msgid "Memos"
-msgstr "Notas"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1426
-#: ../calendar/gui/gnome-cal.c:1714 ../calendar/gui/print.c:1973
-#: ../calendar/gui/tasks-component.c:557 ../calendar/gui/tasks-component.c:879
-#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:751
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:586
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
-msgid "Tasks"
-msgstr "Tarefas"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-msgid "_Calendars"
-msgstr "_Calendarios"
-
-#. Tasks
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:328 ../views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tarefas"
-
-#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Servizo de notificaciÃ³n por alarma do calendario do Evolution"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:23
-#: ../plugins/caldav/caldav-source.c:449
-#: ../plugins/calendar-file/calendar-file.c:287
-#: ../plugins/calendar-http/calendar-http.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:721
-#: ../plugins/google-account-setup/google-contacts-source.c:331
-msgid "hours"
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#, fuzzy
+msgid "hour"
 msgid_plural "hours"
 msgstr[0] "horas"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
 msgid "Start time"
 msgstr "Hora de comezo"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "Citas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
 msgid "Dismiss _All"
 msgstr "Ignorar _todo"
 
 #. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1592
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
-#: ../calendar/gui/e-itip-control.c:1164
-#: ../plugins/itip-formatter/itip-view.c:1023
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1574
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1580
+#: ../calendar/gui/e-itip-control.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1031
 msgid "Location:"
 msgstr "LocalizaciÃ³n:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
 msgid "Snooze _time:"
 msgstr "Pospor o a_viso:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
 msgid "_Dismiss"
 msgstr "_Ignorar"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1038
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
-#: ../widgets/menus/gal-define-views.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1015
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:151
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1605
+#: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "_Pospor"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../filter/filter.ui.h:15
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+#, fuzzy
+msgid "hours"
+msgstr "horas"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
 msgstr "localizaciÃ³n da cita"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1451
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/google-account-setup/google-contacts-source.c:331
+msgid "minutes"
+msgstr "minutos"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1435
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1557
 msgid "No summary available."
 msgstr "Non hai un resumo dispoÃ±Ãbel."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1460
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1462
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1444
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1446
 msgid "No description available."
 msgstr "Non hai unha descriciÃ³n dispoÃ±Ãbel."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
 msgid "No location information available."
 msgstr "Non hai informaciÃ³n da localizaciÃ³n dispoÃ±Ãbel."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1515
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1497
 #, c-format
 msgid "You have %d alarms"
 msgstr "Ten %d alarmas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1675
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1679
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3499,7 +2415,7 @@ msgstr ""
 "configurado para enviar unha mensaxe de correo electrÃ³nico. No seu lugar\n"
 "O Evolution vai mostrar un diÃ¡logo de aviso normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1709
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3516,22 +2432,10 @@ msgstr ""
 "\n"
 "EstÃ¡ seguro de que quere executar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 msgid "Do not ask me about this program again."
 msgstr "Non volver preguntar sobre este programa."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:141
-msgid "Could not initialize Bonobo"
-msgstr "Non se puido inicializar o Bonobo"
-
-#: ../calendar/gui/alarm-notify/notify-main.c:154
-msgid ""
-"Could not create the alarm notify service factory, maybe it's already "
-"running..."
-msgstr ""
-"Non se puido crear a factorÃa do servizo de notificaciÃ³n de alarmas, poida "
-"que xa se estea executando..."
-
 #: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "hora non vÃ¡lida"
@@ -3570,7 +2474,7 @@ msgid "Alarm programs"
 msgstr "Programas de alarma"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Tempo (en segundos) durante o que mostrarÃ¡ o erro na barra de estado."
 
@@ -3600,7 +2504,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)."
+"predefinida)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains line in the Day View."
@@ -3626,7 +2530,7 @@ msgstr "DÃas nos que debe indicarse o inicio e fin das horas de traballo."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
-msgstr "Aviso de cita predeterminado"
+msgstr "Aviso de cita predefinido"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default recurrence count"
@@ -3634,11 +2538,11 @@ msgstr "Conta de recorrencia predefinida"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder units"
-msgstr "Unidades de aviso predeterminadas"
+msgstr "Unidades de aviso predefinidas"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Default reminder value"
-msgstr "Valor de aviso predeterminado"
+msgstr "Valor de aviso predefinido"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Directory for saving alarm audio files"
@@ -3692,43 +2596,55 @@ msgstr ""
 "23."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr ""
+"Se Ã© \"true\", mÃ³strase o panel de previsualizaciÃ³n de recordatorios na "
+"xanela principal."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr ""
+"Se Ã© \"true\", mÃ³strase o panel de previsualizaciÃ³n de tarefas na xanela "
+"principal."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Os intervalos de tempo mostrados nas visualizaciÃ³ns diaria e de semana "
 "laboral, en minutos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Last alarm time"
 msgstr "Hora da Ãºltima alarma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "Nivel a partir do que se deberÃa rexistrar a mensaxe."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of recently used second time zones in a Day View."
 msgstr ""
 "Unha listaxe dos fusos horarios secundarios usados recentemente nunha "
 "VisualizaciÃ³n diaria."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "List of server URLs for free/busy publishing."
 msgstr "Lista dos URL do servidor para publicaciÃ³n de dispoÃ±ibilidade."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line"
 msgstr "LiÃ±a de Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Cor da liÃ±a de Marcus Bains - VisualizaciÃ³n de dÃa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Cor da liÃ±a de Marcus Bains - Barra de tempo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -3736,40 +2652,52 @@ msgstr ""
 "O nÃºmero mÃ¡ximo de fusos horarios usados recentemente para recordar nunha "
 "listaxe 'day_second_zones'."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Maximum number of recently used timezones to remember."
 msgstr ""
 "O nÃºmero mÃ¡ximo de fusos horarios usados recentemente que hai que recordar."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+msgid "Memo layout style"
+msgstr "Estilo da _resposta:"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+msgid "Memo preview pane position (horizontal)"
+msgstr "PosiciÃ³n do panel de previsualizaciÃ³n de recordatorios (horizontal)"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+msgid "Memo preview pane position (vertical)"
+msgstr "PosiciÃ³n do panel de previsualizaciÃ³n de recordatorios (vertical)"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuto de finalizaciÃ³n da xornada laboral, de 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuto de comezo da xornada laboral, de 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view horizontal pane position"
 msgstr "PosiciÃ³n do panel horizontal da visualizaciÃ³n mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Month view vertical pane position"
 msgstr "PosiciÃ³n do panel vertical na visualizaciÃ³n mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining a default reminder."
-msgstr "NÃºmero de unidades para determinar un aviso predeterminado."
+msgstr "NÃºmero de unidades para determinar un aviso predefinido."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Number of units for determining when to hide tasks."
 msgstr "NÃºmero de unidades para determinar cando ocultar as tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Overdue tasks color"
 msgstr "Cor para as tarefas pendentes"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -3778,7 +2706,7 @@ msgstr ""
 "do calendario e a lista de tarefas cando non estÃ¡ na visualizaciÃ³n mensual, "
 "en pÃxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.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."
@@ -3786,7 +2714,25 @@ msgstr ""
 "PosiciÃ³n do panel horizontal, entre a visualizaciÃ³n e o navegador de datas "
 "do calendario e a lista de tarefas na visualizaciÃ³n mensual, en pÃxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr ""
+"PosiciÃ³n do panel de previsualizaciÃ³n de recordatorios cando estÃ¡ horientado "
+"verticalmente."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr ""
+"PosiciÃ³n do panel de previsualizaciÃ³n de recordatorios cando estÃ¡ horientado "
+"horizontalmente."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+msgid "Position of the task preview pane when oriented vertically."
+msgstr ""
+"PosiciÃ³n do panel de previsualizaciÃ³n de tarefas cando estÃ¡ horientado "
+"verticalmente."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -3794,15 +2740,7 @@ msgstr ""
 "PosiciÃ³n do panel vertical, entre as listas de calendario e o navegador de "
 "datas do calendario."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
-msgid ""
-"Position of the vertical pane, between the task list and the task preview "
-"pane, in pixels."
-msgstr ""
-"PosiciÃ³n do panel vertical, entre a lista de tarefas e o panel de "
-"previsualizaciÃ³n de tarefas, en pÃxeles."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -3810,7 +2748,7 @@ msgstr ""
 "PosiciÃ³n do panel vertical, entre a visualizaciÃ³n e o navegador de datas do "
 "calendario e a lista de tarefas na visualizaciÃ³n mensual, en pÃxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 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."
@@ -3819,88 +2757,86 @@ msgstr ""
 "calendario e a lista de tarefas cando non estÃ¡ na visualizaciÃ³n mensual, en "
 "pÃxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary calendar"
 msgstr "Calendario primario"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary memo list"
 msgstr "Lista de notas primaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Primary task list"
 msgstr "Lista de tarefas primaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programas que poden ser executados polas alarmas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Recently used second time zones in a Day View"
 msgstr ""
 "Fusos horarios secundarios usados recentemente nunha VisualizaciÃ³n diaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Save directory for alarm audio"
 msgstr "Directorio onde gardar a alarma de son"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Scroll Month View by a week"
 msgstr "Desprazar a vista de mes por semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Mostrar o campo RSVP no editor de eventos/tarefas/reuniÃ³ns"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Mostrar o campo Rol no editor de eventos/tarefas/reuniÃ³ns"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show appointment end times in week and month views"
 msgstr ""
 "Mostrar os prazos finais das citas nas visualizaciÃ³ns semanal e mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Mostrar o campo categorÃas no editor de eventos/reuniÃ³ns/tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show display alarms in notification tray"
 msgstr "Mostrar o visualizador da alarma nunha bandexa de notificaciÃ³n"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/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 eventos/tarefas/reuniÃ³ns"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "Show the \"Preview\" pane"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+msgid "Show the memo preview pane"
 msgstr "Mostrar o panel de \"PrevisualizaciÃ³n\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Show the \"Preview\" pane."
-msgstr "Mostrar o panel de \"PrevisualizaciÃ³n\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+msgid "Show the task preview pane"
+msgstr "Mostrar o panel de \"PrevisualizaciÃ³n\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Mostrar o campo de fuso horario no editor de eventos/reuniÃ³ns"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/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 eventos/tarefas/reuniÃ³ns"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Show week number in Day and Work Week View"
 msgstr ""
 "Mostrar o nÃºmero de semana nas visualizaciÃ³ns de DÃa e de Semana laborÃ¡bel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Show week numbers in date navigator"
 msgstr "Mostrar os nÃºmeros de semana no navegador de datas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -3908,15 +2844,23 @@ msgstr ""
 "Mostra os fusos horarios secundarios nunha VisualizaciÃ³n diaria, se estÃ¡ "
 "estabelecido. O valor Ã© semellante ao usado na chave 'timezone'."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
-msgid "Tasks due today color"
-msgstr "Cor para as tarefas que vencen hoxe"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+msgid "Task layout style"
+msgstr "Estilo da disposiciÃ³n de tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
-msgid "Tasks vertical pane position"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+msgid "Task preview pane position (horizontal)"
 msgstr "PosiciÃ³n do panel vertical de tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+msgid "Task preview pane position (vertical)"
+msgstr "PosiciÃ³n do panel vertical de tarefas"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+msgid "Tasks due today color"
+msgstr "Cor para as tarefas que vencen hoxe"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -3926,20 +2870,43 @@ msgstr ""
 "u substitÃºese pola parte de usuario do enderezo de correo e %d substitÃºese "
 "polo dominio."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 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 ""
-"O fuso horario predeterminado que se empregarÃ¡ nas datas e horas no "
-"calendario, como unha localizaciÃ³n non traducida da base de datos de fusos "
-"horarios Olsen, como en \"America/New York\"."
+"O fuso horario predefinido que se empregarÃ¡ nas datas e horas no calendario, "
+"como unha localizaciÃ³n non traducida da base de datos de fusos horarios "
+"Olsen, como en \"America/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+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 de disposiciÃ³n determina onde dispoÃ±er o panel de previsualizaciÃ³n "
+"en relaciÃ³n coa lista de recordatorios. \"0\" (VisualizaciÃ³n clÃ¡sica) mostra "
+"o panel de previsualizaciÃ³n debaixo da lista de recordatorios. \"1"
+"\" (VisualizaciÃ³n vertical) mostra o panel de previsualizaciÃ³n ao lado da "
+"lista de recordatorios."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+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 previsualizaciÃ³n "
+"en relaciÃ³n coa lista de tarefas. \"0\" (VisualizaciÃ³n clÃ¡sica) mostra o "
+"panel de previsualizaciÃ³n debaixo da lista de tarefas. \"1\" (VisualizaciÃ³n "
+"vertical) mostra o panel de previsualizaciÃ³n ao lado da lista de tarefas."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "The second timezone for a Day View"
 msgstr "O segundo fuso horario dunha VisualizaciÃ³n diaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -3947,19 +2914,19 @@ msgstr ""
 "Isto pode tomar tres valores diferentes: 0 para erros; 1 para avisos e 2 "
 "para as mensaxes de depuraciÃ³n."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time divisions"
 msgstr "DivisiÃ³ns horarias"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Time the last alarm ran, in time_t."
 msgstr "A hora na que se executou a Ãºltima alarma, en time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Timezone"
 msgstr "Fuso horario"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -3967,67 +2934,70 @@ msgstr ""
 "Transparencia dos eventos nas visualizaciÃ³ns de calendario, un valor entre 0 "
 "(transparente) e 1 (opaco)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Twenty four hour time format"
 msgstr "Formato de hora en vinte e catro horas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "URI do calendario realzado (\"primario\")"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "URI da lista de memorizaciÃ³n realzada (\"primary\")"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "URI da lista de tarefas realzada (\"primaria\")"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Unidades para o aviso predeterminado: \"minutes\", \"hours\" ou \"days\"."
+msgstr "Unidades para o aviso predefinido: \"minutes\", \"hours\" ou \"days\"."
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para determinar cando ocultar as tarefas: \"minutes\", \"hours\" ou "
 "\"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Use system timezone"
 msgstr "Empregar o fuso horario do sistema"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr ""
 "Usar o fuso horario do sistema no canto do fuso horario seleccionado no "
 "Evolution."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+msgid "Vertical pane position"
+msgstr "PosiciÃ³n vertical do panel"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Week start"
 msgstr "Comezo da semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "O dÃa no que comeza a semana, dende o domingo (0) atÃ© o sÃ¡bado (6)."
+msgstr "O dÃa no que comeza a semana, desde o domingo (0) atÃ© o sÃ¡bado (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Se se debe usar ou non a bandexa de notificaciÃ³n para mostrar alarmas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Indica se se solicita confirmaciÃ³n ao expurgar citas ou tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -4035,301 +3005,114 @@ msgstr ""
 "Indica se se comprimen as fins de semana. Isto pon o sÃ¡bado e o domingo no "
 "mesmo espazo que un dÃa laborÃ¡bel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 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 dos eventos nas visualizaciÃ³ns "
 "semanais e mensuais."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr ""
 "Indica se se ocultan as tarefas terminadas na visualizaciÃ³n de tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "Se desprazarse na vista de mes por semana ou por mes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to set a default reminder for appointments."
-msgstr "Indica se se define un aviso predeterminado para as citas."
+msgstr "Indica se se define un aviso predefinido para as citas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Indica se se mostra o campo RSVP no editor de eventos/tarefas/reuniÃ³ns"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/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 eventos/reuniÃ³ns"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Indica se se mostra o campo de rol no editor de eventos/tarefas/reuniÃ³ns"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/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 eventos/tarefas/reuniÃ³ns"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/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 eventos ou reuniÃ³ns"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/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 eventos, tarefas ou reuniÃ³ns"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr ""
 "Indica se se mostra o nÃºmero de semana nas visualizaciÃ³ns Diaria e de Semana "
 "laborÃ¡bel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Indica se se mostran os nÃºmeros de semana no navegador de datas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Work days"
 msgstr "DÃas laborÃ¡beis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end hour"
 msgstr "Hora de finalizaciÃ³n da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday end minute"
 msgstr "Minuto de finalizaciÃ³n da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start hour"
 msgstr "Hora de comezo da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
 msgid "Workday start minute"
 msgstr "Minuto de comezo da xornada laboral"
 
-#: ../calendar/gui/cal-editor-utils.c:100
+#: ../calendar/gui/cal-editor-utils.c:105
 msgid "Invalid object"
 msgstr "O obxecto non Ã© vÃ¡lido"
 
-#: ../calendar/gui/cal-search-bar.c:74
-msgid "Summary contains"
-msgstr "O resumo contÃ©n"
-
-#: ../calendar/gui/cal-search-bar.c:75
-msgid "Description contains"
-msgstr "A descriciÃ³n contÃ©n"
-
-#: ../calendar/gui/cal-search-bar.c:76
-msgid "Category is"
-msgstr "A categorÃa Ã©"
-
-#: ../calendar/gui/cal-search-bar.c:77
-msgid "Comment contains"
-msgstr "O comentario contÃ©n"
-
-#: ../calendar/gui/cal-search-bar.c:78
-msgid "Location contains"
-msgstr "A localizaciÃ³n contÃ©n"
-
-#: ../calendar/gui/cal-search-bar.c:636
-msgid "Next 7 Days' Tasks"
-msgstr "Tarefas dos prÃ³ximos sete dÃas"
-
-#: ../calendar/gui/cal-search-bar.c:640
-msgid "Active Tasks"
-msgstr "Tarefas activas"
-
-#: ../calendar/gui/cal-search-bar.c:644
-msgid "Overdue Tasks"
-msgstr "Tarefas atrasadas"
-
-#: ../calendar/gui/cal-search-bar.c:648
-msgid "Completed Tasks"
-msgstr "Tarefas terminadas"
-
-#: ../calendar/gui/cal-search-bar.c:652
-msgid "Tasks with Attachments"
-msgstr "Tarefas con anexos"
-
-#: ../calendar/gui/cal-search-bar.c:698
-msgid "Active Appointments"
-msgstr "Citas activas"
-
-#: ../calendar/gui/cal-search-bar.c:702
-msgid "Next 7 Days' Appointments"
-msgstr "Citas dos prÃ³ximos sete dÃas"
-
-#: ../calendar/gui/calendar-commands.c:89 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
-#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Imprimir"
-
-#: ../calendar/gui/calendar-commands.c:331
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"Esta operaciÃ³n eliminarÃ¡ permanentemente todos os eventos marcados mÃ¡is "
-"antigos que o tempo seleccionado. Se continÃºa, non poderÃ¡ recuperar estes "
-"eventos."
-
-#: ../calendar/gui/calendar-commands.c:337
-msgid "Purge events older than"
-msgstr "Purgar eventos anteriores a"
-
-#: ../calendar/gui/calendar-commands.c:342
-#: ../plugins/caldav/caldav-source.c:450
-#: ../plugins/calendar-file/calendar-file.c:288
-#: ../plugins/calendar-http/calendar-http.c:325
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:722
-#: ../plugins/google-account-setup/google-contacts-source.c:332
-#: ../widgets/misc/e-send-options.glade.h:39
-msgid "days"
-msgstr "dÃas"
-
-#. Create the Webcal source group
-#: ../calendar/gui/calendar-component.c:194
-#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:504
-#: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
-#: ../calendar/gui/tasks-component.c:149
-msgid "On The Web"
-msgstr "Na Web"
-
-#: ../calendar/gui/calendar-component.c:195
-#: ../plugins/calendar-weather/calendar-weather.c:126
-msgid "Weather"
-msgstr "O tempo"
-
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:289
-#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:398
-msgid "Birthdays & Anniversaries"
-msgstr "Datas de nacementos e aniversarios"
-
-#: ../calendar/gui/calendar-component.c:626
-msgid "_New Calendar"
-msgstr "Calendario _novo"
-
-#: ../calendar/gui/calendar-component.c:627
-#: ../calendar/gui/memos-component.c:478 ../calendar/gui/tasks-component.c:471
-#: ../mail/em-folder-tree.c:2114
-msgid "_Copy..."
-msgstr "_Copiar..."
-
-#: ../calendar/gui/calendar-component.c:632
-#: ../calendar/gui/memos-component.c:483 ../calendar/gui/tasks-component.c:476
-msgid "_Make available for offline use"
-msgstr "_Mostrar como dispoÃ±Ãbel para o uso sen conexiÃ³n"
-
-#: ../calendar/gui/calendar-component.c:633
-#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:477
-msgid "_Do not make available for offline use"
-msgstr "_Non mostrar como dispoÃ±Ãbel para o uso sen conexiÃ³n"
-
-#: ../calendar/gui/calendar-component.c:961
-msgid "Failed upgrading calendars."
-msgstr "Fallou ao actualizar os calendarios."
-
-#: ../calendar/gui/calendar-component.c:1089
-#, c-format
-msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr "Non se puido abrir o calendario '%s' para crear eventos e reuniÃ³ns"
-
-#: ../calendar/gui/calendar-component.c:1105
-msgid "There is no calendar available for creating events and meetings"
-msgstr "Non hai ningÃºn calendario dispoÃ±Ãbel para crear eventos e reuniÃ³ns"
-
-#: ../calendar/gui/calendar-component.c:1218
-msgid "Calendar Source Selector"
-msgstr "Selector de orixe do calendario"
-
-#: ../calendar/gui/calendar-component.c:1433
-msgid "New appointment"
-msgstr "Cita nova"
-
-#: ../calendar/gui/calendar-component.c:1434
-msgctxt "New"
-msgid "_Appointment"
-msgstr "Cit_a"
-
-#: ../calendar/gui/calendar-component.c:1435
-msgid "Create a new appointment"
-msgstr "Crear unha cita nova"
-
-#: ../calendar/gui/calendar-component.c:1441
-msgid "New meeting"
-msgstr "ReuniÃ³n nova"
-
-#: ../calendar/gui/calendar-component.c:1442
-msgctxt "New"
-msgid "M_eeting"
-msgstr "R_euniÃ³n"
-
-#: ../calendar/gui/calendar-component.c:1443
-msgid "Create a new meeting request"
-msgstr "Crear unha solicitude de cita nova"
-
-#: ../calendar/gui/calendar-component.c:1449
-msgid "New all day appointment"
-msgstr "Cita nova para todo o dÃa"
-
-#: ../calendar/gui/calendar-component.c:1450
-msgctxt "New"
-msgid "All Day A_ppointment"
-msgstr "Ci_ta para todo o dÃa"
-
-#: ../calendar/gui/calendar-component.c:1451
-msgid "Create a new all-day appointment"
-msgstr "Crear nova cita nova para todo o dÃa"
-
-#: ../calendar/gui/calendar-component.c:1457
-msgid "New calendar"
-msgstr "Calendario novo"
-
-#: ../calendar/gui/calendar-component.c:1458
-msgctxt "New"
-msgid "Cale_ndar"
-msgstr "Cale_ndario"
-
-#: ../calendar/gui/calendar-component.c:1459
-msgid "Create a new calendar"
-msgstr "Crear un calendario novo"
-
-#: ../calendar/gui/calendar-view-factory.c:113
+#: ../calendar/gui/calendar-view-factory.c:117
 msgid "Day View"
 msgstr "VisualizaciÃ³n diaria"
 
-#: ../calendar/gui/calendar-view-factory.c:116
+#: ../calendar/gui/calendar-view-factory.c:120
 msgid "Work Week View"
 msgstr "VisualizaciÃ³n de semana laboral"
 
-#: ../calendar/gui/calendar-view-factory.c:119
+#: ../calendar/gui/calendar-view-factory.c:123
 msgid "Week View"
 msgstr "VisualizaciÃ³n semanal"
 
-#: ../calendar/gui/calendar-view-factory.c:122
+#: ../calendar/gui/calendar-view-factory.c:126
 msgid "Month View"
 msgstr "VisualizaciÃ³n mensual"
 
@@ -4358,18 +3141,19 @@ msgstr "CategorÃa"
 msgid "Classification"
 msgstr "ClasificaciÃ³n"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:370 ../calendar/gui/e-calendar-table.c:565
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
+#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:487
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Confidencial"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../plugins/plugin-manager/plugin-manager.c:60
 #: ../widgets/misc/e-attachment-tree-view.c:496
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "DescriciÃ³n"
 
@@ -4390,8 +3174,9 @@ msgstr "Existe"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:722
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
 msgstr "LocalizaciÃ³n"
 
@@ -4400,20 +3185,21 @@ msgstr "LocalizaciÃ³n"
 msgid "Organizer"
 msgstr "Organizador"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:368 ../calendar/gui/e-calendar-table.c:564
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
+#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:486
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privado"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:359 ../calendar/gui/e-cal-model.c:366
-#: ../calendar/gui/e-calendar-table.c:563 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
+#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
+#: ../calendar/gui/e-task-table.c:485 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "PÃºblico"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:304
+#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Recorrencia"
 
@@ -4422,7 +3208,7 @@ msgstr "Recorrencia"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../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:357
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Summary"
 msgstr "Resumo"
 
@@ -4451,485 +3237,445 @@ msgstr "Ã©"
 msgid "is not"
 msgstr "non Ã©"
 
-#: ../calendar/gui/comp-editor-factory.c:408
-msgid "Error while opening the calendar"
-msgstr "Erro ao abrir o calendario"
-
-#: ../calendar/gui/comp-editor-factory.c:414
-msgid "Method not supported when opening the calendar"
-msgstr "MÃ©todo non compatÃbel ao abrir o calendario"
-
-#: ../calendar/gui/comp-editor-factory.c:420
-msgid "Permission denied to open the calendar"
-msgstr "Permiso denegado para abrir o calendario"
-
-#: ../calendar/gui/comp-editor-factory.c:438 ../shell/e-shell.c:1261
-msgid "Unknown error"
-msgstr "Erro descoÃ±ecido"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:611
+#: ../calendar/gui/dialogs/alarm-dialog.c:626
 msgid "Edit Alarm"
 msgstr "Editar alarma"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/dialogs/alarm-dialog.c:817
 #: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Emerxer unha alerta"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/dialogs/alarm-dialog.c:818
 #: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Reproducir un son"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/dialogs/alarm-dialog.c:819
 #: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Executar un programa"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/dialogs/alarm-dialog.c:820
 #: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Enviar un correo"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
-msgid "<b>Alarm</b>"
-msgstr "<b>Alarma</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
-msgid "<b>Options</b>"
-msgstr "<b>OpciÃ³ns</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
-msgid "<b>Repeat</b>"
-msgstr "<b>RepeticiÃ³n</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
 msgid "Add Alarm"
 msgstr "Engadir alarma"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+msgid "Alarm"
+msgstr "Alarmas"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "_Mensaxe personalizada"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Custom alarm sound"
 msgstr "Son de alarma personalizado"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 msgid "Mes_sage:"
 msgstr "Mensa_xes:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+msgid "Options"
+msgstr "_OpciÃ³ns"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+msgid "Repeat"
+msgstr "<b>RepeticiÃ³n</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 msgid "Select A File"
 msgstr "Seleccionar un ficheiro"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Send To:"
 msgstr "Enviar a:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 msgid "_Arguments:"
 msgstr "_Argumentos:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "_Program:"
 msgstr "_Programa:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the alarm"
 msgstr "_Repetir a alarma"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
 msgstr "_Son:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
-msgid ""
-"before\n"
-"after"
-msgstr ""
-"antes\n"
-"despois"
+#: ../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"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
+msgid "day(s)"
+msgstr "dÃas"
+
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "days"
+msgstr "dÃas"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+msgid "end of appointment"
+msgstr "Cita nova"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "extra times every"
 msgstr "tempos adicionais a cada"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
-msgid ""
-"minute(s)\n"
-"hour(s)\n"
-"day(s)"
-msgstr ""
-"minutos(s)\n"
-"hora(s)\n"
-"dÃa(s)"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+msgid "hour(s)"
+msgstr "horas"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-msgid ""
-"minutes\n"
-"hours\n"
-"days"
-msgstr ""
-"minutos\n"
-"horas\n"
-"dÃas"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+msgid "minute(s)"
+msgstr "minutos"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
-msgid ""
-"start of appointment\n"
-"end of appointment"
-msgstr ""
-"comezo da cita\n"
-"final da cita"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+msgid "start of appointment"
+msgstr "localizaciÃ³n da cita"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "AcciÃ³n/Activador"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
 msgid "A_dd"
 msgstr "Enga_dir"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:553
-msgid "_Suggest automatic display of attachment"
-msgstr "_Suxerir mostrar o anexo automaticamente"
-
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
-msgid "Attach file(s)"
-msgstr "Anexar ficheiro(s)"
-
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:136
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/event-page.c:2993
-#: ../calendar/gui/e-cal-model-tasks.c:671
-#: ../calendar/gui/e-day-view-time-item.c:785
-#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:942
-#: ../mail/em-account-editor.c:717 ../mail/em-account-editor.c:1451
-#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:333
-#: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:394
-#: ../plugins/exchange-operations/exchange-delegates-user.c:179
-#: ../plugins/itip-formatter/itip-formatter.c:2208
-#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
-#: ../widgets/misc/e-dateedit.c:1674
-#: ../widgets/misc/e-signature-combo-box.c:74
+#. Translators: "None" indicates no second time zone set for a day view
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/e-day-view-time-item.c:797
+msgctxt "cal-second-zone"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/e-day-view-time-item.c:824
+#: ../calendar/gui/e-timezone-entry.c:319
+msgid "Select..."
+msgstr "Seleccionar..."
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:499
 msgid "Selected Calendars for Alarms"
 msgstr "Seleccionar calendario para alarmas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:788
 msgid "Time and date:"
 msgstr "Hora e data:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
 msgid "Date only:"
 msgstr "SÃ³ data:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "(Shown in a Day View)"
-msgstr "(Mostrar nunha VisualizaciÃ³n diaria)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid ""
-"60 minutes\n"
-"30 minutes\n"
-"15 minutes\n"
-"10 minutes\n"
-"05 minutes"
-msgstr ""
-"60 minutos\n"
-"30 minutos\n"
-"15 minutos\n"
-"10 minutos\n"
-"05 minutos"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr ""
 "<i>%u e %d serÃ¡n substituÃdos polo usuario e o dominio do enderezo de correo "
 "electrÃ³nico.</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "<span weight=\"bold\">Alarms</span>"
-msgstr "<span weight=\"bold\">Alertas</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
+msgid "(Shown in a Day View)"
+msgstr "(Mostrar nunha VisualizaciÃ³n diaria)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">Alertas</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
+msgid "05 minutes"
+msgstr "minutos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ../mail/mail-config.glade.h:13
-msgid "<span weight=\"bold\">Date/Time Format</span>"
-msgstr "<span weight=\"bold\">Data/Formato de hora</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
+msgid "10 minutes"
+msgstr "minutos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr ""
-"<span weight=\"bold\">Servidor predeterminado de dispoÃ±ibilidade</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
+msgid "15 minutes"
+msgstr "minutos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: ../mail/mail-config.glade.h:17
-#: ../plugins/publish-calendar/publish-calendar.glade.h:1
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">Xeral</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
+msgid "30 minutes"
+msgstr "minutos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\">Lista de tarefas</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
+msgid "60 minutes"
+msgstr "minutos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "<span weight=\"bold\">Time</span>"
-msgstr "<span weight=\"bold\">Hora</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+msgid "Alerts"
+msgstr "Alarmas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">Semana laboral</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
+#: ../mail/mail-config.ui.h:28
+#: ../modules/addressbook/autocompletion-config.c:153
+msgid "Date/Time Format"
+msgstr "Data/Formato de hora"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
 msgid "Day _ends:"
 msgstr "A xornada _finaliza Ã¡s:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
+msgid "Days"
+msgstr "DÃa"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
+msgid "Default Free/Busy Server"
+msgstr "<span weight=\"bold\">Servidor predefinido de dispoÃ±ibilidade</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
 msgid "Display"
 msgstr "Mostrar"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
 msgid "Display alarms in _notification area only"
 msgstr "Mostrar as alertas sÃ³ na Ã¡rea de _notificaciÃ³n"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Venres"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days"
-msgstr ""
-"Minutos\n"
-"Horas\n"
-"DÃas"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
+#: ../modules/addressbook/addressbook-config.c:985
+#: ../plugins/itip-formatter/itip-formatter.c:2653
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:23
+msgid "General"
+msgstr "Xeral"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
+msgid "Hours"
+msgstr "horas"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
+msgid "Minutes"
+msgstr "minutos"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1109
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Luns"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday"
-msgstr ""
-"Luns\n"
-"Martes\n"
-"MÃ©rcores\n"
-"Xoves\n"
-"Venres\n"
-"SÃ¡bado\n"
-"Domingo"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: ../mail/mail-config.glade.h:118
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#. Translators: Used in send options dialog
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
+#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
+msgid "None"
+msgstr "NingÃºn"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
+#: ../mail/mail-config.ui.h:80
 msgid "Pick a color"
 msgstr "Seleccionar unha cor"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
 msgid "S_un"
 msgstr "_Dom"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "SÃ¡bado"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
 msgid "Sc_roll Month View by a week"
 msgstr "Desp_razar a vista de mes por semana"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Se_cond zone:"
 msgstr "Seg_undo fuso horario:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Select the calendars for alarm notification"
 msgstr "Seleccione os calendarios para a notificaciÃ³n de alarma"
 
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Sh_ow a reminder"
 msgstr "M_ostrar un aviso"
 
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 msgid "Show a _reminder"
 msgstr "Mostrar un a_viso"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Show week _numbers in date navigator"
 msgstr "Mostrar os _nÃºmeros das semanas no navegador de datas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
 msgid "Show week n_umber in Day and Work Week View"
 msgstr ""
 "Mostrar o _nÃºmero de semana nas visualizaciÃ³ns Diaria e de Semana laborÃ¡bel"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "T_asks due today:"
 msgstr "T_arefas que vencen hoxe:"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "T_hu"
 msgstr "_Xov"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+msgid "Task List"
+msgstr "Lista de tarefas"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "Template:"
 msgstr "Modelo:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Xoves"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../e-util/e-non-intrusive-error-dialog.c:287
+#: ../widgets/misc/e-dateedit.c:613
+msgid "Time"
+msgstr "Hora"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Time _zone:"
 msgstr "Fuso _horario:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Time format:"
 msgstr "Formato da hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Martes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 msgid "Use s_ystem time zone"
 msgstr "Empregar o fuso horario do s_istema"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "MÃ©rcores"
 
-#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Wee_k starts on:"
 msgstr "A _semana comeza en:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
+msgid "Work Week"
+msgstr "Semana laboral"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Work days:"
 msgstr "DÃas laborÃ¡beis:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Pedir confirmaciÃ³n ao eliminar elementos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir as fins de semana na visualizaciÃ³n mensual"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_Day begins:"
 msgstr "A _xornada comeza Ã¡s:"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_Fri"
 msgstr "_Ven"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar as tarefas terminadas despois de"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Mon"
 msgstr "_Lun"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Overdue tasks:"
 msgstr "Tarefas _atrasadas:"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Sat"
 msgstr "_SÃ¡b"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr ""
 "_Mostrar os prazos finais das citas nas visualizaciÃ³ns semanal e mensual"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Time divisions:"
 msgstr "Di_visiÃ³ns horarias:"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Tue"
 msgstr "_Mar"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Wed"
 msgstr "MÃ©_r"
 
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "before every anniversary/birthday"
 msgstr "antes de cada data especial ou aniversario"
 
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
@@ -4937,6 +3683,19 @@ msgstr "antes de cada cita"
 msgid "Type:"
 msgstr "Tipo:"
 
+#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../modules/addressbook/addressbook-config.c:500
+msgid "_Type:"
+msgstr "_Tipo:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
+#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
+#: ../widgets/misc/e-signature-script-dialog.c:282
+msgid "_Name:"
+msgstr "_Nome:"
+
 #: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
@@ -4958,10 +3717,6 @@ msgstr ""
 msgid "Colo_r:"
 msgstr "Co_r:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-msgid "Task List"
-msgstr "Lista de tarefas"
-
 #: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Lista de notas"
@@ -5043,255 +3798,270 @@ msgstr "%s  Non realizou modificaciÃ³ns. Quere actualizar o editor?"
 msgid "Validation error: %s"
 msgstr "Erro de validaciÃ³n: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2349
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
 msgid " to "
 msgstr " para "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2353
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
 msgid " (Completed "
 msgstr " (Terminada "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2355
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
 msgid "Completed "
 msgstr "Terminada "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2360
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
 msgid " (Due "
 msgstr " (Pendente "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
 msgid "Due "
 msgstr "Pendente "
 
-#: ../calendar/gui/dialogs/comp-editor.c:224
+#: ../calendar/gui/dialogs/comp-editor.c:246
 msgid "Could not save attachments"
-msgstr "Non se puideron gardar os anexos"
+msgstr "Non foi posÃbel gardar os anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:487
+#: ../calendar/gui/dialogs/comp-editor.c:509
 msgid "Could not update object"
-msgstr "Non se puido actualizar o obxecto"
+msgstr "Non foi posÃbel actualizar o obxecto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:582
+#: ../calendar/gui/dialogs/comp-editor.c:604
 msgid "Edit Appointment"
 msgstr "Editar cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:589
+#: ../calendar/gui/dialogs/comp-editor.c:611
 #, c-format
 msgid "Meeting - %s"
 msgstr "ReuniÃ³n - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:591
+#: ../calendar/gui/dialogs/comp-editor.c:613
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:597
+#: ../calendar/gui/dialogs/comp-editor.c:619
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa asignada - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:599
+#: ../calendar/gui/dialogs/comp-editor.c:621
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:604
+#: ../calendar/gui/dialogs/comp-editor.c:626
 #, c-format
 msgid "Memo - %s"
 msgstr "Nota - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:642
 msgid "No Summary"
 msgstr "Sen resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:762
+#: ../calendar/gui/dialogs/comp-editor.c:751
 msgid "Keep original item?"
 msgstr "Quere gardar o elemento orixinal?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:968
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Click here to close the current window"
 msgstr "Prema aquÃ para pechar a xanela actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
-msgid "Copy selected text to the clipboard"
-msgstr "Copiar o texto seleccionado ao portapapeis"
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1444
+#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+msgid "Copy the selection"
+msgstr "Copiar a selecciÃ³n"
 
-#: ../calendar/gui/dialogs/comp-editor.c:982
-msgid "Cut selected text to the clipboard"
-msgstr "Cortar o texto seleccionado para o portapapeis"
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1451
+#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
+#: ../widgets/misc/e-web-view.c:959
+msgid "Cut the selection"
+msgstr "Cortar a selecciÃ³n"
 
-#: ../calendar/gui/dialogs/comp-editor.c:989
+#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../shell/e-shell-window-actions.c:1458
+#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+msgid "Delete the selection"
+msgstr "Cortar a selecciÃ³n"
+
+#: ../calendar/gui/dialogs/comp-editor.c:966
 msgid "Click here to view help available"
 msgstr "Prema aquÃ para ver a axuda dispoÃ±Ãbel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:996
-msgid "Paste text from the clipboard"
-msgstr "Colar texto dende o portapapeis"
+#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1493
+#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:971
+msgid "Paste the clipboard"
+msgstr "Pegar o contido do portapapeis"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1017
+#: ../calendar/gui/dialogs/comp-editor.c:994
 msgid "Click here to save the current window"
 msgstr "Prema aquÃ para gardar a xanela actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1024
+#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1563
+#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "Seleccionar todo o texto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1031
+#: ../calendar/gui/dialogs/comp-editor.c:1008
 msgid "_Classification"
 msgstr "_ClasificaciÃ³n"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1045
-#: ../mail/mail-signature-editor.c:209
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1612
+#: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1052
-#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1029
+#: ../shell/e-shell-window-actions.c:1619
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1059
+#: ../calendar/gui/dialogs/comp-editor.c:1036
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1066
+#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../composer/e-composer-actions.c:351
 msgid "_Options"
 msgstr "_OpciÃ³ns"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073 ../mail/em-folder-tree.c:2106
-#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:55
+#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1654
 msgid "_View"
 msgstr "_Ver"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1083
-#: ../composer/e-composer-actions.c:315
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../composer/e-composer-actions.c:279
 msgid "_Attachment..."
 msgstr "_Anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1085
+#: ../calendar/gui/dialogs/comp-editor.c:1062
 msgid "Click here to attach a file"
 msgstr "Prema aquÃ para anexar un ficheiro"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1093
+#: ../calendar/gui/dialogs/comp-editor.c:1070
 msgid "_Categories"
 msgstr "_CategorÃas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095
+#: ../calendar/gui/dialogs/comp-editor.c:1072
 msgid "Toggles whether to display categories"
 msgstr "Alterna entre se se mostran as categorÃas ou non"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1078
 msgid "Time _Zone"
 msgstr "_Fuso horario"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1080
 msgid "Toggles whether the time zone is displayed"
 msgstr "Alterna entre se se mostra ou non o campo Fuso horario"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1112
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 msgid "Pu_blic"
 msgstr "PÃº_blico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1091
 msgid "Classify as public"
 msgstr "Clasificar como pÃºblico"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1096
 msgid "_Private"
 msgstr "_Privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1098
 msgid "Classify as private"
 msgstr "Clasificar como privado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1126
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 msgid "Classify as confidential"
 msgstr "Clasificar como confidencial"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1113
 msgid "R_ole Field"
 msgstr "Campo de _rol"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "Toggles whether the Role field is displayed"
 msgstr "Alterna entre se se mostra o campo Rol ou non"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1144
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1146
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Alterna entre se se mostra o campo RSVP ou non"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1152
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "_Status Field"
 msgstr "Campo de e_stado"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1154
+#: ../calendar/gui/dialogs/comp-editor.c:1131
 msgid "Toggles whether the Status field is displayed"
 msgstr "Alterna entre se se mostra o campo Estado ou non"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_Type Field"
 msgstr "Campo _tipo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1162
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Alterna entre se mostrar o Tipo de participante ou non"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1186
-#: ../composer/e-composer-private.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "_Documentos recentes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1615
-#: ../composer/e-composer-actions.c:518
+#: ../calendar/gui/dialogs/comp-editor.c:1683
+#: ../composer/e-composer-actions.c:475
 msgid "Attach"
 msgstr "Anexar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1738
 msgid "Save"
 msgstr "Gardar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1924
-#: ../calendar/gui/dialogs/comp-editor.c:1973
-#: ../calendar/gui/dialogs/comp-editor.c:2833
+#: ../calendar/gui/dialogs/comp-editor.c:2015
+#: ../calendar/gui/dialogs/comp-editor.c:2064
+#: ../calendar/gui/dialogs/comp-editor.c:2955
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "As modificaciÃ³ns realizadas neste elemento pÃ³dense rexeitar se chega unha "
 "actualizaciÃ³n"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2801 ../mail/em-utils.c:371
-#: ../plugins/prefer-plain/prefer-plain.c:91
+#: ../calendar/gui/dialogs/comp-editor.c:2923
+#: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2862
+#: ../calendar/gui/dialogs/comp-editor.c:2985
 msgid "Unable to use current version!"
 msgstr "Non Ã© posÃbel usar a versiÃ³n actual!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:64
+#: ../calendar/gui/dialogs/copy-source-dialog.c:91
 msgid "Could not open source"
-msgstr "Non se puido abrir a orixe"
+msgstr "Non foi posÃbel abrir a orixe"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:72
+#: ../calendar/gui/dialogs/copy-source-dialog.c:99
 msgid "Could not open destination"
-msgstr "Non se puido abrir o destino"
+msgstr "Non foi posÃbel abrir o destino"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:81
+#: ../calendar/gui/dialogs/copy-source-dialog.c:108
 msgid "Destination is read only"
 msgstr "O destino Ã© sÃ³ de lectura"
 
-#: ../calendar/gui/dialogs/delete-comp.c:205
+#: ../calendar/gui/dialogs/delete-comp.c:214
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "Quere e_liminar este elemento das caixas de correo de todos os outros "
@@ -5299,209 +4069,195 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
-msgstr "O actividade non se puido eliminar debido a un erro de Corba"
+msgstr "Non foi posÃbel eliminar a actividade debido a un erro de Corba"
 
 #: ../calendar/gui/dialogs/delete-error.c:58
 msgid "The task could not be deleted due to a corba error"
-msgstr "A tarefa non se puido eliminar debido a un erro de Corba"
+msgstr "Non foi posÃbel eliminar a tarefa debido a un erro de Corba"
 
 #: ../calendar/gui/dialogs/delete-error.c:61
 msgid "The memo could not be deleted due to a corba error"
-msgstr "A nota non se puido eliminar debido a un erro de Corba"
+msgstr "Non foi posÃbel eliminar a nota debido a un erro de Corba"
 
 #: ../calendar/gui/dialogs/delete-error.c:64
 msgid "The item could not be deleted due to a corba error"
-msgstr "O elemento non se puido eliminar debido a un erro de Corba"
+msgstr "Non foi posÃbel eliminar o elemento debido a un erro de Corba"
 
 #: ../calendar/gui/dialogs/delete-error.c:71
 msgid "The event could not be deleted because permission was denied"
-msgstr "O actividade non se puido eliminar porque se denegou o permiso"
+msgstr "Non foi posÃbel eliminar o evento porque se denegou o permiso"
 
 #: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The task could not be deleted because permission was denied"
-msgstr "A tarefa non se puido eliminar porque se denegou o permiso"
+msgstr "Non foi posÃbel eliminar a tarefa porque se denegou o permiso"
 
 #: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The memo could not be deleted because permission was denied"
-msgstr "A nota non se puido eliminar porque se denegou o permiso"
+msgstr "Non foi posÃbel eliminar o recordatorio porque se denegou o permiso"
 
 #: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The item could not be deleted because permission was denied"
-msgstr "O elemento non se puido eliminar porque se denegou o permiso"
+msgstr "Non foi posÃbel eliminar o elemento porque se denegou o permiso"
 
 #: ../calendar/gui/dialogs/delete-error.c:87
 msgid "The event could not be deleted due to an error"
-msgstr "O actividade non se puido eliminar debido a un erro"
+msgstr "Non foi posÃbel eliminar o evento debido a un erro"
 
 #: ../calendar/gui/dialogs/delete-error.c:90
 msgid "The task could not be deleted due to an error"
-msgstr "A tarefa non se puido eliminar debido a un erro"
+msgstr "Non foi posÃbel eliminar a tarefa debido a un erro"
 
 #: ../calendar/gui/dialogs/delete-error.c:93
 msgid "The memo could not be deleted due to an error"
-msgstr "A nota non se puido eliminar debido a un erro"
+msgstr "Non foi posÃbel eliminar o recordatorio debido a un erro"
 
 #: ../calendar/gui/dialogs/delete-error.c:96
 msgid "The item could not be deleted due to an error"
-msgstr "O elemento non se puido eliminar debido a un erro"
+msgstr "Non foi posÃbel eliminar o elemento debido a un erro"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
 msgstr "Contactos..."
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:416
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
 msgstr "Delegar en:"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 msgid "Enter Delegate"
 msgstr "Introducir delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:201
 msgid "_Alarms"
 msgstr "_Alarmas"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "Click here to set or unset alarms for this event"
 msgstr ""
 "Prema aquÃ para configurar ou desconfigurar as alarmas para este actividade"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:208
 msgid "_Recurrence"
 msgstr "_Recorrencia"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:210
 msgid "Make this a recurring event"
 msgstr "Converter en actividade recorrente"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:215
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../plugins/groupwise-features/send-options.c:211
+#: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "OpciÃ³ns de envÃo"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
-#: ../calendar/gui/dialogs/task-editor.c:125
+#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "Inserir opciÃ³ns avanzadas de envÃo"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:225
 msgid "All _Day Event"
 msgstr "Evento de _dÃa completo"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Toggles whether to have All Day Event"
 msgstr "Alterna entre se se ten un actividade de dÃa completo ou non"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/event-editor.c:233
 msgid "Show Time as _Busy"
 msgstr "Mostrar hora como oc_upada"
 
-#: ../calendar/gui/dialogs/event-editor.c:236
+#: ../calendar/gui/dialogs/event-editor.c:235
 msgid "Toggles whether to show time as busy"
 msgstr "Alterna entre se se mostran as horas como ocupadas ou non"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 msgid "_Free/Busy"
 msgstr "_DispoÃ±ibilidade"
 
-#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/event-editor.c:246
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar informaciÃ³n de dispoÃ±ibilidade para os participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:301
+#: ../calendar/gui/dialogs/event-editor.c:291
 msgid "Appoint_ment"
 msgstr "_Cita"
 
-#: ../calendar/gui/dialogs/event-page.c:748
+#: ../calendar/gui/dialogs/event-page.c:751
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
 "Incluso se non pode ser editada, porque o calendario seleccionado Ã© de sÃ³ "
 "lectura"
 
-#: ../calendar/gui/dialogs/event-page.c:752
+#: ../calendar/gui/dialogs/event-page.c:755
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Incluso se non pode ser totalmente editada porque vostede Ã© o organizador"
 
-#: ../calendar/gui/dialogs/event-page.c:764
-#: ../calendar/gui/dialogs/event-page.c:2769
+#: ../calendar/gui/dialogs/event-page.c:767
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "Este actividade ten alarmas"
 
-#: ../calendar/gui/dialogs/event-page.c:827
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.c:830
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizador:"
 
-#: ../calendar/gui/dialogs/event-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:877
 msgid "_Delegatees"
 msgstr "_Delegados"
 
-#: ../calendar/gui/dialogs/event-page.c:876
+#: ../calendar/gui/dialogs/event-page.c:879
 msgid "Atte_ndees"
 msgstr "_Participantes"
 
-#: ../calendar/gui/dialogs/event-page.c:1062
+#: ../calendar/gui/dialogs/event-page.c:1094
 msgid "Event with no start date"
 msgstr "Actividade sen data de comezo"
 
-#: ../calendar/gui/dialogs/event-page.c:1065
+#: ../calendar/gui/dialogs/event-page.c:1097
 msgid "Event with no end date"
 msgstr "Actividade sen data de finalizaciÃ³n"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
-#: ../calendar/gui/dialogs/memo-page.c:654
-#: ../calendar/gui/dialogs/task-page.c:830
+#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/memo-page.c:655
+#: ../calendar/gui/dialogs/task-page.c:861
 msgid "Start date is wrong"
 msgstr "A data de comezo Ã© incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1246
+#: ../calendar/gui/dialogs/event-page.c:1278
 msgid "End date is wrong"
 msgstr "A data de finalizaciÃ³n Ã© incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1269
+#: ../calendar/gui/dialogs/event-page.c:1301
 msgid "Start time is wrong"
 msgstr "A hora de comezo Ã© incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1276
+#: ../calendar/gui/dialogs/event-page.c:1308
 msgid "End time is wrong"
 msgstr "A hora de finalizaciÃ³n Ã© incorrecta"
 
-#: ../calendar/gui/dialogs/event-page.c:1438
-#: ../calendar/gui/dialogs/memo-page.c:695
-#: ../calendar/gui/dialogs/task-page.c:890
+#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/memo-page.c:696
+#: ../calendar/gui/dialogs/task-page.c:921
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador seleccionado xa non ten unha conta."
 
-#: ../calendar/gui/dialogs/event-page.c:1444
-#: ../calendar/gui/dialogs/memo-page.c:701
-#: ../calendar/gui/dialogs/task-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/memo-page.c:702
+#: ../calendar/gui/dialogs/task-page.c:927
 msgid "An organizer is required."
 msgstr "RequÃrese un organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1469
-#: ../calendar/gui/dialogs/task-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:1501
+#: ../calendar/gui/dialogs/task-page.c:951
 msgid "At least one attendee is required."
 msgstr "RequÃrese polo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:1912
-#: ../calendar/gui/dialogs/task-page.c:1219
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "E_liminar"
-
-#: ../calendar/gui/dialogs/event-page.c:1913
-#: ../calendar/gui/dialogs/task-page.c:1220
-msgid "_Add "
-msgstr "_Engadir "
-
-#: ../calendar/gui/dialogs/event-page.c:2639
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Non foi posÃbel abrir o calendario '%s'."
@@ -5512,150 +4268,147 @@ msgstr "Non foi posÃbel abrir o calendario '%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:2683
-#: ../calendar/gui/dialogs/memo-page.c:910
-#: ../calendar/gui/dialogs/task-page.c:1825
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:914
+#: ../calendar/gui/dialogs/task-page.c:1743
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "EstÃ¡ actuando no nome de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2967
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, 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:2973
+#: ../calendar/gui/dialogs/event-page.c:2943
 #, 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:2979
+#: ../calendar/gui/dialogs/event-page.c:2949
 #, 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:2992
+#: ../calendar/gui/dialogs/event-page.c:2962
 msgid "Customize"
 msgstr "Personalizar"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid ""
-"15 minutes before appointment\n"
-"1 hour before appointment\n"
-"1 day before appointment"
-msgstr ""
-"15 minutos antes da cita\n"
-"1 hora antes da cita\n"
-"1 dÃa antes da cita"
+#. Translators: "None" for "No alarm set"
+#: ../calendar/gui/dialogs/event-page.c:2964
+msgctxt "cal-alarms"
+msgid "None"
+msgstr "NingÃºn"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:1
+msgid "1 day before appointment"
+msgstr "%d dÃa antes da cita"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+msgid "1 hour before appointment"
+msgstr "%d hora antes da cita"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:3
+msgid "15 minutes before appointment"
+msgstr "%d minuto antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:5
 msgid "Attendee_s..."
 msgstr "Participante_s..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/e-meeting-list-view.c:151
+#: ../calendar/gui/dialogs/event-page.ui.h:6
+#: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "Participantes"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
 msgstr "Alarma personalizada:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "Event Description"
 msgstr "DescriciÃ³n da actividade"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../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/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Alarm"
 msgstr "_Alarma"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_DescriciÃ³n:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:356
 msgid "_Location:"
 msgstr "_LocalizaciÃ³n:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "_Hora:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-#: ../calendar/gui/dialogs/memo-page.glade.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../mail/mail-config.glade.h:192 ../mail/mail-dialogs.glade.h:21
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
-#: ../smime/gui/smime-ui.glade.h:49
-msgid ""
-"a\n"
-"b"
-msgstr ""
-"a\n"
-"b"
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgid "for"
+msgstr "cuarto"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-msgid ""
-"for\n"
-"until"
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+msgid "until"
 msgstr ""
 "para\n"
 "atÃ©"
 
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
 msgid "Memo"
 msgstr "Nota"
 
-#: ../calendar/gui/dialogs/memo-page.c:347
+#: ../calendar/gui/dialogs/memo-page.c:350
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "A nota non pode ser editada porque a nota solicitado Ã© de sÃ³ lectura"
 
-#: ../calendar/gui/dialogs/memo-page.c:351
+#: ../calendar/gui/dialogs/memo-page.c:354
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "A nota non pode ser totalmente editada porque vostede Ã© o organizador"
 
-#: ../calendar/gui/dialogs/memo-page.c:871
+#: ../calendar/gui/dialogs/memo-page.c:875
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Non Ã© posÃbel abrir as notas en '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1031 ../mail/em-format-html.c:1566
-#: ../mail/em-format-html.c:1624 ../mail/em-format-html.c:1649
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
-#: ../mail/em-mailer-prefs.c:78 ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
+#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
+#: ../mail/em-format-html.c:2299 ../mail/em-format-html.c:2324
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "Para"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:5
 msgid "Sta_rt date:"
 msgstr "Data de _comezo:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "_Para:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:7
 #: ../calendar/gui/dialogs/task-page.c:380
-#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
 
@@ -5695,22 +4448,22 @@ msgstr "Esta instancia e as futuras"
 msgid "All Instances"
 msgstr "Todas as instancias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:558
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita contÃ©n recorrencias que o Evolution non pode editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:889
 msgid "Recurrence date is invalid"
 msgstr "A data da recorrencia non Ã© vÃ¡lida"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:929
 msgid "End time of the recurrence was before event's start"
 msgstr ""
 "A hora de finalizaciÃ³n da recorrencia era anterior Ã¡ do comezo do actividade"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:961
+#: ../calendar/gui/dialogs/recurrence-page.c:958
 msgid "on"
 msgstr "en"
 
@@ -5718,7 +4471,7 @@ msgstr "en"
 #. * (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/dialogs/recurrence-page.c:1018
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 msgid "first"
 msgstr "primeiro"
 
@@ -5727,7 +4480,7 @@ msgstr "primeiro"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1021
 msgid "second"
 msgstr "segundo"
 
@@ -5735,7 +4488,7 @@ msgstr "segundo"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1026
 msgid "third"
 msgstr "terceiro"
 
@@ -5743,7 +4496,7 @@ msgstr "terceiro"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "fourth"
 msgstr "cuarto"
 
@@ -5751,7 +4504,7 @@ msgstr "cuarto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
 msgid "fifth"
 msgstr "quinto"
 
@@ -5759,13 +4512,13 @@ msgstr "quinto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "last"
 msgstr "Ãºltimo"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1068
+#: ../calendar/gui/dialogs/recurrence-page.c:1065
 msgid "Other Date"
 msgstr "Outra data"
 
@@ -5773,7 +4526,7 @@ msgstr "Outra data"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1071
 msgid "1st to 10th"
 msgstr "Do 1 ao 10"
 
@@ -5781,7 +4534,7 @@ msgstr "Do 1 ao 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1077
 msgid "11th to 20th"
 msgstr "do 11 ao 20"
 
@@ -5789,96 +4542,79 @@ msgstr "do 11 ao 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
 msgid "21st to 31st"
 msgstr "Do 21 ao 31"
 
 #. 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/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
 msgid "day"
 msgstr "dÃa"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1240
+#: ../calendar/gui/dialogs/recurrence-page.c:1237
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1410
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
-msgstr "ocorrencias"
+msgstr "apariciÃ³ns"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2105
+#: ../calendar/gui/dialogs/recurrence-page.c:2117
 msgid "Add exception"
 msgstr "Engadir excepciÃ³n"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2146
+#: ../calendar/gui/dialogs/recurrence-page.c:2158
 msgid "Could not get a selection to modify."
-msgstr "Non se puido obter unha selecciÃ³n para modificar."
+msgstr "Non foi posÃbel obter unha selecciÃ³n para modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2152
+#: ../calendar/gui/dialogs/recurrence-page.c:2164
 msgid "Modify exception"
 msgstr "Modificar excepciÃ³n"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2196
+#: ../calendar/gui/dialogs/recurrence-page.c:2208
 msgid "Could not get a selection to delete."
-msgstr "Non se puido obter unha selecciÃ³n para eliminar."
+msgstr "Non foi posÃbel obter unha selecciÃ³n para eliminar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2320
+#: ../calendar/gui/dialogs/recurrence-page.c:2347
 msgid "Date/Time"
 msgstr "Data e hora"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "<b>Exceptions</b>"
-msgstr "<b>ExcepciÃ³ns</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
-msgid "<b>Preview</b>"
-msgstr "<b>Previsualizar</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "<b>Recurrence</b>"
-msgstr "<b>Recorrencia</b>"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
+#: ../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' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
+msgid "Exceptions"
+msgstr "<b>ExcepciÃ³ns</b>"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+msgid "Preview"
+msgstr "_PrevisualizaciÃ³n"
+
+#: ../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.glade.h:11
-msgid ""
-"day(s)\n"
-"week(s)\n"
-"month(s)\n"
-"year(s)"
-msgstr ""
-"dÃas(s)\n"
-"semana(s)\n"
-"mes(es)\n"
-"ano(s)"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+msgid "forever"
+msgstr "Nunca"
 
-#. 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.glade.h:17
-msgid ""
-"for\n"
-"until\n"
-"forever"
-msgstr ""
-"para\n"
-"ata\n"
-"sempre"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgid "month(s)"
+msgstr "Mes"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+msgid "week(s)"
+msgstr "semanas"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+msgid "year(s)"
+msgstr "ano(s)"
 
 #: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
@@ -5888,86 +4624,132 @@ msgstr "Enviar as miÃ±as alarmas con este actividade"
 msgid "Notify new attendees _only"
 msgstr "Notificar mensaxes n_ovas"
 
-#: ../calendar/gui/dialogs/task-details-page.c:376
-#: ../calendar/gui/dialogs/task-details-page.c:396
+#: ../calendar/gui/dialogs/task-details-page.c:379
+#: ../calendar/gui/dialogs/task-details-page.c:399
 msgid "Completed date is wrong"
 msgstr "A data de finalizaciÃ³n Ã© incorrecta"
 
-#: ../calendar/gui/dialogs/task-details-page.c:481
+#: ../calendar/gui/dialogs/task-details-page.c:485
 msgid "Web Page"
 msgstr "PÃ¡xina web"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:1
-msgid "<span weight=\"bold\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\">Varios</span>"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:292
+#: ../calendar/gui/e-cal-model-tasks.c:463
+#: ../calendar/gui/e-cal-model-tasks.c:737
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
+#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:212
+#: ../calendar/gui/e-task-table.c:227 ../calendar/gui/e-task-table.c:582
+#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:367
+msgid "Completed"
+msgstr "Terminada"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "<span weight=\"bold\">Status</span>"
-msgstr "<span weight=\"bold\">Estado</span>"
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-task-table.c:507 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+msgid "High"
+msgstr "Alta"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-msgid ""
-"High\n"
-"Normal\n"
-"Low\n"
-"Undefined"
-msgstr ""
-"Alta\n"
-"Normal\n"
-"Baixa\n"
-"Non definida"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:289
+#: ../calendar/gui/e-cal-model-tasks.c:461
+#: ../calendar/gui/e-cal-model-tasks.c:735
+#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:581
+#: ../calendar/gui/print.c:2645
+msgid "In Progress"
+msgstr "En progreso"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-msgid ""
-"Not Started\n"
-"In Progress\n"
-"Completed\n"
-"Canceled"
-msgstr ""
-"Sen inicar\n"
-"En progreso\n"
-"Completada\n"
-"Cancelada"
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/e-cal-component-preview.c:318
+#: ../calendar/gui/e-task-table.c:509 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+msgid "Low"
+msgstr "Baixa"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:316
+#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:508
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../widgets/misc/e-send-options.ui.h:13
+msgid "Normal"
+msgstr "Normal"
+
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:15
+#: ../calendar/gui/e-cal-component-preview.c:299
+#: ../calendar/gui/e-cal-model-tasks.c:459
+#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:208
+#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:580
+#: ../calendar/gui/print.c:2642 ../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.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
 msgid "Stat_us:"
 msgstr "Esta_do:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#. 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/e-calendar-view.c:1743
+#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../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
+msgid "Status"
+msgstr "Estado"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:20
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:24
+msgid "Undefined"
+msgstr "Indefinida"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
 msgstr "_Data completada:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Priority:"
 msgstr "_Prioridade:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.ui.h:23
 msgid "_Web Page:"
 msgstr "PÃ¡xina _Web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:113
+#: ../calendar/gui/dialogs/task-editor.c:112
 msgid "_Status Details"
 msgstr "Detalles do e_stado"
 
-#: ../calendar/gui/dialogs/task-editor.c:115
+#: ../calendar/gui/dialogs/task-editor.c:114
 msgid "Click to change or view the status details of the task"
 msgstr "Prema para cambiar ou ver os detalles da tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:371
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "OpciÃ³n_s de envÃo"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/dialogs/task-editor.c:334
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:337
 msgid "Task Details"
 msgstr "Detalles da tarefa"
 
@@ -5982,32 +4764,32 @@ msgstr ""
 "A tarefa non pode ser editada totalmente porque vostede non Ã© o organizador"
 
 #: ../calendar/gui/dialogs/task-page.c:388
-#: ../calendar/gui/dialogs/task-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zador:"
 
-#: ../calendar/gui/dialogs/task-page.c:803
+#: ../calendar/gui/dialogs/task-page.c:834
 msgid "Due date is wrong"
 msgstr "A data de vencemento Ã© incorrecta"
 
-#: ../calendar/gui/dialogs/task-page.c:1782
+#: ../calendar/gui/dialogs/task-page.c:1700
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Non Ã© posÃbel abrir as tarefas en '%s'."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:1
 msgid "Atte_ndees..."
 msgstr "Participa_ntes..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "Ca_tegorÃas..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
 msgstr "Data de _vencemento:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.ui.h:7
 msgid "Time zone:"
 msgstr "Fuso horario:"
 
@@ -6087,131 +4869,53 @@ msgstr "%s a %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de activador descoÃ±ecido"
 
-#: ../calendar/gui/e-attachment-handler-calendar.c:258
-msgid "I_mport"
-msgstr "I_mportar"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:340
-msgid "Select a Calendar"
-msgstr "Seleccione un calendario"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:367
-msgid "Select a Task List"
-msgstr "Seleccione unha lista de tarefas"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:377
-msgid "I_mport to Calendar"
-msgstr "I_mportar ao calendario"
-
-#: ../calendar/gui/e-attachment-handler-calendar.c:384
-msgid "I_mport to Tasks"
-msgstr "_Importar Ã¡s tarefas"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:68
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3210
-#, c-format
-msgid "Click to open %s"
-msgstr "Prema para abrir %s"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:127
-#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:859
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "Sen tÃtulo"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:178
-#: ../calendar/gui/e-cal-component-preview.c:209
-#: ../calendar/gui/e-cal-component-preview.c:220
-msgid "Start Date:"
-msgstr "Data de inicio:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:191
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1210
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
-msgid "Description:"
-msgstr "DescriciÃ³n:"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:215
-#: ../calendar/gui/e-cal-component-preview.c:309
-msgid "Web Page:"
-msgstr "PÃ¡xina Web:"
+#: ../calendar/gui/e-cal-component-preview.c:198
+msgid "Categories:"
+msgstr "CategorÃas"
 
-#: ../calendar/gui/e-cal-component-preview.c:202
-#: ../calendar/gui/e-itip-control.c:1154
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Resumo:"
 
-#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:259
+msgid "Start Date:"
+msgstr "Data de inicio:"
+
+#: ../calendar/gui/e-cal-component-preview.c:272
 msgid "Due Date:"
 msgstr "Data de vencemento:"
 
-#. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:238
-#: ../calendar/gui/e-itip-control.c:1178
-#: ../plugins/exchange-operations/exchange-account-setup.c:283
-#: ../plugins/itip-formatter/itip-view.c:1054
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1176
+#: ../plugins/itip-formatter/itip-view.c:1062
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../calendar/gui/e-cal-component-preview.c:242
-#: ../calendar/gui/e-cal-model-tasks.c:359
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-cal-model-tasks.c:752
-#: ../calendar/gui/e-calendar-table.c:234
-#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2542
-msgid "In Progress"
-msgstr "En progreso"
-
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/e-cal-component-preview.c:245
-#: ../calendar/gui/e-cal-model-tasks.c:361
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-calendar-table.c:236
-#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/e-itip-control.c:939
-#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/print.c:2545 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:361
-msgid "Completed"
-msgstr "Terminada"
-
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model-tasks.c:357
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-calendar-table.c:232
-#: ../calendar/gui/e-calendar-table.c:658 ../calendar/gui/print.c:2539
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "Non Iniciada"
-
-#: ../calendar/gui/e-cal-component-preview.c:262
+#: ../calendar/gui/e-cal-component-preview.c:312
 msgid "Priority:"
 msgstr "Prioridade:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
-#: ../calendar/gui/e-calendar-table.c:585 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1064
-msgid "High"
-msgstr "Alta"
-
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-cal-model.c:1076 ../calendar/gui/e-calendar-table.c:586
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
-msgid "Normal"
-msgstr "Normal"
+#: ../calendar/gui/e-cal-component-preview.c:337
+#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:34
+msgid "Description:"
+msgstr "DescriciÃ³n:"
 
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-calendar-table.c:587 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1062
-msgid "Low"
-msgstr "Baixa"
+#: ../calendar/gui/e-cal-component-preview.c:368
+msgid "Web Page:"
+msgstr "PÃ¡xina Web:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Created"
 msgstr "Creado"
 
@@ -6231,17 +4935,16 @@ msgid "Start Date"
 msgstr "Data de inicio"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:637
+#: ../calendar/gui/e-task-table.c:559
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:638
-#: ../calendar/gui/e-meeting-time-sel.c:391
+#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:560
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../calendar/gui/e-cal-model-tasks.c:625
+#: ../calendar/gui/e-cal-model-tasks.c:681
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6251,209 +4954,78 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
-#: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/e-meeting-store.c:742
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:731
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "NingÃºn"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-meeting-list-view.c:187
+#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:856
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Si"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:174
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Non"
 
+#: ../calendar/gui/e-cal-model.c:377
+#, fuzzy
+msgid "Default Client"
+msgstr "Cliente de correo predefinido"
+
+#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
+#: ../shell/e-shell.c:836
+msgid "Shell Settings"
+msgstr "ConfiguraciÃ³n do Exchange"
+
+#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
+#: ../shell/e-shell.c:837
+msgid "Application-wide settings"
+msgstr "ConfiguraciÃ³n do completado automÃ¡tico"
+
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:372 ../calendar/gui/e-itip-control.c:1195
-#: ../calendar/gui/e-itip-control.c:1333
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
-#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1339
-#: ../plugins/itip-formatter/itip-formatter.c:449
-#: ../plugins/itip-formatter/itip-formatter.c:2233
+#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:931
+#: ../plugins/itip-formatter/itip-formatter.c:461
+#: ../plugins/itip-formatter/itip-formatter.c:2325
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "DescoÃ±ecido"
 
-#: ../calendar/gui/e-cal-model.c:1078
+#: ../calendar/gui/e-cal-model.c:1306
 msgid "Recurring"
 msgstr "Recorrencia"
 
-#: ../calendar/gui/e-cal-model.c:1080
+#: ../calendar/gui/e-cal-model.c:1308
 msgid "Assigned"
 msgstr "Asignada"
 
-#: ../calendar/gui/e-calendar-table.c:335
-msgid "* No Summary *"
-msgstr "* Sen resumo *"
-
-#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:371
-#: ../calendar/gui/e-calendar-view.c:2429
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organizador: %s <%s>"
-
-#. With SunOne accounts, there may be no ':' in organiser.value
-#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2433
+#: ../calendar/gui/e-cal-model.c:2203
 #, c-format
-msgid "Organizer: %s"
-msgstr "Organizador: %s"
-
-#: ../calendar/gui/e-calendar-table.c:405
-msgid "Start: "
-msgstr "Comezo: "
-
-#: ../calendar/gui/e-calendar-table.c:417
-msgid "Due: "
-msgstr "Pendente: "
-
-#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "Indefinida"
-
-#: ../calendar/gui/e-calendar-table.c:607
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-calendar-table.c:608
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-calendar-table.c:609
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-calendar-table.c:610
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-calendar-table.c:611
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-calendar-table.c:612
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-calendar-table.c:613
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-calendar-table.c:614
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-calendar-table.c:615
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-calendar-table.c:616
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-calendar-table.c:617
-msgid "100%"
-msgstr "100%"
-
-#: ../calendar/gui/e-calendar-table.c:897
-#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:449
-msgid "Deleting selected objects"
-msgstr "Eliminar os obxectos seleccionados"
-
-#: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:654
-msgid "Updating objects"
-msgstr "Actualizando obxectos"
-
-#: ../calendar/gui/e-calendar-table.c:1364
-#: ../calendar/gui/e-calendar-view.c:1333 ../calendar/gui/e-memo-table.c:828
-#: ../composer/e-composer-actions.c:219
-msgid "Save as..."
-msgstr "Gardar como..."
-
-#: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-calendar-view.c:1789
-msgid "New _Task"
-msgstr "Nova _tarefa"
-
-#: ../calendar/gui/e-calendar-table.c:1592 ../calendar/gui/e-memo-table.c:933
-msgid "Open _Web Page"
-msgstr "Abrir pÃ¡xina _web"
-
-#: ../calendar/gui/e-calendar-table.c:1593
-#: ../calendar/gui/e-calendar-view.c:1807 ../calendar/gui/e-memo-table.c:934
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494
-msgid "_Save As..."
-msgstr "_Gardar como..."
-
-#: ../calendar/gui/e-calendar-table.c:1594
-#: ../calendar/gui/e-calendar-view.c:1792 ../calendar/gui/e-memo-table.c:935
-msgid "P_rint..."
-msgstr "Imp_rimir..."
-
-#: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:939
-#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "Co_rtar"
-
-#: ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1795
-#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:941
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
-msgid "_Paste"
-msgstr "Co_lar"
-
-#: ../calendar/gui/e-calendar-table.c:1604 ../ui/evolution-tasks.xml.h:22
-msgid "_Assign Task"
-msgstr "_Asignar Tarefa"
-
-#: ../calendar/gui/e-calendar-table.c:1605 ../calendar/gui/e-memo-table.c:945
-#: ../ui/evolution-tasks.xml.h:26
-msgid "_Forward as iCalendar"
-msgstr "_Remitir como iCalendar"
-
-#: ../calendar/gui/e-calendar-table.c:1606
-msgid "_Mark as Complete"
-msgstr "_Marcar como terminada"
-
-#: ../calendar/gui/e-calendar-table.c:1607
-msgid "_Mark Selected Tasks as Complete"
-msgstr "_Marcar as tarefas seleccionadas como terminadas"
-
-#: ../calendar/gui/e-calendar-table.c:1608
-msgid "_Mark as Incomplete"
-msgstr "_Marcar como non terminada"
-
-#: ../calendar/gui/e-calendar-table.c:1609
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "_Marcar as tarefas seleccionadas como non terminadas"
-
-#: ../calendar/gui/e-calendar-table.c:1614
-msgid "_Delete Selected Tasks"
-msgstr "E_liminar as tarefas seleccionadas"
-
-#: ../calendar/gui/e-calendar-table.c:1849
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-msgid "Click to add a task"
-msgstr "Prema para engadir unha tarefa"
+msgid "Opening %s"
+msgstr "Abrindo %s"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% Terminado"
 
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "Prema para engadir unha tarefa"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "Terminado"
@@ -6468,7 +5040,7 @@ msgstr "Data de vencemento"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Priority"
 msgstr "Prioridade"
 
@@ -6476,153 +5048,114 @@ msgstr "Prioridade"
 msgid "Start date"
 msgstr "Data de inicio"
 
-#. 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/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:2337
-#: ../calendar/gui/e-meeting-list-view.c:601
-#: ../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
-msgid "Status"
-msgstr "Estado"
-
-#: ../calendar/gui/e-calendar-view.c:1478
-msgid "Moving items"
-msgstr "Movendo elementos"
-
-#: ../calendar/gui/e-calendar-view.c:1480
-msgid "Copying items"
-msgstr "Copiando elementos"
-
-#: ../calendar/gui/e-calendar-view.c:1786
-msgid "New _Appointment..."
-msgstr "_Cita nova..."
-
-#: ../calendar/gui/e-calendar-view.c:1787
-msgid "New All Day _Event"
-msgstr "Novo _actividade de dÃa completo"
-
-#: ../calendar/gui/e-calendar-view.c:1788
-msgid "New _Meeting"
-msgstr "_ReuniÃ³n nova"
-
-#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1799
-msgid "_Current View"
-msgstr "_VisualizaciÃ³n actual"
-
-#: ../calendar/gui/e-calendar-view.c:1801
-msgid "Select T_oday"
-msgstr "Seleccionar _hoxe"
-
-#: ../calendar/gui/e-calendar-view.c:1802
-msgid "_Select Date..."
-msgstr "_Seleccionar data..."
-
-#: ../calendar/gui/e-calendar-view.c:1808
-msgid "Pri_nt..."
-msgstr "_Imprimir..."
-
-#: ../calendar/gui/e-calendar-view.c:1818
-msgid "Cop_y to Calendar..."
-msgstr "Cop_iar a un calendario..."
-
-#: ../calendar/gui/e-calendar-view.c:1819
-msgid "Mo_ve to Calendar..."
-msgstr "Mo_ver ao calendario..."
-
-#: ../calendar/gui/e-calendar-view.c:1820
-msgid "_Delegate Meeting..."
-msgstr "_Delegar cita..."
-
-#: ../calendar/gui/e-calendar-view.c:1821
-msgid "_Schedule Meeting..."
-msgstr "_Programar cita..."
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
+msgid "Type"
+msgstr "Tipo"
 
-#: ../calendar/gui/e-calendar-view.c:1822
-msgid "_Forward as iCalendar..."
-msgstr "Remi_tir como iCalendar..."
+#: ../calendar/gui/e-calendar-view.c:392
+msgid "Cut selected events to the clipboard"
+msgstr "Cortar o texto seleccionado para o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:1823
-msgid "_Reply"
-msgstr "_Responder"
+#: ../calendar/gui/e-calendar-view.c:398
+msgid "Copy selected events to the clipboard"
+msgstr "Copiar o texto seleccionado ao portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:1824
-#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
-#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
-msgid "Reply to _All"
-msgstr "Responder a t_odos"
+#: ../calendar/gui/e-calendar-view.c:404
+msgid "Paste events from the clipboard"
+msgstr "Pegar eventos desde o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:1829
-msgid "Make this Occurrence _Movable"
-msgstr "Facer esta ocorrencia _movÃbel"
+#: ../calendar/gui/e-calendar-view.c:410
+#, fuzzy
+msgid "Delete selected events"
+msgstr "Eliminar as notas seleccionadas"
 
-#: ../calendar/gui/e-calendar-view.c:1830 ../ui/evolution-calendar.xml.h:9
-msgid "Delete this _Occurrence"
-msgstr "Eliminar esta _ocorrencia"
+#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:186
+#: ../calendar/gui/e-task-table.c:264
+msgid "Deleting selected objects"
+msgstr "Eliminar os obxectos seleccionados"
 
-#: ../calendar/gui/e-calendar-view.c:1831
-msgid "Delete _All Occurrences"
-msgstr "Eliminar _todas as ocorrencias"
+#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:841
+#: ../calendar/gui/e-task-table.c:1062
+msgid "Updating objects"
+msgstr "Actualizando obxectos"
 
-#: ../calendar/gui/e-calendar-view.c:2284
-#: ../calendar/gui/e-itip-control.c:1183
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
-#: ../plugins/itip-formatter/itip-formatter.c:2221
+#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../plugins/itip-formatter/itip-formatter.c:2313
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-calendar-view.c:2285
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
-#: ../plugins/itip-formatter/itip-formatter.c:2227
+#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-meeting-list-view.c:200
+#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../plugins/itip-formatter/itip-formatter.c:2319
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: ../calendar/gui/e-calendar-view.c:2286
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/e-meeting-time-sel.c:390
+#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-time-sel.c:542
 msgid "Tentative"
 msgstr "Provisional"
 
-#: ../calendar/gui/e-calendar-view.c:2287
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../plugins/itip-formatter/itip-formatter.c:2230
+#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../plugins/itip-formatter/itip-formatter.c:2322
 msgid "Delegated"
 msgstr "Delegado"
 
-#: ../calendar/gui/e-calendar-view.c:2288
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Needs action"
 msgstr "Necesita unha acciÃ³n"
 
+#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
+#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
+#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:526
+#: ../calendar/gui/e-task-table.c:737
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organizador: %s <%s>"
+
+#. With SunOne accouts, there may be no ':' in organiser.value
+#. With SunOne accounts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:531
+#: ../calendar/gui/e-task-table.c:740
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organizador: %s"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2449 ../calendar/gui/print.c:2501
+#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
 #, c-format
 msgid "Location: %s"
 msgstr "LocalizaciÃ³n: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2480
+#: ../calendar/gui/e-calendar-view.c:1886
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:102
+#: ../calendar/gui/e-cell-date-edit-text.c:160
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:105
+#: ../calendar/gui/e-cell-date-edit-text.c:163
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:113
+#: ../calendar/gui/e-cell-date-edit-text.c:171
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6635,12 +5168,12 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:747
+#: ../calendar/gui/e-day-view-time-item.c:759
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisiÃ³ns de minuto"
 
-#: ../calendar/gui/e-day-view-time-item.c:768
+#: ../calendar/gui/e-day-view-time-item.c:780
 msgid "Show the second time zone"
 msgstr "Mostrar o fuso horario secundario"
 
@@ -6650,35 +5183,60 @@ msgstr "Mostrar o fuso horario secundario"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:840 ../calendar/gui/e-day-view.c:1576
-#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1666
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1884
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1901
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:894
+msgid "%a %d %b"
+msgstr "%a, %d de %b"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1917
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../modules/calendar/e-cal-shell-view-private.c:930
+msgid "%d %b"
+msgstr "%d de %b"
+
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:825
+#: ../calendar/gui/e-day-view.c:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:827
+#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2309
+#: ../calendar/gui/e-day-view.c:2614
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
 
-#: ../calendar/gui/e-itip-control.c:758
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Si. (Recorrencia complexa)"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../calendar/gui/e-itip-control.c:775
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -6686,7 +5244,7 @@ msgstr[0] "Cada dÃa"
 msgstr[1] "Cada %d dÃas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../calendar/gui/e-itip-control.c:788
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -6694,7 +5252,7 @@ msgstr[0] "Cada semana"
 msgstr[1] "Cada %d semanas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -6702,22 +5260,22 @@ msgstr[0] "Cada semana en "
 msgstr[1] "Cada %d semanas en "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " e "
 
-#: ../calendar/gui/e-itip-control.c:815
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "O %s dÃa de "
 
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "O %s %s de "
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../calendar/gui/e-itip-control.c:842
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -6725,14 +5283,14 @@ msgstr[0] "cada mes"
 msgstr[1] "cada %d meses"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../calendar/gui/e-itip-control.c:854
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Cada ano"
 msgstr[1] "Cada %d anos"
 
-#: ../calendar/gui/e-itip-control.c:867
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -6740,446 +5298,455 @@ msgstr[0] " un total de %d vez"
 msgstr[1] " un total de %d veces"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:878
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", finalizando en "
 
 #. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:900
+#: ../calendar/gui/e-itip-control.c:906
 msgid "Starts"
 msgstr "Comeza"
 
 #. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:914
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "Finaliza"
 
-#: ../calendar/gui/e-itip-control.c:954
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../calendar/gui/e-itip-control.c:943
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Due"
 msgstr "Vence"
 
-#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
 msgid "iCalendar Information"
 msgstr "informaciÃ³n de iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1012
+#: ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Error"
 msgstr "Erro de iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
-#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
-#: ../plugins/itip-formatter/itip-view.c:346
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:434
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:522
-#: ../plugins/itip-formatter/itip-view.c:523
+#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
+#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:526
 msgid "An unknown person"
 msgstr "Unha persoa descoÃ±ecida"
 
-#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1135
+#: ../calendar/gui/e-itip-control.c:1132
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Revise a seguinte informaciÃ³n, e escolla unha acciÃ³n do menÃº de abaixo."
 
+#. Translators: "None" used as a default value for events without Summary received by mail
+#: ../calendar/gui/e-itip-control.c:1147
+#: ../plugins/itip-formatter/itip-formatter.c:2300
+msgctxt "cal-itip"
+msgid "None"
+msgstr "NingÃºn"
+
 #: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2224
+#: ../plugins/itip-formatter/itip-formatter.c:2316
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:1274
+#: ../calendar/gui/e-itip-control.c:1277
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
-msgstr "A cita cancelouse, porÃ©n non se puido encontrar nos seus calendarios"
+msgstr ""
+"A cita foi cancelouse, porÃ©n non foi posÃbel encontralo nos seus calendarios"
 
-#: ../calendar/gui/e-itip-control.c:1276
+#: ../calendar/gui/e-itip-control.c:1279
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
-"A tarefa cancelouse, porÃ©n non se puido encontrar nas sÃºas listas de tarefas"
+"A tarefa cancelouse, porÃ©n non foi posÃbel encontralo nas sÃºas listas de "
+"tarefas"
 
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publicou informaciÃ³n sobre unha cita."
 
-#: ../calendar/gui/e-itip-control.c:1354
+#: ../calendar/gui/e-itip-control.c:1357
 msgid "Meeting Information"
 msgstr "InformaciÃ³n da cita"
 
-#: ../calendar/gui/e-itip-control.c:1360
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> solicita a presenza de %s nunha cita."
 
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> require a sÃºa presenza nunha cita."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1366
 msgid "Meeting Proposal"
 msgstr "Proposta de cita"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1369
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> quere que se lle engada a unha cita existente."
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Update"
 msgstr "ActualizaciÃ³n da cita"
 
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1377
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> quere recibir a Ãºltima informaciÃ³n sobre a cita."
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1378
 msgid "Meeting Update Request"
 msgstr "Solicitude de actualizaciÃ³n da cita"
 
-#: ../calendar/gui/e-itip-control.c:1382
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> respondeu a unha peticiÃ³n de cita."
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Reply"
 msgstr "Resposta de cita"
 
-#: ../calendar/gui/e-itip-control.c:1390
+#: ../calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> cancelou unha cita."
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1394
 msgid "Meeting Cancelation"
 msgstr "CancelaciÃ³n da cita"
 
-#: ../calendar/gui/e-itip-control.c:1401 ../calendar/gui/e-itip-control.c:1478
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
+#: ../calendar/gui/e-itip-control.c:1521
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> enviou unha mensaxe inintelixÃbel."
 
-#: ../calendar/gui/e-itip-control.c:1402
+#: ../calendar/gui/e-itip-control.c:1405
 msgid "Bad Meeting Message"
 msgstr "Mensaxe de cita incorrecta"
 
-#: ../calendar/gui/e-itip-control.c:1429
+#: ../calendar/gui/e-itip-control.c:1432
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> publicou informaciÃ³n da tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1433
 msgid "Task Information"
 msgstr "InformaciÃ³n da tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1440
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> require a %s que efectÃºe unha tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> require que efectÃºe unha tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1443
 msgid "Task Proposal"
 msgstr "Proposta de tarefa"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1446
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> quere que se lle engada a unha tarefa existente."
 
-#: ../calendar/gui/e-itip-control.c:1447
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Update"
 msgstr "ActualizaciÃ³n de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> quere recibir a Ãºltima informaciÃ³n sobre a tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1455
 msgid "Task Update Request"
 msgstr "Solicitude de actualizaciÃ³n de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1459
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> respondeu a unha asignaciÃ³n de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Reply"
 msgstr "Resposta de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> cancelou unha tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Task Cancelation"
 msgstr "CancelaciÃ³n de tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1479
+#: ../calendar/gui/e-itip-control.c:1482
 msgid "Bad Task Message"
 msgstr "Mensaxe de tarefa incorrecta"
 
-#: ../calendar/gui/e-itip-control.c:1503
+#: ../calendar/gui/e-itip-control.c:1506
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publicou informaciÃ³n de dispoÃ±ibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1504
+#: ../calendar/gui/e-itip-control.c:1507
 msgid "Free/Busy Information"
 msgstr "InformaciÃ³n de dispoÃ±ibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1511
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> require a sÃºa informaciÃ³n de dispoÃ±ibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1512
 msgid "Free/Busy Request"
 msgstr "Solicitude de dispoÃ±ibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1516
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> respondeu a unha solicitude de dispoÃ±ibilidade."
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1517
 msgid "Free/Busy Reply"
 msgstr "Resposta de dispoÃ±ibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1522
 msgid "Bad Free/Busy Message"
 msgstr "Mensaxe incorrecta de dispoÃ±ibilidade"
 
-#: ../calendar/gui/e-itip-control.c:1595
+#: ../calendar/gui/e-itip-control.c:1598
 msgid "The message does not appear to be properly formed"
 msgstr "A mensaxe non parece estar formada apropiadamente"
 
-#: ../calendar/gui/e-itip-control.c:1654
+#: ../calendar/gui/e-itip-control.c:1657
 msgid "The message contains only unsupported requests."
 msgstr "Esta mensaxe sÃ³ contÃ©n solicitudes non compatÃbeis."
 
-#: ../calendar/gui/e-itip-control.c:1687
+#: ../calendar/gui/e-itip-control.c:1690
 msgid "The attachment does not contain a valid calendar message"
 msgstr "O anexo non contÃ©n unha mensaxe de calendario vÃ¡lida"
 
-#: ../calendar/gui/e-itip-control.c:1725
+#: ../calendar/gui/e-itip-control.c:1728
 msgid "The attachment has no viewable calendar items"
 msgstr "O anexo non ten elementos de calendario visÃbeis"
 
-#: ../calendar/gui/e-itip-control.c:1967
+#: ../calendar/gui/e-itip-control.c:1970
 msgid "Update complete\n"
 msgstr "ActualizaciÃ³n terminada\n"
 
-#: ../calendar/gui/e-itip-control.c:2001
+#: ../calendar/gui/e-itip-control.c:2004
 msgid "Object is invalid and cannot be updated\n"
 msgstr "O obxecto non Ã© vÃ¡lido e non pode ser actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2018
+#: ../calendar/gui/e-itip-control.c:2022
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta resposta non Ã© dun participante actual. Quere engadilo como "
 "participante?"
 
-#: ../calendar/gui/e-itip-control.c:2036
+#: ../calendar/gui/e-itip-control.c:2040
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
-"O estado do participante non se puido actualizar debido a un estado non "
+"Non foi posÃbel actualizar o estado do participante debido a un estado non "
 "vÃ¡lido!\n"
 
-#: ../calendar/gui/e-itip-control.c:2060
+#: ../calendar/gui/e-itip-control.c:2064
 msgid "Attendee status updated\n"
 msgstr "Estado do participante actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2067
-#: ../plugins/itip-formatter/itip-formatter.c:1385
+#: ../calendar/gui/e-itip-control.c:2071
+#: ../plugins/itip-formatter/itip-formatter.c:1408
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
-"O estado do participante non se puido actualizar porque xa non existe o "
+"Non foi posÃbel actualizar estado do participante porque xa non existe o "
 "elemento"
 
-#: ../calendar/gui/e-itip-control.c:2098 ../calendar/gui/e-itip-control.c:2155
+#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
 msgid "Item sent!\n"
 msgstr "Elemento enviado!\n"
 
-#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
 msgid "The item could not be sent!\n"
-msgstr "Non se puido enviar o elemento!\n"
+msgstr "Non foi posÃbel enviar o elemento!\n"
 
-#: ../calendar/gui/e-itip-control.c:2281
+#: ../calendar/gui/e-itip-control.c:2260
 msgid "Choose an action:"
 msgstr "Seleccione unha acciÃ³n:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2310
-#: ../calendar/gui/e-meeting-list-view.c:589
+#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-meeting-list-view.c:591
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2350
+#: ../calendar/gui/e-itip-control.c:2329
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../calendar/gui/e-itip-control.c:2374
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../calendar/gui/e-itip-control.c:2353
+#: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../calendar/gui/e-itip-control.c:2375
+#: ../calendar/gui/e-itip-control.c:2354
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:2376
-#: ../plugins/groupwise-features/process-meeting.c:54
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "Rexeitar"
 
-#: ../calendar/gui/e-itip-control.c:2401
+#: ../calendar/gui/e-itip-control.c:2380
 msgid "Send Free/Busy Information"
 msgstr "Enviar informaciÃ³n de dispoÃ±ibilidade"
 
-#: ../calendar/gui/e-itip-control.c:2425
+#: ../calendar/gui/e-itip-control.c:2404
 msgid "Update respondent status"
 msgstr "Actualizar o estado do interlocutor"
 
-#: ../calendar/gui/e-itip-control.c:2449
+#: ../calendar/gui/e-itip-control.c:2428
 msgid "Send Latest Information"
 msgstr "Enviar a Ãºltima informaciÃ³n"
 
-#: ../calendar/gui/e-itip-control.c:2473 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2452
+#: ../modules/mail/e-mail-shell-view-actions.c:1030
+#: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.ui.h:1
 msgid "--to--"
 msgstr "--a--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.ui.h:2
 msgid "Calendar Message"
 msgstr "Mensaxe do calendario"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.ui.h:3
 msgid "Date:"
 msgstr "Data:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.ui.h:5
 msgid "Loading Calendar"
 msgstr "Cargando calendario"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.ui.h:6
 msgid "Loading calendar..."
 msgstr "Cargando calendario..."
 
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.ui.h:7
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.ui.h:8
 msgid "Server Message:"
 msgstr "Mensaxe do servidor:"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "Participantes requiridos"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "Participantes opcionais"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "Recursos"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:84 ../calendar/gui/e-meeting-store.c:101
-#: ../calendar/gui/e-meeting-store.c:736 ../calendar/gui/print.c:974
+#: ../calendar/gui/e-meeting-list-view.c:159
+#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Individual"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/print.c:975 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:160
+#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Grupo"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/print.c:976
+#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
-#: ../calendar/gui/print.c:977
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Sala"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/print.c:991
+#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "Presidente"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:992
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Participante requirido"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/print.c:993
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
-#: ../calendar/gui/print.c:994
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "Non-participante"
 
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:192
-#: ../calendar/gui/e-meeting-store.c:749
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:863
 msgid "Needs Action"
 msgstr "Necesita acciÃ³n"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:544
+#: ../calendar/gui/e-meeting-list-view.c:546
 msgid "Attendee                          "
 msgstr "Participante                          "
 
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
 msgid "In Process"
 msgstr "En progreso"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2083
+#: ../calendar/gui/e-meeting-time-sel.c:2284
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -7188,7 +5755,7 @@ msgstr "%A, %d de %B de %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2114
+#: ../calendar/gui/e-meeting-time-sel.c:2315
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -7198,67 +5765,67 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:392
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "Out of Office"
 msgstr "FÃ³ra da oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:393
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "No Information"
 msgstr "Sen informaciÃ³n"
 
-#: ../calendar/gui/e-meeting-time-sel.c:408
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "A_ttendees..."
 msgstr "Par_ticipantes..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:429
+#: ../calendar/gui/e-meeting-time-sel.c:581
 msgid "O_ptions"
 msgstr "O_pciÃ³ns"
 
-#: ../calendar/gui/e-meeting-time-sel.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:598
 msgid "Show _only working hours"
 msgstr "Mostrar _sÃ³ as horas de traballo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:456
+#: ../calendar/gui/e-meeting-time-sel.c:608
 msgid "Show _zoomed out"
 msgstr "Mostrar _reducido"
 
-#: ../calendar/gui/e-meeting-time-sel.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:623
 msgid "_Update free/busy"
 msgstr "_Actualizar dispoÃ±ibilidade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:486
+#: ../calendar/gui/e-meeting-time-sel.c:638
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:504
+#: ../calendar/gui/e-meeting-time-sel.c:656
 msgid "_Autopick"
 msgstr "Seleccionar _automaticamente"
 
-#: ../calendar/gui/e-meeting-time-sel.c:519
+#: ../calendar/gui/e-meeting-time-sel.c:671
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:536
+#: ../calendar/gui/e-meeting-time-sel.c:688
 msgid "_All people and resources"
 msgstr "_Todas as persoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:697
 msgid "All _people and one resource"
 msgstr "Todas as _persoas e un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:554
+#: ../calendar/gui/e-meeting-time-sel.c:706
 msgid "_Required people"
 msgstr "Persoas _requiridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:714
 msgid "Required people and _one resource"
 msgstr "Persoas requiridas e _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:760
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:626
+#: ../calendar/gui/e-meeting-time-sel.c:797
 msgid "_End time:"
 msgstr "Hora de _finalizaciÃ³n:"
 
@@ -7286,54 +5853,132 @@ msgstr "Idioma"
 msgid "Member"
 msgstr "Integrante"
 
-#: ../calendar/gui/e-memo-table.c:950
-msgid "_Delete Selected Memos"
-msgstr "E_liminar as notas seleccionadas"
+#: ../calendar/gui/e-memo-table.c:410
+#: ../modules/calendar/e-cal-shell-content.c:399
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view.c:289
+#: ../plugins/caldav/caldav-browse-server.c:432
+msgid "Memos"
+msgstr "Notas"
+
+#: ../calendar/gui/e-memo-table.c:488 ../calendar/gui/e-task-table.c:701
+msgid "* No Summary *"
+msgstr "* Sen resumo *"
+
+#: ../calendar/gui/e-memo-table.c:572 ../calendar/gui/e-task-table.c:781
+msgid "Start: "
+msgstr "Comezo: "
+
+#: ../calendar/gui/e-memo-table.c:590 ../calendar/gui/e-task-table.c:799
+msgid "Due: "
+msgstr "Pendente: "
+
+#: ../calendar/gui/e-memo-table.c:706
+msgid "Cut selected memos to the clipboard"
+msgstr "Cortar as mensaxes seleccionadas ao portapapeis"
+
+#: ../calendar/gui/e-memo-table.c:712
+msgid "Copy selected memos to the clipboard"
+msgstr "Copiar as mensaxes seleccionadas ao portapapeis"
+
+#: ../calendar/gui/e-memo-table.c:718
+msgid "Paste memos from the clipboard"
+msgstr "Pegar recordatorios desde o portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:1099 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:724
+#: ../modules/calendar/e-memo-shell-view-actions.c:569
+msgid "Delete selected memos"
+msgstr "Eliminar as notas seleccionadas"
+
+#: ../calendar/gui/e-memo-table.c:730
+msgid "Select all visible memos"
+msgstr "Seleccionar todas as mensaxes visÃbeis"
+
+#: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Prema para engadir unha nota"
 
-#: ../calendar/gui/e-memos.c:754 ../calendar/gui/e-tasks.c:902
-#, c-format
-msgid ""
-"Error on %s:\n"
-" %s"
-msgstr ""
-"Erro en %s:\n"
-" %s"
+#: ../calendar/gui/e-task-table.c:529
+msgid "0%"
+msgstr "0%"
 
-#: ../calendar/gui/e-memos.c:806
-msgid "Loading memos"
-msgstr "Cargando notas"
+#: ../calendar/gui/e-task-table.c:530
+msgid "10%"
+msgstr "10%"
 
-#: ../calendar/gui/e-memos.c:897
-#, c-format
-msgid "Opening memos at %s"
-msgstr "Abrindo notas en %s"
+#: ../calendar/gui/e-task-table.c:531
+msgid "20%"
+msgstr "20%"
 
-#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
-msgid "Deleting selected objects..."
-msgstr "Eliminando os obxectos seleccionados..."
+#: ../calendar/gui/e-task-table.c:532
+msgid "30%"
+msgstr "30%"
 
-#: ../calendar/gui/e-tasks.c:955
-msgid "Loading tasks"
-msgstr "Cargando tarefas"
+#: ../calendar/gui/e-task-table.c:533
+msgid "40%"
+msgstr "40%"
 
-#: ../calendar/gui/e-tasks.c:1052
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Abrindo tarefas en %s"
+#: ../calendar/gui/e-task-table.c:534
+msgid "50%"
+msgstr "50%"
 
-#: ../calendar/gui/e-tasks.c:1295
-msgid "Completing tasks..."
-msgstr "Finalizando tarefas..."
+#: ../calendar/gui/e-task-table.c:535
+msgid "60%"
+msgstr "60%"
 
-#: ../calendar/gui/e-tasks.c:1345
-msgid "Expunging"
-msgstr "Compactando"
+#: ../calendar/gui/e-task-table.c:536
+msgid "70%"
+msgstr "70%"
+
+#: ../calendar/gui/e-task-table.c:537
+msgid "80%"
+msgstr "80%"
 
-#: ../calendar/gui/e-timezone-entry.c:124
+#: ../calendar/gui/e-task-table.c:538
+msgid "90%"
+msgstr "90%"
+
+#: ../calendar/gui/e-task-table.c:539
+msgid "100%"
+msgstr "100%"
+
+#: ../calendar/gui/e-task-table.c:623 ../calendar/gui/print.c:2043
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../modules/calendar/e-cal-shell-content.c:359
+#: ../modules/calendar/e-task-shell-view-actions.c:241
+#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view.c:437
+#: ../plugins/caldav/caldav-browse-server.c:430
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: ../calendar/gui/e-task-table.c:927
+msgid "Cut selected tasks to the clipboard"
+msgstr "Cortar o texto seleccionado para o portapapeis"
+
+#: ../calendar/gui/e-task-table.c:933
+msgid "Copy selected tasks to the clipboard"
+msgstr "Copiar o texto seleccionado ao portapapeis"
+
+#: ../calendar/gui/e-task-table.c:939
+msgid "Paste tasks from the clipboard"
+msgstr "Pegar as tarefas desde o portapapeis"
+
+#: ../calendar/gui/e-task-table.c:945
+#: ../modules/calendar/e-task-shell-view-actions.c:693
+msgid "Delete selected tasks"
+msgstr "Eliminar as tarefas seleccionadas"
+
+#: ../calendar/gui/e-task-table.c:951
+msgid "Select all visible tasks"
+msgstr "Seleccionar todas as mensaxes visÃbeis"
+
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "Seleccionar fuso horario"
 
@@ -7341,108 +5986,244 @@ msgstr "Seleccionar 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:376 ../calendar/gui/print.c:1647
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%d de %B"
 
-#: ../calendar/gui/gnome-cal.c:2673
-msgid "_Custom View"
-msgstr "VisualizaciÃ³n _personalizada"
+#: ../calendar/gui/ea-cal-view-event.c:276
+msgid "It has alarms."
+msgstr "Ten alarmas."
 
-#: ../calendar/gui/gnome-cal.c:2674
-msgid "_Save Custom View"
-msgstr "_Gardar visualizaciÃ³n personalizada"
+#: ../calendar/gui/ea-cal-view-event.c:279
+msgid "It has recurrences."
+msgstr "Ten recorrencias."
 
-#: ../calendar/gui/gnome-cal.c:2679
-msgid "_Define Views..."
-msgstr "_Definir visualizaciÃ³ns..."
+#: ../calendar/gui/ea-cal-view-event.c:282
+msgid "It is a meeting."
+msgstr "Ã? unha cita."
 
-#: ../calendar/gui/gnome-cal.c:2916
+#: ../calendar/gui/ea-cal-view-event.c:288
 #, c-format
-msgid "Loading appointments at %s"
-msgstr "Cargando citas en %s"
+msgid "Calendar Event: Summary is %s."
+msgstr "Evento de calendario: o resumo Ã© %s."
+
+#: ../calendar/gui/ea-cal-view-event.c:290
+msgid "Calendar Event: It has no summary."
+msgstr "Evento de calendario: non ten resumo."
+
+#: ../calendar/gui/ea-cal-view-event.c:312
+msgid "calendar view event"
+msgstr "visualizaciÃ³n de actividades de calendario"
+
+#: ../calendar/gui/ea-cal-view-event.c:540
+msgid "Grab Focus"
+msgstr "Obter o foco"
+
+#: ../calendar/gui/ea-cal-view.c:300
+msgid "New Appointment"
+msgstr "Nova cita"
+
+#: ../calendar/gui/ea-cal-view.c:301
+msgid "New All Day Event"
+msgstr "Novo actividade de dÃa completo"
+
+#: ../calendar/gui/ea-cal-view.c:302
+msgid "New Meeting"
+msgstr "Nova cita"
+
+#: ../calendar/gui/ea-cal-view.c:303
+msgid "Go to Today"
+msgstr "Ir a hoxe"
+
+#: ../calendar/gui/ea-cal-view.c:304
+msgid "Go to Date"
+msgstr "Ir Ã¡ data"
+
+#: ../calendar/gui/ea-day-view-main-item.c:308
+#: ../calendar/gui/ea-week-view-main-item.c:340
+msgid "a table to view and select the current time range"
+msgstr "unha tÃ¡boa para ver e seleccionar o intervalo de tempo actual"
 
-#: ../calendar/gui/gnome-cal.c:2931
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
 #, c-format
-msgid "Loading tasks at %s"
-msgstr "Cargando tarefas en %s"
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "Ten %d actividade."
+msgstr[1] "Ten %d eventos."
+
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
+msgid "It has no events."
+msgstr "Non ten eventos."
 
-#: ../calendar/gui/gnome-cal.c:2940
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
-msgid "Loading memos at %s"
-msgstr "Cargando notas en %s"
+msgid "Work Week View: %s. %s"
+msgstr "VisualizaciÃ³n de semana laboral: %s. %s"
 
-#: ../calendar/gui/gnome-cal.c:3052
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:166
 #, c-format
-msgid "Opening %s"
-msgstr "Abrindo %s"
+msgid "Day View: %s. %s"
+msgstr "VisualizaciÃ³n diaria: %s. %s"
+
+#: ../calendar/gui/ea-day-view.c:197
+msgid "calendar view for a work week"
+msgstr "visualizaciÃ³n de calendario para unha semana laboral"
+
+#: ../calendar/gui/ea-day-view.c:199
+msgid "calendar view for one or more days"
+msgstr "visualizaciÃ³n de calendario para un ou mÃ¡is dÃas"
+
+#: ../calendar/gui/ea-gnome-calendar.c:46
+#: ../calendar/gui/ea-gnome-calendar.c:54
+#: ../calendar/importers/icalendar-importer.c:780
+msgid "Gnome Calendar"
+msgstr "Calendario do Gnome"
+
+#: ../calendar/gui/ea-gnome-calendar.c:197
+#: ../modules/calendar/e-cal-shell-view-private.c:890
+msgid "%A %d %b %Y"
+msgstr "%A, %d de %b de %Y"
+
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:209
+#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:903
+#: ../modules/calendar/e-cal-shell-view-private.c:906
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
+
+#: ../calendar/gui/ea-gnome-calendar.c:226
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:240
+#: ../modules/calendar/e-cal-shell-view-private.c:923
+#: ../modules/calendar/e-cal-shell-view-private.c:934
+#: ../modules/calendar/e-cal-shell-view-private.c:941
+#: ../modules/calendar/e-cal-shell-view-private.c:944
+msgid "%d %b %Y"
+msgstr "%d de %b de %Y"
+
+#: ../calendar/gui/ea-jump-button.c:147
+msgid "Jump button"
+msgstr "BotÃ³n de salto"
+
+#: ../calendar/gui/ea-jump-button.c:156
+msgid "Click here, you can find more events."
+msgstr "Prema aquÃ para localizar mÃ¡is eventos."
+
+#: ../calendar/gui/ea-week-view.c:153
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "VisualizaciÃ³n mensual: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:157
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "VisualizaciÃ³n semanal: %s. %s"
 
-#: ../calendar/gui/gnome-cal.c:4012
+#: ../calendar/gui/ea-week-view.c:188
+msgid "calendar view for a month"
+msgstr "VisualizaciÃ³n de calendario para un mes"
+
+#: ../calendar/gui/ea-week-view.c:190
+msgid "calendar view for one or more weeks"
+msgstr "visualizaciÃ³n de calendario para unha ou mÃ¡is semanas"
+
+#: ../calendar/gui/gnome-cal.c:2144
 msgid "Purging"
 msgstr "Depurando"
 
-#: ../calendar/gui/goto-dialog.glade.h:1
-msgid ""
-"January\n"
-"February\n"
-"March\n"
-"April\n"
-"May\n"
-"June\n"
-"July\n"
-"August\n"
-"September\n"
-"October\n"
-"November\n"
-"December"
-msgstr ""
-"Xaneiro\n"
-"Febreiro\n"
-"Marzo\n"
-"Abril\n"
-"Maio\n"
-"XuÃ±o\n"
-"Xullo\n"
-"Agosto\n"
-"Setembro\n"
-"Outubro\n"
-"Novembro\n"
-"Decembro"
-
-#: ../calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.ui.h:1
+msgid "April"
+msgstr "Abril"
+
+#: ../calendar/gui/goto-dialog.ui.h:2
+msgid "August"
+msgstr "Agosto"
+
+#: ../calendar/gui/goto-dialog.ui.h:3
+msgid "December"
+msgstr "Integrante"
+
+#: ../calendar/gui/goto-dialog.ui.h:4
+msgid "February"
+msgstr "Febreiro"
+
+#: ../calendar/gui/goto-dialog.ui.h:5
+msgid "January"
+msgstr "Xaneiro"
+
+#: ../calendar/gui/goto-dialog.ui.h:6
+msgid "July"
+msgstr "Jullo"
+
+#: ../calendar/gui/goto-dialog.ui.h:7
+msgid "June"
+msgstr "Correo non desexado"
+
+#: ../calendar/gui/goto-dialog.ui.h:8
+msgid "March"
+msgstr "Buscar"
+
+#: ../calendar/gui/goto-dialog.ui.h:9
+msgid "May"
+msgstr "Luns"
+
+#: ../calendar/gui/goto-dialog.ui.h:10
+msgid "November"
+msgstr "Integrante"
+
+#: ../calendar/gui/goto-dialog.ui.h:11
+msgid "October"
+msgstr "Outros"
+
+#: ../calendar/gui/goto-dialog.ui.h:12
 msgid "Select Date"
 msgstr "Seleccionar data"
 
-#: ../calendar/gui/goto-dialog.glade.h:14
+#: ../calendar/gui/goto-dialog.ui.h:13
+msgid "September"
+msgstr "Integrante"
+
+#: ../calendar/gui/goto-dialog.ui.h:14
 msgid "_Select Today"
 msgstr "_Seleccionar hoxe"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:461
-#: ../calendar/gui/itip-utils.c:553
+#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
+#: ../calendar/gui/itip-utils.c:552
 msgid "An organizer must be set."
 msgstr "DÃ©bese definir un organizador."
 
-#: ../calendar/gui/itip-utils.c:453
+#: ../calendar/gui/itip-utils.c:452
 msgid "At least one attendee is necessary"
 msgstr "Ã? necesario polo menos un participante"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:784
 msgid "Event information"
 msgstr "InformaciÃ³n do actividade"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:787
 msgid "Task information"
 msgstr "InformaciÃ³n da tarefa"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:787
+#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:790
 msgid "Memo information"
 msgstr "InformaciÃ³n da nota"
 
-#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:643 ../calendar/gui/itip-utils.c:808
 msgid "Free/Busy information"
 msgstr "InformaciÃ³n de dispoÃ±ibilidade"
 
-#: ../calendar/gui/itip-utils.c:643
+#: ../calendar/gui/itip-utils.c:646
 msgid "Calendar information"
 msgstr "InformaciÃ³n do calendario"
 
@@ -7450,7 +6231,7 @@ msgstr "InformaciÃ³n do calendario"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:677
+#: ../calendar/gui/itip-utils.c:680
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Aceptado"
@@ -7459,7 +6240,7 @@ msgstr "Aceptado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:684
+#: ../calendar/gui/itip-utils.c:687
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
@@ -7471,7 +6252,7 @@ msgstr "Aceptado provisionalmente"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
+#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:742
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Rexeitado"
@@ -7480,7 +6261,7 @@ msgstr "Rexeitado"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:701
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegado"
@@ -7488,7 +6269,7 @@ msgstr "Delegado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:711
+#: ../calendar/gui/itip-utils.c:714
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Actualizado"
@@ -7496,7 +6277,7 @@ msgstr "Actualizado"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:721
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -7504,7 +6285,7 @@ msgstr "Cancelar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:725
+#: ../calendar/gui/itip-utils.c:728
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Actualizar"
@@ -7512,267 +6293,155 @@ msgstr "Actualizar"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:732
+#: ../calendar/gui/itip-utils.c:735
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contraproposta"
 
-#: ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:805
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "InformaciÃ³n de dispoÃ±ibilidade (de %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:810
+#: ../calendar/gui/itip-utils.c:813
 msgid "iCalendar information"
 msgstr "InformaciÃ³n de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:981
-msgid "You must be an attendee of the event."
-msgstr "Debe ser un participante no actividade."
-
-#: ../calendar/gui/memos-component.c:477
-msgid "_New Memo List"
-msgstr "Lista de notas _nova"
-
-#: ../calendar/gui/memos-component.c:560
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "%d nota"
-msgstr[1] "%d notas"
-
-#: ../calendar/gui/memos-component.c:562 ../calendar/gui/tasks-component.c:555
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ", %d seleccionada"
-msgstr[1] ", %d seleccionadas"
-
-#: ../calendar/gui/memos-component.c:609
-msgid "Failed upgrading memos."
-msgstr "Fallou ao actualizar as notas."
-
-#: ../calendar/gui/memos-component.c:739
-#, c-format
-msgid "Unable to open the memo list '%s' for creating events and meetings"
+#: ../calendar/gui/itip-utils.c:833
+msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
-"Non Ã© posÃbel abrir a lista de notas '%s' para crear eventos e reuniÃ³ns"
-
-#: ../calendar/gui/memos-component.c:752
-msgid "There is no calendar available for creating memos"
-msgstr "Non hai un calendario dispoÃ±Ãbel para crear notas"
+"Non foi posÃbel almacenar un recurso, o novo evento colisiona con algÃºn "
+"outro."
 
-#: ../calendar/gui/memos-component.c:862
-msgid "Memo Source Selector"
-msgstr "Selector de orixe de notas"
+#: ../calendar/gui/itip-utils.c:835
+msgid "Unable to book a resource, error: "
+msgstr "Non foi posÃbel almacenar un recurso, erro:"
 
-#: ../calendar/gui/memos-component.c:1041
-msgid "New memo"
-msgstr "Nota nova"
-
-#: ../calendar/gui/memos-component.c:1042
-msgctxt "New"
-msgid "Mem_o"
-msgstr "N_ota"
-
-#: ../calendar/gui/memos-component.c:1043
-msgid "Create a new memo"
-msgstr "Crear unha nota nova"
-
-#: ../calendar/gui/memos-component.c:1049
-msgid "New shared memo"
-msgstr "Nota compartida nova"
-
-#: ../calendar/gui/memos-component.c:1050
-msgctxt "New"
-msgid "_Shared memo"
-msgstr "Nota _compartida"
-
-#: ../calendar/gui/memos-component.c:1051
-msgid "Create a shared new memo"
-msgstr "Crear unha nota compartida nova"
-
-#: ../calendar/gui/memos-component.c:1057
-msgid "New memo list"
-msgstr "Lista de notas nova"
-
-#: ../calendar/gui/memos-component.c:1058
-msgctxt "New"
-msgid "Memo li_st"
-msgstr "Li_sta de notas"
-
-#: ../calendar/gui/memos-component.c:1059
-msgid "Create a new memo list"
-msgstr "Crear unha lista de notas nova"
-
-#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
-msgid "Print Memos"
-msgstr "Imprimir notas"
-
-#: ../calendar/gui/migration.c:157
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"A localizaciÃ³n e xerarquÃa dos cartafoles de tarefas do Evolution "
-"modificouse dende o Evolution 1.x.\n"
-"\n"
-"Agarde mentres o Evolution migra os seus cartafoles..."
-
-#: ../calendar/gui/migration.c:161
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"A localizaciÃ³n e xerarquÃa dos cartafoles de calendario do Evolution "
-"modificouse dende o Evolution 1.x.\n"
-"\n"
-"Agarde mentres o Evolution migra os seus cartafoles..."
-
-#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:774 ../calendar/gui/migration.c:942
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
-"Non Ã© posÃbel migrar a configuraciÃ³n antiga dende evolution/config.xmldb"
-
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:803
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "Non se puido migrar o calendario `%s'"
-
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:971
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "Non se puido migrar as tarefas `%s'"
+#: ../calendar/gui/itip-utils.c:988
+msgid "You must be an attendee of the event."
+msgstr "Debe ser un participante no actividade."
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:508
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:509
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:510
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "31st"
 msgstr "31"
 
@@ -7804,140 +6473,52 @@ msgstr "Ve"
 msgid "Sa"
 msgstr "SÃ¡"
 
-#: ../calendar/gui/print.c:2465
+#: ../calendar/gui/print.c:2564
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../calendar/gui/print.c:2467
+#: ../calendar/gui/print.c:2566
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/gui/print.c:2492
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:2515
+#: ../calendar/gui/print.c:2615
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2555
+#: ../calendar/gui/print.c:2658
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2569
+#: ../calendar/gui/print.c:2673
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:2584
+#: ../calendar/gui/print.c:2691
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada: %i"
 
-#: ../calendar/gui/print.c:2595
+#: ../calendar/gui/print.c:2702
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2608
+#: ../calendar/gui/print.c:2715
 #, c-format
 msgid "Categories: %s"
 msgstr "CategorÃas: %s"
 
-#: ../calendar/gui/print.c:2619
+#: ../calendar/gui/print.c:2726
 msgid "Contacts: "
 msgstr "Contactos: "
 
-#: ../calendar/gui/tasks-component.c:470
-msgid "_New Task List"
-msgstr "Lista de tarefas _nova"
-
-#: ../calendar/gui/tasks-component.c:553
-#, c-format
-msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] "%d tarefa"
-msgstr[1] "%d tarefas"
-
-#: ../calendar/gui/tasks-component.c:602
-msgid "Failed upgrading tasks."
-msgstr "Fallou ao actualizar as tarefas."
-
-#: ../calendar/gui/tasks-component.c:735
-#, c-format
-msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr ""
-"Non Ã© posÃbel abrir a lista de tarefas '%s' para crear eventos e reuniÃ³ns"
-
-#: ../calendar/gui/tasks-component.c:748
-msgid "There is no calendar available for creating tasks"
-msgstr "Non hai ningÃºn calendario dispoÃ±Ãbel para crear tarefas"
-
-#: ../calendar/gui/tasks-component.c:859
-msgid "Task Source Selector"
-msgstr "Selector de orixe de tarefas"
-
-#: ../calendar/gui/tasks-component.c:1113
-msgid "New task"
-msgstr "Tarefa nova"
-
-#: ../calendar/gui/tasks-component.c:1114
-msgctxt "New"
-msgid "_Task"
-msgstr "_Tarefa"
-
-#: ../calendar/gui/tasks-component.c:1115
-msgid "Create a new task"
-msgstr "Crear unha tarefa nova"
-
-#: ../calendar/gui/tasks-component.c:1121
-msgid "New assigned task"
-msgstr "Tarefa asignada nova"
-
-#: ../calendar/gui/tasks-component.c:1122
-msgctxt "New"
-msgid "Assigne_d Task"
-msgstr "Tarefa asigna_da"
-
-#: ../calendar/gui/tasks-component.c:1123
-msgid "Create a new assigned task"
-msgstr "Crear unha tarefa asignada nova"
-
-#: ../calendar/gui/tasks-component.c:1129
-msgid "New task list"
-msgstr "Lista de tarefas nova"
-
-#: ../calendar/gui/tasks-component.c:1130
-msgctxt "New"
-msgid "Tas_k list"
-msgstr "Lista de tare_fas"
-
-#: ../calendar/gui/tasks-component.c:1131
-msgid "Create a new task list"
-msgstr "Crear unha lista de tarefas nova"
-
-#: ../calendar/gui/tasks-control.c:484
-msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
-"\n"
-"Really erase these tasks?"
-msgstr ""
-"Esta operaciÃ³n eliminarÃ¡ permanentemente todas as tarefas marcadas como "
-"terminadas. Se continÃºa, non serÃ¡ capaz de recuperar estas tarefas.\n"
-"\n"
-"EstÃ¡ seguro de que quere eliminar estas tarefas?"
-
-#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
-msgid "Do not ask me again."
-msgstr "Non preguntar de novo."
-
-#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
-msgid "Print Tasks"
-msgstr "Imprimir tarefas"
-
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
 msgid "% Completed"
@@ -7964,8 +6545,8 @@ msgid "Appointments and Meetings"
 msgstr "Citas e reuniÃ³ns"
 
 #: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:630
-#: ../plugins/itip-formatter/itip-formatter.c:1728
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1820
 msgid "Opening calendar"
 msgstr "Abrir calendario"
 
@@ -7989,11 +6570,11 @@ msgstr "Ficheiros vCalendar (.vcf)"
 msgid "Evolution vCalendar importer"
 msgstr "Importador de vCalendar do Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:746
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "Eventos de calendario"
 
-#: ../calendar/importers/icalendar-importer.c:783
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "Importador intelixente do calendario do Evolution"
 
@@ -8547,7 +7128,7 @@ msgid "America/Nassau"
 msgstr "AmÃ©rica/Nassau"
 
 #: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
 msgid "America/New_York"
 msgstr "AmÃ©rica/Nova_York"
 
@@ -9550,190 +8131,177 @@ msgstr "PacÃfico/Wallis"
 msgid "Pacific/Yap"
 msgstr "PacÃfico/Yap"
 
-#: ../composer/e-composer-autosave.c:445
-msgid "Unable to retrieve message from editor"
-msgstr "Non Ã© posÃbel obter a mensaxe do editor"
-
-#: ../composer/e-composer-actions.c:84
+#: ../composer/e-composer-actions.c:79
 msgid "Untitled Message"
 msgstr "Mensaxe sen tÃtulo"
 
-#: ../composer/e-composer-actions.c:317
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:202
+msgid "Save as..."
+msgstr "Gardar como..."
+
+#: ../composer/e-composer-actions.c:281
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
-#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:195
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:286
+#: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:288
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1337
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
+#: ../composer/e-composer-actions.c:293
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
-#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+#: ../composer/e-composer-actions.c:300
 msgid "Print Pre_view"
 msgstr "Pre_visualizaciÃ³n da impresiÃ³n"
 
-#: ../composer/e-composer-actions.c:345
+#: ../composer/e-composer-actions.c:309
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:314
 msgid "Save _As..."
 msgstr "Gardar _como..."
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:316
 msgid "Save the current file with a different name"
 msgstr "Gardar o ficheiro actual cun nome diferente"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:321
 msgid "Save as _Draft"
 msgstr "Gardar como borra_dor"
 
-#: ../composer/e-composer-actions.c:359
+#: ../composer/e-composer-actions.c:323
 msgid "Save as draft"
 msgstr "Gardar como borrador"
 
-#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:191
+#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:264
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:330
 msgid "Send this message"
 msgstr "Enviar esta mensaxe"
 
-#: ../composer/e-composer-actions.c:373
-msgid "Insert Send options"
-msgstr "Introducir opciÃ³ns de envÃo"
-
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:335
 msgid "New _Message"
 msgstr "_Mensaxe nova"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:337
 msgid "Open New Message window"
 msgstr "Abrir unha xanela de Mensaxe nova"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:344
 msgid "Character _Encoding"
 msgstr "C_odificaciÃ³n de caracteres"
 
-#: ../composer/e-composer-actions.c:394
-msgid "_Security"
-msgstr "_Seguranza"
-
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "C_ifrar con PGP"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:363
 msgid "Encrypt this message with PGP"
 msgstr "Cifrar esta mensaxe con PGP"
 
-#: ../composer/e-composer-actions.c:412
+#: ../composer/e-composer-actions.c:369
 msgid "PGP _Sign"
 msgstr "A_sinar con PGP"
 
-#: ../composer/e-composer-actions.c:414
+#: ../composer/e-composer-actions.c:371
 msgid "Sign this message with your PGP key"
 msgstr "Asinar esta mensaxe coa sÃºa chave PGP"
 
-#: ../composer/e-composer-actions.c:420
+#: ../composer/e-composer-actions.c:377
 msgid "_Prioritize Message"
 msgstr "_Mensaxe prioritaria"
 
-#: ../composer/e-composer-actions.c:422
+#: ../composer/e-composer-actions.c:379
 msgid "Set the message priority to high"
 msgstr "Definir a prioridade da mensaxe como alta"
 
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:385
 msgid "Re_quest Read Receipt"
 msgstr "_Requirir confirmaciÃ³n de lectura"
 
-#: ../composer/e-composer-actions.c:430
+#: ../composer/e-composer-actions.c:387
 msgid "Get delivery notification when your message is read"
 msgstr "Obter unha notificaciÃ³n de entrega cando se lea a sÃºa mensaxe"
 
-#: ../composer/e-composer-actions.c:436
+#: ../composer/e-composer-actions.c:393
 msgid "S/MIME En_crypt"
 msgstr "_Cifrar con S/MIME"
 
-#: ../composer/e-composer-actions.c:438
+#: ../composer/e-composer-actions.c:395
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Cifrar esta mensaxe co seu certificado de cifrado S/MIME"
 
-#: ../composer/e-composer-actions.c:444
+#: ../composer/e-composer-actions.c:401
 msgid "S/MIME Sig_n"
 msgstr "Si_natura S/MIME"
 
-#: ../composer/e-composer-actions.c:446
+#: ../composer/e-composer-actions.c:403
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Asinar esta mensaxe co seu certificado de sinatura S/MIME"
 
-#: ../composer/e-composer-actions.c:452
+#: ../composer/e-composer-actions.c:409
 msgid "_Bcc Field"
 msgstr "Campo _Cco"
 
-#: ../composer/e-composer-actions.c:454
+#: ../composer/e-composer-actions.c:411
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo CCO"
 
-#: ../composer/e-composer-actions.c:460
+#: ../composer/e-composer-actions.c:417
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ../composer/e-composer-actions.c:462
+#: ../composer/e-composer-actions.c:419
 msgid "Toggles whether the CC field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo CC"
 
-#: ../composer/e-composer-actions.c:468
+#: ../composer/e-composer-actions.c:425
 msgid "_From Field"
 msgstr "Campo _De"
 
-#: ../composer/e-composer-actions.c:470
+#: ../composer/e-composer-actions.c:427
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Alterna entre se se mostra ou non o selector do campo De"
 
-#: ../composer/e-composer-actions.c:476
+#: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
 msgstr "Campo _Responder a"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo Responder a"
 
-#: ../composer/e-composer-actions.c:521
+#: ../composer/e-composer-actions.c:478
 msgid "Save Draft"
 msgstr "Gardar borrador"
 
-#: ../composer/e-composer-header.c:120
+#: ../composer/e-composer-header.c:129
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../composer/e-composer-header.c:123
+#: ../composer/e-composer-header.c:137
 msgid "Hide"
 msgstr "Ocultar"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:44
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduza os enderezos que recibirÃ¡n unha copia da mensaxe"
 
-#: ../composer/e-composer-header-table.c:46
+#: ../composer/e-composer-header-table.c:47
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -9741,92 +8309,95 @@ msgstr ""
 "Introduza os enderezos que recibirÃ¡n unha copia da mensaxe sen aparecerer na "
 "lista de destinatarios da mensaxe"
 
-#: ../composer/e-composer-header-table.c:945
+#: ../composer/e-composer-header-table.c:959
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:945 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:923 ../mail/em-mailer-prefs.c:76
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:296
+#: ../composer/e-composer-header-table.c:959
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:77
 msgid "From"
 msgstr "De"
 
-#: ../composer/e-composer-header-table.c:954
+#: ../composer/e-composer-header-table.c:968
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:973
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:965
+#: ../composer/e-composer-header-table.c:979
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:965 ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "Cc"
 
-#: ../composer/e-composer-header-table.c:971
+#: ../composer/e-composer-header-table.c:985
 msgid "_Bcc:"
 msgstr "_Cco:"
 
-#: ../composer/e-composer-header-table.c:971 ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "Cco"
 
-#: ../composer/e-composer-header-table.c:976
+#: ../composer/e-composer-header-table.c:990
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-composer-header-table.c:980
+#: ../composer/e-composer-header-table.c:994
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../composer/e-composer-header-table.c:989
+#: ../composer/e-composer-header-table.c:1003
 msgid "Si_gnature:"
 msgstr "Si_natura:"
 
-#: ../composer/e-composer-name-header.c:116
+#: ../composer/e-composer-name-header.c:134
 msgid "Click here for the address book"
 msgstr "Prema aquÃ para ir Ã¡ axenda de enderezos"
 
-#: ../composer/e-composer-post-header.c:137
-msgid "Posting destination"
-msgstr "Destino onde publicar"
-
-#: ../composer/e-composer-post-header.c:138
-msgid "Choose folders to post the message to."
-msgstr "Escolla os cartafoles nos que publicar a mensaxe."
-
-#: ../composer/e-composer-post-header.c:172
+#: ../composer/e-composer-post-header.c:116
 msgid "Click here to select folders to post to"
 msgstr "Prema aquÃ para seleccionar os cartafoles nos que publicar"
 
-#: ../composer/e-composer-private.c:208
+#: ../composer/e-composer-private.c:284
 msgid "Save draft"
 msgstr "Gardar borrador"
 
-#: ../composer/e-msg-composer.c:807
+#. Check buttons
+#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:150
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
+msgid "_Do not show this message again."
+msgstr "_Non mostrar esta mensaxe outra vez."
+
+#: ../composer/e-msg-composer.c:983
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
-"Non se pode asinar a mensaxe saÃnte: non hai un certificado de sinatura "
+"Non Ã© posÃbel asinar a mensaxe saÃnte: non hai un certificado de sinatura "
 "definido para esta conta"
 
-#: ../composer/e-msg-composer.c:814
+#: ../composer/e-msg-composer.c:990
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
-"Non se pode cifrar a mensaxe saÃnte: non hai un certificado de cifrado "
+"Non Ã© posÃbel cifrar a mensaxe saÃnte: non hai un certificado de cifrado "
 "definido para esta conta"
 
-#: ../composer/e-msg-composer.c:1350 ../composer/e-msg-composer.c:2189
+#: ../composer/e-msg-composer.c:1379
+msgid "Unable to reconstruct message from autosave file"
+msgstr "Non Ã© posÃbel obter a mensaxe do editor"
+
+#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:3347
+#: ../composer/e-msg-composer.c:3310
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -9876,41 +8447,39 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
-msgstr "Non se puido crear a xanela do editor."
+msgstr "Non foi posÃbel crear a xanela do editor."
 
 #: ../composer/mail-composer.error.xml.h:8
 msgid "Could not create message."
-msgstr "Non se puido crear a mensaxe."
+msgstr "Non foi posÃbel crear a mensaxe."
 
 #: ../composer/mail-composer.error.xml.h:9
 msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "Non se puido ler o ficheiro de sinatura &quot;{0}&quot;."
+msgstr "Non foi posÃbel ler o ficheiro de sinatura &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:10
 msgid "Could not retrieve messages to attach from {0}."
-msgstr "Non se puideron obter as mensaxes para anexar dende {0}."
+msgstr "Non foi posÃbel obter as mensaxes para anexar desde {0}."
 
 #: ../composer/mail-composer.error.xml.h:11
 msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr "Non se puido gardar no ficheiro de gardado automÃ¡tico &quot;{0}&quot;."
+msgstr ""
+"Non foi posÃbel gardar no ficheiro de gardado automÃ¡tico &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:12
-msgid "Directories can not be attached to Messages."
-msgstr "Os directorios non se poden anexar Ã¡s mensaxes."
-
-#: ../composer/mail-composer.error.xml.h:13
 msgid "Do you want to recover unfinished messages?"
 msgstr "Quere recuperar as mensaxes non finalizadas?"
 
-#: ../composer/mail-composer.error.xml.h:14
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "Hai unha descarga en progreso. Quere enviar o correo?"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Error saving to autosave because &quot;{1}&quot;."
-msgstr "Erro ao gardar no gardado automÃ¡tico debido a &quot;{1}&quot;."
+msgstr ""
+"Produciuse un erro ao gardar no gardado automÃ¡tico debido a &quot;{1}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:15
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -9918,33 +8487,13 @@ msgstr ""
 "O Evolution saÃu inesperadamente mentres estaba a redactar unha mensaxe "
 "nova. Recuperar a mensaxe permitiralle continuar onde a deixou."
 
-#: ../composer/mail-composer.error.xml.h:17
-msgid ""
-"Send options available only for Novell GroupWise and Microsoft Exchange "
-"accounts."
-msgstr ""
-"As opciÃ³ns de envÃo sÃ³ estÃ¡n dispoÃ±Ãbeis para as contas Novell GroupWise e "
-"Microsoft Exchange."
-
-#: ../composer/mail-composer.error.xml.h:18
-msgid "Send options not available."
-msgstr "As opciÃ³ns de envÃo non estÃ¡n dispoÃ±Ãbeis."
-
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:16
 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 ser enviado nunha "
 "mensaxe."
 
-#: ../composer/mail-composer.error.xml.h:20
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
-msgstr ""
-"Para anexar os contidos deste directorio, anexe individualmente cada "
-"ficheiro ou cree un arquivo do directorio e anÃ©xeo."
-
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:17
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -9955,51 +8504,56 @@ msgstr ""
 "\n"
 "AsegÃºrese de que ten instalada a versiÃ³n correcta de gtkhtml e libgtkhtml."
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:20
 msgid "Unable to activate the address selector control."
 msgstr "Non Ã© posÃbel activar o control de selecciÃ³n de enderezos."
 
-#: ../composer/mail-composer.error.xml.h:25
-msgid "Unfinished messages found"
-msgstr "LocalizÃ¡ronse mensaxes non finalizadas"
-
-#: ../composer/mail-composer.error.xml.h:26
-msgid "Warning: Modified Message"
-msgstr "Aviso: modificouse a mensaxe"
-
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:21
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Non pode anexar o ficheiro `{0}' a esta mensaxe."
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:22
 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:29
+#: ../composer/mail-composer.error.xml.h:23
 msgid "_Continue Editing"
 msgstr "_Continuar editando"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:25
 msgid "_Do not Recover"
 msgstr "_Non recuperar"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:26
 msgid "_Recover"
 msgstr "_Recuperar"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Save Draft"
 msgstr "_Gardar borrador"
 
-#: ../data/evolution.desktop.in.in.h:1
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+msgid "Calendar event notifications"
+msgstr "InformaciÃ³n do calendario"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Evolution Alarm Notify"
+msgstr "Importador do Elm do Evolution"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:786
+#: ../shell/e-shell-window-private.c:255
+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:2 ../shell/e-shell-window-commands.c:947
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:653
 msgid "Groupware Suite"
 msgstr "Suite de Groupware"
 
-#: ../data/evolution.desktop.in.in.h:3
+#: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "Xestionar o seu correo, contactos e calendario"
 
@@ -10011,138 +8565,250 @@ msgstr "tarxeta de enderezo"
 msgid "calendar information"
 msgstr "informaciÃ³n de calendario"
 
+#. Translators: This is a cancelled activity.
+#: ../e-util/e-activity.c:224
+#, c-format
+msgid "%s (cancelled)"
+msgstr "%s (Cancelado)"
+
+#. Translators: This is a completed activity.
+#: ../e-util/e-activity.c:227
+#, c-format
+msgid "%s (completed)"
+msgstr "%s (completada)"
+
+#. Translators: This is an activity whose percent
+#. * complete is unknown.
+#: ../e-util/e-activity.c:231
+#, c-format
+msgid "%s..."
+msgstr "%s (...)"
+
+#: ../e-util/e-activity.c:236
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% terminada)"
+
+#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+msgid "Evolution Error"
+msgstr "Erro do Evolution"
+
+#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+msgid "Evolution Warning"
+msgstr "Aviso do Evolution"
+
+#: ../e-util/e-alert.c:636
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr "Erro interno: requiriuse un erro descoÃ±ecido '%s'"
+
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
+msgstr "Ã?rabe"
+
+#: ../e-util/e-charset.c:54
+msgid "Baltic"
+msgstr "BÃ¡ltico"
+
+#: ../e-util/e-charset.c:55
+msgid "Central European"
+msgstr "Centroeuropeo"
+
+#: ../e-util/e-charset.c:56
+msgid "Chinese"
+msgstr "ChinÃ©s"
+
+#: ../e-util/e-charset.c:57
+msgid "Cyrillic"
+msgstr "CirÃlico"
+
+#: ../e-util/e-charset.c:58
+msgid "Greek"
+msgstr "Grego"
+
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "Hebreo"
+
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "XaponÃ©s"
+
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "Coreano"
+
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "TailandÃ©s"
+
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "Turco"
+
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../e-util/e-charset.c:65
+msgid "Western European"
+msgstr "Europeo occidental"
+
+#: ../e-util/e-charset.c:66
+msgid "Western European, New"
+msgstr "Europeo occidental, novo"
+
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+msgid "Traditional"
+msgstr "Tradicional"
+
+#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
+#: ../e-util/e-charset.c:91
+msgid "Simplified"
+msgstr "Simplificado"
+
+#: ../e-util/e-charset.c:94
+msgid "Ukrainian"
+msgstr "UcraÃno"
+
+#: ../e-util/e-charset.c:97
+msgid "Visual"
+msgstr "Visual"
+
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:188 ../plugins/itip-formatter/itip-view.c:191
-#: ../ui/evolution-calendar.xml.h:34 ../widgets/misc/e-cell-date-edit.c:304
+#: ../e-util/e-datetime-format.c:193
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../plugins/itip-formatter/itip-view.c:195
+#: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "Hoxe"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:200 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow"
 msgstr "MaÃ±Ã¡"
 
-#: ../e-util/e-datetime-format.c:202
+#: ../e-util/e-datetime-format.c:204
 msgid "Yesterday"
 msgstr "Onte"
 
-#: ../e-util/e-datetime-format.c:205
+#: ../e-util/e-datetime-format.c:207
 #, c-format
 msgid "%d days from now"
 msgstr "%d dÃas desde agora"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:209
 #, c-format
 msgid "%d days ago"
 msgstr "hai %d dÃas"
 
-#: ../e-util/e-datetime-format.c:281 ../e-util/e-datetime-format.c:291
-#: ../e-util/e-datetime-format.c:300
+#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
+#: ../e-util/e-datetime-format.c:302
 msgid "Use locale default"
 msgstr "Usar os locais predefinidos"
 
-#: ../e-util/e-datetime-format.c:494
+#: ../e-util/e-datetime-format.c:496
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
-msgid "Evolution Error"
-msgstr "Erro do Evolution"
-
-#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
-msgid "Evolution Warning"
-msgstr "Aviso do Evolution"
-
-#: ../e-util/e-error.c:118
-msgid "Evolution Information"
-msgstr "InformaciÃ³n do Evolution"
-
-#: ../e-util/e-error.c:120
-msgid "Evolution Query"
-msgstr "Consulta do Evolution"
+#: ../e-util/e-file-utils.c:136
+msgid "(Unknown Filename)"
+msgstr "Tipo descoÃ±ecido"
 
-#. setup a dummy error
-#: ../e-util/e-error.c:448
+#. Translators: The string value is the basename of a file.
+#: ../e-util/e-file-utils.c:140
 #, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "Erro interno: requiriuse un erro descoÃ±ecido '%s'"
+msgid "Writing \"%s\""
+msgstr "Facendo ping a %s"
 
-#: ../e-util/e-logger.c:161
-msgid "Component"
-msgstr "CompoÃ±ente"
+#. Translators: The first string value is the basename of a
+#. * remote file, the second string value is the hostname.
+#: ../e-util/e-file-utils.c:145
+#, c-format
+msgid "Writing \"%s\" to %s"
+msgstr "Copiando `%s' a `%s'"
 
-#: ../e-util/e-logger.c:162
-msgid "Name of the component being logged"
+#: ../e-util/e-logger.c:175
+msgid "Name of the logger"
 msgstr "Nome do compoÃ±ente que se estÃ¡ rexistrando"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:191
+#: ../e-util/e-module.c:188
+msgid "Filename"
+msgstr "Nome do f_icheiro:"
+
+#: ../e-util/e-module.c:189
+msgid "The filename of the module"
+msgstr "Modificar o nome deste cartafol"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "Rexistros de depuraciÃ³n"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:205
+#: ../e-util/e-non-intrusive-error-dialog.c:208
 msgid "Show _errors in the status bar for"
 msgstr "Mostrar _erros na barra de estado para"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:223
+#: ../e-util/e-non-intrusive-error-dialog.c:226
 msgid "second(s)."
 msgstr "segundos."
 
-#: ../e-util/e-non-intrusive-error-dialog.c:229
+#: ../e-util/e-non-intrusive-error-dialog.c:232
 msgid "Log Messages:"
 msgstr "Rexistro de mensaxes:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:274
+#: ../e-util/e-non-intrusive-error-dialog.c:279
 msgid "Log Level"
 msgstr "Nivel de rexistro"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:282
-#: ../widgets/misc/e-dateedit.c:380
-msgid "Time"
-msgstr "Hora"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2527
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensaxes"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:301
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1430
 msgid "Close this window"
 msgstr "Pechar esta xanela"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Error"
 msgstr "Erro"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Errors"
 msgstr "Erros"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warnings and Errors"
 msgstr "Avisos e erros"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Debug"
 msgstr "DepuraciÃ³n"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Error, Warnings and Debug messages"
 msgstr "Erros, avisos e mensaxes de depuraciÃ³n"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
-#: ../mail/em-account-prefs.c:477 ../mail/em-composer-prefs.c:957
-#: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:718
+#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../e-util/e-plugin.c:309
+#: ../e-util/e-plugin.c:296
 msgid "Whether the plugin is enabled"
-msgstr "Indica se o plugin estÃ¡ activado"
+msgstr "Indica se o engadido estÃ¡ activado"
+
+#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "semanas"
 
 #: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
@@ -10158,21 +8824,21 @@ msgid ""
 msgstr ""
 "O sistema de impresiÃ³n non informou de ningÃºn detalle adicional sobre o erro."
 
-#: ../e-util/e-signature.c:690
+#: ../e-util/e-signature.c:701
 msgid "Autogenerated"
 msgstr "Xerado automaticamente"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
 msgid "Because \"{1}\"."
 msgstr "Porque \"{1}\"."
 
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file \"{0}\"."
-msgstr "Non se pode abrir o ficheiro \"{0}\"."
+msgstr "Non Ã© posÃbel abrir o ficheiro \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:3
 msgid "Cannot save file \"{0}\"."
-msgstr "Non se pode gardar o ficheiro \"{0}\"."
+msgstr "Non Ã© posÃbel gardar o ficheiro \"{0}\"."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
@@ -10182,81 +8848,124 @@ msgstr "Quere sobrescribilo?"
 msgid "File exists \"{0}\"."
 msgstr "O ficheiro xa existe \"{0}\"."
 
-#: ../e-util/e-system.error.xml.h:6
-msgid "Overwrite file?"
-msgstr "Quere sobrescribir o ficheiro?"
-
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "S_obrescribir"
 
-#: ../e-util/e-util.c:133
+#: ../e-util/e-util.c:140
 msgid "Could not open the link."
-msgstr "Non se puido abrir a ligazÃ³n."
+msgstr "Non foi posÃbel abrir a ligazÃ³n."
 
-#: ../e-util/e-util.c:183
+#: ../e-util/e-util.c:190
 msgid "Could not display help for Evolution."
 msgstr "Non foi posÃbel mostrar a axuda do Evolution."
 
-#: ../e-util/e-util-labels.c:45
-msgid "I_mportant"
-msgstr "I_mportante"
+#: ../e-util/gconf-bridge.c:1276
+#, c-format
+msgid "GConf error: %s"
+msgstr "Erro do GConf: %s"
 
-#. red
-#: ../e-util/e-util-labels.c:46
-msgid "_Work"
-msgstr "_Traballo"
+#: ../e-util/gconf-bridge.c:1287
+msgid "All further errors shown only on terminal."
+msgstr "Todos os erros posteriores mostraranse sÃ³ no terminal."
 
-#. orange
-#: ../e-util/e-util-labels.c:47
-msgid "_Personal"
-msgstr "_Persoal"
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
+#: ../modules/mail/em-mailer-prefs.c:78
+msgid "Reply-To"
+msgstr "Responder a"
 
-#. green
-#: ../e-util/e-util-labels.c:48
-msgid "_To Do"
-msgstr "_Tarefas pendentes"
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
+#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2306
+#: ../mail/em-format-html.c:2327 ../modules/mail/em-mailer-prefs.c:80
+msgid "Cc"
+msgstr "Cc"
 
-#. blue
-#: ../e-util/e-util-labels.c:49
-msgid "_Later"
-msgstr "_MÃ¡is tarde"
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2312
+#: ../mail/em-format-html.c:2330 ../modules/mail/em-mailer-prefs.c:81
+msgid "Bcc"
+msgstr "Cco"
 
-#: ../e-util/e-util-labels.c:320
-msgid "Label _Name:"
-msgstr "_Nome da etiqueta:"
+#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
+#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+msgid "Subject"
+msgstr "Asunto"
 
-#: ../e-util/e-util-labels.c:343
-msgid "Edit Label"
-msgstr "Editar etiqueta"
+#. pseudo-header
+#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2422
+#: ../modules/mail/em-mailer-prefs.c:1130
+msgid "Mailer"
+msgstr "Aplicativo de correo"
 
-#: ../e-util/e-util-labels.c:343
-msgid "Add Label"
-msgstr "Engadir etiqueta"
+#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Mensaxe reenviada --------"
 
-#: ../e-util/e-util-labels.c:362
-msgid "Label name cannot be empty."
-msgstr "O nome da etiqueta non pode estar baleiro."
+#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
+#: ../widgets/misc/e-dateedit.c:567
+msgid "Date"
+msgstr "Data"
 
-#: ../e-util/e-util-labels.c:367
-msgid ""
-"A label having the same tag already exists on the server. Please rename your "
-"label."
-msgstr ""
-"Unha etiqueta que ten a mesma etiqueta (tag) xa existe no servidor. Renomee "
-"a sÃºa etiqueta."
+#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+msgid "Newsgroups"
+msgstr "Grupos de noticias"
 
-#: ../e-util/gconf-bridge.c:1222
+#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "Cara"
+
+#: ../em-format/em-format.c:1319
 #, c-format
-msgid "GConf error: %s"
-msgstr "Erro do GConf: %s"
+msgid "%s attachment"
+msgstr "%s anexo"
 
-#: ../e-util/gconf-bridge.c:1233
-msgid "All further errors shown only on terminal."
-msgstr "Todos os erros posteriores mostraranse sÃ³ no terminal."
+#: ../em-format/em-format.c:1374
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Non foi posÃbel analizar a mensaxe S/MIME: erro descoÃ±ecido"
+
+#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Non foi posÃbel analizar a mensaxe MIME. MostrÃ¡ndoa como orixe."
+
+#: ../em-format/em-format.c:1520
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Tipo de cifrado non compatÃbel para multipart/encrypted"
+
+#: ../em-format/em-format.c:1532
+msgid "Could not parse PGP/MIME message"
+msgstr "Non foi posÃbel analizar a mensaxe PGP/MIME"
+
+#: ../em-format/em-format.c:1532
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "Non foi posÃbel analizar a mensaxe PGP/MIME: erro descoÃ±ecido"
+
+#: ../em-format/em-format.c:1698
+msgid "Unsupported signature format"
+msgstr "O formato da sinatura non Ã© compatÃbel"
+
+#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+msgid "Error verifying signature"
+msgstr "Produciuse un erro ao verificar a sinatura"
+
+#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
+#: ../em-format/em-format.c:1847
+msgid "Unknown error verifying signature"
+msgstr "Produciuse un erro descoÃ±ecido ao verificar a sinatura"
+
+#: ../em-format/em-format.c:1924
+msgid "Could not parse PGP message"
+msgstr "Non foi posÃbel analizar a mensaxe PGP"
+
+#: ../em-format/em-format.c:1924
+msgid "Could not parse PGP message: Unknown error"
+msgstr "Non foi posÃbel analizar a mensaxe PGP: erro descoÃ±ecido"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -10264,7 +8973,7 @@ msgstr[0] "hai un segundo"
 msgstr[1] "hai %d segundos"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -10272,7 +8981,7 @@ msgstr[0] "dentro de 1 segundo"
 msgstr[1] "dentro de %d segundos"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -10280,7 +8989,7 @@ msgstr[0] "hai 1 minuto"
 msgstr[1] "hai %d minutos"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -10288,7 +8997,7 @@ msgstr[0] "dentro de 1 minuto"
 msgstr[1] "dentro de %d minutos"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -10296,7 +9005,7 @@ msgstr[0] "hai 1 hora"
 msgstr[1] "hai %d horas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -10304,7 +9013,7 @@ msgstr[0] "dentro de 1 hora"
 msgstr[1] "dentro de %d horas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -10312,7 +9021,7 @@ msgstr[0] "hai 1 dÃa"
 msgstr[1] "hai %d dÃas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -10320,7 +9029,7 @@ msgstr[0] "dentro de 1 dÃa"
 msgstr[1] "dentro de %d dÃas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -10328,7 +9037,7 @@ msgstr[0] "hai 1 semana"
 msgstr[1] "hai %d semanas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -10336,7 +9045,7 @@ msgstr[0] "dentro de 1 semana"
 msgstr[1] "dentro de %d semanas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -10344,7 +9053,7 @@ msgstr[0] "hai 1 mes"
 msgstr[1] "hai %d meses"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/filter-datespec.c:84
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -10352,107 +9061,110 @@ msgstr[0] "dentro de 1 mes"
 msgstr[1] "dentro de %d meses"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/filter-datespec.c:85
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "hai 1 ano"
 msgstr[1] "hai %d anos"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "dentro de 1 ano"
 msgstr[1] "dentro de %d anos"
 
-#: ../filter/filter-datespec.c:294
+#: ../filter/e-filter-datespec.c:116
 msgid "<click here to select a date>"
 msgstr "<prema aquÃ para seleccionar unha data>"
 
-#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
-#: ../filter/filter-datespec.c:319
+#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
+#: ../filter/e-filter-datespec.c:141
 msgid "now"
 msgstr "agora"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:304
+#: ../filter/e-filter-datespec.c:126
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:447
+#: ../filter/e-filter-datespec.c:269
 msgid "Select a time to compare against"
 msgstr "Seleccione unha hora coa que comparar"
 
-#: ../filter/filter-file.c:281
-msgid "Choose a file"
+#: ../filter/e-filter-file.c:184
+msgid "Choose a File"
 msgstr "Seleccione un ficheiro"
 
-#: ../filter/filter-part.c:528
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Proba"
-
-#: ../filter/filter-rule.c:854
+#: ../filter/e-filter-rule.c:659
 msgid "R_ule name:"
 msgstr "Nome da r_egra:"
 
-#: ../filter/filter-rule.c:882
+#: ../filter/e-filter-rule.c:689
 msgid "Find items that meet the following conditions"
 msgstr "Encontrar os elementos que cumpran as seguintes condiciÃ³ns"
 
-#: ../filter/filter-rule.c:916
+#: ../filter/e-filter-rule.c:723
 msgid "A_dd Condition"
 msgstr "Enga_dir unha condiciÃ³n"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/e-filter-rule.c:732
 msgid "If all conditions are met"
 msgstr "Se se cumpren todas as condiciÃ³ns"
 
-#: ../filter/filter-rule.c:922
+#: ../filter/e-filter-rule.c:733
 msgid "If any conditions are met"
 msgstr "Se se cumpre calquera condiciÃ³n"
 
-#: ../filter/filter-rule.c:924
+#: ../filter/e-filter-rule.c:736
 msgid "_Find items:"
 msgstr "_Buscar elementos:"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:760
 msgid "All related"
 msgstr "Todos os relacionados"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
 msgid "Replies"
 msgstr "Respostas"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:762
 msgid "Replies and parents"
 msgstr "Respostas e pais"
 
-#: ../filter/filter-rule.c:942
+#: ../filter/e-filter-rule.c:763
 msgid "No reply or parent"
 msgstr "Sen resposta nin pai"
 
-#: ../filter/filter-rule.c:944
+#: ../filter/e-filter-rule.c:766
 msgid "I_nclude threads"
 msgstr "I_ncluÃr fÃos"
 
-#: ../filter/filter-rule.c:1038 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:301
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/filter-rule.c:1038 ../mail/em-utils.c:310
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:302
 msgid "Outgoing"
 msgstr "SaÃnte"
 
+#: ../filter/e-rule-editor.c:265
+msgid "Add Rule"
+msgstr "Engadir regra"
+
+#: ../filter/e-rule-editor.c:352
+msgid "Edit Rule"
+msgstr "Editar regra"
+
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "ExpresiÃ³n regular incorrecta &quot;{0}&quot;."
 
 #: ../filter/filter.error.xml.h:2
 msgid "Could not compile regular expression &quot;{1}&quot;."
-msgstr "Non se puido compilar a expresiÃ³n regular &quot;{1}&quot;."
+msgstr "Non foi posÃbel compilar a expresiÃ³n regular &quot;{1}&quot;."
 
 #: ../filter/filter.error.xml.h:3
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
@@ -10466,7 +9178,7 @@ msgstr "Falta a data."
 msgid "Missing file name."
 msgstr "Falta o nome do ficheiro."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:72
 msgid "Missing name."
 msgstr "Falta o nome."
 
@@ -10490,19 +9202,15 @@ msgstr "Debe dar un nome a este filtro."
 msgid "You must specify a file name."
 msgstr "Debe especificar un nome de ficheiro."
 
-#: ../filter/filter.glade.h:1
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>Regras de _filtro</b>"
-
-#: ../filter/filter.glade.h:2
+#: ../filter/filter.ui.h:1
 msgid "Compare against"
 msgstr "Comparar con"
 
-#: ../filter/filter.glade.h:4
+#: ../filter/filter.ui.h:3
 msgid "Show filters for mail:"
 msgstr "Mostrar os filtros para o correo:"
 
-#: ../filter/filter.glade.h:5
+#: ../filter/filter.ui.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -10510,7 +9218,7 @@ msgstr ""
 "A data da mensaxe compararase coas\n"
 "12:00am da data especificada."
 
-#: ../filter/filter.glade.h:7
+#: ../filter/filter.ui.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -10518,7 +9226,7 @@ msgstr ""
 "A data da mensaxe compararase cunha\n"
 "data relativa ao momento no que se produce a filtraxe."
 
-#: ../filter/filter.glade.h:9
+#: ../filter/filter.ui.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -10526,239 +9234,908 @@ msgstr ""
 "A data da mensaxe compararase coa\n"
 "data actual do momento no que se produce a filtraxe."
 
-#: ../filter/filter.glade.h:12
-msgid ""
-"ago\n"
-"in the future"
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+msgid "_Filter Rules"
+msgstr "Regras de _filtro"
+
+#: ../filter/filter.ui.h:12
+msgid "a time relative to the current time"
+msgstr ""
+"a hora actual\n"
+"a hora que especifique\n"
+"unha hora relativa Ã¡ hora actual"
+
+#: ../filter/filter.ui.h:13
+msgid "ago"
+msgstr "Etiqueta"
+
+#: ../filter/filter.ui.h:16
+msgid "in the future"
 msgstr ""
 "fai\n"
 "no futuro"
 
-#: ../filter/filter.glade.h:14
+#: ../filter/filter.ui.h:18
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+msgid "months"
+msgstr "Mes"
+
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+msgid "seconds"
+msgstr "segundos"
+
+#: ../filter/filter.ui.h:20
+msgid "the current time"
+msgstr "Gardar o ficheiro actual"
+
+#: ../filter/filter.ui.h:21
+msgid "the time you specify"
+msgstr "o tempo que especificou"
+
+#: ../filter/filter.ui.h:23
+msgid "years"
+msgstr "Cabeceiras"
+
+#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
+#: ../mail/em-format-html-display.c:1025 ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
+#: ../widgets/misc/e-attachment-paned.c:153
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Anexo"
+msgstr[1] "Anexos"
+
+#: ../mail/e-mail-attachment-bar.c:617
+#: ../widgets/misc/e-attachment-paned.c:612
+msgid "Icon View"
+msgstr "VisualizaciÃ³n en iconas"
+
+#: ../mail/e-mail-attachment-bar.c:618
+#: ../widgets/misc/e-attachment-paned.c:613
+msgid "List View"
+msgstr "VisualizaciÃ³n de lista"
+
+#: ../mail/e-mail-browser.c:729 ../shell/e-shell-window.c:631
+msgid "Focus Tracker"
+msgstr "Enfocar o tracker"
+
+#: ../mail/e-mail-browser.c:739
+msgid "Shell Module"
+msgstr "Modo de selecciÃ³n"
+
+#: ../mail/e-mail-browser.c:740 ../mail/message-list.c:2589
+msgid "The mail shell backend"
+msgstr "A infraestrutura da terminal de mail"
+
+#: ../mail/e-mail-browser.c:750
+msgid "Show Deleted"
+msgstr "Eliminada"
+
+#: ../mail/e-mail-browser.c:751
+msgid "Show deleted messages"
+msgstr "Mensaxes reenviadas"
+
+#: ../mail/e-mail-display.c:66
+msgid "_Add to Address Book..."
+msgstr "_Engadir Ã¡ axenda de enderezos"
+
+#: ../mail/e-mail-display.c:73
+msgid "_To This Address"
+msgstr "_A este enderezo"
+
+#: ../mail/e-mail-display.c:80
+msgid "_From This Address"
+msgstr "_Desde este enderezo"
+
+#: ../mail/e-mail-display.c:89
+msgid "Create Search _Folder"
+msgstr "Crear cartafol de _busca"
+
+#: ../mail/e-mail-label-dialog.c:220
+msgid "_Label name:"
+msgstr "_Nome da etiqueta:"
+
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "I_mportante"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:42
+msgid "_Work"
+msgstr "_Traballo"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:43
+msgid "_Personal"
+msgstr "_Persoal"
+
+#. green
+#: ../mail/e-mail-label-list-store.c:44
+msgid "_To Do"
+msgstr "_Tarefas pendentes"
+
+#. blue
+#: ../mail/e-mail-label-list-store.c:45
+msgid "_Later"
+msgstr "_MÃ¡is tarde"
+
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:515
+msgid "Add Label"
+msgstr "Engadir etiqueta"
+
+#: ../mail/e-mail-label-manager.c:216
+msgid "Edit Label"
+msgstr "Editar etiqueta"
+
+#: ../mail/e-mail-label-manager.c:349
 msgid ""
-"seconds\n"
-"minutes\n"
-"hours\n"
-"days\n"
-"weeks\n"
-"months\n"
-"years"
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
 msgstr ""
-"segundos\n"
-"minutos\n"
-"horas\n"
-"dÃas\n"
-"semanas\n"
-"meses\n"
-"anos"
+"Nota: o subliÃ±ado do nome da etiqueta emprÃ©gase como identificador "
+"mnemotÃ©cnico no menÃº."
+
+#: ../mail/e-mail-label-tree-view.c:86
+msgid "Color"
+msgstr "Cor"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
+#: ../mail/em-folder-tree-model.c:658 ../mail/em-folder-tree.c:2570
+#: ../modules/mail/e-mail-shell-view-private.c:961
+msgid "Inbox"
+msgstr "Caixa de entrada"
+
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:651
+msgid "Drafts"
+msgstr "Borradores"
+
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:661
+msgid "Outbox"
+msgstr "Caixa de saÃda"
+
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:663
+msgid "Sent"
+msgstr "Enviado"
+
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:654
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../plugins/templates/templates.c:574
+msgid "Templates"
+msgstr "Modelos"
+
+#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Importante"
+
+#. green
+#: ../mail/e-mail-migrate.c:963
+msgid "To Do"
+msgstr "Tarefas pendentes"
+
+#. blue
+#: ../mail/e-mail-migrate.c:964
+msgid "Later"
+msgstr "MÃ¡is tarde"
+
+#: ../mail/e-mail-migrate.c:1110
+#: ../modules/addressbook/e-book-shell-migrate.c:76
+#: ../modules/calendar/e-cal-shell-migrate.c:123
+#: ../modules/calendar/e-task-shell-migrate.c:90
+msgid "Migrating..."
+msgstr "Migrando..."
+
+#: ../mail/e-mail-migrate.c:1143
+msgid "Migration"
+msgstr "MigraciÃ³n"
+
+#: ../mail/e-mail-migrate.c:1183
+#: ../modules/addressbook/e-book-shell-migrate.c:128
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-task-shell-migrate.c:132
+#, c-format
+msgid "Migrating '%s':"
+msgstr "Migrando '%s':"
+
+#: ../mail/e-mail-migrate.c:1594
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Non Ã© posÃbel crear un cartafol novo: `%s': %s"
+
+#: ../mail/e-mail-migrate.c:1622
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "Non Ã© posÃbel copiar o cartafol `%s' en `%s': %s"
+
+#: ../mail/e-mail-migrate.c:1817
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Non Ã© posÃbel examinar as caixas de correo existentes en `%s': %s"
+
+#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2927
+msgid "Migrating Folders"
+msgstr "MigraciÃ³n de cartafoles"
 
-#: ../filter/filter.glade.h:21
+#: ../mail/e-mail-migrate.c:1824
 msgid ""
-"the current time\n"
-"the time you specify\n"
-"a time relative to the current time"
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
-"a hora actual\n"
-"a hora que especifique\n"
-"unha hora relativa Ã¡ hora actual"
+"A localizaciÃ³n e a xerarquÃa dos cartafoles da caixa de correo modificouse "
+"desde Evolution 1.x.\n"
+"\n"
+"Agarde mentres o Evolution migra os seus cartafoles..."
 
-#: ../filter/rule-editor.c:381
-msgid "Add Rule"
-msgstr "Engadir regra"
+#: ../mail/e-mail-migrate.c:2027
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Non Ã© posÃbel abrir os datos antigos POP keep-on-server `%s': %s"
 
-#: ../filter/rule-editor.c:462
-msgid "Edit Rule"
-msgstr "Editar regra"
+#: ../mail/e-mail-migrate.c:2043
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "Non Ã© posÃbel crear o directorio de datos POP3 keep-on-server `%s': %s"
 
-#: ../filter/rule-editor.c:808
-msgid "Rule name"
-msgstr "Nome da regra"
+#: ../mail/e-mail-migrate.c:2075
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr "Non Ã© posÃbel copiar os datos POP3 keep-on-server `%s': %s"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Preferencias do editor"
+#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Produciuse un fallo ao crear o almacenamento de correo local `%s': %s"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: ../mail/e-mail-migrate.c:2928
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Configurar aquÃ as preferencias de correo incluÃndo seguranza e "
-"visualizaciÃ³n de mensaxes"
+"O formato de resumo dos cartafoles das caixas de correo do Evolution foron "
+"movidos ao SQLite desde Evolution 2.24.\n"
+"\n"
+"Sexa paciente mentres o Evolution migra os seus cartafoles..."
+
+#. On This Computer is always first, and Search Folders
+#. * is always last.
+#. create the local source group
+#: ../mail/e-mail-migrate.c:2943 ../mail/e-mail-store.c:229
+#: ../mail/em-folder-tree-model.c:144 ../mail/em-folder-tree-model.c:146
+#: ../mail/mail-vfolder.c:215 ../mail/message-list.c:1617
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:501
+msgid "On This Computer"
+msgstr "Neste computador"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: ../mail/e-mail-migrate.c:3023
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr "Non Ã© posÃbel crear os cartafoles de correo local en `%s': %s"
+
+#: ../mail/e-mail-migrate.c:3041
+#, c-format
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
 msgstr ""
-"Configurar aquÃ a verificaciÃ³n ortogrÃ¡fica, as sinaturas e o editor de "
-"mensaxes"
+"Non Ã© posÃbel ler a configuraciÃ³n da instalaciÃ³n anterior do Evolution: "
+"`evolution/config.xmldb' non existe ou estÃ¡ danado."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Configurar aquÃ as sÃºas contas de correo"
+#. XXX e-error should provide a widget layout and API suitable
+#. *     for packing additional widgets to the right of the alert
+#. *     icon.  But for now, screw it.
+#: ../mail/e-mail-reader-utils.c:105
+#: ../modules/calendar/e-task-shell-view-actions.c:572
+msgid "Do not ask me again"
+msgstr "Non preguntar de novo."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your network connection settings here"
-msgstr "Configure as sÃºas definiciÃ³ns de conexiÃ³n de rede aquÃ"
+#: ../mail/e-mail-reader.c:208 ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "Copiar ao cartafol"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Correo do Evolution"
+#: ../mail/e-mail-reader.c:208 ../mail/em-folder-utils.c:385
+msgid "C_opy"
+msgstr "C_opiar"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Control de configuraciÃ³n de contas de correo do Evolution"
+#: ../mail/e-mail-reader.c:582 ../mail/em-filter-i18n.h:51
+msgid "Move to Folder"
+msgstr "Mover ao cartafol"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "CompoÃ±ente de correo do Evolution"
+#: ../mail/e-mail-reader.c:582 ../mail/em-folder-utils.c:385
+msgid "_Move"
+msgstr "_Mover"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Editor de correo do Evolution"
+#: ../mail/e-mail-reader.c:808
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "Gardar mensaxe..."
+msgstr[1] "Gardar mensaxe..."
+
+#. Translators: This is a part of a suggested file name
+#. * used when saving a message or multiple messages to an
+#. * mbox format, when the first message doesn't have a
+#. * Subject. The extension ".mbox" is appended to this
+#. * string, thus it will be something like "Message.mbox"
+#. * at the end.
+#: ../mail/e-mail-reader.c:829 ../plugins/groupwise-features/properties.ui.h:5
+#: ../widgets/table/e-table-click-to-add.c:518
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "Mensaxe"
+msgstr[1] "Mensaxe"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Control de configuraciÃ³n do editor de correo do Evolution"
+#: ../mail/e-mail-reader.c:1087
+msgid "A_dd Sender to Address Book"
+msgstr "_Engadir o remitente Ã¡ axenda de enderezos"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Control de preferencias do Evolution"
+#: ../mail/e-mail-reader.c:1089
+msgid "Add sender to address book"
+msgstr "Engadir o remitente Ã¡ axenda de enderezos"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Network configuration control"
-msgstr "Control de configuraciÃ³n de rede do Evolution"
+#: ../mail/e-mail-reader.c:1094
+msgid "Check for _Junk"
+msgstr "Verificar se hai correo non dese_xado"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
-#: ../mail/mail-component.c:793
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
-msgid "Mail"
-msgstr "Correo"
+#: ../mail/e-mail-reader.c:1096
+msgid "Filter the selected messages for junk status"
+msgstr "Filtrar as mensaxes seleccionadas polo estado de correo non desexado"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:490
-msgid "Mail Accounts"
-msgstr "Contas de correo"
+#: ../mail/e-mail-reader.c:1101
+msgid "_Copy to Folder..."
+msgstr "_Copiar ao cartafol..."
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:108
-msgid "Mail Preferences"
-msgstr "Preferencias de correo"
+#: ../mail/e-mail-reader.c:1103
+msgid "Copy selected messages to another folder"
+msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
-msgid "Network Preferences"
-msgstr "Preferencias de rede"
+#: ../mail/e-mail-reader.c:1108
+msgid "_Delete Message"
+msgstr "E_liminar mensaxe"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:297
-msgid "_Mail"
-msgstr "_Correo"
+#: ../mail/e-mail-reader.c:1110
+msgid "Mark the selected messages for deletion"
+msgstr "Marcar as mensaxes seleccionadas para eliminalas"
 
-#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
-#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
-msgid "_Forward"
-msgstr "_Reenviar"
+#: ../mail/e-mail-reader.c:1115
+msgid "Filter on Mailing _List..."
+msgstr "Filtrar por _lista de correo..."
+
+#: ../mail/e-mail-reader.c:1117
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Crear unha regra para filtrar mensaxes a esta lista de correo"
+
+#: ../mail/e-mail-reader.c:1122
+msgid "Filter on _Recipients..."
+msgstr "Filtrar por _destinatarios..."
+
+#: ../mail/e-mail-reader.c:1124
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Crear unha regra para filtrar mensaxes a estes destinatarios"
+
+#: ../mail/e-mail-reader.c:1129
+msgid "Filter on Se_nder..."
+msgstr "Filtrar por re_mitente..."
+
+#: ../mail/e-mail-reader.c:1131
+msgid "Create a rule to filter messages from this sender"
+msgstr "Crear unha regra para filtrar mensaxes deste remitente"
+
+#: ../mail/e-mail-reader.c:1136
+msgid "Filter on _Subject..."
+msgstr "Filtrar por a_sunto..."
+
+#: ../mail/e-mail-reader.c:1138
+msgid "Create a rule to filter messages with this subject"
+msgstr "Crear unha regra para filtrar mensaxes con este asunto"
+
+#: ../mail/e-mail-reader.c:1143
+msgid "A_pply Filters"
+msgstr "_Aplicar filtros"
+
+#: ../mail/e-mail-reader.c:1145
+msgid "Apply filter rules to the selected messages"
+msgstr "Aplicar as regras de filtraxe Ã¡s mensaxes seleccionadas"
+
+#: ../mail/e-mail-reader.c:1150
+msgid "_Find in Message..."
+msgstr "_Buscar na mensaxe..."
+
+#: ../mail/e-mail-reader.c:1152
+msgid "Search for text in the body of the displayed message"
+msgstr "Buscar texto no corpo da mensaxe mostrada"
+
+#: ../mail/e-mail-reader.c:1157
+msgid "_Clear Flag"
+msgstr "E_liminar marca"
+
+#: ../mail/e-mail-reader.c:1159
+msgid "Remove the follow-up flag from the selected messages"
+msgstr "Crear unha tarefa nova a partir da mensaxe seleccionada"
+
+#: ../mail/e-mail-reader.c:1164
+msgid "_Flag Completed"
+msgstr "_Marcar como terminado"
+
+#: ../mail/e-mail-reader.c:1166
+msgid "Set the follow-up flag to completed on the selected messages"
+msgstr "Seleccionar todas as mensaxes do mesmo fÃo que a mensaxe seleccionada"
+
+#: ../mail/e-mail-reader.c:1171
+msgid "Follow _Up..."
+msgstr "Seg_uimento..."
+
+#: ../mail/e-mail-reader.c:1173
+msgid "Flag the selected messages for follow-up"
+msgstr "Marcar as mensaxes seleccionadas para o seguimento"
+
+#: ../mail/e-mail-reader.c:1178
+msgid "_Attached"
+msgstr "_Anexada"
+
+#: ../mail/e-mail-reader.c:1180 ../mail/e-mail-reader.c:1187
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Reenviar a alguÃ©n a mensaxe seleccionada como un anexo"
+
+#: ../mail/e-mail-reader.c:1185
+msgid "Forward As _Attached"
+msgstr "_Remitir como iCalendar"
+
+#: ../mail/e-mail-reader.c:1192
+msgid "_Inline"
+msgstr "_En liÃ±a"
+
+#: ../mail/e-mail-reader.c:1194 ../mail/e-mail-reader.c:1201
+msgid "Forward the selected message in the body of a new message"
+msgstr "Reenviar a mensaxe seleccionada no corpo dunha mensaxe nova"
+
+#: ../mail/e-mail-reader.c:1199
+msgid "Forward As _Inline"
+msgstr "Estilo de _reenvÃo:"
+
+#: ../mail/e-mail-reader.c:1206
+msgid "_Quoted"
+msgstr "_Citada"
+
+#: ../mail/e-mail-reader.c:1208 ../mail/e-mail-reader.c:1215
+msgid "Forward the selected message quoted like a reply"
+msgstr "Reenviar a mensaxe seleccionada citada como unha resposta"
+
+#: ../mail/e-mail-reader.c:1213
+msgid "Forward As _Quoted"
+msgstr "Estilo de _reenvÃo:"
+
+#: ../mail/e-mail-reader.c:1220
+msgid "_Load Images"
+msgstr "_Cargar imaxes"
+
+#: ../mail/e-mail-reader.c:1222
+msgid "Force images in HTML mail to be loaded"
+msgstr "Forzar a carga de imaxes no correo HTML"
+
+#: ../mail/e-mail-reader.c:1227
+msgid "_Important"
+msgstr "_Importante"
+
+#: ../mail/e-mail-reader.c:1229
+msgid "Mark the selected messages as important"
+msgstr "Marcar as mensaxes seleccionadas como importantes"
+
+#: ../mail/e-mail-reader.c:1234
+msgid "_Junk"
+msgstr "_Correo non desexado"
 
-#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../mail/e-mail-reader.c:1236
+msgid "Mark the selected messages as junk"
+msgstr "Marcar as mensaxes seleccionadas como correo non desexado"
+
+#: ../mail/e-mail-reader.c:1241
+msgid "_Not Junk"
+msgstr "_Non Ã© correo non desexado"
+
+#: ../mail/e-mail-reader.c:1243
+msgid "Mark the selected messages as not being junk"
+msgstr "Marcar as mensaxes seleccionadas como non lixo"
+
+#: ../mail/e-mail-reader.c:1248
+msgid "_Read"
+msgstr "_Lida"
+
+#: ../mail/e-mail-reader.c:1250
+msgid "Mark the selected messages as having been read"
+msgstr "Marcar as mensaxes seleccionadas como lidas"
+
+#: ../mail/e-mail-reader.c:1255
+msgid "Uni_mportant"
+msgstr "Non i_mportante"
+
+#: ../mail/e-mail-reader.c:1257
+msgid "Mark the selected messages as unimportant"
+msgstr "Marcar as mensaxes seleccionadas como non importantes"
+
+#: ../mail/e-mail-reader.c:1262
+msgid "_Unread"
+msgstr "_Non lida"
+
+#: ../mail/e-mail-reader.c:1264
+msgid "Mark the selected messages as not having been read"
+msgstr "Marcar as mensaxes seleccionadas como non lidas"
+
+#: ../mail/e-mail-reader.c:1269
+msgid "_Edit as New Message..."
+msgstr "_Editar como unha mensaxe nova..."
+
+#: ../mail/e-mail-reader.c:1271
+msgid "Open the selected messages in the composer for editing"
+msgstr "Abrir as mensaxes seleccionadas no editor para editalas"
+
+#: ../mail/e-mail-reader.c:1276
+msgid "Compose _New Message"
+msgstr "Redactar unha mensaxe _nova"
+
+#: ../mail/e-mail-reader.c:1278
+msgid "Open a window for composing a mail message"
+msgstr "Abrir unha xanela para compor unha mensaxe de correo"
+
+#: ../mail/e-mail-reader.c:1283
+msgid "_Open in New Window"
+msgstr "_Abrir nunha xanela nova"
+
+#: ../mail/e-mail-reader.c:1285
+msgid "Open the selected messages in a new window"
+msgstr "Abrir as mensaxes seleccionadas nunha xanela nova"
+
+#: ../mail/e-mail-reader.c:1290
+msgid "_Move to Folder..."
+msgstr "_Mover ao cartafol..."
+
+#: ../mail/e-mail-reader.c:1292
+msgid "Move selected messages to another folder"
+msgstr "Mover as mensaxes seleccionadas a outro cartafol"
+
+#: ../mail/e-mail-reader.c:1297
+msgid "_Next Message"
+msgstr "_Seguinte mensaxe"
+
+#: ../mail/e-mail-reader.c:1299
+msgid "Display the next message"
+msgstr "Mostrar a seguinte mensaxe"
+
+#: ../mail/e-mail-reader.c:1304
+msgid "Next _Important Message"
+msgstr "Seguinte mensaxe _importante"
+
+#: ../mail/e-mail-reader.c:1306
+msgid "Display the next important message"
+msgstr "Mostrar a seguinte mensaxe importante"
+
+#: ../mail/e-mail-reader.c:1311
+msgid "Next _Thread"
+msgstr "Seguinte _fÃo"
+
+#: ../mail/e-mail-reader.c:1313
+msgid "Display the next thread"
+msgstr "Mostrar o seguinte fÃo"
+
+#: ../mail/e-mail-reader.c:1318
+msgid "Next _Unread Message"
+msgstr "Seguinte mensaxe _non lida"
+
+#: ../mail/e-mail-reader.c:1320
+msgid "Display the next unread message"
+msgstr "Mostrar a seguinte mensaxe non lida"
+
+#: ../mail/e-mail-reader.c:1325
+msgid "_Previous Message"
+msgstr "_Mensaxe anterior"
+
+#: ../mail/e-mail-reader.c:1327
+msgid "Display the previous message"
+msgstr "Mostrar a mensaxe anterior"
+
+#: ../mail/e-mail-reader.c:1332
+msgid "Pr_evious Important Message"
+msgstr "Ant_erior mensaxe importante"
+
+#: ../mail/e-mail-reader.c:1334
+msgid "Display the previous important message"
+msgstr "Mostrar a anterior mensaxe importante"
+
+#: ../mail/e-mail-reader.c:1339
+msgid "P_revious Unread Message"
+msgstr "Ante_rior mensaxe non lida"
+
+#: ../mail/e-mail-reader.c:1341
+msgid "Display the previous unread message"
+msgstr "Mostrar a anterior mensaxe non lida"
+
+#: ../mail/e-mail-reader.c:1348
+msgid "Print this message"
+msgstr "Imprimir esta mensaxe"
+
+#: ../mail/e-mail-reader.c:1355
+msgid "Preview the message to be printed"
+msgstr "Previsualizar a mensaxe que se vai imprimir"
+
+#: ../mail/e-mail-reader.c:1360
+msgid "Re_direct"
+msgstr "Re_direccionar"
+
+#: ../mail/e-mail-reader.c:1362
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Redireccionar a alguÃ©n (rebotar) a mensaxe seleccionada"
+
+#: ../mail/e-mail-reader.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../modules/mail/e-mail-attachment-handler.c:141
+msgid "Reply to _All"
+msgstr "Responder a t_odos"
+
+#: ../mail/e-mail-reader.c:1369
+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:1374
+msgid "Reply to _List"
+msgstr "Responder Ã¡ _lista"
+
+#: ../mail/e-mail-reader.c:1376
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "Redactar unha resposta para a lista de correo da mensaxe seleccionada"
+
+#: ../mail/e-mail-reader.c:1381
+#: ../modules/mail/e-mail-attachment-handler.c:148
 msgid "_Reply to Sender"
 msgstr "_Responder ao remitente"
 
-# (pofilter) variables: (u'translation contains variables not in original: %d',)
-#. Translators: This is only for multiple messages.
-#: ../mail/e-attachment-handler-mail.c:334
-#, c-format
-msgid "%d attached messages"
-msgstr "%d mensaxes anexas"
+#: ../mail/e-mail-reader.c:1383
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Redactar unha resposta para o remitente da mensaxe seleccionada"
 
-#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1642
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Anexo"
-msgstr[1] "Anexos"
+#: ../mail/e-mail-reader.c:1388
+msgid "_Save as mbox..."
+msgstr "Gardar como..."
 
-#: ../mail/e-mail-attachment-bar.c:615
-#: ../widgets/misc/e-attachment-paned.c:607
-msgid "Icon View"
-msgstr "VisualizaciÃ³n en iconas"
+#: ../mail/e-mail-reader.c:1390
+msgid "Save selected messages as an mbox file"
+msgstr "Gardar as mensaxes como un ficheiro de texto"
 
-#: ../mail/e-mail-attachment-bar.c:616
-#: ../widgets/misc/e-attachment-paned.c:608
-msgid "List View"
-msgstr "VisualizaciÃ³n de lista"
+#: ../mail/e-mail-reader.c:1395
+msgid "Search Folder from Mailing _List..."
+msgstr "Cartafol de busca por _lista de correo..."
 
-#: ../mail/e-mail-search-bar.c:76
-#, c-format
-msgid "Matches: %d"
-msgstr "Equivalencias: %d"
+#: ../mail/e-mail-reader.c:1397
+msgid "Create a search folder for this mailing list"
+msgstr "Crear un cartafol de busca para esta lista de correo"
 
-#: ../mail/e-mail-search-bar.c:520
-msgid "Close the find bar"
-msgstr "Pechar esta barra de bÃºsqueda"
+#: ../mail/e-mail-reader.c:1402
+msgid "Search Folder from Recipien_ts..."
+msgstr "Cartafol de busca por des_tinatarios..."
 
-#: ../mail/e-mail-search-bar.c:528
-msgid "Fin_d:"
-msgstr "_Buscar:"
+#: ../mail/e-mail-reader.c:1404
+msgid "Create a search folder for these recipients"
+msgstr "Crear un cartafol de busca para estes destinatarios"
 
-#: ../mail/e-mail-search-bar.c:540
-msgid "Clear the search"
-msgstr "Limpar bÃºsqueda"
+#: ../mail/e-mail-reader.c:1409
+msgid "Search Folder from Sen_der..."
+msgstr "Cartafol de busca por _remitente..."
 
-#: ../mail/e-mail-search-bar.c:559
-msgid "_Previous"
-msgstr "_Anterior"
+#: ../mail/e-mail-reader.c:1411
+msgid "Create a search folder for this sender"
+msgstr "Crear un cartafol de busca para este remitente"
 
-#: ../mail/e-mail-search-bar.c:565
-msgid "Find the previous occurrence of the phrase"
-msgstr "Buscar a ocorrencia anterior na frase"
+#: ../mail/e-mail-reader.c:1416
+msgid "Search Folder from S_ubject..."
+msgstr "Cartafol de busca por as_unto..."
 
-#: ../mail/e-mail-search-bar.c:573
-msgid "_Next"
-msgstr "_Seguinte"
+#: ../mail/e-mail-reader.c:1418
+msgid "Create a search folder for this subject"
+msgstr "Crear un cartafol de busca para este asunto"
 
-#: ../mail/e-mail-search-bar.c:579
-msgid "Find the next occurrence of the phrase"
-msgstr "Buscar a seguinte ocorrencia na frase"
+#: ../mail/e-mail-reader.c:1423
+msgid "_Message Source"
+msgstr "Orixe da _mensaxe"
 
-#: ../mail/e-mail-search-bar.c:587
-msgid "Mat_ch case"
-msgstr "_Coincidir maiÃºsculas e minÃºsculas"
+#: ../mail/e-mail-reader.c:1425
+msgid "Show the raw email source of the message"
+msgstr "Mostrar o cÃ³digo fonte da mensaxe"
 
-#: ../mail/e-mail-search-bar.c:615
-msgid "Reached bottom of page, continued from top"
-msgstr "Atinxiuse o final da pÃ¡xina, continÃºase pola parte superior"
+#: ../mail/e-mail-reader.c:1437
+msgid "_Undelete Message"
+msgstr "_Recuperar a mensaxe"
 
-#: ../mail/e-mail-search-bar.c:637
-msgid "Reached top of page, continued from bottom"
-msgstr "Atinxiuse a parte superior da pÃ¡xina, continÃºase pola parte inferior"
+#: ../mail/e-mail-reader.c:1439
+msgid "Undelete the selected messages"
+msgstr "Recuperar as mensaxes seleccionadas"
+
+#: ../mail/e-mail-reader.c:1444
+msgid "_Normal Size"
+msgstr "TamaÃ±o _normal"
+
+#: ../mail/e-mail-reader.c:1446
+msgid "Reset the text to its original size"
+msgstr "Restabelecer o texto ao seu tamaÃ±o orixinal"
+
+#: ../mail/e-mail-reader.c:1451
+msgid "_Zoom In"
+msgstr "_Ampliar"
+
+#: ../mail/e-mail-reader.c:1453
+msgid "Increase the text size"
+msgstr "Aumentar o tamaÃ±o do texto"
+
+#: ../mail/e-mail-reader.c:1458
+msgid "Zoom _Out"
+msgstr "_Reducir"
+
+#: ../mail/e-mail-reader.c:1460
+msgid "Decrease the text size"
+msgstr "DiminuÃr o tamaÃ±o do texto"
+
+#: ../mail/e-mail-reader.c:1467
+msgid "Create R_ule"
+msgstr "Crear r_egra"
+
+#: ../mail/e-mail-reader.c:1474
+msgid "Ch_aracter Encoding"
+msgstr "CodificaciÃ³n de car_acteres"
+
+#: ../mail/e-mail-reader.c:1481
+msgid "F_orward As"
+msgstr "Reen_viar como..."
+
+#: ../mail/e-mail-reader.c:1488
+msgid "_Go To"
+msgstr "_Ir a"
+
+#: ../mail/e-mail-reader.c:1495
+msgid "Mar_k As"
+msgstr "Mar_car como"
+
+#: ../mail/e-mail-reader.c:1502
+msgid "_Message"
+msgstr "_Mensaxe"
+
+#: ../mail/e-mail-reader.c:1509
+msgid "_Zoom"
+msgstr "_Zoom"
+
+#: ../mail/e-mail-reader.c:1534
+msgid "Mark for Follo_w Up..."
+msgstr "Marcar para _seguimento..."
+
+#: ../mail/e-mail-reader.c:1542
+msgid "Mark as _Important"
+msgstr "Marcar como _importante"
+
+#: ../mail/e-mail-reader.c:1546
+msgid "Mark as _Junk"
+msgstr "Marcar como correo _non desexado"
+
+#: ../mail/e-mail-reader.c:1550
+msgid "Mark as _Not Junk"
+msgstr "Desmarcar como correo non dese_xado"
+
+#: ../mail/e-mail-reader.c:1554
+msgid "Mar_k as Read"
+msgstr "Marcar como _lida"
+
+#: ../mail/e-mail-reader.c:1558
+msgid "Mark as Uni_mportant"
+msgstr "Marcar como non im_portante"
+
+#: ../mail/e-mail-reader.c:1562
+msgid "Mark as _Unread"
+msgstr "Marcar como _non lida"
+
+#: ../mail/e-mail-reader.c:1598
+msgid "_Caret Mode"
+msgstr "Activar _cursor"
+
+#: ../mail/e-mail-reader.c:1600
+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:1606
+msgid "All Message _Headers"
+msgstr "Todas as ca_beceiras da mensaxe"
+
+#: ../mail/e-mail-reader.c:1608
+msgid "Show messages with all email headers"
+msgstr "Mostrar as mensaxes con todas as cabeceiras de correo electrÃ³nico"
+
+#: ../mail/e-mail-reader.c:1831
+msgid "Unable to retrieve message"
+msgstr "Non foi posÃbel obter a mensaxe"
+
+#: ../mail/e-mail-reader.c:1876 ../mail/mail-ops.c:1849
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "Recuperando a mensaxe %s"
+
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/e-mail-reader.c:2370
+#: ../plugins/google-account-setup/google-source.c:304
+#: ../plugins/google-account-setup/google-source.c:534
+#: ../plugins/google-account-setup/google-source.c:656
+#: ../widgets/misc/e-account-tree-view.c:234
+msgid "Default"
+msgstr "Predefinido"
+
+#: ../mail/e-mail-reader.c:2489
+#: ../modules/mail/e-mail-attachment-handler.c:134
+msgid "_Forward"
+msgstr "_Reenviar"
+
+#: ../mail/e-mail-reader.c:2490
+msgid "Forward the selected message to someone"
+msgstr "Reenviar a alguÃ©n a mensaxe seleccionada"
+
+#: ../mail/e-mail-reader.c:2534 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:753
+msgid "Delete"
+msgstr "Eliminar"
+
+#: ../mail/e-mail-reader.c:2538
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+#: ../widgets/misc/e-calendar.c:193
+msgid "Next"
+msgstr "Seguinte"
+
+#: ../mail/e-mail-reader.c:2542
+#: ../modules/calendar/e-cal-shell-view-actions.c:1243
+#: ../widgets/misc/e-calendar.c:169
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../mail/e-mail-reader.c:2546 ../mail/mail-dialogs.ui.h:18
+msgid "Reply"
+msgstr "Responder"
+
+#: ../mail/e-mail-tag-editor.c:292
+msgid "Flag to Follow Up"
+msgstr "Marcar para facer seguimento"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:309
+#: ../mail/em-account-editor.c:500 ../mail/mail-config.ui.h:72
+#: ../modules/addressbook/ldap-config.ui.h:10
 msgid "No encryption"
 msgstr "Sen cifrado"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:313
+#: ../mail/em-account-editor.c:504 ../mail/mail-config.ui.h:120
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:317
+#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:93
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
-#: ../mail/em-account-editor.c:408
+#: ../mail/em-account-editor.c:595
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acordo de licenza %s"
 
-#: ../mail/em-account-editor.c:415
+#: ../mail/em-account-editor.c:602
 #, c-format
 msgid ""
 "\n"
@@ -10771,126 +10148,154 @@ msgstr ""
 "para %s que se mostra abaixo\n"
 "e marque a caixa de verificaciÃ³n para aceptalo\n"
 
-#: ../mail/em-account-editor.c:487 ../mail/em-filter-folder-element.c:258
-#: ../mail/em-vfolder-rule.c:513
-msgid "Select Folder"
-msgstr "Seleccionar cartafol"
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:882 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "NingÃºn"
 
-#: ../mail/em-account-editor.c:797
+#: ../mail/em-account-editor.c:965
 msgid "Never"
 msgstr "Nunca"
 
-#: ../mail/em-account-editor.c:798
+#: ../mail/em-account-editor.c:966
 msgid "Always"
 msgstr "Sempre"
 
-#: ../mail/em-account-editor.c:799
+#: ../mail/em-account-editor.c:967
 msgid "Ask for each message"
 msgstr "Preguntar para cada mensaxe"
 
-#: ../mail/em-account-editor.c:1877 ../mail/mail-config.glade.h:100
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "NingÃºn"
+
+#: ../mail/em-account-editor.c:2055
+msgid "Mail Configuration"
+msgstr "ConfiguraciÃ³n do correo"
+
+#: ../mail/em-account-editor.c:2056
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin."
+msgstr ""
+"DÃ¡moslle a benvida ao asistente de configuraciÃ³n de correo do Evolution.\n"
+"\n"
+"Prema en \"Adiante\" para comezar."
+
+#: ../mail/em-account-editor.c:2058 ../mail/em-account-editor.c:2194
+#: ../mail/mail-config.ui.h:58
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../mail/em-account-editor.c:1928 ../mail/mail-config.glade.h:127
+#: ../mail/em-account-editor.c:2059
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Introduza o seu nome e enderezo de correo abaixo. Os campos \"opcionais\" de "
+"abaixo non necesitan encherse, a non ser que desexe incluÃr esta informaciÃ³n "
+"no correo que envÃe."
+
+#: ../mail/em-account-editor.c:2061 ../mail/em-account-editor.c:2231
+#: ../mail/mail-config.ui.h:90
 msgid "Receiving Email"
 msgstr "Recibindo correo"
 
-#: ../mail/em-account-editor.c:2200
+#: ../mail/em-account-editor.c:2062
+msgid "Please configure the following account settings."
+msgstr "Configure as seguintes opciÃ³ns de conta."
+
+#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2708
+msgid "Sending Email"
+msgstr "Enviando correo"
+
+#: ../mail/em-account-editor.c:2065
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"Introduza informaciÃ³n sobre a maneira na que envÃa o correo. Se non estÃ¡ "
+"seguro, pregunte ao seu administrador do sistema ou provedor de acceso a "
+"Internet."
+
+#: ../mail/em-account-editor.c:2067
+msgid "Account Management"
+msgstr "XestiÃ³n de contas"
+
+#: ../mail/em-account-editor.c:2068
+msgid ""
+"Please enter a descriptive name for this account in the space below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"Introduza un nome descritivo para esta conta no espazo de abaixo.\n"
+"Este nome usarase sÃ³ para os efectos de visualizaciÃ³n."
+
+#: ../mail/em-account-editor.c:2072
+msgid "Done"
+msgstr "Feito"
+
+#: ../mail/em-account-editor.c:2073
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"ParabÃ©ns! concluÃu a configuraciÃ³n do correo.\n"
+"\n"
+"Agora estÃ¡ preparado para enviar e recibir correo \n"
+"usando o Evolution. \n"
+"\n"
+"Prema en \"Aplicar\" para gardar a sÃºa configuraciÃ³n."
+
+#: ../mail/em-account-editor.c:2518
 msgid "Check for _new messages every"
 msgstr "Verificar automaticamente se hai mensaxes _novas cada"
 
-#: ../mail/em-account-editor.c:2208
+#: ../mail/em-account-editor.c:2526
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:2398 ../mail/mail-config.glade.h:138
-msgid "Sending Email"
-msgstr "Enviando correo"
-
-#: ../mail/em-account-editor.c:2457 ../mail/mail-config.glade.h:73
+#: ../mail/em-account-editor.c:2772 ../mail/mail-config.ui.h:31
 msgid "Defaults"
-msgstr "Predeterminados"
+msgstr "Predefinidos"
 
-#. Security settings
-#: ../mail/em-account-editor.c:2523 ../mail/mail-config.glade.h:133
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../mail/em-account-editor.c:2834 ../mail/mail-config.ui.h:100
 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:2560 ../mail/em-account-editor.c:2655
+#: ../mail/em-account-editor.c:2871 ../mail/em-account-editor.c:2939
 msgid "Receiving Options"
 msgstr "OpciÃ³ns de recepciÃ³n"
 
-#: ../mail/em-account-editor.c:2561 ../mail/em-account-editor.c:2656
+#: ../mail/em-account-editor.c:2872 ../mail/em-account-editor.c:2940
 msgid "Checking for New Messages"
 msgstr "Comprobando se hai mensaxes novas"
 
-#: ../mail/em-account-editor.c:3123 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3408
 msgid "Account Editor"
 msgstr "Editor de contas"
 
-#: ../mail/em-account-editor.c:3123 ../mail/mail-config.glade.h:89
+#: ../mail/em-account-editor.c:3408
 msgid "Evolution Account Assistant"
 msgstr "Asistente de contas do Evolution"
 
-#. translators: default account indicator
-#: ../mail/em-account-prefs.c:426
-msgid "[Default]"
-msgstr "[Predeterminado]"
-
-#: ../mail/em-account-prefs.c:483
-msgid "Account name"
-msgstr "Nome da conta"
-
-#: ../mail/em-account-prefs.c:485
-msgid "Protocol"
-msgstr "Protocolo"
-
-#: ../mail/em-composer-prefs.c:318 ../mail/em-composer-prefs.c:452
-#: ../mail/mail-config.c:1160 ../mail/mail-signature-editor.c:481
-msgid "Unnamed"
-msgstr "Sen nome"
-
-#: ../mail/em-composer-prefs.c:961
-msgid "Language(s)"
-msgstr "Idioma(s)"
-
-#: ../mail/em-composer-prefs.c:994
-msgid "Add signature script"
-msgstr "Engadir script de sinatura"
-
-#: ../mail/em-composer-prefs.c:1036
-msgid "Signature(s)"
-msgstr "Sinatura(s)"
-
-#: ../mail/em-composer-utils.c:1132 ../mail/em-format-quote.c:415
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Mensaxe reenviada --------"
-
-#: ../mail/em-composer-utils.c:1585
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
-msgstr ""
-"Non se proporcionou ningÃºn enderezo de destino; foi cancelado o reenvÃo da "
-"mensaxe."
-
-#: ../mail/em-composer-utils.c:1591
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr ""
-"Non se encontrou ningunha conta para usar; foi cancelado o reenvÃo da "
-"mensaxe."
-
-#: ../mail/em-composer-utils.c:2058
+#: ../mail/em-composer-utils.c:1954
 msgid "an unknown sender"
 msgstr "un remitente descoÃ±ecido"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2105
+#: ../mail/em-composer-utils.c:2001
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10898,13 +10303,21 @@ msgstr ""
 "O ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} Ã¡s ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribiu:"
 
-#: ../mail/em-composer-utils.c:2248
+#: ../mail/em-composer-utils.c:2145
 msgid "-----Original Message-----"
 msgstr "-----Mensaxe orixinal-----"
 
-#: ../mail/em-filter-editor.c:172
-msgid "_Filter Rules"
-msgstr "Regras de _filtro"
+#: ../mail/em-composer-utils.c:2326
+msgid "Posting destination"
+msgstr "Destino onde publicar"
+
+#: ../mail/em-composer-utils.c:2327
+msgid "Choose folders to post the message to."
+msgstr "Escolla os cartafoles nos que publicar a mensaxe."
+
+#: ../mail/em-filter-folder-element.c:258
+msgid "Select Folder"
+msgstr "Seleccionar cartafol"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -10927,10 +10340,6 @@ msgstr "Ton de aviso"
 msgid "Completed On"
 msgstr "Terminado o"
 
-#: ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "Copiar ao cartafol"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "Data de recepciÃ³n"
@@ -10939,14 +10348,6 @@ msgstr "Data de recepciÃ³n"
 msgid "Date sent"
 msgstr "Data de envÃo"
 
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:765
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
-#: ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Eliminar"
-
 #: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Eliminada"
@@ -10995,10 +10396,6 @@ msgstr "Seguimento"
 msgid "Forward to"
 msgstr "Reenviar a"
 
-#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
-msgid "Important"
-msgstr "Importante"
-
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "Ã© posterior a"
@@ -11023,8 +10420,7 @@ msgstr "non estÃ¡ definida"
 msgid "is set"
 msgstr "estÃ¡ definida"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:102
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
 msgid "Junk"
 msgstr "Correo non desexado"
 
@@ -11064,10 +10460,6 @@ msgstr "A mensaxe non Ã© un correo non desexado"
 msgid "Message Location"
 msgstr "LocalizaciÃ³n da mensaxe"
 
-#: ../mail/em-filter-i18n.h:51
-msgid "Move to Folder"
-msgstr "Mover ao cartafol"
-
 #: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "Canalizar para o programa"
@@ -11076,8 +10468,8 @@ msgstr "Canalizar para o programa"
 msgid "Play Sound"
 msgstr "Reproducir son"
 
-#. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
+#. Past tense, as in "has been read".
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
 msgid "Read"
 msgstr "Ler"
 
@@ -11153,75 +10545,19 @@ msgstr "comeza por"
 msgid "Stop Processing"
 msgstr "Deter o procesamento"
 
-#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
-#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:300
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1112
-msgid "Subject"
-msgstr "Asunto"
-
 #: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "Desfacer a definiciÃ³n de estado"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:530
 msgid "Then"
 msgstr "EntÃ³n"
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:561
 msgid "Add Ac_tion"
 msgstr "Engadir a_cciÃ³n"
 
-#: ../mail/em-folder-browser.c:194
-msgid "C_reate Search Folder From Search..."
-msgstr "C_rear un cartafol de busca por busca..."
-
-#: ../mail/em-folder-browser.c:219
-msgid "All Messages"
-msgstr "Todas as mensaxes"
-
-#: ../mail/em-folder-browser.c:220
-msgid "Unread Messages"
-msgstr "Mensaxes non lidas"
-
-#: ../mail/em-folder-browser.c:222
-msgid "No Label"
-msgstr "Sen etiqueta"
-
-#: ../mail/em-folder-browser.c:229
-msgid "Read Messages"
-msgstr "Mensaxes lidas"
-
-#: ../mail/em-folder-browser.c:230
-msgid "Recent Messages"
-msgstr "Mensaxes recentes"
-
-#: ../mail/em-folder-browser.c:231
-msgid "Last 5 Days' Messages"
-msgstr "Mensaxes dos Ãºltimos 5 dÃas"
-
-#: ../mail/em-folder-browser.c:232
-msgid "Messages with Attachments"
-msgstr "Mensaxes con anexos"
-
-#: ../mail/em-folder-browser.c:233
-msgid "Important Messages"
-msgstr "Mensaxes importantes"
-
-#: ../mail/em-folder-browser.c:234
-msgid "Messages Not Junk"
-msgstr "Mensaxes que non son lixo"
-
-#: ../mail/em-folder-browser.c:1194
-msgid "Account Search"
-msgstr "Buscar na conta"
-
-#: ../mail/em-folder-browser.c:1256
-msgid "All Account Search"
-msgstr "Buscar en todas as contas"
-
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
@@ -11247,64 +10583,47 @@ msgstr "Cuota de uso (%s):"
 msgid "Quota usage"
 msgstr "Cuota de uso"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
-#: ../mail/em-folder-tree.c:2602 ../mail/mail-component.c:168
-#: ../mail/mail-component.c:608
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:593
-msgid "Inbox"
-msgstr "Caixa de entrada"
-
-#: ../mail/em-folder-properties.c:390
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../mail/em-folder-properties.c:399
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Folder Properties"
 msgstr "Propiedades do cartafol"
 
-#: ../mail/em-folder-selection-button.c:120
+#: ../mail/em-folder-selection-button.c:75
 msgid "<click here to select a folder>"
 msgstr "<prema aquÃ para seleccionar un cartafol>"
 
-#: ../mail/em-folder-selector.c:249
+#: ../mail/em-folder-selector.c:266
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../mail/em-folder-selector.c:253
+#: ../mail/em-folder-selector.c:270
 msgid "Folder _name:"
 msgstr "_Nome do cartafol:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:195 ../mail/em-folder-tree-model.c:197
-#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
+#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
 msgid "Search Folders"
 msgstr "Cartafoles de busca"
 
-#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:156
 msgid "UNMATCHED"
 msgstr "SEN EQUIVALENCIA"
 
-#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
-msgid "Drafts"
-msgstr "Borradores"
-
-#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:172
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "Modelos"
-
-#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170
-msgid "Outbox"
-msgstr "Caixa de saÃda"
-
-#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
-msgid "Sent"
-msgstr "Enviado"
-
-#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
+#: ../mail/em-folder-tree-model.c:726 ../mail/em-folder-tree-model.c:1063
 msgid "Loading..."
 msgstr "Cargando..."
 
+#: ../mail/em-folder-tree.c:188
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "Examinando os cartafoles en \"%s\""
+
+#: ../mail/em-folder-tree.c:589
+msgid "Folder names cannot contain '/'"
+msgstr "Os nomes dos cartafoles non poden conter o carÃ¡cter '/'"
+
 #. Translators: This is the string used for displaying the
 #. * folder names in folder trees. The first "%s" will be
 #. * replaced by the folder's name and "%u" will be replaced
@@ -11319,284 +10638,78 @@ msgstr "Cargando..."
 #. * (like Arabic and Hebrew) may need to add bidirectional
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
+#. *
+#. * Do not translate the "folder-display|" part. Remove it
+#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:318
+#: ../mail/em-folder-tree.c:1071
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:727
+#: ../mail/em-folder-tree.c:1277
 msgid "Mail Folder Tree"
 msgstr "Ã?rbore de cartafoles de correo"
 
-#: ../mail/em-folder-tree.c:886
+#: ../mail/em-folder-tree.c:1477 ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movendo o cartafol %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:1479 ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando cartafol %s"
 
-#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2018
+#: ../mail/em-folder-tree.c:1486 ../mail/message-list.c:2103
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2020
+#: ../mail/em-folder-tree.c:1488 ../mail/message-list.c:2105
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:912
+#: ../mail/em-folder-tree.c:1503
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Non se poden soltar as mensaxes no almacenamento do nivel superior"
 
-#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
-msgid "_Copy to Folder"
-msgstr "_Copiar ao cartafol"
-
-#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
-msgid "_Move to Folder"
-msgstr "_Mover ao cartafol"
-
-#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2110
-msgid "_Move"
-msgstr "_Mover"
-
-#: ../mail/em-folder-tree.c:994 ../mail/message-list.c:2112
-msgid "Cancel _Drag"
-msgstr "Cancelar o _arrastre"
-
-#: ../mail/em-folder-tree.c:1702 ../mail/mail-ops.c:1063
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Examinando os cartafoles en \"%s\""
-
-#: ../mail/em-folder-tree.c:2107
-msgid "Open in _New Window"
-msgstr "Abrir nunha _nova xanela"
-
-#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2112
-msgid "_New Folder..."
-msgstr "Cartafol _novo..."
-
-#: ../mail/em-folder-tree.c:2115
-msgid "_Move..."
-msgstr "_Mover..."
-
-#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh"
-msgstr "Ac_tualizar"
-
-#: ../mail/em-folder-tree.c:2124
-msgid "Fl_ush Outbox"
-msgstr "Lim_par a caixa de saÃda"
-
-#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:138
-msgid "_Empty Trash"
-msgstr "_Baleirar o lixo"
-
-#: ../mail/em-folder-tree.c:2232
-msgid "_Unread Search Folder"
-msgstr "Cartafol de busca de mensaxes sen _ler"
-
-#: ../mail/em-folder-utils.c:99
-#, c-format
-msgid "Copying `%s' to `%s'"
-msgstr "Copiando `%s' a `%s'"
-
-#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:302
-msgid "Select folder"
-msgstr "Seleccionar cartafol"
+#: ../mail/em-folder-utils.c:386
+msgid "Move Folder To"
+msgstr "_Mover o cartafol a..."
 
-#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
-msgid "C_opy"
-msgstr "C_opiar"
+#: ../mail/em-folder-utils.c:386
+msgid "Copy Folder To"
+msgstr "_Copiar cartafol a..."
 
-#: ../mail/em-folder-utils.c:537
-#: ../plugins/groupwise-features/share-folder-common.c:144
+#: ../mail/em-folder-utils.c:499
+#: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando o cartafol `%s'"
 
-#: ../mail/em-folder-utils.c:695
-#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
-msgid "Create folder"
+#: ../mail/em-folder-utils.c:662
+msgid "Create Folder"
 msgstr "Crear cartafol"
 
-#: ../mail/em-folder-utils.c:695
-#: ../plugins/groupwise-features/install-shared.c:168
-#: ../plugins/groupwise-features/share-folder-common.c:385
+#: ../mail/em-folder-utils.c:663
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde crear o cartafol:"
 
-#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
-msgid "Mail Deletion Failed"
-msgstr "Fallou a eliminaciÃ³n de correo"
-
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "Vostede non ten os permisos suficientes para eliminar este correo."
-
-#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:102
-msgid "_Edit as New Message..."
-msgstr "_Editar como unha mensaxe nova..."
-
-#: ../mail/em-folder-view.c:1341
-msgid "U_ndelete"
-msgstr "Rec_uperar"
-
-#: ../mail/em-folder-view.c:1342
-msgid "_Move to Folder..."
-msgstr "_Mover ao cartafol..."
-
-#: ../mail/em-folder-view.c:1343
-msgid "_Copy to Folder..."
-msgstr "_Copiar ao cartafol..."
-
-#: ../mail/em-folder-view.c:1346
-msgid "Mar_k as Read"
-msgstr "Marcar como _lida"
-
-#: ../mail/em-folder-view.c:1347
-msgid "Mark as _Unread"
-msgstr "Marcar como _non lida"
-
-#: ../mail/em-folder-view.c:1348
-msgid "Mark as _Important"
-msgstr "Marcar como _importante"
-
-#: ../mail/em-folder-view.c:1349
-msgid "Mark as Un_important"
-msgstr "Marcar como non im_portante"
-
-#: ../mail/em-folder-view.c:1350
-msgid "Mark as _Junk"
-msgstr "Marcar como correo _non desexado"
-
-#: ../mail/em-folder-view.c:1351
-msgid "Mark as _Not Junk"
-msgstr "Desmarcar como correo non dese_xado"
-
-#: ../mail/em-folder-view.c:1352
-msgid "Mark for Follo_w Up..."
-msgstr "Marcar para _seguimento..."
-
-#: ../mail/em-folder-view.c:1354
-msgid "_Label"
-msgstr "_Etiqueta"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:469
-msgid "_None"
-msgstr "_NingÃºn"
-
-#: ../mail/em-folder-view.c:1358
-msgid "_New Label"
-msgstr "Etiqueta _nova"
-
-#: ../mail/em-folder-view.c:1362
-msgid "Fla_g Completed"
-msgstr "M_arcar como terminado"
-
-#: ../mail/em-folder-view.c:1363
-msgid "Cl_ear Flag"
-msgstr "E_liminar marca"
-
-#: ../mail/em-folder-view.c:1366
-msgid "Crea_te Rule From Message"
-msgstr "Crear reg_ra a partir da mensaxe"
-
-#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1368
-msgid "Search Folder based on _Subject"
-msgstr "Cartafol de busca por _tema"
-
-#: ../mail/em-folder-view.c:1369
-msgid "Search Folder based on Se_nder"
-msgstr "Cartafol de busca por re_mitente"
-
-#: ../mail/em-folder-view.c:1370
-msgid "Search Folder based on _Recipients"
-msgstr "Cartafol de busca por _destinatarios"
-
-#: ../mail/em-folder-view.c:1371
-msgid "Search Folder based on Mailing _List"
-msgstr "Cartafol de busca por _lista de correo"
-
-#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1376
-msgid "Filter based on Sub_ject"
-msgstr "Filtrar por t_ema"
-
-#: ../mail/em-folder-view.c:1377
-msgid "Filter based on Sen_der"
-msgstr "Filtrar por re_mitente"
-
-#: ../mail/em-folder-view.c:1378
-msgid "Filter based on Re_cipients"
-msgstr "Filtrar por desti_natarios"
-
-#: ../mail/em-folder-view.c:1379
-msgid "Filter based on _Mailing List"
-msgstr "Filtrar por lista de _correo"
-
-#. default charset used in mail view
-#. we changed user, thus reset the chosen calendar combo too, because
-#. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2232 ../mail/em-folder-view.c:2275
-#: ../plugins/google-account-setup/google-source.c:303
-#: ../plugins/google-account-setup/google-source.c:593
-#: ../plugins/google-account-setup/google-source.c:764
-msgid "Default"
-msgstr "Predeterminado"
-
-#: ../mail/em-folder-view.c:2493
-msgid "Unable to retrieve message"
-msgstr "Non se puido obter a mensaxe"
-
-#: ../mail/em-folder-view.c:2696
-msgid "Create _Search Folder"
-msgstr "Crear cartafol de _busca"
-
-#: ../mail/em-folder-view.c:2697
-msgid "_From this Address"
-msgstr "_dende este enderezo"
-
-#: ../mail/em-folder-view.c:2698
-msgid "_To this Address"
-msgstr "_A este enderezo"
-
-#: ../mail/em-folder-view.c:3191
+#: ../mail/em-folder-utils.c:679
 #, c-format
-msgid "Click to mail %s"
-msgstr "Prema para enviar un correo a %s"
-
-#: ../mail/em-folder-view.c:3203
-#, c-format
-msgid "Click to call %s"
-msgstr "Prema para chamar %s"
-
-#: ../mail/em-folder-view.c:3208
-msgid "Click to hide/unhide addresses"
-msgstr "Prema para ocultar ou mostrar os enderezos"
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Eliminando a subscriciÃ³n do cartafol \"%s\""
 
-#: ../mail/em-format-html-display.c:560 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
 msgid "Unsigned"
 msgstr "Non asinado"
 
-#: ../mail/em-format-html-display.c:560
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11604,11 +10717,11 @@ msgstr ""
 "Esta mensaxe non estÃ¡ asinada. Non hai garantÃa de que a mensaxe sexa "
 "autÃ©ntica."
 
-#: ../mail/em-format-html-display.c:561 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
 msgid "Valid signature"
 msgstr "Sinatura vÃ¡lida"
 
-#: ../mail/em-format-html-display.c:561
+#: ../mail/em-format-html-display.c:104
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11616,11 +10729,11 @@ msgstr ""
 "Esta mensaxe estÃ¡ asinada e Ã© vÃ¡lida, o que significa que Ã© moi probÃ¡bel que "
 "a mensaxe sexa autÃ©ntica."
 
-#: ../mail/em-format-html-display.c:562 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
 msgid "Invalid signature"
 msgstr "Sinatura non vÃ¡lida"
 
-#: ../mail/em-format-html-display.c:562
+#: ../mail/em-format-html-display.c:105
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11628,23 +10741,23 @@ msgstr ""
 "A sinatura desta mensaxe non se pode verificar, puido ser alterada en "
 "trÃ¡nsito."
 
-#: ../mail/em-format-html-display.c:563 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
 msgid "Valid signature, but cannot verify sender"
 msgstr "A sinatura Ã© vÃ¡lida, mais non se pode verificar o remitente"
 
-#: ../mail/em-format-html-display.c:563
+#: ../mail/em-format-html-display.c:106
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
-"Esta mensaxe estÃ¡ asinada cunha sinatura vÃ¡lida, mais non se puido verificar "
-"o remitente da mensaxe."
+"Esta mensaxe estÃ¡ asinada cunha sinatura vÃ¡lida, mais non foi posÃbel "
+"verificar o remitente da mensaxe."
 
-#: ../mail/em-format-html-display.c:564 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
 msgid "Signature exists, but need public key"
 msgstr "A sinatura existe, mais precisa unha chave pÃºblica"
 
-#: ../mail/em-format-html-display.c:564
+#: ../mail/em-format-html-display.c:107
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -11652,11 +10765,11 @@ msgstr ""
 "Esta mensaxe estÃ¡ asinada cunha sinatura, mais non existe unha chave pÃºblica "
 "correspondente."
 
-#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:664
+#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
 msgid "Unencrypted"
 msgstr "Non cifrada"
 
-#: ../mail/em-format-html-display.c:571
+#: ../mail/em-format-html-display.c:114
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11664,11 +10777,11 @@ msgstr ""
 "Esta mensaxe non estÃ¡ cifrada. O seu contido pode verse en trÃ¡nsito a travÃ©s "
 "de Internet."
 
-#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
 msgid "Encrypted, weak"
 msgstr "Cifrada; dÃ©bil"
 
-#: ../mail/em-format-html-display.c:572
+#: ../mail/em-format-html-display.c:115
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11678,11 +10791,11 @@ msgstr ""
 "difÃcil, mais non imposÃbel para un intruso ver o contido desta mensaxe "
 "dentro dun perÃodo de tempo Ãºtil."
 
-#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
 msgid "Encrypted"
 msgstr "Cifrada"
 
-#: ../mail/em-format-html-display.c:573
+#: ../mail/em-format-html-display.c:116
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11690,11 +10803,11 @@ msgstr ""
 "Esta mensaxe estÃ¡ cifrada. SerÃa difÃcil para un intruso ver o contido desta "
 "mensaxe."
 
-#: ../mail/em-format-html-display.c:574 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
 msgid "Encrypted, strong"
 msgstr "Cifrada; forte"
 
-#: ../mail/em-format-html-display.c:574
+#: ../mail/em-format-html-display.c:117
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -11703,511 +10816,228 @@ msgstr ""
 "Esta mensaxe estÃ¡ cifrada cun algoritmo de cifrado forte. SerÃa moi difÃcil "
 "para un intruso ver o contido desta mensaxe dentro dun perÃodo de tempo Ãºtil."
 
-#: ../mail/em-format-html-display.c:675 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Ver o certificado"
 
-#: ../mail/em-format-html-display.c:690
+#: ../mail/em-format-html-display.c:261
 msgid "This certificate is not viewable"
 msgstr "Este certificado non Ã© visÃbel"
 
-#: ../mail/em-format-html-display.c:980
+#: ../mail/em-format-html-display.c:509
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+"O Evolution non pode renderizar este correo electrÃ³nico porque o seu "
+"procesamento demora demasiado. Pode visualizalo sen formato ou ben cun "
+"editor de texto externo."
+
+#: ../mail/em-format-html-display.c:738
 msgid "Completed on"
 msgstr "Terminado o"
 
-#: ../mail/em-format-html-display.c:988
+#: ../mail/em-format-html-display.c:746
 msgid "Overdue:"
 msgstr "Atrasada:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:992
+#: ../mail/em-format-html-display.c:750
 msgid "by"
 msgstr "por"
 
-#: ../mail/em-format-html-display.c:1071
-#: ../widgets/misc/e-attachment-view.c:357
-msgid "_View Inline"
-msgstr "_Ver en liÃ±a"
-
-#: ../mail/em-format-html-display.c:1072
-#: ../widgets/misc/e-attachment-view.c:350
-msgid "_Hide"
-msgstr "_Ocultar"
-
-#: ../mail/em-format-html-display.c:1073
-msgid "_Fit to Width"
-msgstr "A_xustar Ã¡ largura"
-
-#: ../mail/em-format-html-display.c:1074
-msgid "Show _Original Size"
-msgstr "Mostrar tamaÃ±o _orixinal"
-
-#: ../mail/em-format-html-display.c:1575 ../mail/em-format-html-display.c:1614
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html-display.c:997
 msgid "View _Unformatted"
 msgstr "Ver sen _formato"
 
-#: ../mail/em-format-html-display.c:1577
+#: ../mail/em-format-html-display.c:960
 msgid "Hide _Unformatted"
 msgstr "Ocultar sen _formato"
 
-#: ../mail/em-format-html-display.c:1634
+#: ../mail/em-format-html-display.c:1017
 msgid "O_pen With"
 msgstr "A_brir con"
 
-#: ../mail/em-format-html-display.c:1711
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"O Evolution non pode renderizar este correo electrÃ³nico porque o seu "
-"procesamento demora demasiado. Pode visualizalo sen formato ou ben cun "
-"editor de texto externo."
-
-#: ../mail/em-format-html-print.c:157
+#: ../mail/em-format-html-print.c:163
 #, c-format
 msgid "Page %d of %d"
 msgstr "PÃ¡xina %d de %d"
 
-#: ../mail/em-format-html.c:505 ../mail/em-format-html.c:514
+#: ../mail/em-format-html.c:165
+msgid "Formatting message"
+msgstr "Formatando a mensaxe"
+
+#: ../mail/em-format-html.c:356
+msgid "Formatting Message..."
+msgstr "Formatando a mensaxe..."
+
+#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Recuperando `%s'"
 
-#: ../mail/em-format-html.c:929
+#: ../mail/em-format-html.c:1854
 msgid "Unknown external-body part."
 msgstr "Parte do corpo externo descoÃ±ecida."
 
-#: ../mail/em-format-html.c:937
+#: ../mail/em-format-html.c:1862
 msgid "Malformed external-body part."
 msgstr "Parte do corpo externo formada incorrectamente."
 
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:1892
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro ao sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:978
+#: ../mail/em-format-html.c:1903
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Punteiro ao ficheiro local (%s) vÃ¡lido no sitio \"%s\""
 
-#: ../mail/em-format-html.c:980
+#: ../mail/em-format-html.c:1905
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro ao ficheiro local (%s)"
 
-#: ../mail/em-format-html.c:1001
+#: ../mail/em-format-html.c:1926
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro aos datos remotos (%s)"
 
-#: ../mail/em-format-html.c:1012
+#: ../mail/em-format-html.c:1937
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro aos datos externos descoÃ±ecidos (tipo \"%s\")"
 
-#: ../mail/em-format-html.c:1240
-msgid "Formatting message"
-msgstr "Formatando a mensaxe"
-
-#: ../mail/em-format-html.c:1414
-msgid "Formatting Message..."
-msgstr "Formatando a mensaxe..."
-
-#: ../mail/em-format-html.c:1567 ../mail/em-format-html.c:1631
-#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:79
-msgid "Cc"
-msgstr "Cc"
-
-#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1637
-#: ../mail/em-format-html.c:1655 ../mail/em-format-quote.c:209
-#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:80
-msgid "Bcc"
-msgstr "Cco"
-
-#. pseudo-header
-#: ../mail/em-format-html.c:1747 ../mail/em-format-quote.c:352
-#: ../mail/em-mailer-prefs.c:1435
-msgid "Mailer"
-msgstr "Aplicativo de correo"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1910
+#: ../mail/em-format-html.c:2595
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Esta mensaxe foi enviada por <b>%s</b> no nome de <b>%s</b>"
 
-#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
-#: ../mail/em-mailer-prefs.c:77
-msgid "Reply-To"
-msgstr "Responder a"
-
-#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:82
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:316
-#: ../widgets/misc/e-dateedit.c:338
-msgid "Date"
-msgstr "Data"
-
-#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:83
-msgid "Newsgroups"
-msgstr "Grupos de noticias"
-
-#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:84
-#: ../plugins/face/org-gnome-face.eplug.xml.h:4
-msgid "Face"
-msgstr "Cara"
-
-#: ../mail/em-format.c:1201
-#, c-format
-msgid "%s attachment"
-msgstr "%s anexo"
-
-#: ../mail/em-format.c:1239
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Non se puido analizar a mensaxe S/MIME: erro descoÃ±ecido"
-
-#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Non se puido analizar a mensaxe MIME. MostrÃ¡ndoa como orixe."
-
-#: ../mail/em-format.c:1384
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Tipo de cifrado non compatÃbel para multipart/encrypted"
-
-#: ../mail/em-format.c:1394
-msgid "Could not parse PGP/MIME message"
-msgstr "Non se puido analizar a mensaxe PGP/MIME"
-
-#: ../mail/em-format.c:1394
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "Non se puido analizar a mensaxe PGP/MIME: erro descoÃ±ecido"
-
-#: ../mail/em-format.c:1552
-msgid "Unsupported signature format"
-msgstr "O formato da sinatura non Ã© compatÃbel"
-
-#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
-msgid "Error verifying signature"
-msgstr "Produciuse un erro ao verificar a sinatura"
-
-#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
-msgid "Unknown error verifying signature"
-msgstr "Produciuse un erro descoÃ±ecido ao verificar a sinatura"
-
-#: ../mail/em-format.c:1772
-msgid "Could not parse PGP message"
-msgstr "Non se puido analizar a mensaxe PGP"
-
-#: ../mail/em-format.c:1772
-msgid "Could not parse PGP message: Unknown error"
-msgstr "Non se puido analizar a mensaxe PGP: erro descoÃ±ecido"
-
-#: ../mail/em-mailer-prefs.c:95
-msgid "Every time"
-msgstr "Cada vez"
-
-#: ../mail/em-mailer-prefs.c:96
-msgid "Once per day"
-msgstr "Unha vez ao dÃa"
-
-#: ../mail/em-mailer-prefs.c:97
-msgid "Once per week"
-msgstr "Unha vez Ã¡ semana"
-
-#: ../mail/em-mailer-prefs.c:98
-msgid "Once per month"
-msgstr "Unha vez ao mes"
-
-#: ../mail/em-mailer-prefs.c:332
-msgid "Add Custom Junk Header"
-msgstr "Engadir unha cabeceira personalizada para o correo non desexado"
-
-#: ../mail/em-mailer-prefs.c:336
-msgid "Header Name:"
-msgstr "Nome da cabeceira:"
-
-#: ../mail/em-mailer-prefs.c:337
-msgid "Header Value Contains:"
-msgstr "O valor da cabeceira contÃ©n:"
-
-#: ../mail/em-mailer-prefs.c:438 ../widgets/table/e-table-click-to-add.c:500
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "Cabeceira"
-
-#: ../mail/em-mailer-prefs.c:442
-msgid "Contains Value"
-msgstr "ContÃ©n o valor"
-
-#: ../mail/em-mailer-prefs.c:465
-msgid "Color"
-msgstr "Cor"
-
-#: ../mail/em-mailer-prefs.c:468
-msgid "Tag"
-msgstr "Etiqueta"
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1063 ../mail/em-mailer-prefs.c:1117
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "O plugin %s estÃ¡ dispoÃ±Ãbel e o binario estÃ¡ instalado."
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1071 ../mail/em-mailer-prefs.c:1126
-#, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
-msgstr ""
-"O plugin %s non estÃ¡ dispoÃ±Ãbel. Verifique se o paquete estÃ¡ instalado."
-
-#: ../mail/em-mailer-prefs.c:1092
-msgid "No Junk plugin available"
-msgstr "Non hai dispoÃ±Ãbel un plugin de correo non desexado"
-
-#: ../mail/em-mailer-prefs.c:1455
-msgid "Date header:"
-msgstr "Data da cabeceira:"
-
-#. green
-#: ../mail/em-migrate.c:961
-msgid "To Do"
-msgstr "Tarefas pendentes"
-
-#. blue
-#: ../mail/em-migrate.c:962
-msgid "Later"
-msgstr "MÃ¡is tarde"
-
-#: ../mail/em-migrate.c:1128
-msgid "Migration"
-msgstr "MigraciÃ³n"
-
-#: ../mail/em-migrate.c:1573
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "Non Ã© posÃbel crear un cartafol novo: `%s': %s"
-
-#: ../mail/em-migrate.c:1599
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Non Ã© posÃbel copiar o cartafol `%s' en `%s': %s"
-
-#: ../mail/em-migrate.c:1784
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "Non Ã© posÃbel examinar as caixas de correo existentes en `%s': %s"
-
-#: ../mail/em-migrate.c:1789
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"A localizaciÃ³n e a xerarquÃa dos cartafoles da caixa de correo modificouse "
-"dende o Evolution 1.x.\n"
-"\n"
-"Agarde mentres o Evolution migra os seus cartafoles..."
-
-#: ../mail/em-migrate.c:1990
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "Non Ã© posÃbel abrir os datos antigos POP keep-on-server `%s': %s"
-
-#: ../mail/em-migrate.c:2004
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Non Ã© posÃbel crear o directorio de datos POP3 keep-on-server `%s': %s"
-
-#: ../mail/em-migrate.c:2033
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "Non Ã© posÃbel copiar os datos POP3 keep-on-server `%s': %s"
-
-#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "Fallo ao crear o almacenamento de correo local `%s': %s"
-
-#: ../mail/em-migrate.c:2874
-msgid "Migrating Folders"
-msgstr "MigraciÃ³n de cartafoles"
-
-#: ../mail/em-migrate.c:2874
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"O formato de resumo dos cartafoles das caixas de correo do Evolution foron "
-"movidos ao SQLite dende o Evolution 2.24.\n"
-"\n"
-"Sexa paciente mentres o Evolution migra os seus cartafoles..."
-
-#: ../mail/em-migrate.c:2955
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "Non Ã© posÃbel crear os cartafoles de correo local en `%s': %s"
-
-#: ../mail/em-migrate.c:2974
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Non Ã© posÃbel ler a configuraciÃ³n da instalaciÃ³n anterior do Evolution: "
-"`evolution/config.xmldb' non existe ou estÃ¡ danado."
-
-#: ../mail/em-popup.c:364
-msgid "Save As..."
-msgstr "Gardar como..."
-
-#: ../mail/em-popup.c:389
-#, c-format
-msgid "untitled_image.%s"
-msgstr "imaxe_sen tÃtulo.%s"
-
-#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
-msgid "Set as _Background"
-msgstr "Definir como _fondo"
-
-#: ../mail/em-popup.c:497
-msgid "_Reply to sender"
-msgstr "_Responder ao remitente"
-
-#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79
-msgid "Reply to _List"
-msgstr "Responder Ã¡ _lista"
-
-#. make it first item
-#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
-msgid "_Add to Address Book"
-msgstr "_Engadir Ã¡ axenda de enderezos"
-
-#: ../mail/em-popup.c:725
-#, c-format
-msgid "Open in %s..."
-msgstr "Abrir en %s..."
-
-#: ../mail/em-subscribe-editor.c:606
+#: ../mail/em-subscribe-editor.c:586
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Este almacenamento non Ã© compatÃbel con subscriciÃ³ns, ou non estÃ¡n activadas."
 
-#: ../mail/em-subscribe-editor.c:639
+#: ../mail/em-subscribe-editor.c:619
 msgid "Subscribed"
 msgstr "Subscrito"
 
-#: ../mail/em-subscribe-editor.c:643
+#: ../mail/em-subscribe-editor.c:623
 msgid "Folder"
 msgstr "Cartafol"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:858
+#: ../mail/em-subscribe-editor.c:835
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: ../mail/em-subscribe-editor.c:894
+#: ../mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "Non se seleccionou un servidor"
 
-#. Check buttons
-#: ../mail/em-utils.c:121
-#: ../plugins/attachment-reminder/attachment-reminder.c:129
-msgid "_Do not show this message again."
-msgstr "_Non mostrar esta mensaxe outra vez."
-
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:311
 msgid "Message Filters"
 msgstr "Filtros de mensaxe"
 
-#: ../mail/em-utils.c:369
-msgid "message"
-msgstr "mensaxe"
-
-#: ../mail/em-utils.c:652
-msgid "Save Message..."
-msgstr "Gardar mensaxe..."
-
-#: ../mail/em-utils.c:702
-msgid "Add address"
-msgstr "Engadir enderezo"
-
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1223
+#: ../mail/em-utils.c:815
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensaxes de %s"
 
-#: ../mail/em-vfolder-editor.c:114
+#: ../mail/em-vfolder-editor.c:126
 msgid "Search _Folders"
 msgstr "Carta_foles de busca"
 
-#: ../mail/em-vfolder-rule.c:592
-msgid "Search Folder source"
-msgstr "Orixe do cartafol de busca"
+#: ../mail/em-vfolder-rule.c:522
+msgid "Add Folder"
+msgstr "Cartafol"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Filter Editor\" window height"
+msgstr "Altura predefinida da xanela"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Filter Editor\" window maximize state"
+msgstr "Estado maximizado da xanela \"Enviar e recibir correo\""
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Filter Editor\" window width"
+msgstr "Largura predefinida da xanela"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "\"Search Folder Editor\" window height"
+msgstr "Altura predefinida da xanela"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "Estado maximizado da xanela \"Enviar e recibir correo\""
+
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "\"Search Folder Editor\" window width"
+msgstr "Cartafol de busca por _lista de correo"
+
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Send and Receive Mail\" window height"
 msgstr "Altura da xanela \"Enviar e recibir correo\""
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "Estado maximizado da xanela \"Enviar e recibir correo\""
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Send and Receive Mail\" window width"
 msgstr "Largura da xanela \"Enviar e recibir correo\""
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Allows Evolution to display text part of limited size"
 msgstr "Permite que o Evolution mostre unha parte de texto de tamaÃ±o limitado"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "Requirir sempre confirmaciÃ³n de lectura"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic emoticon recognition"
 msgstr "RecoÃ±ecemento automÃ¡tico de emoticonas"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Automatic link recognition"
 msgstr "RecoÃ±ecemento automÃ¡tico da ligazÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Check incoming mail being junk"
 msgstr "Verificar se o correo entrante Ã© correo non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color"
 msgstr "Cor de realce de citas"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Citation highlight color."
 msgstr "Cor de realce de citas."
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default height"
-msgstr "Altura predeterminada da xanela do editor"
+msgstr "Altura predefinida da xanela do editor"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer Window default width"
-msgstr "Largura predeterminada da xanela do editor"
+msgstr "Largura predefinida da xanela do editor"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Composer load/attach directory"
 msgstr "Directorio para cargar/anexar do editor"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Comprimir a visualizaciÃ³n de enderezos en A/CC/CCO"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -12215,7 +11045,7 @@ msgstr ""
 "Comprime a visualizaciÃ³n de enderezos en A/CC/CCO co nÃºmero especificado en "
 "address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -12223,13 +11053,13 @@ 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."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Custom headers to use while checking for junk."
 msgstr ""
 "As cabeceiras personalizadas para usar mentres se verifica o correo non "
 "desexado."
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -12237,59 +11067,63 @@ msgstr ""
 "As cabeceiras personalizadas para usar mentres se verifica o correo non "
 "desexado. A lista de elementos son cadeas no formato \"headername=value\"."
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages"
-msgstr "Conxunto de caracteres predeterminado para escribir mensaxes"
+msgstr "Conxunto de caracteres predefinido para escribir mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to compose messages."
-msgstr "Conxunto de caracteres predeterminado para escribir mensaxes."
+msgstr "Conxunto de caracteres predefinido para escribir mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages"
-msgstr "Conxunto de caracteres predeterminado para mostrar mensaxes"
+msgstr "Conxunto de caracteres predefinido para mostrar mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default charset in which to display messages."
-msgstr "Conxunto de caracteres predeterminado para mostrar mensaxes."
+msgstr "Conxunto de caracteres predefinido para mostrar mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default forward style"
-msgstr "Estilo de reenvÃo predeterminado"
+msgstr "Estilo de reenvÃo predefinido"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the Composer Window."
-msgstr "Altura predeterminada da xanela do editor."
+msgstr "Altura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:26
-msgid "Default height of the message window."
-msgstr "Altura predeterminada da xanela de mensaxe."
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid "Default height of the mail browser window."
+msgstr "Altura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default height of the subscribe dialog."
-msgstr "Altura predeterminada do diÃ¡logo de subscriciÃ³n."
+msgstr "Altura predefinida do diÃ¡logo de subscriciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Default maximized state of the mail browser window."
+msgstr "Largura predefinida da xanela do editor."
+
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default reply style"
-msgstr "Estilo de resposta predeterminado"
+msgstr "Estilo de resposta predefinido"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default value for thread expand state"
-msgstr "Valor predeterminado para o estado expandido do fÃo"
+msgstr "Valor predefinido para o estado expandido do fÃo"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the Composer Window."
-msgstr "Largura predeterminada da xanela do editor."
+msgstr "Largura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:31
-msgid "Default width of the message window."
-msgstr "Largura predeterminada da xanela de mensaxe."
+#: ../mail/evolution-mail.schemas.in.h:38
+msgid "Default width of the mail browser window."
+msgstr "Largura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default width of the subscribe dialog."
-msgstr "Largura predeterminada do diÃ¡logo de subscriciÃ³n."
+msgstr "Largura predefinida do diÃ¡logo de subscriciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -12297,12 +11131,12 @@ msgstr ""
 "Determina se hai que buscar correo non desexado nos enderezos filtrando sÃ³ "
 "as axendas de enderezos locais"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Determina se hai que buscar enderezos de remitentes nas axendas de enderezos"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:42
 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 "
@@ -12315,13 +11149,13 @@ msgstr ""
 "axendas de enderezos remotas (LDAP, por exemplo) estÃ¡n marcadas para o "
 "completado automÃ¡tico."
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Determina se se deben usar cabeceiras personalizadas para comprobar o correo "
 "non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:44
 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 "
@@ -12331,7 +11165,7 @@ msgstr ""
 "non desexado. Se esta opciÃ³n estÃ¡ activada e se mencionan as cabeceiras, "
 "mellorarase a velocidade de comprobaciÃ³n do correo non desexado."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -12339,44 +11173,48 @@ msgstr ""
 "Determina se se debe usar o mesmo tipo de letra para as liÃ±as De e Asunto na "
 "columna Mensaxes da visualizaciÃ³n vertical."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directorio onde cargar/anexar os ficheiros no editor."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Directory for saving mail component files."
 msgstr "Directorio onde gardar os ficheiros enviados por correo."
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 "Desactivar ou activar a elisiÃ³n (...) dos nomes de cartafoles na barra "
 "lateral"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:49
+msgid "Do not add signature delimiter"
+msgstr "Non foi posÃbel gardar o ficheiro de sinatura."
+
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Debuxar os indicadores de erros de ortografÃa nas palabras mentres se "
 "escribe."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Empty Junk folders on exit"
 msgstr "Baleirar os cartafoles de correo non desexado ao saÃr"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Empty Trash folders on exit"
 msgstr "Baleirar os cartafoles de lixo ao saÃr"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr ""
 "Baleirar todos os cartafoles de correo non desexado ao saÃr do Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Baleirar todos os cartafoles de lixo ao saÃr do Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -12384,31 +11222,31 @@ msgstr ""
 "Activar imaxes animadas no correo HTML. AlgÃºns usuarios encontran as imaxes "
 "animadas repunantes e polo contrario prefiren ver a mensaxe estÃ¡tica."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:56
 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:49
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable or disable magic space bar"
 msgstr "Activar ou desactivar a barra de espazo mÃ¡xica"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Activa ou desactiva a pregunta cando se marcan varias mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:59
 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:52
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable search folders"
 msgstr "Activar cartafoles de busca"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable search folders on startup."
 msgstr "Activar cartafoles de busca ao inicio."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -12416,7 +11254,7 @@ msgstr ""
 "Activar a barra de bÃºsqueda lateral para permitirlle as bÃºsquedas "
 "interactivas de nomes de cartafoles."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -12424,20 +11262,20 @@ msgstr ""
 "Active esta opciÃ³n para usar a barra de espazo para desprazarse na "
 "previsualizaciÃ³n da mensaxe, na lista de mensaxes e nos cartafoles."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable to render message text part of limited size."
 msgstr ""
 "Active isto para renderizar a parte da mensaxe de texto de tamaÃ±o limitado."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar o modo de cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:58 ../mail/mail-config.glade.h:86
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Codificar os nomes de ficheiro como o Outlook ou o Gmail"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:67
 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, "
@@ -12449,19 +11287,19 @@ msgstr ""
 "UTF-8 enviados polo Evolution, porque estes non seguen a RFC 2231, senÃ³n que "
 "usan un estÃ¡ndar RFC 2047 incorrecto."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Height of the message-list pane"
 msgstr "Altura do panel da lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Height of the message-list pane."
 msgstr "Altura do panel da lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Oculta a previsualizaciÃ³n por cartafol e elimina a selecciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12469,15 +11307,7 @@ msgstr ""
 "Se un usuario tenta abrir 10 ou mÃ¡is mensaxes ao mesmo tempo, pregÃºntalle se "
 "estÃ¡ seguro de que o quere facer."
 
-#: ../mail/evolution-mail.schemas.in.h:64
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr ""
-"Se o panel de \"PrevisualizaciÃ³n\" estÃ¡ activado, mÃ³strao de lado a lado en "
-"vez de verticalmente."
-
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:72
 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 "
@@ -12488,7 +11318,23 @@ msgstr ""
 "que apareza nesta listaxe e que estea mapeado a un visualizador de "
 "compoÃ±entes Bonobo na base de datos de tipos MIME do Gnome."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:73
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr ""
+"A altura inicial da xanela \"Enviar e recibir correo\". O valor actualÃzase "
+"a medida que o usuario redimensiona a xanela verticalmente."
+
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"A altura inicial da xanela \"Enviar e recibir correo\". O valor actualÃzase "
+"a medida que o usuario redimensiona a xanela verticalmente."
+
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -12496,7 +11342,33 @@ msgstr ""
 "A altura inicial da xanela \"Enviar e recibir correo\". O valor actualÃzase "
 "a medida que o usuario redimensiona a xanela verticalmente."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:76
+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 ""
+"A altura inicial 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 a xanela \"Enviar e recibir "
+"correo\" non pode ser maximizada. Esta chave sÃ³ existe como un detalle de "
+"implementaciÃ³n."
+
+#: ../mail/evolution-mail.schemas.in.h:77
+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 ""
+"A altura inicial 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 a xanela \"Enviar e recibir "
+"correo\" non pode ser maximizada. Esta chave sÃ³ existe como un detalle de "
+"implementaciÃ³n."
+
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -12506,27 +11378,35 @@ msgid ""
 msgstr ""
 "A altura inicial 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 dende que a xanela \"Enviar e recibir "
+"particular non se usa no Evolution desde que a xanela \"Enviar e recibir "
 "correo\" non pode ser maximizada. Esta chave sÃ³ existe como un detalle de "
 "implementaciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+msgstr ""
+"A 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:80
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
 "A 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:69
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
-"It disables/enables the repeated prompts to ask if offline sync is required "
-"before going into offline mode."
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
 msgstr ""
-"Activa e desactiva as preguntas repetitivas para confirmar se se require a "
-"sincronizaciÃ³n sen conexiÃ³n ao activar o modo desconectado."
+"A 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:70
+#: ../mail/evolution-mail.schemas.in.h:82
 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 "
@@ -12536,33 +11416,37 @@ msgstr ""
 "mensaxes dun cartafol de busca bÃ³rranse as mensaxes permanentemente, non sÃ³ "
 "dos resultados da busca."
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Last time empty junk was run"
 msgstr "Ã?ltima vez que se baleirou o correo non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Last time empty trash was run"
 msgstr "Ã?ltima vez que se baleirou o lixo"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid "Layout style"
+msgstr "Disp_osiciÃ³n"
+
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas e as cores asociadas"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr ""
 "Lista dos tipos MIME para os que verificar os visualizadores de compoÃ±entes "
 "do Bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "List of accepted licenses"
 msgstr "Lista de licenzas aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "List of accounts"
 msgstr "Lista de contas"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12571,17 +11455,17 @@ msgstr ""
 "contÃ©n cadeas que nomean subdirectorios relativos a /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeceiras personalizadas e se estas estÃ¡n activadas."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Lista dos cÃ³digos de idioma dos dicionarios usados para a verificaciÃ³n "
 "ortogrÃ¡fica."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:94
 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."
@@ -12590,15 +11474,15 @@ msgstr ""
 "lista contÃ©n cadeas que conteÃ±en nome:cor, onde \"cor\" usa a codificaciÃ³n "
 "hexadecimal HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nomes de protocolos cuxa licenza foi aceptada."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Load images for HTML messages over HTTP"
 msgstr "Cargar as imaxes das mensaxes HTML sobre HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:97
 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 "
@@ -12608,110 +11492,109 @@ msgstr ""
 "\" - 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:85
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Log filter actions"
 msgstr "Rexistrar acciÃ³ns de filtraxe"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Log filter actions to the specified log file."
 msgstr "Rexistrar as acciÃ³ns de filtraxe no ficheiro de rexistro especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Logfile to log filter actions"
 msgstr "Ficheiro de rexistro para rexistrar as acciÃ³ns de filtraxe"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Logfile to log filter actions."
 msgstr "Ficheiro de rexistro para rexistrar as acciÃ³ns de filtraxe."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid "Mail browser height"
+msgstr "Altura uniforme da fila"
+
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Mail browser maximized"
+msgstr "Navegador de mail maximizado"
+
+#: ../mail/evolution-mail.schemas.in.h:104
+msgid "Mail browser width"
+msgstr "O correo comeza por"
+
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto despois do tempo de espera especificado"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto despois do tempo de espera especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar as citas textuais na \"PrevisualizaciÃ³n\" da mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar as citas textuais na \"PrevisualizaciÃ³n\" da mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.h:93
-msgid "Message Window default height"
-msgstr "Altura predeterminada da xanela de mensaxes"
-
-#: ../mail/evolution-mail.schemas.in.h:94
-msgid "Message Window default width"
-msgstr "Largura predeterminada da xanela de mensaxes"
-
 # (pofilter) gconf: do not translate gconf attribute: "source"
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estilo de visualizaciÃ³n da mensaxe (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "NÃºmero mÃnimo de dÃas antes do baleirado do correo non desexado ao saÃr"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the trash on exit"
 msgstr "NÃºmero mÃnimo de dÃas antes do baleirado do lixo ao saÃr"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Tempo mÃnimo antes do baleirado do correo non desexado ao saÃr, en dÃas."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tempo mÃnimo antes do baleirado do lixo ao saÃr, en dÃas."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:114
 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
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Prompt on empty subject"
 msgstr "Preguntar cando o asunto estÃ¡ baleiro"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar ao usuario cando tente compactar un cartafol."
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar ao usuario cando tente enviar unha mensaxe sen asunto."
 
-#: ../mail/evolution-mail.schemas.in.h:104
-msgid "Prompt to check if the user wants to go offline immediately"
-msgstr ""
-"Preguntar para verificar se o usuario se quere desconectar inmediatamente"
-
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Prompt when deleting messages in search folder"
 msgstr "Preguntar cando se eliminen mensaxes nun cartafol de busca"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when user expunges"
 msgstr "Preguntar cando o usuario compacta"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cando o usuario sÃ³ encha o campo Cco"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Preguntar cando o usuario tente abrir dez ou mÃ¡is mensaxes ao mesmo tempo"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12719,221 +11602,263 @@ msgstr ""
 "Preguntar ao enviar mensaxes en HTML a destinatarios que non desexen "
 "recibilas."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Preguntar cando o usuario tente enviar unha mensaxe sen destinatarios Para "
 "ou CC."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Preguntar cando o usuario tente enviar un HTML non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt while marking multiple messages"
 msgstr "Preguntar cando se marquen varias mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Put personalized signatures at the top of replies"
 msgstr "PoÃ±er sinaturas personalizadas no inicio das respostas"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put the cursor at the bottom of replies"
 msgstr "PoÃ±er o cursor ao fondo da resposta"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "RecoÃ±ecer emoticonas no texto e substituÃlas con imaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize links in text and replace them."
 msgstr "RecoÃ±ecer ligazÃ³ns no texto e substituÃlas."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Run junk test on incoming mail."
 msgstr "Realizar a proba de correo non desexado no correo entrante."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Save directory"
 msgstr "Directorio onde gardar"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:132
 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:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML por omisiÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default."
 msgstr "Enviar correo en HTML por omisiÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 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:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Server synchronization interval"
 msgstr "Intervalo de sincronizaciÃ³n do servidor"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+"EstabelÃ©zao a TRUE no caso de que queira engadir o delimitador de sinatura "
+"antes da sÃºa sinatura ao escribir un correo electrÃ³nico."
+
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Mostrar o campo \"Bcc\" ao enviar unha mensaxe de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:139
 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:126
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Mostrar o campo \"De\" ao enviar a unha rolda de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show \"From\" field when sending a mail message"
 msgstr "Mostrar o campo \"De\" ao enviar unha mensaxe de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Mostrar o campo \"Respostar a\" ao enviar a unha rolda de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:143
 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:130
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show Animations"
 msgstr "Mostrar animaciÃ³ns"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid "Show all message headers"
+msgstr "Contraer todos os fÃos de mensaxe"
+
+#: ../mail/evolution-mail.schemas.in.h:146
+msgid "Show all the headers when viewing a messages."
+msgstr "Mostrar o campo \"Respostar a\" ao enviar unha mensaxe de correo"
+
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show animated images as animations."
 msgstr "Mostrar as imaxes animadas como animaciÃ³ns."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:148
 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:133
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar as mensaxes eliminadas na lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show image animations"
 msgstr "Mostrar as animaciÃ³ns de imaxe "
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Show original \"Date\" header value."
+msgstr "Mostrar o valor da cabeceira \"Date\" orixinal"
+
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show photo of the sender"
 msgstr "Mostrar a foto do remitente"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:153
 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 \"Bcc\" ao enviar unha mensaxe de correo. Isto pÃ³dese "
-"configurar dende o menÃº Ver cando se selecciona unha conta de correo."
+"configurar desde o menÃº Ver cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:154
 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 dende o menÃº Ver cando se selecciona unha conta de correo."
+"configurar desde o menÃº Ver cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:155
 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 a unha rolda de correo. Isto pÃ³dese "
-"configurar dende o menÃº Ver cando se selecciona unha conta de novas."
+"configurar desde o menÃº Ver cando se selecciona unha conta de novas."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
 "Mostrar o campo \"De\" ao enviar unha mensaxe de correo. Isto pÃ³dese "
-"configurar dende o menÃº Ver cando se selecciona unha conta de correo."
+"configurar desde o menÃº Ver cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:157
 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 \"Respostar a\" ao enviar a unha rolda de correo. Isto "
-"pÃ³dese configurar dende o menÃº VEr cando se selecciona unha conta de novas."
+"pÃ³dese configurar desde o menÃº VEr cando se selecciona unha conta de novas."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:158
 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 \"Respostar a\" ao enviar unha mensaxe de correo. Isto "
-"pÃ³dese configurar dende o menÃº Ver cando se selecciona unha conta de correo."
+"pÃ³dese configurar desde o menÃº Ver cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
 "Mostrar o enderezo do remitente nunha columna Ã¡ parte na lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:160
+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 mÃ³strase o valor de cabeceira \"Data no formato "
+"predefinido polo usuario e o fuso de hora local."
+
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Mostrar a foto do remitente no panel de lectura da mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Spell check inline"
 msgstr "VerificaciÃ³n ortogrÃ¡fica en liÃ±a"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell checking color"
 msgstr "Cor da verificaciÃ³n ortogrÃ¡fica"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking languages"
 msgstr "Idiomas da verificaciÃ³n ortogrÃ¡fica"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Subscribe dialog default height"
-msgstr "Altura predeterminada do diÃ¡logo de subscriciÃ³n"
+msgstr "Altura predefinida do diÃ¡logo de subscriciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default width"
-msgstr "Largura predeterminada do diÃ¡logo de subscriciÃ³n"
+msgstr "Largura predefinida do diÃ¡logo de subscriciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Terminal font"
 msgstr "Tipo de letra do terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Text message part limit"
 msgstr "LÃmite da parte de texto da mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
-msgstr "O plugin predefinido para a asociaciÃ³n de correo non desexado"
+msgstr "O engadido predefinido para a asociaciÃ³n de correo non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr ""
-"A Ãºltima vez que se baleirou o correo non desexado, en dÃas dende a Ã©poca."
+"A Ãºltima vez que se baleirou o correo non desexado, en dÃas desde a Ã©poca."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "The last time empty trash was run, in days since the epoch."
-msgstr "A Ãºltima vez que se baleirou o lixo, en dÃas dende a Ã©poca."
+msgstr "A Ãºltima vez que se baleirou o lixo, en dÃas desde a Ã©poca."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:172
+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 de disposiciÃ³n determina onde dispoÃ±er o panel de previsualizaciÃ³n "
+"en relaciÃ³n coa lista de mensaxes. \"0\" (VisualizaciÃ³n clÃ¡sica) mostra o "
+"panel de previsualizaciÃ³n debaixo da lista de mensaxes. \"1\" (VisualizaciÃ³n "
+"vertical) mostra o panel de previsualizaciÃ³n ao lado da lista de mensaxes."
+
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "The terminal font for mail display."
 msgstr "O tipo de letra do terminal para mostrar o correo."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "The variable width font for mail display."
 msgstr "O tipo de letra de largura variÃ¡bel para mostrar o correo."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -12941,26 +11866,25 @@ msgstr ""
 "Isto pode ter tres valores posÃbeis: \"0\" para erros; \"1\" para avisos; \"2"
 "\" para mensaxes de depuraciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
 msgstr ""
 "Isto decide o tamaÃ±o mÃ¡ximo da parte de texto que pode ser formatada no "
-"Evolution. O predeterminado Ã© 4MB/4096 KB e estÃ¡ especificado en termos de "
-"KB."
+"Evolution. O predefinido Ã© 4MB/4096 KB e estÃ¡ especificado en termos de KB."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:177
 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 plugin predeterminado para o correo non desexado, aÃnda que hai "
-"varios plugins activados. Se o plugin predeterminado listado estÃ¡ "
-"desactivado, entÃ³n non se usarÃ¡n os outros plugins dispoÃ±Ãbeis."
+"Este Ã© o engadido predefinido para o correo non desexado, aÃnda que hai "
+"varios engadidos activados. Se o engadido predefinido listado estÃ¡ "
+"desactivado, entÃ³n non se usarÃ¡n os outros engadidos dispoÃ±Ãbeis."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:178
 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."
@@ -12969,7 +11893,7 @@ msgstr ""
 "ler. Isto deselecciona o correo da lista e elimina a previsualizaciÃ³n para "
 "ese cartafol."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:179
 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;"
@@ -12981,7 +11905,7 @@ msgstr ""
 "estrutura XML Ã© &lt;header enabled&gt; - defÃnao como activado se se debe "
 "mostrar a cabeceira na visualizaciÃ³n do correo."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:180
 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 "
@@ -12992,19 +11916,19 @@ msgstr ""
 "para excluÃr os correos enviados por contactos coÃ±ecidos do filtro de correo "
 "non desexado."
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:181
 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:165
+#: ../mail/evolution-mail.schemas.in.h:182
 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 visualizaciÃ³n da lista de "
-"mensaxes predeterminada; para os restantes mÃ³strase un '...'."
+"mensaxes predefinidas; para os restantes mÃ³strase un '...'."
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -13012,7 +11936,7 @@ msgstr ""
 "Esta opciÃ³n especifica se as conversas deberÃan estar por omisiÃ³n no estado "
 "expandido ou contraÃdo. Ã? necesario reiniciar o Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:184
 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 "
@@ -13022,65 +11946,53 @@ msgstr ""
 "da Ãºltima mensaxe en cada conversa e non segundo a data das mensaxes. Ã? "
 "necesario reiniciar o Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Thread the message list."
-msgstr "Lista de mensaxes por fÃos."
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "Thread the message-list"
-msgstr "Lista de mensaxes por fÃos"
-
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Thread the message-list based on Subject"
 msgstr "Lista de mensaxes por fÃos baseadas no asunto"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Timeout for marking message as seen"
 msgstr "Tempo de espera para marcar unha mensaxe como vista"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Timeout for marking message as seen."
 msgstr "Tempo de espera para marcar unha mensaxe como vista."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "UID string of the default account."
-msgstr "Cadea UID para a conta predeterminada."
+msgstr "Cadea UID para a conta predefinida."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "Cor de subliÃ±ado para as palabras escritas incorrectamente cando se usa a "
 "verificaciÃ³n ortogrÃ¡fica en liÃ±a."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Use SpamAssassin daemon and client"
-msgstr "Usar o demoÃ±o e cliente SpamAssassin"
+msgstr "Usar o daemon e cliente SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "Usar o demoÃ±o e cliente SpamAssassin (spamc/spamd)."
+msgstr "Usar o daemon e cliente SpamAssassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "Use custom fonts"
 msgstr "Usar tipos de letra personalizados"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Use custom fonts for displaying mail."
 msgstr "Usar tipos de letra personalizados para mostrar o correo."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use only local spam tests."
 msgstr "Usar sÃ³ probas locais de correo non desexado."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usar sÃ³ as probas locais de correo non desexado (sen DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:181
-msgid "Use side-by-side or wide layout"
-msgstr "Usar a disposiciÃ³n lado a lado ou longa"
-
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:196
 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 "
@@ -13090,7 +12002,7 @@ msgstr ""
 "responde a unha mensaxe. Isto determina se o cursor se sitÃºa no inicio da "
 "mensaxe ou no fondo."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:197
 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 "
@@ -13100,23 +12012,23 @@ msgstr ""
 "cando responden a unha mensaxe. Isto determina se a sinatura se sitÃºa no "
 "inicio da mensaxe ou no fondo."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Variable width font"
 msgstr "Tipo de letra de largura variÃ¡bel"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
-"Indica cando predeterminar todas as mensaxes para engadirlles unha "
-"confirmaciÃ³n de lectura."
+"Indica cando unha solicitude lida e recibida se engade a cada unha das "
+"mensaxes de forma predefinida."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Se hai que desactivar a funcionalidade de elisiÃ³n (...) dos nomes dos "
 "cartafoles na barra lateral."
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13124,736 +12036,546 @@ msgstr ""
 "Se se debe ou non retroceder ao encadeamento por asuntos cando as mensaxes "
 "non conteÃ±en cabeceiras En resposta a ou Referencias."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 "Indica se clasificar os fÃos de mensaxes segundo a Ãºltima mensaxe que "
 "apareza nelas"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Width of the message-list pane"
 msgstr "Largura do panel de lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Width of the message-list pane."
 msgstr "Largura do panel de lista de mensaxes."
 
-#: ../mail/importers/elm-importer.c:182
+#: ../mail/importers/elm-importer.c:178
 msgid "Importing Elm data"
 msgstr "Importando datos Elm"
 
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../modules/mail/e-mail-shell-view.c:952
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+msgid "Mail"
+msgstr "Correo"
+
 #: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Importador do Elm do Evolution"
 
 #: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
-msgstr "Importar correo dende o Elm."
+msgstr "Importar correo desde o Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:309
+#: ../mail/importers/evolution-mbox-importer.c:115
+#: ../plugins/pst-import/pst-importer.c:311
 msgid "Destination folder:"
 msgstr "Cartafol de destino:"
 
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:302
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
+msgid "Select folder"
+msgstr "Seleccionar cartafol"
+
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
 msgid "Select folder to import into"
 msgstr "Seleccionar un cartafol para o que importar"
 
-#: ../mail/importers/evolution-mbox-importer.c:219
+#: ../mail/importers/evolution-mbox-importer.c:260
+#: ../shell/e-shell-utils.c:218
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Caixa de correo Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:261
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de cartafoles no formato caixa de correo de Berkeley"
 
-#: ../mail/importers/mail-importer.c:147
+#: ../mail/importers/mail-importer.c:71
 msgid "Importing mailbox"
 msgstr "Importando caixa de correo"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:454
-#: ../plugins/pst-import/pst-importer.c:560 ../shell/e-shell-importer.c:555
+#: ../mail/importers/mail-importer.c:155
+#: ../plugins/pst-import/pst-importer.c:456
+#: ../plugins/pst-import/pst-importer.c:562
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando `%s'"
 
-#: ../mail/importers/mail-importer.c:371
+#: ../mail/importers/mail-importer.c:298
 #, c-format
 msgid "Scanning %s"
 msgstr "Examinando %s"
 
-#: ../mail/importers/pine-importer.c:225
+#: ../mail/importers/pine-importer.c:221
 msgid "Importing Pine data"
 msgstr "Importando datos do Pine"
 
-#: ../mail/importers/pine-importer.c:424
+#: ../mail/importers/pine-importer.c:379
+#: ../modules/addressbook/addressbook-config.c:986
+msgid "Address Book"
+msgstr "Axenda de enderezos"
+
+#: ../mail/importers/pine-importer.c:420
 msgid "Evolution Pine importer"
 msgstr "Importador do Pine do Evolution"
 
-#: ../mail/importers/pine-importer.c:425
+#: ../mail/importers/pine-importer.c:421
 msgid "Import mail from Pine."
 msgstr "Importar correo do Pine."
 
-#: ../mail/mail-autofilter.c:72
+#: ../mail/mail-autofilter.c:73
 #, c-format
 msgid "Mail to %s"
 msgstr "Enviar a %s"
 
-#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "Correo de %s"
 
-#: ../mail/mail-autofilter.c:258
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "O asunto Ã© %s"
 
-#: ../mail/mail-autofilter.c:293
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: ../mail/mail-autofilter.c:364
+#: ../mail/mail-autofilter.c:366
 msgid "Add Filter Rule"
 msgstr "Engadir unha regra de filtraxe"
 
-#: ../mail/mail-component.c:573
-#, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
-msgstr[0] "%d seleccionado, "
-msgstr[1] "%d seleccionados, "
-
-#: ../mail/mail-component.c:577
-#, c-format
-msgid "%d deleted"
-msgid_plural "%d deleted"
-msgstr[0] "%d eliminado"
-msgstr[1] "%d eliminados"
-
-#: ../mail/mail-component.c:584
-#, c-format
-msgid "%d junk"
-msgid_plural "%d junk"
-msgstr[0] "%d correo non desexado"
-msgstr[1] "%d correos non desexados"
-
-#: ../mail/mail-component.c:587
-#, c-format
-msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] "%d borrador"
-msgstr[1] "%d borradores"
-
-#: ../mail/mail-component.c:589
-#, c-format
-msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] "%d enviado"
-msgstr[1] "%d enviados"
-
-#: ../mail/mail-component.c:591
-#, c-format
-msgid "%d unsent"
-msgid_plural "%d unsent"
-msgstr[0] "%d non enviado"
-msgstr[1] "%d non enviados"
-
-#: ../mail/mail-component.c:597
-#, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "%d sen ler, "
-msgstr[1] "%d sen ler, "
-
-#: ../mail/mail-component.c:598
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "%d en total"
-msgstr[1] "%d en total"
-
-#: ../mail/mail-component.c:952
-msgid "New Mail Message"
-msgstr "Nova mensaxe de correo"
-
-#: ../mail/mail-component.c:953
-msgctxt "New"
-msgid "_Mail Message"
-msgstr "_Mensaxe de correo"
-
-#: ../mail/mail-component.c:954
-msgid "Compose a new mail message"
-msgstr "Compor unha mensaxe de correo nova"
-
-#: ../mail/mail-component.c:960
-msgid "New Mail Folder"
-msgstr "Novo cartafol de correo"
-
-#: ../mail/mail-component.c:961
-msgctxt "New"
-msgid "Mail _Folder"
-msgstr "Carta_fol de correo"
-
-#: ../mail/mail-component.c:962
-msgid "Create a new mail folder"
-msgstr "Crear un cartafol novo de correo"
-
-#: ../mail/mail-component.c:1109
-msgid "Failed upgrading Mail settings or folders."
-msgstr "Fallou ao actualizar a configuraciÃ³n do correo ou os cartafoles."
-
-#: ../mail/mail-config.glade.h:1
+#: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(Nota: Ã© preciso reiniciar o aplicativo)"
 
-#: ../mail/mail-config.glade.h:3
-msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr "<b>SSL non Ã© compatÃbel con esta versiÃ³n do Evolution</b>"
-
-#: ../mail/mail-config.glade.h:4
-msgid "<b>Sender Photograph</b>"
-msgstr "<b>FotografÃa do remitente</b>"
-
-#: ../mail/mail-config.glade.h:5
-msgid "<b>Sig_natures</b>"
-msgstr "<b>Si_naturas</b>"
-
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.ui.h:2
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>OpciÃ³n para responder por encima</b> (Non se recomenda)"
 
-#: ../mail/mail-config.glade.h:7
-msgid "<b>_Languages</b>"
-msgstr "<b>_Idiomas</b>"
-
-#: ../mail/mail-config.glade.h:8
-msgid "<span weight=\"bold\">Account Information</span>"
-msgstr "<span weight=\"bold\">InformaciÃ³n da conta</span>"
-
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Authentication</span>"
-msgstr "<span weight=\"bold\">AutenticaciÃ³n</span>"
-
-#: ../mail/mail-config.glade.h:11
-msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr "<span weight=\"bold\">RedacciÃ³n de mensaxes</span>"
-
-#: ../mail/mail-config.glade.h:12
-msgid "<span weight=\"bold\">Configuration</span>"
-msgstr "<span weight=\"bold\">ConfiguraciÃ³n</span>"
-
-#: ../mail/mail-config.glade.h:14
-msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr "<span weight=\"bold\">Comportamento predeterminado</span>"
-
-#: ../mail/mail-config.glade.h:15
-msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\">Eliminar correo</span>"
-
-#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
-msgstr "<span weight=\"bold\">Ca_beceiras das mensaxes mostradas</span>"
-
-#: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels</span>"
-msgstr "<span weight=\"bold\">Etiquetas</span>"
-
-#: ../mail/mail-config.glade.h:19
-msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr "<span weight=\"bold\">Cargando imaxes</span>"
-
-#: ../mail/mail-config.glade.h:20
-msgid "<span weight=\"bold\">Message Display</span>"
-msgstr "<span weight=\"bold\">Visualizador de mensaxes</span>"
-
-#: ../mail/mail-config.glade.h:21
-msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr "<span weight=\"bold\">Tipos de letra das mensaxes</span>"
-
-#: ../mail/mail-config.glade.h:22
-msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">NotificaciÃ³ns de recepciÃ³n de mensaxes</span>"
-
-#: ../mail/mail-config.glade.h:23
-#: ../plugins/publish-calendar/publish-calendar.glade.h:3
-msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr "<span weight=\"bold\">InformaciÃ³n opcional</span>"
-
-#: ../mail/mail-config.glade.h:24
-msgid "<span weight=\"bold\">Options</span>"
-msgstr "<span weight=\"bold\">OpciÃ³ns</span>"
-
-#: ../mail/mail-config.glade.h:25
-msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgstr "<span weight=\"bold\">Privacidade bastante boa (PGP/GPG)</span>"
-
-#: ../mail/mail-config.glade.h:26
-msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr "<span weight=\"bold\">Tipos de letra para imprimir</span>"
-
-#: ../mail/mail-config.glade.h:27
-msgid "<span weight=\"bold\">Proxy Settings</span>"
-msgstr "<span weight=\"bold\">ConfiguraciÃ³ns de Proxy</span>"
-
-#: ../mail/mail-config.glade.h:28
-msgid "<span weight=\"bold\">Required Information</span>"
-msgstr "<span weight=\"bold\">InformaciÃ³n requirida</span>"
-
-#: ../mail/mail-config.glade.h:29
-msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-msgstr "<span weight=\"bold\">MIME seguro (S/MIME)</span>"
-
-#: ../mail/mail-config.glade.h:30
-msgid "<span weight=\"bold\">Security</span>"
-msgstr "<span weight=\"bold\">Seguranza</span>"
-
-#: ../mail/mail-config.glade.h:31
-msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\">Mensaxes enviadas e borradores</span>"
-
-#: ../mail/mail-config.glade.h:32
-msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr "<span weight=\"bold\">ConfiguraciÃ³n do servidor</span>"
-
-#: ../mail/mail-config.glade.h:33
-msgid "<span weight=\"bold\">_Authentication Type</span>"
-msgstr "<span weight=\"bold\">Tipo de _autenticaciÃ³n</span>"
-
-#: ../mail/mail-config.glade.h:35
-msgid "Account Management"
-msgstr "XestiÃ³n de contas"
+#: ../mail/mail-config.ui.h:3
+msgid "Account Information"
+msgstr "Sen informaciÃ³n"
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.ui.h:4
 msgid "Add Ne_w Signature..."
 msgstr "Engadir sinatura _nova..."
 
-#: ../mail/mail-config.glade.h:37
-msgid "Add _Script"
-msgstr "Engadir _script"
-
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.ui.h:5
 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.glade.h:39
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Ci_frar tamÃ©n para un mesmo ao enviar correo cifrado"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Enviar sempre _copia de carbÃ³n (Cc) a:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Enviar sempre copia de carbÃ³n _oculta (Cco) a:"
 
-#: ../mail/mail-config.glade.h:42
+#: ../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"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Cifrar sempre para un _mesmo ao enviar correo cifrado"
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "Requirir sempre confirmaciÃ³n de lec_tura"
 
-#: ../mail/mail-config.glade.h:45
-msgid ""
-"Attachment\n"
-"Inline\n"
-"Quoted"
-msgstr ""
-"Anexo\n"
-"En liÃ±a\n"
-"Citado"
-
-#: ../mail/mail-config.glade.h:48
-msgid ""
-"Attachment\n"
-"Inline (Outlook style)\n"
-"Quoted\n"
-"Do not quote"
-msgstr ""
-"Anexo\n"
-"Inserido (estilo Outlook)\n"
-"Citado\n"
-"Non citar"
+#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+msgid "Authentication"
+msgstr "AutenticaciÃ³n"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "Inserir imaxes de _emoticonas automaticamente"
 
-#: ../mail/mail-config.glade.h:53
-msgid "Baltic (ISO-8859-13)"
-msgstr "BÃ¡ltico (ISO-8859-13)"
-
-#: ../mail/mail-config.glade.h:54
-msgid "Baltic (ISO-8859-4)"
-msgstr "BÃ¡ltico (ISO-8859-4)"
-
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "Conxunto de ca_racteres:"
 
-#: ../mail/mail-config.glade.h:56
-#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+#: ../mail/mail-config.ui.h:17
 msgid "Ch_eck for Supported Types"
 msgstr "_Verificar os tipos compatÃbeis"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr ""
 "Verificar as cabeceiras personalizada_s para detectar correo non desexado"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.ui.h:19
 msgid "Check incoming _messages for junk"
 msgstr "Verificar as _mensaxes entrantes para detectar correo non desexado"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.ui.h:20
 msgid "Check spelling while I _type"
 msgstr "Verificar a orto_grafÃa mentres se escribe"
 
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.ui.h:21
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Verifica se o correo entrante Ã© correo non desexado"
 
-#: ../mail/mail-config.glade.h:61
+#: ../mail/mail-config.ui.h:22
 msgid "Cle_ar"
 msgstr "Limp_ar"
 
-#: ../mail/mail-config.glade.h:62
+#: ../mail/mail-config.ui.h:23
 msgid "Clea_r"
 msgstr "Limpa_r"
 
-#: ../mail/mail-config.glade.h:63
+#: ../mail/mail-config.ui.h:24
 msgid "Color for _misspelled words:"
 msgstr "Cor para as palabras escritas _incorrectamente:"
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.ui.h:25
+msgid "Composing Messages"
+msgstr "Escribir unha mensaxe"
+
+#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "ConfiguraciÃ³n"
+
+#: ../mail/mail-config.ui.h:27
 msgid "Confirm _when expunging a folder"
 msgstr "Confirmar a_o compactar un cartafol"
 
-#: ../mail/mail-config.glade.h:65
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"ParabÃ©ns! concluÃu a configuraciÃ³n do correo.\n"
-"\n"
-"Agora estÃ¡ preparado para enviar e recibir correo \n"
-"usando o Evolution. \n"
-"\n"
-"Prema en \"Aplicar\" para gardar a sÃºa configuraciÃ³n."
-
-#: ../mail/mail-config.glade.h:71
-msgid "De_fault"
-msgstr "Pre_determinado"
+#: ../mail/mail-config.ui.h:29
+msgid "Default Behavior"
+msgstr "Prioridade predefinida:"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.ui.h:30
 msgid "Default character e_ncoding:"
-msgstr "CodificaciÃ³_n de caracteres predeterminada:"
+msgstr "CodificaciÃ³_n de caracteres predefinida:"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.ui.h:32
+msgid "Delete Mail"
+msgstr "Eliminar"
+
+#: ../mail/mail-config.ui.h:33
 msgid "Delete junk messages on e_xit"
 msgstr "Eliminar os correos non desexados ao saÃ_r"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.ui.h:35
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Asinar dixitalmente as mensaxes saÃnt_es (por omisiÃ³n)"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.ui.h:36
+msgid "Displayed Message _Headers"
+msgstr "Todas as ca_beceiras da mensaxe"
+
+#: ../mail/mail-config.ui.h:37
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "Non formatar as mensaxes cando o ta_maÃ±o do texto excede"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.ui.h:38
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "Non ma_rcar as mensaxes como correo non desexado se o remitente estÃ¡ na miÃ±a "
 "axenda de enderezos"
 
-#: ../mail/mail-config.glade.h:79
-msgid "Done"
-msgstr "Feito"
+#: ../mail/mail-config.ui.h:39
+msgid "Do not quote"
+msgstr "Non eliminar"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.ui.h:40
 msgid "Drafts _Folder:"
 msgstr "Carta_fol de borradores:"
 
-#: ../mail/mail-config.glade.h:81
-msgid "Email Accounts"
-msgstr "Contas de correo"
-
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.ui.h:41
 msgid "Email _Address:"
 msgstr "_Enderezo de correo:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.ui.h:42
 msgid "Empty trash folders on e_xit"
 msgstr "Baleirar os cartafoles de lixo ao _saÃr"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.ui.h:43
 msgid "Enable Magic S_pacebar"
 msgstr "Activar a barra de espa_zos mÃ¡xica"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Sea_rch Folders"
 msgstr "Activar cartafoles de _busca"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "Certificado de ci_frado:"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "Cifrar as mensaxes saÃn_tes (por omisiÃ³n)"
 
-#: ../mail/mail-config.glade.h:90
+#: ../mail/mail-config.ui.h:48
 msgid "Fi_xed-width:"
 msgstr "Largura fi_xa:"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed width Font:"
 msgstr "Tipo de letra de largura f_ixa:"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.ui.h:50
 msgid "Font Properties"
 msgstr "Propiedades do tipo de letra"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.ui.h:51
 msgid "Format messages in _HTML"
 msgstr "Formato das mensaxes en _HTML"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.ui.h:52
 msgid "Full Nam_e:"
 msgstr "Nom_e completo:"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "Mensaxes HTML"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "Proxy H_TTP:"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.ui.h:56
 msgid "Headers"
 msgstr "Cabeceiras"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.ui.h:57
 msgid "Highlight _quotations with"
 msgstr "Realzar as _citas con"
 
-#: ../mail/mail-config.glade.h:101
-msgid ""
-"If the server uses a non-standard port then specify the server address as "
-"\"server-name:port-number\""
-msgstr ""
-"Se o servidor usa un porto non estÃ¡ndar entÃ³n especifique o enderezo do "
-"servidor tal como \"servidor-nome:porto-nÃºmero\""
+#: ../mail/mail-config.ui.h:59
+msgid "Inline"
+msgstr "En liÃ±a"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.ui.h:60
+msgid "Inline (Outlook style)"
+msgstr "En liÃ±a (estilo Outlook)"
+
+#: ../mail/mail-config.ui.h:62
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:104 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.ui.h:64
 msgid "Languages Table"
 msgstr "TÃ¡boa de idiomas"
 
-#: ../mail/mail-config.glade.h:106
-msgid "Mail Configuration"
-msgstr "ConfiguraciÃ³n do correo"
+#: ../mail/mail-config.ui.h:65
+msgid "Loading Images"
+msgstr "_Cargar imaxes"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.ui.h:66
 msgid "Mail Headers Table"
 msgstr "TÃ¡boa de cabeceiras de correo"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.ui.h:67
 msgid "Mailbox location"
 msgstr "LocalizaciÃ³n da caixa de correo"
 
-#: ../mail/mail-config.glade.h:110
-msgid "Message Composer"
-msgstr "Editor de mensaxes"
+#: ../mail/mail-config.ui.h:68
+msgid "Message Display"
+msgstr "Mensaxes"
+
+#: ../mail/mail-config.ui.h:69
+msgid "Message Fonts"
+msgstr "A mensaxe contÃ©n"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.ui.h:70
+msgid "Message Receipts"
+msgstr "Retirada de mensaxe"
+
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "Sen pro_xy para:"
 
-#: ../mail/mail-config.glade.h:112
-msgid ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
-msgstr ""
-"Nota: o subliÃ±ado do nome da etiqueta emprÃ©gase como identificador "
-"mnemotÃ©cnico no menÃº."
-
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.ui.h:73
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Nota: non se lle pedirÃ¡ un contrasinal atÃ© que se conecte por primeira vez"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.ui.h:74
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "IgnÃ³rase a opciÃ³n se se encontra unha coincidencia para as cabeceiras "
 "personalizadas de correo non desexado."
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.ui.h:75
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+msgid "Optional Information"
+msgstr "Datos persoais"
+
+#: ../mail/mail-config.ui.h:77
 msgid "Or_ganization:"
 msgstr "Organi_zaciÃ³n:"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.ui.h:78
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da _Chave PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.ui.h:79
 msgid "Pass_word:"
 msgstr "Con_trasinal:"
 
-#: ../mail/mail-config.glade.h:119
-msgid "Please configure the following account settings."
-msgstr "Configure as seguintes opciÃ³ns de conta."
-
-#: ../mail/mail-config.glade.h:120
-msgid ""
-"Please enter a descriptive name for this account in the space below. This "
-"name will be used for display purposes only."
-msgstr ""
-"Introduza un nome descritivo para esta conta no espazo de abaixo.\n"
-"Este nome usarase sÃ³ para os efectos de visualizaciÃ³n."
-
-#: ../mail/mail-config.glade.h:121
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Introduza informaciÃ³n sobre a maneira na que envÃa o correo. Se non estÃ¡ "
-"seguro, pregunte ao seu administrador do sistema ou provedor de acceso a "
-"Internet."
-
-#: ../mail/mail-config.glade.h:122
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Introduza o seu nome e enderezo de correo abaixo. Os campos \"opcionais\" de "
-"abaixo non necesitan encherse, a non ser que desexe incluÃr esta informaciÃ³n "
-"no correo que envÃe."
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.ui.h:81
 msgid "Port:"
 msgstr "Porto:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.ui.h:82
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Preg_untar cando se envÃen mensaxes sÃ³ con destinatarios Cco definidos"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.ui.h:83
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "<span weight=\"bold\">Privacidade bastante boa (PGP/GPG)</span>"
+
+#: ../mail/mail-config.ui.h:85
+msgid "Printed Fonts"
+msgstr "Imprimir notas"
+
+#: ../mail/mail-config.ui.h:86
+msgid "Proxy Settings"
+msgstr "ConfiguraciÃ³n de correo non desexado"
+
+#: ../mail/mail-config.ui.h:87
+msgid "Quoted"
+msgstr "_Citada"
+
+#: ../mail/mail-config.ui.h:88
 msgid "Re_member password"
 msgstr "Le_mbrar contrasinal"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.ui.h:89
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.ui.h:91
 msgid "Remember _password"
 msgstr "Lembrar _contrasinal"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.ui.h:92
+msgid "Required Information"
+msgstr "InformaciÃ³n do servidor"
+
+#: ../mail/mail-config.ui.h:94
+msgid "SSL is not supported in this build of Evolution"
+msgstr "<b>SSL non Ã© compatÃbel con esta versiÃ³n do Evolution</b>"
+
+#: ../mail/mail-config.ui.h:95
 msgid "S_earch for sender photograph only in local address books"
 msgstr "B_uscar o remitente da fotografÃa sÃ³ nas axendas de enderezos locais"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.ui.h:96
 msgid "S_elect..."
 msgstr "S_eleccionar..."
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.ui.h:97
 msgid "S_end message receipts:"
 msgstr "En_viar confirmaciÃ³ns de mensaxes:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.ui.h:98
 msgid "S_tandard Font:"
 msgstr "Tipo de letra es_tÃ¡ndar:"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.ui.h:99
+msgid "Secure MIME (S/MIME)"
+msgstr "MIME seguro (S/MIME)"
+
+#: ../mail/mail-config.ui.h:101
+msgid "Select Drafts Folder"
+msgstr "Seleccionar cartafol"
+
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "Seleccione o tipo de letra de largura fixa para HTML"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font for printing"
 msgstr "Seleccione o tipo de letra de largura fixa en HTML para imprimir"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML variable width font"
 msgstr "Seleccione o tipo de letra de largura variÃ¡bel en HTML"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font for printing"
 msgstr "Seleccione o tipo de letra de largura variÃ¡bel en HTML para imprimir"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.ui.h:106
+msgid "Select Sent Folder"
+msgstr "Seleccionar cartafol"
+
+#: ../mail/mail-config.ui.h:107
+msgid "Sender Photograph"
+msgstr "<b>FotografÃa do remitente</b>"
+
+#: ../mail/mail-config.ui.h:108
 msgid "Sending Mail"
 msgstr "Enviando correo"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.ui.h:109
 msgid "Sent _Messages Folder:"
 msgstr "Cartafol de _mensaxes enviadas:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.ui.h:110
+msgid "Sent and Draft Messages"
+msgstr "Mensaxes enviadas"
+
+#: ../mail/mail-config.ui.h:111
 msgid "Ser_ver requires authentication"
 msgstr "O ser_vidor require autenticaciÃ³n"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.ui.h:112
+msgid "Server Configuration"
+msgstr "InformaciÃ³n do servidor"
+
+#: ../mail/mail-config.ui.h:113
 msgid "Server _Type:"
 msgstr "_Tipo de servidor:"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.ui.h:114
+msgid "Sig_natures"
+msgstr "Sinaturas"
+
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_ning certificate:"
 msgstr "Certificado de si_natura:"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.ui.h:116
 msgid "Signat_ure:"
 msgstr "Sinat_ura:"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.ui.h:117
 msgid "Signatures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.glade.h:146
-msgid "Signatures Table"
-msgstr "TÃ¡boa de sinaturas"
-
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.ui.h:118
 msgid "Spell Checking"
 msgstr "VerificaciÃ³n ortogrÃ¡fica"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.ui.h:119
 msgid "Start _typing at the bottom on replying"
 msgstr "Comezar a escri_bir ao final da resposta"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.ui.h:121
 msgid "T_ype:"
 msgstr "T_ipo:"
 
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.ui.h:122
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -13861,15 +12583,16 @@ msgstr ""
 "Esta lista de idiomas reflicte unicamente os idiomas para os cales hai "
 "instalado un dicionario."
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used for display purposes only."
+"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 especifique usarase sÃ³ para os efectos de visualizaciÃ³n."
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.ui.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13877,531 +12600,565 @@ msgstr ""
 "Teclee o nome polo que quere identificar a esta conta.\n"
 "Por exemplo: \"Traballo\" ou \"Persoal\""
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.ui.h:128
 msgid "Us_ername:"
 msgstr "Nome de _usuario:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.ui.h:129
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticaciÃ³n"
 
-#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
-#: ../plugins/google-account-setup/google-source.c:681
-#: ../plugins/google-account-setup/google-contacts-source.c:280
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
+#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
+#: ../plugins/google-account-setup/google-contacts-source.c:283
+#: ../plugins/google-account-setup/google-source.c:620
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "User_name:"
 msgstr "_Nome de usuario:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.ui.h:131
 msgid "V_ariable-width:"
 msgstr "Largura v_ariÃ¡bel:"
 
-#: ../mail/mail-config.glade.h:159
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"DÃ¡moslle a benvida ao asistente de configuraciÃ³n de correo do Evolution.\n"
-"\n"
-"Prema en \"Adiante\" para comezar."
-
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.ui.h:132
 msgid "_Add Signature"
 msgstr "_Engadir sinatura"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.ui.h:133
 msgid "_Always load images from the Internet"
-msgstr "Cargar _sempre as imaxes dende Internet"
+msgstr "Cargar _sempre as imaxes desde Internet"
+
+#: ../mail/mail-config.ui.h:134
+msgid "_Authentication Type"
+msgstr "Tipo de _autenticaciÃ³n"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.ui.h:135
 msgid "_Default junk plugin:"
-msgstr "Plugin por _omisiÃ³n de correo non desexado:"
+msgstr "engadido por _omisiÃ³n de correo non desexado:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.ui.h:136
 msgid "_Direct connection to the Internet"
 msgstr "ConexiÃ³n _directa a Internet"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.ui.h:137
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Non asinar as peticiÃ³ns de cita (para a compatibilidade co Outlook)"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.ui.h:138
 msgid "_Forward style:"
 msgstr "Estilo de _reenvÃo:"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.ui.h:139
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Manter a sinatura sobre a mensaxe orixinal ao responder"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.ui.h:140
+msgid "_Languages"
+msgstr "Idioma"
+
+#: ../mail/mail-config.ui.h:141
 msgid "_Load images in messages from contacts"
 msgstr "Ca_rgar as imaxes nas mensaxes dos contactos"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.ui.h:142
 msgid "_Lookup in local address book only"
 msgstr "_Buscar sÃ³ nas axendas de enderezos locais"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.ui.h:143
 msgid "_Make this my default account"
-msgstr "_Facer desta a miÃ±a conta predeterminada"
+msgstr "_Facer desta a miÃ±a conta predefinida"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.ui.h:144
 msgid "_Manual proxy configuration:"
 msgstr "ConfiguraciÃ³n _manual do proxy:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.ui.h:145
 msgid "_Mark messages as read after"
 msgstr "_Marcar as mensaxes como lidas despois de"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.ui.h:147
 msgid "_Never load images from the Internet"
-msgstr "_Nunca cargar as imaxes dende Internet"
+msgstr "_Nunca cargar as imaxes desde Internet"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.ui.h:148
 msgid "_Path:"
 msgstr "_CamiÃ±o:"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.ui.h:149
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Preguntar ao enviar correo HTML aos contactos que non o queren"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.ui.h:150
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Preguntar cando se envÃen mensaxes cun asunto baleiro"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.ui.h:151
 msgid "_Reply style:"
 msgstr "Estilo da _resposta:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.ui.h:152
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.ui.h:153
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _seguro:"
 
-#: ../mail/mail-config.glade.h:183
-msgid "_Select..."
-msgstr "_Seleccionar..."
+#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../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.glade.h:186
+#: ../mail/mail-config.ui.h:157
 msgid "_Show image animations"
 msgstr "_Mostrar animaciÃ³ns de imaxes"
 
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.ui.h:158
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Mostrar a fotografÃa do remitente na previsualizaciÃ³n da mensaxe"
 
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.ui.h:159
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Reducir as cabeceiras Para/Cc/Cco como "
 
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.ui.h:160
 msgid "_Use Secure Connection:"
 msgstr "_Usar unha conexiÃ³n segura:"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.ui.h:161
 msgid "_Use system defaults"
-msgstr "_Usar os predeterminados do sistema"
+msgstr "_Usar as configuraciÃ³ns predefinidas do sistema"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.ui.h:162
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar os mesmos tipos de letra que noutros aplicativos"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+msgid "a"
+msgstr "am"
+
+#: ../mail/mail-config.ui.h:164
 msgid "addresses"
 msgstr "enderezos"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+msgid "b"
+msgstr "por"
+
+#: ../mail/mail-config.ui.h:166
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.ui.h:167
 msgid "description"
 msgstr "descriciÃ³n"
 
-#: ../mail/mail-config.glade.h:197
-msgid "seconds"
-msgstr "segundos"
-
-#: ../mail/mail-dialogs.glade.h:1
+#: ../mail/mail-dialogs.ui.h:1
 msgid "    "
 msgstr "    "
 
-#: ../mail/mail-dialogs.glade.h:2
-msgid "<b>Search Folder Sources</b>"
-msgstr "<b>Orixes do cartafol de busca</b>"
-
-#: ../mail/mail-dialogs.glade.h:3
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Sinatura dixital</span>"
-
-#: ../mail/mail-dialogs.glade.h:4
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Cifrado</span>"
-
-#: ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "Todos os cartafoles remotos activados"
 
-#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local and active remote folders"
 msgstr "Todos os cartafoles locais e remotos activados"
 
-#: ../mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.ui.h:4
 msgid "All local folders"
 msgstr "Todos os cartafoles locais"
 
-#: ../mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.ui.h:5
+msgid "Call"
+msgstr "Chamar"
+
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "Ter_minado"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
-msgid "Flag to Follow Up"
-msgstr "Marcar para facer seguimento"
+#: ../mail/mail-dialogs.ui.h:7
+msgid "Digital Signature"
+msgstr "Editar a sinatura"
 
-#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.ui.h:8
+msgid "Do Not Forward"
+msgstr "Non reenviar"
+
+#: ../mail/mail-dialogs.ui.h:9
+msgid "Encryption"
+msgstr "Cifrado"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Folder Subscriptions"
 msgstr "SubscriciÃ³ns de cartafoles"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.ui.h:11
+msgid "Follow-Up"
+msgstr "Seguimento"
+
+#: ../mail/mail-dialogs.ui.h:12
+msgid "For Your Information"
+msgstr "Para a sÃºa informaciÃ³n"
+
+#: ../mail/mail-dialogs.ui.h:13
+msgid "Forward"
+msgstr "Reenviar"
+
+#: ../mail/mail-dialogs.ui.h:14
 msgid "License Agreement"
 msgstr "Acordo de licenza"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.ui.h:15
+msgid "No Response Necessary"
+msgstr "Non Ã© necesaria unha resposta"
+
+#: ../mail/mail-dialogs.ui.h:19
+msgid "Reply to All"
+msgstr "Responder a todos"
+
+#: ../mail/mail-dialogs.ui.h:20
+msgid "Review"
+msgstr "Revisar"
+
+#: ../mail/mail-dialogs.ui.h:21
 msgid "S_erver:"
 msgstr "S_ervidor:"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.ui.h:22
+msgid "Search Folder Sources"
+msgstr "Orixe do cartafol de busca"
+
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "InformaciÃ³n de seguranza"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Specific folders"
 msgstr "Cartafoles especÃficos"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.ui.h:25
 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 abaixo.\n"
-"Seleccione unha acciÃ³n de seguimento dende o menÃº \"Marcar\"."
+"Seleccione unha acciÃ³n de seguimento desde o menÃº \"Marcar\"."
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Accept License"
 msgstr "_Aceptar a licenza"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Due By:"
 msgstr "_Vence o:"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Flag:"
 msgstr "_Marca:"
 
-#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Tick this to accept the license agreement"
 msgstr "Ma_rque isto para aceptar o acordo de licenza"
 
-#: ../mail/mail-folder-cache.c:834
+#: ../mail/mail-folder-cache.c:893
 #, c-format
 msgid "Pinging %s"
 msgstr "Facendo ping a %s"
 
-#: ../mail/mail-ops.c:107
+#: ../mail/mail-ops.c:95
 msgid "Filtering Selected Messages"
 msgstr "Filtrando as mensaxes seleccionadas"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:254
 msgid "Fetching Mail"
 msgstr "Recibindo correo"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:562
+#: ../mail/mail-ops.c:585
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
-msgstr "Fallo ao aplicar os filtros ao correo saÃnte: %s"
+msgstr "Produciuse un fallo ao aplicar os filtros ao correo saÃnte: %s"
 
-#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:601
+#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
-"Fallo ao anexar a %s: %s\n"
+"Produciuse un fallo ao anexar a %s: %s\n"
 "anexando ao cartafol local `Enviados' no seu lugar."
 
-#: ../mail/mail-ops.c:618
+#: ../mail/mail-ops.c:641
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Fallo ao anexar ao cartafol local `Enviados': %s"
+msgstr "Produciuse un fallo ao anexar ao cartafol local `Enviados': %s"
 
-#: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805
+#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: ../mail/mail-ops.c:734
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:789
 #, c-format
 msgid "Failed to send %d of %d messages"
-msgstr "Fallo ao enviar %d de %d mensaxes"
+msgstr "Produciuse un fallo ao enviar %d de %d mensaxes"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:701
+#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:703
+#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
 msgid "Complete."
 msgstr "Terminado."
 
-#: ../mail/mail-ops.c:877
-msgid "Saving message to folder"
-msgstr "Gardando a mensaxe no cartafol"
+#: ../mail/mail-ops.c:905
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr "Gardando a mensaxe no cartafol %s"
 
-#: ../mail/mail-ops.c:954
+#: ../mail/mail-ops.c:982
 #, c-format
-msgid "Moving messages to %s"
+msgid "Moving messages to '%s'"
 msgstr "Movendo as mensaxes a %s"
 
-#: ../mail/mail-ops.c:954
+#: ../mail/mail-ops.c:982
 #, c-format
-msgid "Copying messages to %s"
+msgid "Copying messages to '%s'"
 msgstr "Copiando as mensaxes a %s"
 
-#: ../mail/mail-ops.c:1171
+#: ../mail/mail-ops.c:1091
+#, c-format
+msgid "Scanning folders in '%s'"
+msgstr "Examinando os cartafoles en \"%s\""
+
+#: ../mail/mail-ops.c:1199
 msgid "Forwarded messages"
 msgstr "Mensaxes reenviadas"
 
-#: ../mail/mail-ops.c:1212
+#: ../mail/mail-ops.c:1240
 #, c-format
-msgid "Opening folder %s"
+msgid "Opening folder '%s'"
 msgstr "Abrindo cartafol %s"
 
-#: ../mail/mail-ops.c:1277
+#: ../mail/mail-ops.c:1306
 #, c-format
-msgid "Retrieving quota information for folder %s"
+msgid "Retrieving quota information for folder '%s'"
 msgstr "Obtendo a informaciÃ³n de cuota do cartafol %s"
 
-#: ../mail/mail-ops.c:1346
+#: ../mail/mail-ops.c:1378
 #, c-format
-msgid "Opening store %s"
+msgid "Opening store '%s'"
 msgstr "Abrindo almacenamento %s"
 
-#: ../mail/mail-ops.c:1417
+#: ../mail/mail-ops.c:1449
 #, c-format
-msgid "Removing folder %s"
+msgid "Removing folder '%s'"
 msgstr "Eliminando o cartafol %s"
 
-#: ../mail/mail-ops.c:1535
+#: ../mail/mail-ops.c:1567
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Almacenando o cartafol '%s'"
 
-#: ../mail/mail-ops.c:1598
+#: ../mail/mail-ops.c:1630
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando e almacenando a conta '%s'"
 
-#: ../mail/mail-ops.c:1599
+#: ../mail/mail-ops.c:1631
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando a conta '%s'"
 
-#: ../mail/mail-ops.c:1653
-msgid "Refreshing folder"
-msgstr "Actualizando o cartafol"
+#: ../mail/mail-ops.c:1685
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr "Actualizando o cartafol %s"
 
-#: ../mail/mail-ops.c:1693 ../mail/mail-ops.c:1743
-msgid "Expunging folder"
-msgstr "Compactando o cartafol"
+#: ../mail/mail-ops.c:1725
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr "Compactando o cartafol %s"
 
-#: ../mail/mail-ops.c:1740
+#: ../mail/mail-ops.c:1770
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Baleirando o lixo en '%s'"
 
-#: ../mail/mail-ops.c:1741
+#: ../mail/mail-ops.c:1771
 msgid "Local Folders"
 msgstr "Cartafoles locais"
 
-#: ../mail/mail-ops.c:1822
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Recuperando a mensaxe %s"
-
-#: ../mail/mail-ops.c:1931
+#: ../mail/mail-ops.c:1967
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Recuperando %d mensaxe"
 msgstr[1] "Recuperando %d mensaxes"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Gardando %d mensaxe"
 msgstr[1] "Gardando %d mensaxes"
 
-#: ../mail/mail-ops.c:2096
+#: ../mail/mail-ops.c:2136
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
-"Erro ao gardar as mensaxes en: %s:\n"
+"Produciuse un erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2168
+#: ../mail/mail-ops.c:2208
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
+#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
-"Non se pode crear o ficheiro de saÃda: %s:\n"
+"Non Ã© posÃbel crear o ficheiro de saÃda: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2209
+#: ../mail/mail-ops.c:2249
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non se poden escribir os datos: %s"
 
-#: ../mail/mail-ops.c:2354
+#: ../mail/mail-ops.c:2394
 #, c-format
-msgid "Disconnecting from %s"
+msgid "Disconnecting from '%s'"
 msgstr "Desconectando de %s"
 
-#: ../mail/mail-ops.c:2354
+#: ../mail/mail-ops.c:2394
 #, c-format
-msgid "Reconnecting to %s"
+msgid "Reconnecting to '%s'"
 msgstr "Conectando novamente con %s"
 
-#: ../mail/mail-ops.c:2450
+#: ../mail/mail-ops.c:2490
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando a conta '%s' para o modo sen conexiÃ³n"
 
-#: ../mail/mail-ops.c:2536
+#: ../mail/mail-ops.c:2576
 msgid "Checking Service"
 msgstr "Verificando o servizo"
 
-#: ../mail/mail-send-recv.c:181
+#: ../mail/mail-send-recv.c:189
 msgid "Canceling..."
 msgstr "Cancelando..."
 
-#: ../mail/mail-send-recv.c:383
+#: ../mail/mail-send-recv.c:431
 msgid "Send & Receive Mail"
 msgstr "Enviar e recibir correo"
 
-#: ../mail/mail-send-recv.c:394
+#: ../mail/mail-send-recv.c:444
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: ../mail/mail-send-recv.c:503
+#: ../mail/mail-send-recv.c:553
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
 msgid "Waiting..."
 msgstr "En espera..."
 
-#: ../mail/mail-send-recv.c:814
+#: ../mail/mail-send-recv.c:873
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando o correo novo"
 
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:220
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduza a frase de paso para %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:222
 msgid "Enter Passphrase"
 msgstr "Introduza a frase de paso"
 
-#: ../mail/mail-session.c:215
-#: ../plugins/exchange-operations/exchange-config-listener.c:705
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza o contrasinal para %s"
 
-#: ../mail/mail-session.c:217
+#: ../mail/mail-session.c:227
 msgid "Enter Password"
 msgstr "Introduza o contrasinal"
 
-#: ../mail/mail-session.c:259
+#: ../mail/mail-session.c:269
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operaciÃ³n."
 
-#: ../mail/mail-signature-editor.c:202
-msgid "_Save and Close"
-msgstr "_Gardar e saÃr"
-
-#: ../mail/mail-signature-editor.c:356
-msgid "Edit Signature"
-msgstr "Editar a sinatura"
+#: ../mail/mail-session.c:663
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+"Non se proporcionou ningÃºn enderezo de destino; foi cancelado o reenvÃo da "
+"mensaxe."
 
-#: ../mail/mail-signature-editor.c:371
-msgid "_Signature Name:"
-msgstr "Nome da _sinatura:"
+#: ../mail/mail-session.c:669
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr ""
+"Non se encontrou ningunha conta para usar; foi cancelado o reenvÃo da "
+"mensaxe."
 
-#: ../mail/mail-tools.c:120
+#: ../mail/mail-tools.c:123
 #, c-format
 msgid "Could not create spool directory `%s': %s"
-msgstr "Non se puido crear o directorio spool `%s': %s"
+msgstr "Non foi posÃbel crear o directorio spool `%s': %s"
 
-#: ../mail/mail-tools.c:150
+#: ../mail/mail-tools.c:153
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr ""
 "Tentando facer un movemail dunha orixe que non Ã© unha caixa de correo `%s'"
 
-#: ../mail/mail-tools.c:256
+#: ../mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe reenviada - %s"
 
-#: ../mail/mail-tools.c:258
+#: ../mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Mensaxe reenviada"
 
-#: ../mail/mail-tools.c:298
+#: ../mail/mail-tools.c:301
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Cartafol non vÃ¡lido: `%s'"
 
-#: ../mail/mail-vfolder.c:89
+#: ../mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Configurando o cartafol de busca: %s"
 
-#: ../mail/mail-vfolder.c:234
+#: ../mail/mail-vfolder.c:232
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Actualizando os cartafoles de busca para '%s: %s'"
 
-#: ../mail/mail-vfolder.c:241
+#: ../mail/mail-vfolder.c:239
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Actualizando os cartafoles de busca para '%s'"
 
-#: ../mail/mail-vfolder.c:1067
+#: ../mail/mail-vfolder.c:1172
 msgid "Edit Search Folder"
 msgstr "Editar cartafol de busca"
 
-#: ../mail/mail-vfolder.c:1155
+#: ../mail/mail-vfolder.c:1274
 msgid "New Search Folder"
 msgstr "Cartafol de busca novo"
 
@@ -14487,74 +13244,82 @@ msgid "Are you sure you want to send a message in HTML format?"
 msgstr "EstÃ¡ seguro de que quere enviar unha mensaxe en formato HTML?"
 
 #: ../mail/mail.error.xml.h:16
-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 address?"
 msgstr "EstÃ¡ seguro de que quere enviar unha mensaxe sÃ³ con destinatarios Cco?"
 
 #: ../mail/mail.error.xml.h:17
+msgid "Are you sure you want to send a message with invalid addresses?"
+msgstr "EstÃ¡ seguro de que quere enviar unha mensaxe sÃ³ con destinatarios Cco?"
+
+#: ../mail/mail.error.xml.h:18
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "EstÃ¡ seguro de que quere enviar unha mensaxe sÃ³ con destinatarios Cco?"
+
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "EstÃ¡ seguro de que quere enviar unha mensaxe sen un asunto?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Because \"{0}\"."
 msgstr "Por causa de \"{0}\"."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:22
 msgid "Because \"{2}\"."
 msgstr "Por causa de \"{2}\"."
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "Sinatura en branco"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Non Ã© posÃbel engadir o Cartafol de busca \"{0}\"."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Non Ã© posÃbel copiar o cartafol \"{0}\" en \"{1}\"."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create folder \"{0}\"."
-msgstr "Non se pode crear o cartafol \"{0}\"."
+msgstr "Non Ã© posÃbel crear o cartafol \"{0}\"."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create temporary save directory."
-msgstr "Non se pode crear o directorio de gardado temporal."
+msgstr "Non Ã© posÃbel crear o directorio de gardado temporal."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Non Ã© posÃbel crear o directorio de gardado porque \"{1}\""
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Non Ã© posÃbel eliminar o cartafol \"{0}\"."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Non Ã© posÃbel eliminar o cartafol de sistema \"{0}\"."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:31
 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:30
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Non Ã© posÃbel mover o cartafol \"{0}\" a \"{1}\"."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{1}\""
 msgstr "Non Ã© posÃbel abrir a orixe \"{1}\""
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open source \"{2}\"."
 msgstr "Non Ã© posÃbel abrir a orixe \"{2}\"."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot open target \"{2}\"."
 msgstr "Non Ã© posÃbel abrir o destino \"{2}\"."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:36
 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."
@@ -14563,35 +13328,35 @@ msgstr ""
 "instalaciÃ³n. Non serÃ¡ capaz de usar este provedor atÃ© que acepte a sÃºa "
 "licenza."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Non Ã© posÃbel renomear \"{0}\" como \"{1}\"."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Non Ã© posÃbel renomear ou mover o cartafol de sistema \"{0}\"."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save changes to account."
 msgstr "Non se poden gardar as modificaciÃ³ns na conta."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Non Ã© posÃbel gardar no directorio \"{0}\"."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot save to file \"{0}\"."
 msgstr "Non Ã© posÃbel gardar no ficheiro \"{0}\"."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:42
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Non Ã© posÃbel estabelecer o script de sinatura \"{0}\"."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:43
 msgid "Check Junk Failed"
 msgstr "Fallou a verificaciÃ³n de correo non desexado"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:44
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14600,43 +13365,27 @@ msgstr ""
 "moitos contrasinais diferencian maiÃºsculas de minÃºsculas, a sÃºa tecla Bloq "
 "MaiÃºs pode estar activada."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Could not save signature file."
-msgstr "Non se puido gardar o ficheiro de sinatura."
-
-#: ../mail/mail.error.xml.h:44
-msgid "Delete \"{0}\"?"
-msgstr "Quere eliminar \"{0}\"?"
-
 #: ../mail/mail.error.xml.h:45
-msgid "Delete account?"
-msgstr "Quere eliminar a conta?"
+msgid "Could not save signature file."
+msgstr "Non foi posÃbel gardar o ficheiro de sinatura."
 
 #: ../mail/mail.error.xml.h:46
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Quere eliminar as mensaxes no Cartafol de busca \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:47
-msgid "Delete messages in Search Folder?"
-msgstr "Quere eliminar as mensaxes do cartafol de busca?"
-
-#: ../mail/mail.error.xml.h:48
-msgid "Discard changes?"
-msgstr "Quere rexeitar as modificaciÃ³ns?"
-
-#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "Non _eliminar"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Do not delete"
 msgstr "Non eliminar"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do not disable"
 msgstr "Non desactivar"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -14644,43 +13393,43 @@ msgstr ""
 "Quere sincronizar localmente os cartafoles que estÃ¡n marcados para o uso sen "
 "conexiÃ³n?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "Quere marcar todas as mensaxes como lidas?"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "Quere gardar as modificaciÃ³ns?"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "Introduza o contrasinal."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
-msgstr "Erro ao cargar as definiciÃ³ns dos filtros."
+msgstr "Produciuse un erro ao cargar as definiciÃ³ns dos filtros."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:55
 msgid "Error while performing operation."
-msgstr "Erro ao efectuar a operaciÃ³n."
+msgstr "Produciuse un erro ao efectuar a operaciÃ³n."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "Error while {0}."
-msgstr "Erro ao {0}."
+msgstr "Produciuse un erro ao {0}."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but cannot overwrite it."
 msgstr "O ficheiro existe mais non se pode sobrescribir."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but is not a regular file."
 msgstr "O ficheiro existe mais non Ã© un ficheiro normal."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 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:62
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14688,11 +13437,11 @@ msgstr ""
 "Se elimina o cartafol eliminarase permanentemente todo o seu contido e o dos "
 "seus subcartafoles."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Se procede, as contas proxy eliminaranse permanentemente."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14700,11 +13449,11 @@ msgstr ""
 "Se continÃºa, a informaciÃ³n da conta e toda a\n"
 "informaciÃ³n do proxy eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Se procede, a informaciÃ³n da conta eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14712,19 +13461,23 @@ msgstr ""
 "Se sae, estas mensaxes non se enviarÃ¡n atÃ© que o Evolution sexa iniciado de "
 "novo."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:66
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:67
 msgid "Invalid authentication"
 msgstr "AutenticaciÃ³n non vÃ¡lida"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:68
+msgid "Mail Deletion Failed"
+msgstr "Fallou a eliminaciÃ³n de correo"
+
+#: ../mail/mail.error.xml.h:69
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automaticamente."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:70
 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 "
@@ -14736,31 +13489,27 @@ msgstr ""
 "todas as formas todos os destinatarios da sÃºa mensaxe. Para evitar isto "
 "deberÃa engadir polo menos un destinatario Para: ou CC:."
 
-#: ../mail/mail.error.xml.h:73
-msgid "Mark all messages as read"
-msgstr "Marcar todas as mensaxes como lidas"
-
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:71
 msgid "Missing folder."
 msgstr "Falta o cartafol."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:73
 msgid "No sources selected."
 msgstr "Non se seleccionou ningunha orixe."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:74
 msgid "Opening too many messages at once may take a long time."
 msgstr "Abrir demasiadas mensaxes ao mesmo tempo pode levar moito tempo."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:75
 msgid "Please check your account settings and try again."
 msgstr "Verifique a configuraciÃ³n da conta e tÃ©nteo outra vez."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:76
 msgid "Please enable the account or send using another account."
 msgstr "Active a conta ou envÃe usando outra conta."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:77
 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."
@@ -14768,7 +13517,7 @@ msgstr ""
 "Introduza un enderezo de correo vÃ¡lido no campo Para:. Pode buscar enderezos "
 "de correo premendo no botÃ³n Para: ao lado da caixa de entrada."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:78
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14778,67 +13527,63 @@ msgstr ""
 "HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:80
 msgid "Please provide an unique name to identify this signature."
 msgstr "Introduza un nome Ãºnico para identificar esta sinatura."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "Agarde."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Houbo un problema ao migrar o cartafol de correo antigo \"{0}\"."
 
-#: ../mail/mail.error.xml.h:86
-msgid "Querying server"
-msgstr "Consultando o servidor"
-
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Estase consultando o servidor sobre unha lista de mecanismos de "
 "autenticaciÃ³n compatÃbeis."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "Solicitouse unha confirmaciÃ³n de lectura."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
 "EstÃ¡ seguro de que quere eliminar o cartafol \"{0}\" e todos os seus "
 "cartafoles secundarios?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:86
 msgid "Report Junk Failed"
 msgstr "Fallou o informe de correo non desexado"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:87
 msgid "Report Not Junk Failed"
 msgstr "Fallou o informe do correo que non Ã© non desexado"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:88
 msgid "Search Folders automatically updated."
 msgstr "Os cartafoles de busca actualizÃ¡ronse automaticamente."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:89
 msgid "Send Receipt"
 msgstr "Enviar notificaciÃ³n de recepciÃ³n"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:90
 msgid "Signature Already Exists"
 msgstr "A sinatura xa existe"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:91
 msgid "Synchronize"
 msgstr "Sincronizar"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Sincronizar os cartafoles localmente para o uso sen conexiÃ³n?"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14846,7 +13591,7 @@ msgstr ""
 "O Evolution precisa os cartafoles de sistema para funcionar correctamente e "
 "non se poden renomear, mover nin eliminar."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14863,7 +13608,7 @@ msgstr ""
 "destinatarios na sÃºa mensaxe. Para evitar isto, deberÃa engadir polo menos "
 "un destinatario a Para: ou Cc:. "
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14877,7 +13622,7 @@ msgstr ""
 "    \"{1}\"\n"
 "e foron actualizados."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:102
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14891,6 +13636,24 @@ msgstr ""
 "    \"{1}\"\n"
 "e foron actualizadas."
 
+#: ../mail/mail.error.xml.h:107
+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}"
+
+#: ../mail/mail.error.xml.h:109
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
+msgstr ""
+"Os seguintes destinatarios non foron recoÃ±ecidos como un enderezo de correo "
+"electrÃ³nico correcto:\n"
+"{0}"
+
 #: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
 msgstr "O ficheiro de script debe existir e ser executÃ¡bel."
@@ -14941,7 +13704,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
-msgstr "Non se puido conectar co servidor GroupWise."
+msgstr "Non foi posÃbel conectar co servidor GroupWise."
 
 #: ../mail/mail.error.xml.h:120
 msgid ""
@@ -14961,7 +13724,7 @@ msgstr "Usar o pre_determinado"
 
 #: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
-msgstr "Quere usar o cartafol de borradores predeterminados?"
+msgstr "Quere usar o cartafol de borradores predefinidos?"
 
 #: ../mail/mail.error.xml.h:124
 msgid ""
@@ -14973,6 +13736,10 @@ msgstr ""
 "mensaxes reais dun dos seus cartafoles locais ou remotos.\n"
 "EstÃ¡ seguro de que quere facer isto?"
 
+#: ../mail/mail.error.xml.h:126
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "Vostede non ten os permisos suficientes para eliminar este correo."
+
 #: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "Non encheu toda a informaciÃ³n requirida."
@@ -15019,6 +13786,11 @@ msgstr "_Rexeitar as modificaciÃ³ns"
 msgid "_Do not Synchronize"
 msgstr "_Non sincronizar"
 
+#: ../mail/mail.error.xml.h:138
+#: ../modules/mail/e-mail-shell-view-actions.c:862
+msgid "_Empty Trash"
+msgstr "_Baleirar o lixo"
+
 #: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "_Compactar"
@@ -15027,81 +13799,89 @@ msgstr "_Compactar"
 msgid "_Open Messages"
 msgstr "_Abrir mensaxes"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1122
 msgid "Unseen"
 msgstr "Non vista"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1123
 msgid "Seen"
 msgstr "Vista"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1124
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1125
 msgid "Forwarded"
 msgstr "Reenviada"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1126
 msgid "Multiple Unseen Messages"
 msgstr "MÃºltiples mensaxes non vistas"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1127
 msgid "Multiple Messages"
 msgstr "MÃºltiples mensaxes"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1131
 msgid "Lowest"
 msgstr "A mÃ¡is baixa"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1132
 msgid "Lower"
 msgstr "Inferior"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1136
 msgid "Higher"
 msgstr "Superior"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1137
 msgid "Highest"
 msgstr "A mÃ¡is alta"
 
-#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M %p"
 msgstr "Hoxe Ã¡s %l:%M %p"
 
-#: ../mail/message-list.c:1670
+#: ../mail/message-list.c:1763
 msgid "Yesterday %l:%M %p"
 msgstr "Onte Ã¡s %l:%M %p"
 
 # (pofilter) variables: do not translate: %a, %l, %p
-#: ../mail/message-list.c:1682
+#: ../mail/message-list.c:1775
 msgid "%a %l:%M %p"
 msgstr "O %A Ã¡s %k:%M"
 
 # (pofilter) variables: do not translate: %b, %l, %p
-#: ../mail/message-list.c:1690
+#: ../mail/message-list.c:1783
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B Ã¡s %k:%M"
 
 # (pofilter) variables: do not translate: %b
-#: ../mail/message-list.c:1692
+#: ../mail/message-list.c:1785
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
+#: ../mail/message-list.c:2537
+msgid "Select all visible messages"
+msgstr "Seleccionar todas as mensaxes visÃbeis"
+
+#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:652
+msgid "Shell Backend"
+msgstr "Infraestrutura shell"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3987 ../mail/message-list.c:4462
+#: ../mail/message-list.c:4399 ../mail/message-list.c:4887
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
-#: ../mail/message-list.c:4299
+#: ../mail/message-list.c:4722
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -15109,7 +13889,7 @@ msgstr ""
 "Non hai mensaxes que satisfagan os seus criterios de busca. Limpe a busca no "
 "elemento de menÃº Buscar->Limpar ou cÃ¡mbieo."
 
-#: ../mail/message-list.c:4301
+#: ../mail/message-list.c:4724
 msgid ""
 "There are only hidden messages in this folder. Use View->Show Hidden "
 "Messages to show them."
@@ -15117,7 +13897,7 @@ msgstr ""
 "SÃ³ hai mensaxes ocultas neste cartafol. Use Ver -> Mostrar mensaxes ocultas "
 "para velas."
 
-#: ../mail/message-list.c:4303
+#: ../mail/message-list.c:4726
 msgid "There are no messages in this folder."
 msgstr "Non hai mensaxes neste cartafol."
 
@@ -15146,7 +13926,6 @@ msgid "Sent Messages"
 msgstr "Mensaxes enviadas"
 
 #: ../mail/message-list.etspec.h:16
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 #: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "TamaÃ±o"
@@ -15155,59 +13934,28 @@ msgstr "TamaÃ±o"
 msgid "Subject - Trimmed"
 msgstr "Asunto - Recortado"
 
-#: ../mail/message-tag-followup.c:54
-msgid "Call"
-msgstr "Chamar"
-
-#: ../mail/message-tag-followup.c:55
-msgid "Do Not Forward"
-msgstr "Non reenviar"
-
-#: ../mail/message-tag-followup.c:56
-msgid "Follow-Up"
-msgstr "Seguimento"
-
-#: ../mail/message-tag-followup.c:57
-msgid "For Your Information"
-msgstr "Para a sÃºa informaciÃ³n"
-
-#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
-msgid "Forward"
-msgstr "Reenviar"
-
-#: ../mail/message-tag-followup.c:59
-msgid "No Response Necessary"
-msgstr "Non Ã© necesaria unha resposta"
-
-#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
-msgid "Reply"
-msgstr "Responder"
-
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
-msgid "Reply to All"
-msgstr "Responder a todos"
-
-#: ../mail/message-tag-followup.c:64
-msgid "Review"
-msgstr "Revisar"
-
 #: ../mail/searchtypes.xml.h:1
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Body contains"
 msgstr "O corpo contÃ©n"
 
 #: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "Message contains"
 msgstr "A mensaxe contÃ©n"
 
 #: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
 msgid "Recipients contain"
 msgstr "Os destinatarios conteÃ±en"
 
 #: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1294
 msgid "Sender contains"
 msgstr "O remitente contÃ©n"
 
 #: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1301
 msgid "Subject contains"
 msgstr "O asunto contÃ©n"
 
@@ -15215,13 +13963,2146 @@ msgstr "O asunto contÃ©n"
 msgid "Subject or Addresses contains"
 msgstr "O asunto ou os enderezos conteÃ±en"
 
-#: ../mail/searchtypes.xml.h:7
-msgid "Subject or Recipients contains"
-msgstr "O asunto ou o destinatario contÃ©n"
+#: ../modules/addressbook/addressbook-config.c:206
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"Seleccionar esta opciÃ³n significa que o Evolution sÃ³ conectarÃ¡ co seu "
+"servidor LDAP se o seu servidor LDAP Ã© compatÃbel con SSL."
+
+#: ../modules/addressbook/addressbook-config.c:208
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"Seleccionar esta opciÃ³n significa que o Evolution sÃ³ conectarÃ¡ co seu "
+"servidor LDAP se o seu servidor LDAP Ã© compatÃbel TLS."
+
+#: ../modules/addressbook/addressbook-config.c:210
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"Seleccionar esta opciÃ³n significa que o seu servidor non permite nin SSL nin "
+"TLS. Isto significa que a sÃºa conexiÃ³n serÃ¡ insegura e que vostede serÃ¡ "
+"vulnerÃ¡bel a fallos de seguranza."
+
+#: ../modules/addressbook/addressbook-config.c:592
+msgid "Use in _Birthday & Anniversaries calendar"
+msgstr "Datas de nacementos e aniversarios"
+
+#: ../modules/addressbook/addressbook-config.c:628
+msgid "Copy _book content locally for offline operation"
+msgstr ""
+"Copiar o contido da a_xenda de enderezos localmente para unha operaciÃ³n sen "
+"conexiÃ³n"
+
+#: ../modules/addressbook/addressbook-config.c:736
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+"Este Ã© o porto do servidor LDAP ao que o Evolution tentarÃ¡ conectarse. "
+"Proporcionouse unha lista de portos estÃ¡ndar. Pregunte ao seu administrador "
+"do sistema que porto deberÃa especificar."
+
+#: ../modules/addressbook/addressbook-config.c:810
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"Este Ã© o mÃ©todo que o Evolution usarÃ¡ para autenticalo a vostede. Note que "
+"definir isto como \"Enderezo de correo\" require o acceso anÃ³nimo ao "
+"servidor LDAP."
+
+#: ../modules/addressbook/addressbook-config.c:885
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+"O Ã¡mbito de busca define atÃ© que profundidade quere que a busca se estenda "
+"ao longo dunha Ã¡rbore de directorios. Un Ã¡mbito de busca de \"sub\" incluirÃ¡ "
+"todas as entradas por debaixo da sÃºa base de busca. Un Ã¡mbito \"un\" sÃ³ "
+"incluirÃ¡ as entradas un nivel por debaixo da sÃºa base."
+
+#: ../modules/addressbook/addressbook-config.c:991
+msgid "Server Information"
+msgstr "InformaciÃ³n do servidor"
+
+#: ../modules/addressbook/addressbook-config.c:996
+#: ../smime/gui/smime-ui.ui.h:14
+msgid "Details"
+msgstr "Detalles"
+
+#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/mail/e-mail-shell-view.c:54
+msgid "Searching"
+msgstr "Buscando"
+
+#: ../modules/addressbook/addressbook-config.c:999
+msgid "Downloading"
+msgstr "Descargando"
+
+#: ../modules/addressbook/addressbook-config.c:1205
+msgid "Address Book Properties"
+msgstr "Propiedades da axenda de enderezos"
+
+#: ../modules/addressbook/addressbook-config.c:1207
+msgid "New Address Book"
+msgstr "Nova axenda de enderezos"
+
+#: ../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:2
+msgid "Contact layout style"
+msgstr "Lista de contactos"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
+msgid "Contact preview pane position (horizontal)"
+msgstr "PosiciÃ³n do panel de previsualizaciÃ³n de contactos (horizontal)"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
+msgid "Contact preview pane position (vertical)"
+msgstr "PosiciÃ³n do panel de previsualizaciÃ³n de contactos (horizontal)"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "XML EFolderList para a lista de completado dos URI"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "XML EFolderList para a lista de completado dos URI."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr ""
+"PosiciÃ³n do panel de previsualizaciÃ³n de contactos cando sexa orientado "
+"horizontalmente."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr ""
+"PosiciÃ³n do panel de previsualizaciÃ³n de contactos cando sexa orientado "
+"verticalmente."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Show autocompleted name with an address"
+msgstr "Mostrar o nome completado automaticamente cun enderezo"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+msgid "Show preview pane"
+msgstr "Mostrar o panel de previsualizaciÃ³n"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+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 "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
+"O estilo de disposiciÃ³n determina onde dispoÃ±er o panel de previsualizaciÃ³n "
+"en relaciÃ³n coa lista de contactos. \"0\" (VisualizaciÃ³n clÃ¡sica) mostra o "
+"panel de previsualizaciÃ³n debaixo da lista de contactos. \"1"
+"\" (VisualizaciÃ³n vertical) mostra o panel de previsualizaciÃ³n ao lado da "
+"lista de contactos."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+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."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+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:14
+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:15
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+"Se hai que forzar que se mostre o enderezo de correo co nome do contacto "
+"completado automaticamente na entrada."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+msgid "Whether to show the preview pane."
+msgstr "Indica se se mostra o panel de previsualizaciÃ³n."
+
+#: ../modules/addressbook/autocompletion-config.c:159
+msgid "Table column:"
+msgstr "Columna da tÃ¡boa:"
+
+#: ../modules/addressbook/autocompletion-config.c:162
+msgid "Autocompletion"
+msgstr "Completado automÃ¡tico"
+
+#: ../modules/addressbook/autocompletion-config.c:165
+msgid "Always _show address of the autocompleted contact"
+msgstr "Mo_strar sempre o enderezo do contacto completado automaticamente"
+
+#. Create the LDAP source group
+#: ../modules/addressbook/e-book-shell-backend.c:190
+#: ../modules/addressbook/e-book-shell-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "En servidores LDAP"
+
+#: ../modules/addressbook/e-book-shell-backend.c:340
+msgctxt "New"
+msgid "_Contact"
+msgstr "_Contacto"
+
+#: ../modules/addressbook/e-book-shell-backend.c:342
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
+msgid "Create a new contact"
+msgstr "Crear un contacto novo"
+
+#: ../modules/addressbook/e-book-shell-backend.c:347
+msgctxt "New"
+msgid "Contact _List"
+msgstr "_Lista de contactos"
+
+#: ../modules/addressbook/e-book-shell-backend.c:349
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
+msgid "Create a new contact list"
+msgstr "Crear unha lista de contactos nova"
+
+#: ../modules/addressbook/e-book-shell-backend.c:357
+msgctxt "New"
+msgid "Address _Book"
+msgstr "_Axenda de enderezos"
+
+#: ../modules/addressbook/e-book-shell-backend.c:359
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
+msgid "Create a new address book"
+msgstr "Crear unha axenda de enderezos nova"
+
+#. Create the contacts group
+#: ../modules/addressbook/e-book-shell-backend.c:376
+#: ../modules/addressbook/e-book-shell-view.c:394
+#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../modules/calendar/e-cal-shell-migrate.c:480
+msgid "Contacts"
+msgstr "Contactos"
+
+#: ../modules/addressbook/e-book-shell-backend.c:596
+#: ../modules/calendar/e-cal-shell-backend.c:777
+#: ../modules/calendar/e-memo-shell-backend.c:587
+#: ../modules/calendar/e-task-shell-backend.c:597
+msgid "Source List"
+msgstr "Orixe"
+
+#: ../modules/addressbook/e-book-shell-backend.c:597
+msgid "The registry of address books"
+msgstr "Non foi posÃbel obter unha lista de axendas de enderezos"
+
+#: ../modules/addressbook/e-book-shell-content.c:364
+msgid "Current View"
+msgstr "_VisualizaciÃ³n actual"
+
+#: ../modules/addressbook/e-book-shell-content.c:365
+msgid "The currently selected address book view"
+msgstr "A visualizaciÃ³n de axenda de enderezo seleccionada actualmente"
+
+#: ../modules/addressbook/e-book-shell-content.c:374
+msgid "Previewed Contact"
+msgstr "Contacto novo"
+
+#: ../modules/addressbook/e-book-shell-content.c:375
+msgid "The contact being shown in the preview pane"
+msgstr "Indica se se mostra o panel de previsualizaciÃ³n."
+
+#: ../modules/addressbook/e-book-shell-content.c:384
+#: ../modules/calendar/e-memo-shell-content.c:617
+#: ../modules/calendar/e-task-shell-content.c:639
+#: ../modules/mail/e-mail-shell-content.c:688
+msgid "Preview is Visible"
+msgstr "A barra lateral Ã© visÃbel"
+
+#: ../modules/addressbook/e-book-shell-content.c:385
+#: ../modules/calendar/e-memo-shell-content.c:618
+#: ../modules/calendar/e-task-shell-content.c:640
+#: ../modules/mail/e-mail-shell-content.c:689
+msgid "Whether the preview pane is visible"
+msgstr "Indica se se mostra o panel de previsualizaciÃ³n."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:645
+msgid "LDAP Servers"
+msgstr "Servidores LDAP"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:765
+msgid "Autocompletion Settings"
+msgstr "ConfiguraciÃ³n do completado automÃ¡tico"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1152
+msgid ""
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"A localizaciÃ³n e a xerarquÃa dos cartafoles de contactos do Evolution "
+"modificouse desde o Evolution 1.x.\n"
+"\n"
+"Sexa paciente mentres o Evolution migra os seus cartafoles..."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1166
+msgid ""
+"The format of mailing list contacts has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Modificouse o formato dos contactos da lista de correo.\n"
+"\n"
+"Sexa paciente mentres o Evolution migra os seus cartafoles..."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1175
+msgid ""
+"The way Evolution stores some phone numbers has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Modificouse a maneira en que o Evolution almacena algÃºns nÃºmeros de "
+"telÃ©fono.\n"
+"\n"
+"Sexa paciente mentres o Evolution migra os seus cartafoles..."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1185
+msgid ""
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data..."
+msgstr ""
+"Modificouse o rexistro de modificaciÃ³ns e os ficheiros de mapa no Palm Sync "
+"do Evolution.\n"
+"\n"
+"Sexa paciente mentres o Evolution migra os seus datos Pilot Sync..."
+
+#: ../modules/addressbook/e-book-shell-sidebar.c:181
+#: ../modules/calendar/e-cal-shell-sidebar.c:756
+#: ../modules/calendar/e-memo-shell-sidebar.c:682
+#: ../modules/calendar/e-task-shell-sidebar.c:682
+msgid "Source Selector Widget"
+msgstr "Selector de orixe de notas"
+
+#: ../modules/addressbook/e-book-shell-sidebar.c:182
+msgid "This widget displays groups of address books"
+msgstr "Non foi posÃbel obter unha lista de axendas de enderezos"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:262
+#: ../modules/addressbook/e-book-shell-view-actions.c:539
+msgid "Save as vCard"
+msgstr "Gardar como vCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:662
+msgid "Co_py All Contacts To..."
+msgstr "Co_piar todos os contactos a..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
+msgid "Copy the contacts of the selected address book to another"
+msgstr "Copiar os contactos do cartafol seleccionado noutro cartafol"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#, fuzzy
+msgid "D_elete Address Book"
+msgstr "E_liminar a axenda de enderezos"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
+msgid "Delete the selected address book"
+msgstr "Eliminar o cartafol seleccionado"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:676
+msgid "Mo_ve All Contacts To..."
+msgstr "Mo_ver todos os contactos a..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
+msgid "Move the contacts of the selected address book to another"
+msgstr "Mover os contactos do cartafol seleccionado a outro cartafol"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
+msgid "_New Address Book"
+msgstr "_Nova axenda de enderezos"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:690
+msgid "Address _Book Properties"
+msgstr "Propiedades da a_xenda de enderezos"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
+msgid "Show properties of the selected address book"
+msgstr "Modificar as propiedades do cartafol seleccionado"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:697
+#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/mail/e-mail-shell-view-actions.c:946
+msgid "_Rename..."
+msgstr "_Renomear..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+msgid "Rename the selected address book"
+msgstr "Renomear o cartafol seleccionado"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:704
+msgid "S_ave Address Book as vCard"
+msgstr "G_ardar axenda de enderezos como VCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "Gardar os contactos do cartafol seleccionado como unha VCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:713
+msgid "Stop loading"
+msgstr "Deter a carga"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:718
+msgid "_Copy Contact To..."
+msgstr "_Copiar contacto a..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
+msgid "Copy selected contacts to another address book"
+msgstr "Copiar os contactos seleccionados a outro cartafol"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:725
+msgid "_Delete Contact"
+msgstr "E_liminar contacto"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#, fuzzy
+msgid "_Find in Contact..."
+msgstr "_Reenviar contacto..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#, fuzzy
+msgid "Search for text in the displayed contact"
+msgstr "Buscar texto no corpo da mensaxe mostrada"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:739
+msgid "_Forward Contact..."
+msgstr "_Reenviar contacto..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
+msgid "Send selected contacts to another person"
+msgstr "Enviar os contactos seleccionados a outra persoa"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:746
+msgid "_Move Contact To..."
+msgstr "_Mover contacto a..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
+msgid "Move selected contacts to another address book"
+msgstr "Mover os contactos seleccionados a outro cartafol"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:753
+msgid "_New Contact..."
+msgstr "Contacto _novo..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:760
+msgid "New Contact _List..."
+msgstr "_Lista de contactos nova..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:767
+msgid "_Open Contact"
+msgstr "_Contacto"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
+msgid "View the current contact"
+msgstr "Ver o contacto actual"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:774
+msgid "_Send Message to Contact..."
+msgstr "_Enviar mensaxe ao contacto..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
+msgid "Send a message to the selected contacts"
+msgstr "Enviar unha mensaxe aos contactos seleccionados"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-task-shell-view-actions.c:805
+msgid "_Actions"
+msgstr "_AcciÃ³ns"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:790
+#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/mail/e-mail-shell-view-actions.c:1088
+msgid "_Preview"
+msgstr "_PrevisualizaciÃ³n"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-memo-shell-view-actions.c:673
+#: ../modules/calendar/e-task-shell-view-actions.c:825
+msgid "_Delete"
+msgstr "E_liminar"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:803
+msgid "_Properties"
+msgstr "_Propiedades"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:811
+msgid "_Save as vCard..."
+msgstr "_Gardar como vCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:839
+msgid "Contact _Preview"
+msgstr "_PrevisualizaciÃ³n de contactos"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:841
+msgid "Show contact preview window"
+msgstr "Mostrar a xanela de previsualizaciÃ³n de contactos"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/calendar/e-memo-shell-view-actions.c:730
+#: ../modules/calendar/e-task-shell-view-actions.c:894
+#: ../modules/mail/e-mail-shell-view-actions.c:1183
+msgid "_Classic View"
+msgstr "VisualizaciÃ³n _clÃ¡sica"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:862
+msgid "Show contact preview below the contact list"
+msgstr "Mostrar a previsualizaciÃ³n da mensaxe baixo a lista de mensaxes"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/calendar/e-memo-shell-view-actions.c:737
+#: ../modules/calendar/e-task-shell-view-actions.c:901
+#: ../modules/mail/e-mail-shell-view-actions.c:1190
+msgid "_Vertical View"
+msgstr "VisualizaciÃ³n _vertical"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:869
+msgid "Show contact preview alongside the contact list"
+msgstr "Mostrar a xanela de previsualizaciÃ³n de contactos"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:918
+msgid "Any Category"
+msgstr "Calquera categorÃa"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
+#: ../modules/calendar/e-cal-shell-view-actions.c:1608
+#: ../modules/calendar/e-memo-shell-view-actions.c:754
+#: ../modules/calendar/e-task-shell-view-actions.c:953
+msgid "Unmatched"
+msgstr "Sen equivalencia"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-memo-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:963
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../shell/e-shell-content.c:516
+msgid "Advanced Search"
+msgstr "Busca avanzada"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
+msgid "Print all shown contacts"
+msgstr "Imprimir os contactos seleccionados"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
+msgid "Preview the contacts to be printed"
+msgstr "Previsualiza os contactos que se van imprimir"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:941
+msgid "Print selected contacts"
+msgstr "Imprimir os contactos seleccionados"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:956
+msgid "Save as vCard..."
+msgstr "Gardar como vCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:958
+msgid "Save selected contacts as a vCard"
+msgstr "Gardar os contactos seleccionados como unha VCard"
+
+#: ../modules/addressbook/e-book-shell-view.c:338
+msgid "_Forward Contacts"
+msgstr "_Reenviar contactos"
+
+#: ../modules/addressbook/e-book-shell-view.c:340
+msgid "_Forward Contact"
+msgstr "_Reenviar contacto"
+
+#: ../modules/addressbook/e-book-shell-view.c:371
+msgid "_Send Message to Contacts"
+msgstr "Enviar unha _mensaxe aos contactos"
+
+#: ../modules/addressbook/e-book-shell-view.c:373
+msgid "_Send Message to List"
+msgstr "Enviar unha _mensaxe Ã¡ lista"
+
+#: ../modules/addressbook/e-book-shell-view.c:375
+msgid "_Send Message to Contact"
+msgstr "Enviar unha _mensaxe ao contacto"
+
+#: ../modules/addressbook/eab-composer-util.c:137
+msgid "Multiple vCards"
+msgstr "MÃºltiples vCards"
+
+#: ../modules/addressbook/eab-composer-util.c:145
+#, c-format
+msgid "vCard for %s"
+msgstr "vCard para %s"
+
+#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:184
+#, c-format
+msgid "Contact information"
+msgstr "InformaciÃ³n de contacto"
+
+#: ../modules/addressbook/eab-composer-util.c:186
+#, c-format
+msgid "Contact information for %s"
+msgstr "InformaciÃ³n de contacto de %s"
+
+#: ../modules/addressbook/ldap-config.ui.h:1
+msgid "1"
+msgstr "1"
+
+#: ../modules/addressbook/ldap-config.ui.h:2
+msgid "3268"
+msgstr "3268"
+
+#: ../modules/addressbook/ldap-config.ui.h:3
+msgid "389"
+msgstr "389"
+
+#: ../modules/addressbook/ldap-config.ui.h:4
+msgid "5"
+msgstr "5"
+
+#: ../modules/addressbook/ldap-config.ui.h:5
+msgid "636"
+msgstr "636"
+
+#: ../modules/addressbook/ldap-config.ui.h:6
+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:8
+msgid "B_rowse this book until limit reached"
+msgstr "Examina_r esta axenda de enderezos atÃ© atinxir o lÃmite"
+
+#: ../modules/addressbook/ldap-config.ui.h:9
+msgid "Lo_gin:"
+msgstr "_Iniciar a sesiÃ³n:"
+
+#. 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:12
+msgid "One"
+msgstr "Conectado"
+
+#: ../modules/addressbook/ldap-config.ui.h:14
+msgid "Search Filter"
+msgstr "Filtro de busca"
+
+#: ../modules/addressbook/ldap-config.ui.h:15
+msgid "Search _base:"
+msgstr "_Base de busca:"
+
+#: ../modules/addressbook/ldap-config.ui.h:16
+msgid "Search _filter:"
+msgstr "_Filtro de busca:"
+
+#: ../modules/addressbook/ldap-config.ui.h:17
+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 dos obxectos buscados mentres se realiza a busca. "
+"Se isto non se modifica, a busca por omisiÃ³n realizarase sobre a clase de "
+"obxectos do tipo \"persoa\"."
+
+#. 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"
+
+#: ../modules/addressbook/ldap-config.ui.h:20
+msgid "Supported Search Bases"
+msgstr "Bases de busca compatÃbeis"
+
+#: ../modules/addressbook/ldap-config.ui.h:22
+msgid "Using distinguished name (DN)"
+msgstr ""
+"Anonimamente\n"
+"Empregar enderezo de correo\n"
+"Empregar nome distintivo (DN)"
+
+#: ../modules/addressbook/ldap-config.ui.h:23
+msgid "Using email address"
+msgstr "_Enderezo de correo:"
+
+#: ../modules/addressbook/ldap-config.ui.h:24
+msgid "_Download limit:"
+msgstr "LÃmite de _descarga:"
+
+#: ../modules/addressbook/ldap-config.ui.h:25
+msgid "_Find Possible Search Bases"
+msgstr "_Localizar bases de busca posÃbeis"
+
+#: ../modules/addressbook/ldap-config.ui.h:26
+msgid "_Login method:"
+msgstr "MÃ©todo de _inicio de sesiÃ³n:"
+
+#: ../modules/addressbook/ldap-config.ui.h:28
+msgid "_Port:"
+msgstr "_Porto:"
+
+#: ../modules/addressbook/ldap-config.ui.h:29
+msgid "_Search scope:"
+msgstr "Ã?mbito da bu_sca:"
+
+#: ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Timeout:"
+msgstr "_Tempo de espera:"
+
+#: ../modules/addressbook/ldap-config.ui.h:32
+msgid "_Use secure connection:"
+msgstr "_Usar unha conexiÃ³n segura:"
+
+#: ../modules/addressbook/ldap-config.ui.h:33
+msgid "cards"
+msgstr "tarxetas"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:259
+msgid "I_mport"
+msgstr "I_mportar"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+msgid "Select a Calendar"
+msgstr "Seleccione un calendario"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:368
+msgid "Select a Task List"
+msgstr "Seleccione unha lista de tarefas"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:378
+msgid "I_mport to Calendar"
+msgstr "I_mportar ao calendario"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:385
+msgid "I_mport to Tasks"
+msgstr "_Importar Ã¡s tarefas"
+
+#. Create the Webcal source group
+#: ../modules/calendar/e-cal-shell-backend.c:125
+#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-memo-shell-backend.c:110
+#: ../modules/calendar/e-memo-shell-migrate.c:136
+#: ../modules/calendar/e-task-shell-backend.c:113
+#: ../modules/calendar/e-task-shell-migrate.c:535
+msgid "On The Web"
+msgstr "Na Web"
+
+#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../plugins/calendar-weather/calendar-weather.c:117
+msgid "Weather"
+msgstr "O tempo"
+
+#: ../modules/calendar/e-cal-shell-backend.c:242
+#: ../modules/calendar/e-cal-shell-migrate.c:483
+msgid "Birthdays & Anniversaries"
+msgstr "Datas de nacementos e aniversarios"
+
+#: ../modules/calendar/e-cal-shell-backend.c:446
+msgctxt "New"
+msgid "_Appointment"
+msgstr "Cit_a"
+
+#: ../modules/calendar/e-cal-shell-backend.c:448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+msgid "Create a new appointment"
+msgstr "Crear unha cita nova"
+
+#: ../modules/calendar/e-cal-shell-backend.c:453
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "Ci_ta para todo o dÃa"
+
+#: ../modules/calendar/e-cal-shell-backend.c:455
+msgid "Create a new all-day appointment"
+msgstr "Crear nova cita nova para todo o dÃa"
+
+#: ../modules/calendar/e-cal-shell-backend.c:460
+msgctxt "New"
+msgid "M_eeting"
+msgstr "R_euniÃ³n"
+
+#: ../modules/calendar/e-cal-shell-backend.c:462
+msgid "Create a new meeting request"
+msgstr "Crear unha solicitude de cita nova"
+
+#: ../modules/calendar/e-cal-shell-backend.c:470
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "Cale_ndario"
+
+#: ../modules/calendar/e-cal-shell-backend.c:472
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
+msgid "Create a new calendar"
+msgstr "Crear un calendario novo"
+
+#: ../modules/calendar/e-cal-shell-backend.c:507
+#: ../plugins/itip-formatter/itip-formatter.c:2644
+msgid "Calendar and Tasks"
+msgstr "Calendario e tarefas"
+
+#: ../modules/calendar/e-cal-shell-backend.c:778
+msgid "The registry of calendars"
+msgstr "Calendario primario"
+
+#: ../modules/calendar/e-cal-shell-migrate.c:131
+msgid ""
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"A localizaciÃ³n e xerarquÃa dos cartafoles de calendario do Evolution "
+"modificouse desde o Evolution 1.x.\n"
+"\n"
+"Agarde mentres o Evolution migra os seus cartafoles..."
+
+#. FIXME: set proper domain/code
+#: ../modules/calendar/e-cal-shell-migrate.c:664
+#: ../modules/calendar/e-task-shell-migrate.c:591
+#, c-format
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+"Non Ã© posÃbel migrar a configuraciÃ³n antiga desde evolution/config.xmldb"
+
+#. FIXME: domain/code
+#: ../modules/calendar/e-cal-shell-migrate.c:693
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr "Non foi posÃbel migrar o calendario `%s'"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:162
+#: ../modules/calendar/e-memo-shell-sidebar.c:157
+#: ../modules/calendar/e-task-shell-sidebar.c:157
+#, c-format
+msgid ""
+"Error on %s\n"
+"%s"
+msgstr ""
+"Erro en %s:\n"
+" %s"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:221
+msgid "Loading calendars"
+msgstr "Cargando calendario"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:610
+msgid "Calendar Selector"
+msgstr "Selector de orixe do calendario"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:736
+msgid "Date Navigator Widget"
+msgstr "Widget do navegador de datas"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:737
+msgid "This widget displays a miniature calendar"
+msgstr "Este widget mostra unha calendario en miniatura"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:746
+#, fuzzy
+msgid "Default Calendar Client"
+msgstr "Cliente de correo predefinido"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:747
+msgid "Default client for calendar operations"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:757
+msgid "This widget displays groups of calendars"
+msgstr "Este widget mostra grupos de calendarios"
 
-#: ../mail/searchtypes.xml.h:8
-msgid "Subject or Sender contains"
-msgstr "O asunto ou o remitente conteÃ±en"
+#: ../modules/calendar/e-cal-shell-sidebar.c:944
+#, c-format
+msgid "Opening calendar at %s"
+msgstr "Abrir calendario en %s"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
+msgid "Print"
+msgstr "Imprimir"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:306
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"Esta operaciÃ³n eliminarÃ¡ permanentemente todos os eventos marcados mÃ¡is "
+"antigos que o tempo seleccionado. Se continÃºa, non poderÃ¡ recuperar estes "
+"eventos."
+
+#. Translators: This is the first part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:323
+msgid "Purge events older than"
+msgstr "Purgar eventos anteriores a"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:540
+msgid "Copying Items"
+msgstr "Copiando elementos"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:795
+msgid "Moving Items"
+msgstr "Movendo elementos"
+
+#. Translators: Default filename part saving an event to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-actions.c:1097
+msgid "event"
+msgstr "Enviado"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1099
+#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
+#: ../modules/calendar/e-memo-shell-view-actions.c:507
+#: ../modules/calendar/e-task-shell-view-actions.c:624
+msgid "Save as iCalendar"
+msgstr "Seleccione un calendario"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1229
+#: ../modules/calendar/e-memo-shell-view-actions.c:588
+msgid "_Copy..."
+msgstr "_Copiar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1236
+#, fuzzy
+msgid "D_elete Calendar"
+msgstr "Seleccione un calendario"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1238
+#, fuzzy
+msgid "Delete the selected calendar"
+msgstr "Renomear o cartafol seleccionado"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1245
+msgid "Go Back"
+msgstr "AtrÃ¡s"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1252
+msgid "Go Forward"
+msgstr "Adiante"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
+msgid "Select _Today"
+msgstr "Seleccionar _hoxe"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+msgid "Select today"
+msgstr "Seleccionar hoxe"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+msgid "Select _Date"
+msgstr "Seleccionar _data"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+msgid "Select a specific date"
+msgstr "Seleccionar unha data especÃfica"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
+msgid "_New Calendar"
+msgstr "Calendario _novo"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../modules/calendar/e-task-shell-view-actions.c:796
+msgid "Purg_e"
+msgstr "D_epurar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
+msgid "Purge old appointments and meetings"
+msgstr "Depurar as reuniÃ³ns e as citas antigas"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../modules/calendar/e-task-shell-view-actions.c:740
+msgid "Re_fresh"
+msgstr "Ac_tualizar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
+msgid "Refresh the selected calendar"
+msgstr "Renomear o cartafol seleccionado"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1301
+msgid "Rename the selected calendar"
+msgstr "Renomear o cartafol seleccionado"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+msgid "Show _Only This Calendar"
+msgstr "M_ostrar sÃ³ este calendario"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+msgid "Cop_y to Calendar..."
+msgstr "Cop_iar a un calendario..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+msgid "_Delegate Meeting..."
+msgstr "_Delegar cita..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#, fuzzy
+msgid "_Delete Appointment"
+msgstr "Eliminar esta cita"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1329
+#, fuzzy
+msgid "Delete selected appointments"
+msgstr "Eliminar esta cita"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+msgid "Delete This _Occurrence"
+msgstr "Eliminar esta _apariciÃ³n"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1336
+msgid "Delete this occurrence"
+msgstr "Eliminar esta apariciÃ³n"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+#, fuzzy
+msgid "Delete All Occ_urrences"
+msgstr "Eliminar _todas as apariciÃ³ns"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1343
+msgid "Delete all occurrences"
+msgstr "Eliminar todas as apariciÃ³ns"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+msgid "New All Day _Event..."
+msgstr "Novo _actividade de dÃa completo"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+msgid "Create a new all day event"
+msgstr "Crear nova cita nova para todo o dÃa"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:581
+#: ../modules/calendar/e-task-shell-view-actions.c:705
+msgid "_Forward as iCalendar..."
+msgstr "Remi_tir como iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+msgid "New _Meeting..."
+msgstr "_ReuniÃ³n nova"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+msgid "Create a new meeting"
+msgstr "Crear unha solicitude de cita nova"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
+msgid "Mo_ve to Calendar..."
+msgstr "Mo_ver ao calendario..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
+msgid "New _Appointment..."
+msgstr "_Cita nova..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
+msgid "Make this Occurrence _Movable"
+msgstr "Facer esta apariciÃ³n _movÃbel"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+msgid "_Open Appointment"
+msgstr "_Abrir cita"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+msgid "View the current appointment"
+msgstr "Ver a cita actual"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+msgid "_Reply"
+msgstr "_Responder"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+msgid "Save as iCalendar..."
+msgstr "Gardar como vCard..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
+msgid "_Schedule Meeting..."
+msgstr "_Programar cita..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
+msgid "Converts an appointment to a meeting"
+msgstr "Depurar as reuniÃ³ns e as citas antigas"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+msgid "Conv_ert to Appointment..."
+msgstr "_Cita nova..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1427
+msgid "Converts a meeting to an appointment"
+msgstr "%s ao finalizar a cita"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1549
+msgid "Day"
+msgstr "DÃa"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1551
+msgid "Show one day"
+msgstr "Mostrar un dÃa"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+msgid "List"
+msgstr "Lista"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1558
+msgid "Show as list"
+msgstr "Mostrar como unha lista"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1563
+msgid "Month"
+msgstr "Mes"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1565
+msgid "Show one month"
+msgstr "Mostrar un mes"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1570
+msgid "Week"
+msgstr "Semana"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1572
+msgid "Show one week"
+msgstr "Mostrar unha semana"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
+msgid "Show one work week"
+msgstr "Mostrar unha semana"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+msgid "Active Appointments"
+msgstr "Citas activas"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1601
+msgid "Next 7 Days' Appointments"
+msgstr "Citas dos prÃ³ximos sete dÃas"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../modules/calendar/e-memo-shell-view-actions.c:778
+#: ../modules/calendar/e-task-shell-view-actions.c:977
+msgid "Description contains"
+msgstr "A descriciÃ³n contÃ©n"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
+#: ../modules/calendar/e-memo-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:984
+msgid "Summary contains"
+msgstr "O resumo contÃ©n"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1651
+msgid "Print this calendar"
+msgstr "Imprimir este calendario"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
+msgid "Preview the calendar to be printed"
+msgstr "Previsualiza o calendario que se vai imprimir"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1730
+msgid "Go To"
+msgstr "Ir a"
+
+#. Translators: Default filename part saving a memo to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-memopad.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:505
+msgid "memo"
+msgstr "Nota"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:637
+msgid "New _Memo"
+msgstr "Nota nova"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:252
+#: ../modules/calendar/e-memo-shell-backend.c:320
+#: ../modules/calendar/e-memo-shell-view-actions.c:639
+msgid "Create a new memo"
+msgstr "Crear unha nota nova"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
+msgid "_Open Memo"
+msgstr "_Abrir nota"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:646
+msgid "View the selected memo"
+msgstr "Ver a nota seleccionada"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-memo-shell-view-actions.c:651
+#: ../modules/calendar/e-task-shell-view-actions.c:789
+msgid "Open _Web Page"
+msgstr "Abrir pÃ¡xina _web"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-memo-shell-view-actions.c:811
+msgid "Print the selected memo"
+msgstr "Ver a nota seleccionada"
+
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../modules/calendar/e-task-shell-view-actions.c:622
+msgid "task"
+msgstr "Tarefa"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:684
+msgid "_Assign Task"
+msgstr "_Asignar Tarefa"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:761
+msgid "_Mark as Complete"
+msgstr "_Marcar como terminada"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:763
+msgid "Mark selected tasks as complete"
+msgstr "Marcar as tarefas seleccionadas como terminadas"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+msgid "_Mark as Incomplete"
+msgstr "_Marcar como non terminada"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:770
+msgid "Mark selected tasks as incomplete"
+msgstr "Marcar as tarefas seleccionadas como terminadas"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-task-shell-view-actions.c:775
+msgid "New _Task"
+msgstr "Nova _tarefa"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-task-shell-backend.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:777
+msgid "Create a new task"
+msgstr "Crear unha tarefa nova"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:782
+msgid "_Open Task"
+msgstr "_Abrir tarefa"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:784
+msgid "View the selected task"
+msgstr "Ver a tarefa seleccionada"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-memo-shell-view-actions.c:826
+#: ../modules/calendar/e-task-shell-view-actions.c:1025
+msgid "_Save as iCalendar..."
+msgstr "Remi_tir como iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-task-shell-view-actions.c:1010
+msgid "Print the selected task"
+msgstr "Ver a tarefa seleccionada"
+
+#: ../modules/calendar/e-memo-shell-backend.c:318
+msgctxt "New"
+msgid "Mem_o"
+msgstr "N_ota"
+
+#: ../modules/calendar/e-memo-shell-backend.c:325
+msgctxt "New"
+msgid "_Shared Memo"
+msgstr "Nota _compartida"
+
+#: ../modules/calendar/e-memo-shell-backend.c:327
+msgid "Create a new shared memo"
+msgstr "Crear unha nota compartida nova"
+
+#: ../modules/calendar/e-memo-shell-backend.c:335
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "Lista de notas"
+
+#: ../modules/calendar/e-memo-shell-backend.c:337
+#: ../modules/calendar/e-memo-shell-view-actions.c:604
+msgid "Create a new memo list"
+msgstr "Crear unha lista de notas nova"
+
+#: ../modules/calendar/e-memo-shell-backend.c:588
+msgid "The registry of memo lists"
+msgstr "Lista de notas primaria"
+
+#: ../modules/calendar/e-memo-shell-content.c:608
+msgid "The memo table model"
+msgstr "Modelo da tÃ¡boa"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:216
+msgid "Loading memos"
+msgstr "Cargando notas"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:564
+msgid "Memo List Selector"
+msgstr "Selector de orixe de notas"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:672
+#, fuzzy
+msgid "Default Memo Client"
+msgstr "Cliente de correo predefinido"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:673
+#, fuzzy
+msgid "Default client for memo operations"
+msgstr "Non se pode efectuar a operaciÃ³n."
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:683
+msgid "This widget displays groups of memo lists"
+msgstr "Este widget mostra os grupos de listas de recordatorios"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:862
+#, c-format
+msgid "Opening memos at %s"
+msgstr "Abrindo notas en %s"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+msgid "Print Memos"
+msgstr "Imprimir notas"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:567
+msgid "_Delete Memo"
+msgstr "E_liminar mensaxe"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:574
+#, fuzzy
+msgid "_Find in Memo..."
+msgstr "_Buscar na mensaxe..."
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:576
+#, fuzzy
+msgid "Search for text in the displayed memo"
+msgstr "Buscar texto no corpo da mensaxe mostrada"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:595
+#, fuzzy
+msgid "D_elete Memo List"
+msgstr "E_liminar mensaxe"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:597
+#, fuzzy
+msgid "Delete the selected memo list"
+msgstr "Renomear o cartafol seleccionado"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:602
+msgid "_New Memo List"
+msgstr "Lista de notas _nova"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:618
+msgid "Refresh the selected memo list"
+msgstr "Eliminar as notas seleccionadas"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:625
+msgid "Rename the selected memo list"
+msgstr "Renomear o cartafol seleccionado"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:630
+msgid "Show _Only This Memo List"
+msgstr "M_ostrar sÃ³ esta lista de notas"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:709
+msgid "Memo _Preview"
+msgstr "_PrevisualizaciÃ³n"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:711
+msgid "Show memo preview pane"
+msgstr "Mostrar o panel de previsualizaciÃ³n"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:732
+msgid "Show memo preview below the memo list"
+msgstr "Mostrar a previsualizaciÃ³n da mensaxe baixo a lista de mensaxes"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:739
+msgid "Show memo preview alongside the memo list"
+msgstr "Mostrar a previsualizaciÃ³n da mensaxe baixo a lista de mensaxes"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:797
+msgid "Print the list of memos"
+msgstr "Imprimir a lista de notas"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:804
+msgid "Preview the list of memos to be printed"
+msgstr "Previsualiza a lista de notas para imprimir"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:414
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d nota"
+msgstr[1] "%d notas"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:418
+#: ../modules/calendar/e-task-shell-view-private.c:567
+#, c-format
+msgid "%d selected"
+msgstr ", %d seleccionada"
+
+#: ../modules/calendar/e-memo-shell-view.c:223
+msgid "Delete Memos"
+msgstr "E_liminar mensaxe"
+
+#: ../modules/calendar/e-memo-shell-view.c:225
+#, fuzzy
+msgid "Delete Memo"
+msgstr "Delegar en"
+
+#: ../modules/calendar/e-task-shell-backend.c:322
+msgctxt "New"
+msgid "_Task"
+msgstr "_Tarefa"
+
+#: ../modules/calendar/e-task-shell-backend.c:329
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "Tarefa asigna_da"
+
+#: ../modules/calendar/e-task-shell-backend.c:331
+msgid "Create a new assigned task"
+msgstr "Crear unha tarefa asignada nova"
+
+#: ../modules/calendar/e-task-shell-backend.c:339
+msgctxt "New"
+msgid "Tas_k List"
+msgstr "Lista de tarefas"
+
+#: ../modules/calendar/e-task-shell-backend.c:341
+#: ../modules/calendar/e-task-shell-view-actions.c:728
+msgid "Create a new task list"
+msgstr "Crear unha lista de tarefas nova"
+
+#: ../modules/calendar/e-task-shell-backend.c:598
+msgid "The registry of task lists"
+msgstr "Lista de tarefas primaria"
+
+#: ../modules/calendar/e-task-shell-content.c:630
+msgid "The task table model"
+msgstr "Modelo da tÃ¡boa"
+
+#: ../modules/calendar/e-task-shell-migrate.c:98
+msgid ""
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"A localizaciÃ³n e xerarquÃa dos cartafoles de tarefas do Evolution "
+"modificouse desde o Evolution 1.x.\n"
+"\n"
+"Agarde mentres o Evolution migra os seus cartafoles..."
+
+#. FIXME: domain/code
+#: ../modules/calendar/e-task-shell-migrate.c:620
+#, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Non foi posÃbel migrar as tarefas `%s'"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:216
+msgid "Loading tasks"
+msgstr "Cargando tarefas"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:564
+msgid "Task List Selector"
+msgstr "Selector de orixe de tarefas"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:672
+#, fuzzy
+msgid "Default Task Client"
+msgstr "Cliente de correo predefinido"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:673
+#, fuzzy
+msgid "Default client for task operations"
+msgstr "Valor predefinido para o estado expandido do fÃo"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:683
+msgid "This widget displays groups of task lists"
+msgstr "Este widget mostra os grupos de listas de tarefas"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:862
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Abrindo tarefas en %s"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:241
+#: ../modules/calendar/e-task-shell-view-actions.c:256
+msgid "Print Tasks"
+msgstr "Imprimir tarefas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:566
+msgid ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+"Esta operaciÃ³n eliminarÃ¡ permanentemente todas as tarefas marcadas como "
+"terminadas. Se continÃºa, non serÃ¡ capaz de recuperar estas tarefas.\n"
+"\n"
+"EstÃ¡ seguro de que quere eliminar estas tarefas?"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:691
+msgid "_Delete Task"
+msgstr "E_liminar"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:698
+#, fuzzy
+msgid "_Find in Task..."
+msgstr "_Buscar na mensaxe..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:700
+#, fuzzy
+msgid "Search for text in the displayed task"
+msgstr "Buscar texto no corpo da mensaxe mostrada"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:712
+msgid "Copy..."
+msgstr "_Copiar..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:719
+#, fuzzy
+msgid "D_elete Task List"
+msgstr "Tarefas terminadas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:721
+#, fuzzy
+msgid "Delete the selected task list"
+msgstr "Renomear o cartafol seleccionado"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:726
+msgid "_New Task List"
+msgstr "Lista de tarefas _nova"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:742
+msgid "Refresh the selected task list"
+msgstr "Eliminar as tarefas seleccionadas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:749
+msgid "Rename the selected task list"
+msgstr "Renomear o cartafol seleccionado"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:754
+msgid "Show _Only This Task List"
+msgstr "M_ostrar sÃ³ esta lista de tarefas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:768
+msgid "Mar_k as Incomplete"
+msgstr "_Marcar como non terminada"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:798
+msgid "Delete completed tasks"
+msgstr "Eliminar as tarefas terminadas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:873
+msgid "Task _Preview"
+msgstr "_Previsualizar tarefa"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:875
+msgid "Show task preview pane"
+msgstr "Mostrar o panel de previsualizaciÃ³n"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:896
+msgid "Show task preview below the task list"
+msgstr "Mostrar a previsualizaciÃ³n da mensaxe baixo a lista de mensaxes"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:903
+msgid "Show task preview alongside the task list"
+msgstr "Mostrar a previsualizaciÃ³n da mensaxe baixo a lista de mensaxes"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:911
+msgid "Active Tasks"
+msgstr "Tarefas activas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:925
+msgid "Completed Tasks"
+msgstr "Tarefas terminadas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:932
+msgid "Next 7 Days' Tasks"
+msgstr "Tarefas dos prÃ³ximos sete dÃas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:939
+msgid "Overdue Tasks"
+msgstr "Tarefas atrasadas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:946
+msgid "Tasks with Attachments"
+msgstr "Tarefas con anexos"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:996
+msgid "Print the list of tasks"
+msgstr "Imprimir a lista de tarefas"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1003
+msgid "Preview the list of tasks to be printed"
+msgstr "Previsualiza a lista de tarefas para imprimir"
+
+#: ../modules/calendar/e-task-shell-view-private.c:461
+msgid "Expunging"
+msgstr "Compactando"
+
+#: ../modules/calendar/e-task-shell-view-private.c:563
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d tarefa"
+msgstr[1] "%d tarefas"
+
+#: ../modules/calendar/e-task-shell-view.c:351
+msgid "Delete Tasks"
+msgstr "Tarefas terminadas"
+
+#: ../modules/calendar/e-task-shell-view.c:353
+#, fuzzy
+msgid "Delete Task"
+msgstr "Delegar en"
+
+# (pofilter) variables: (u'translation contains variables not in original: %d',)
+#. Translators: This is only for multiple messages.
+#: ../modules/mail/e-mail-attachment-handler.c:335
+#, c-format
+msgid "%d attached messages"
+msgstr "%d mensaxes anexas"
+
+#. Translators: "None" for a junk hook name,
+#. * when the junk plugin is not enabled.
+#: ../modules/mail/e-mail-junk-hook.c:90
+msgctxt "mail-junk-hook"
+msgid "None"
+msgstr "NingÃºn"
+
+#: ../modules/mail/e-mail-shell-backend.c:168
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "_Mensaxe de correo"
+
+#: ../modules/mail/e-mail-shell-backend.c:170
+msgid "Compose a new mail message"
+msgstr "Compor unha mensaxe de correo nova"
+
+#: ../modules/mail/e-mail-shell-backend.c:178
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "Carta_fol de correo"
+
+#: ../modules/mail/e-mail-shell-backend.c:180
+msgid "Create a new mail folder"
+msgstr "Crear un cartafol novo de correo"
+
+#: ../modules/mail/e-mail-shell-backend.c:199
+msgid "Mail Accounts"
+msgstr "Contas de correo"
+
+#: ../modules/mail/e-mail-shell-backend.c:207
+msgid "Mail Preferences"
+msgstr "Preferencias de correo"
+
+#: ../modules/mail/e-mail-shell-backend.c:215
+msgid "Composer Preferences"
+msgstr "Preferencias do editor"
+
+#: ../modules/mail/e-mail-shell-backend.c:223
+msgid "Network Preferences"
+msgstr "Preferencias de rede"
+
+#: ../modules/mail/e-mail-shell-content.c:678
+msgid "Group by Threads"
+msgstr "Agr_upar por fÃos"
+
+#: ../modules/mail/e-mail-shell-content.c:679
+msgid "Whether to group messages by threads"
+msgstr "Indica se as mensaxes se agrupan por fÃos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view.c:875
+msgid "_Disable Account"
+msgstr "Desactivar conta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:857
+msgid "Disable this account"
+msgstr "Desactivar conta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:864
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr ""
+"Eliminar permanentemente todas as mensaxes eliminadas en todos os cartafoles"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:869
+msgid "C_reate Search Folder From Search..."
+msgstr "C_rear un cartafol de busca por busca..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:876
+msgid "_Download Messages for Offline Usage"
+msgstr "_Descargar as mensaxes para o uso sen conexiÃ³n"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:878
+#, fuzzy
+msgid "Download messages of accounts and folders marked for offline usage"
+msgstr ""
+"Descargar as mensaxes para as contas ou cartafoles marcados para o modo sen "
+"conexiÃ³n"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:883
+msgid "Fl_ush Outbox"
+msgstr "Lim_par a caixa de saÃda"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:890
+msgid "_Copy Folder To..."
+msgstr "_Copiar cartafol a..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:892
+msgid "Copy the selected folder into another folder"
+msgstr "Copiar o cartafol seleccionado noutro cartafol"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:899
+msgid "Permanently remove this folder"
+msgstr "Eliminar permanentemente este cartafol"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:904
+msgid "E_xpunge"
+msgstr "Com_pactar"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:906
+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:911
+msgid "Mar_k All Messages as Read"
+msgstr "Ma_rcar todas as mensaxes como lidas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:913
+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:918
+msgid "_Move Folder To..."
+msgstr "_Mover o cartafol a..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:920
+msgid "Move the selected folder into another folder"
+msgstr "Mover o cartafol seleccionado a outro cartafol"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:925
+msgid "_New..."
+msgstr "_Novo..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:927
+msgid "Create a new folder for storing mail"
+msgstr "Crear un cartafol novo para almacenar correo"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:934
+msgid "Change the properties of this folder"
+msgstr "Modificar as propiedades deste cartafol"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:941
+msgid "Refresh the folder"
+msgstr "Actualizar o cartafol"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:948
+msgid "Change the name of this folder"
+msgstr "Modificar o nome deste cartafol"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:953
+msgid "Select Message _Thread"
+msgstr "Seleccionar o _fÃo da mensaxe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:955
+msgid "Select all messages in the same thread as the selected message"
+msgstr "Seleccionar todas as mensaxes do mesmo fÃo que a mensaxe seleccionada"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:960
+msgid "Select Message S_ubthread"
+msgstr "Seleccionar o fÃo sec_undario da mensaxe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:962
+msgid "Select all replies to the currently selected message"
+msgstr "Seleccionar todas as respostas Ã¡ mensaxe seleccionada"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:967
+msgid "_Unsubscribe"
+msgstr "Eliminar s_ubscriciÃ³n"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:969
+msgid "Unsubscribe from the selected folder"
+msgstr "Renomear o cartafol seleccionado"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:974
+msgid "Empty _Trash"
+msgstr "Baleirar o _lixo"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:976
+#, fuzzy
+msgid "Permanently remove all the deleted messages from all accounts"
+msgstr ""
+"Eliminar permanentemente todas as mensaxes eliminadas en todos os cartafoles"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:981
+msgid "_New Label"
+msgstr "Etiqueta _nova"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:988
+msgid "N_one"
+msgstr "NingÃºn"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:995
+msgid "Hide _Read Messages"
+msgstr "Ocultar as mensaxes _lidas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:997
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Ocultar temporalmente todas as mensaxes lidas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1002
+msgid "Hide S_elected Messages"
+msgstr "Ocultar as mensaxes s_eleccionadas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
+msgid "Temporarily hide the selected messages"
+msgstr "Ocultar temporalmente as mensaxes seleccionadas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1009
+msgid "Show Hidde_n Messages"
+msgstr "Mostrar as mensaxes o_cultas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
+msgid "Show messages that have been temporarily hidden"
+msgstr "Mostrar as mensaxes ocultas temporalmente"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1032
+msgid "Cancel the current mail operation"
+msgstr "Cancelar a operaciÃ³n de correo actual"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1037
+msgid "Collapse All _Threads"
+msgstr "Contraer todos os _fÃos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1039
+msgid "Collapse all message threads"
+msgstr "Contraer todos os fÃos de mensaxe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1044
+msgid "E_xpand All Threads"
+msgstr "E_xpandir todos os fÃos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1046
+msgid "Expand all message threads"
+msgstr "Expandir todos os fÃos de mensaxe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1051
+msgid "_Message Filters"
+msgstr "Filtros de _mensaxe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1053
+msgid "Create or edit rules for filtering new mail"
+msgstr "Crear ou editar regras para a filtraxe do correo novo"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1058
+msgid "Search F_olders"
+msgstr "Cartaf_oles de busca"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1060
+msgid "Create or edit search folder definitions"
+msgstr "Crear ou editar as definiciÃ³ns de cartafoles de busca"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1065
+msgid "_Subscriptions..."
+msgstr "_SubscriciÃ³ns..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
+"Subscribirse ou eliminar subscriciÃ³n dos cartafoles en servidores remotos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1074
+msgid "F_older"
+msgstr "Cartaf_ol"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1081
+msgid "_Label"
+msgstr "_Etiqueta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1121
+msgid "_New Folder..."
+msgstr "Cartafol _novo..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
+msgid "Hide _Deleted Messages"
+msgstr "Ocultar as mensaxes elimina_das"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr "Ocultar as mensaxes eliminadas en vez de mostralas riscadas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
+msgid "Show Message _Preview"
+msgstr "Mostrar _previsualizaciÃ³n da mensaxe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
+msgid "Show message preview pane"
+msgstr "Mostrar a xanela de previsualizaciÃ³n da mensaxe"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1162
+msgid "_Group By Threads"
+msgstr "Agr_upar por fÃos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
+msgid "Threaded message list"
+msgstr "Lista de mensaxes por fÃos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1185
+msgid "Show message preview below the message list"
+msgstr "Mostrar a previsualizaciÃ³n da mensaxe baixo a lista de mensaxes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1192
+msgid "Show message preview alongside the message list"
+msgstr "Mostrar a previsualizaciÃ³n da mensaxe baixo a lista de mensaxes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1200
+msgid "All Messages"
+msgstr "Todas as mensaxes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1207
+msgid "Important Messages"
+msgstr "Mensaxes importantes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1214
+msgid "Last 5 Days' Messages"
+msgstr "Mensaxes dos Ãºltimos 5 dÃas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1221
+msgid "Messages Not Junk"
+msgstr "Mensaxes que non son lixo"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1228
+msgid "Messages with Attachments"
+msgstr "Mensaxes con anexos"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1235
+msgid "No Label"
+msgstr "Sen etiqueta"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1242
+msgid "Read Messages"
+msgstr "Mensaxes lidas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1249
+msgid "Recent Messages"
+msgstr "Mensaxes recentes"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1256
+msgid "Unread Messages"
+msgstr "Mensaxes non lidas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
+msgid "Subject or Addresses contain"
+msgstr "O asunto ou os enderezos conteÃ±en"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1318
+msgid "All Accounts"
+msgstr "Todas as contas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1325
+msgid "Current Account"
+msgstr "Conta actual"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1332
+msgid "Current Folder"
+msgstr "Cartafol actual"
+
+#: ../modules/mail/e-mail-shell-view-private.c:889
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "%d seleccionado, "
+msgstr[1] "%d seleccionados, "
+
+#: ../modules/mail/e-mail-shell-view-private.c:900
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d eliminado"
+msgstr[1] "%d eliminados"
+
+#: ../modules/mail/e-mail-shell-view-private.c:906
+#: ../modules/mail/e-mail-shell-view-private.c:913
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d correo non desexado"
+msgstr[1] "%d correos non desexados"
+
+#: ../modules/mail/e-mail-shell-view-private.c:919
+#, 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:925
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d non enviado"
+msgstr[1] "%d non enviados"
+
+#: ../modules/mail/e-mail-shell-view-private.c:931
+#, 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:943
+#, 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:946
+#, 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.c:548
+msgid "All Account Search"
+msgstr "Buscar en todas as contas"
+
+#: ../modules/mail/e-mail-shell-view.c:685
+msgid "Account Search"
+msgstr "Buscar na conta"
+
+#: ../modules/mail/e-mail-shell-view.c:873
+msgid "Proxy _Logout"
+msgstr "_Terminar a sesiÃ³n proxy"
+
+#: ../modules/mail/em-composer-prefs.c:473
+msgid "Language(s)"
+msgstr "Idioma(s)"
+
+#: ../modules/mail/em-mailer-prefs.c:96
+msgid "Every time"
+msgstr "Cada vez"
+
+#: ../modules/mail/em-mailer-prefs.c:97
+msgid "Once per day"
+msgstr "Unha vez ao dÃa"
+
+#: ../modules/mail/em-mailer-prefs.c:98
+msgid "Once per week"
+msgstr "Unha vez Ã¡ semana"
+
+#: ../modules/mail/em-mailer-prefs.c:99
+msgid "Once per month"
+msgstr "Unha vez ao mes"
+
+#: ../modules/mail/em-mailer-prefs.c:221
+msgid "Add Custom Junk Header"
+msgstr "Engadir unha cabeceira personalizada para o correo non desexado"
+
+#: ../modules/mail/em-mailer-prefs.c:225
+msgid "Header Name:"
+msgstr "Nome da cabeceira:"
+
+#: ../modules/mail/em-mailer-prefs.c:226
+msgid "Header Value Contains:"
+msgstr "O valor da cabeceira contÃ©n:"
+
+#: ../modules/mail/em-mailer-prefs.c:325
+#: ../widgets/table/e-table-click-to-add.c:504
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "Cabeceira"
+
+#: ../modules/mail/em-mailer-prefs.c:329
+msgid "Contains Value"
+msgstr "ContÃ©n o valor"
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr "O engadido %s estÃ¡ dispoÃ±Ãbel e o binario estÃ¡ instalado."
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr ""
+"O engadido %s non estÃ¡ dispoÃ±Ãbel. Verifique se o paquete estÃ¡ instalado."
+
+#: ../modules/mail/em-mailer-prefs.c:766
+msgid "No junk plugin available"
+msgstr "Non hai dispoÃ±Ãbel un engadido de correo non desexado"
+
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
+#: ../modules/mail/em-mailer-prefs.c:1151
+msgid "_Table column:"
+msgstr "Columna da tÃ¡boa:"
+
+#. 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:1153
+msgid "_Date header:"
+msgstr "Data da cabeceira:"
+
+#: ../modules/mail/em-mailer-prefs.c:1154
+msgid "Show _original header value"
+msgstr "Mostrar tamaÃ±o _orixinal"
+
+#: ../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 de cargador de engadido Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "engadido de proba de Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "engadido de proba de Python para o cargador Python Eengadido."
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
@@ -15236,7 +16117,7 @@ msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
 msgstr ""
-"Lista de pistas do plugin de aviso de anexos para buscar no corpo dunha "
+"Lista de pistas do engadido de aviso de anexos para buscar no corpo dunha "
 "mensaxe"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
@@ -15244,24 +16125,15 @@ msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
 msgstr ""
-"Lista de pistas do plugin de aviso de anexos para buscar no corpo dunha "
+"Lista de pistas do engadido de aviso de anexos para buscar no corpo dunha "
 "mensaxe."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:476
-#: ../plugins/templates/templates.c:389
+#: ../plugins/attachment-reminder/attachment-reminder.c:514
+#: ../plugins/templates/templates.c:413
 msgid "Keywords"
 msgstr "Palabras chave"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid "Attachment Reminder"
-msgstr "Aviso de anexos"
-
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid "Reminds you when you forgot to add an attachment to a mail message."
-msgstr "LÃ©mbralle se esquenceu engadir un anexo Ã¡ mensaxe de correo."
-
-#: ../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."
@@ -15269,61 +16141,65 @@ msgstr ""
 "O Evolution encontrou algunhas pistas que indican que esta mensaxe deberÃa "
 "ter un anexo, mais non encontrou ningÃºn."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#: ../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:4
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add attachment..."
 msgstr "_Engadir anexo..."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
 msgstr "_Editar a mensaxe"
 
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+msgid "Attachment Reminder"
+msgstr "Aviso de anexos"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr "LÃ©mbralle se esquenceu engadir un anexo Ã¡ mensaxe de correo."
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid "Audio Inline"
-msgstr "Son en liÃ±a"
+msgid "Inline Audio"
+msgstr "vCards en liÃ±a"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Play audio attachments directly from Evolution."
-msgstr "Reproducir os anexos de audio directamente dende Evolution."
+msgid "Play audio attachments directly in mail messages."
+msgstr "Reproducir os anexos de audio directamente desde Evolution."
 
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:152
 msgid "Select name of the Evolution backup file"
 msgstr "Seleccione o nome do ficheiro de copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:167
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar o Evolution despois de facer unha copia de seguranza"
 
-#: ../plugins/backup-restore/backup-restore.c:190
+#: ../plugins/backup-restore/backup-restore.c:209
 msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 "Seleccione o nome do ficheiro de copia de seguranza do Evolution que quere "
 "restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:214
+#: ../plugins/backup-restore/backup-restore.c:222
 msgid "_Restart Evolution after restore"
 msgstr "_Reiniciar o Evolution despois de restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:287
-msgid "Restore from backup"
-msgstr "Restaurar dende unha copia de seguranza"
-
-#: ../plugins/backup-restore/backup-restore.c:289
+#: ../plugins/backup-restore/backup-restore.c:290
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
 "settings, mail filters etc."
 msgstr ""
-"Pode restaurar o Evolution dende o seu ficheiro de copia de seguranza. Isto "
+"Pode restaurar o Evolution desde o seu ficheiro de copia de seguranza. Isto "
 "pode restaurar todos os correos, calendarios, tarefas, notas e contactos. \n"
 "TamÃ©n restaurarÃ¡ todas as configuraciÃ³ns persoais, filtros de correo etc."
 
 #: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
-msgstr "_Restaurar o Evolution dende o ficheiro de copia de seguranza"
+msgstr "_Restaurar o Evolution desde o ficheiro de copia de seguranza"
 
 #: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
@@ -15333,6 +16209,28 @@ msgstr "Seleccione o arquivo do Evolution para restaurar:"
 msgid "Choose a file to restore"
 msgstr "Escolla un ficheiro para restaurar"
 
+#: ../plugins/backup-restore/backup-restore.c:315
+msgid "Restore from backup"
+msgstr "Restaurar desde unha copia de seguranza"
+
+#: ../plugins/backup-restore/backup-restore.c:353
+msgid "_Backup Settings..."
+msgstr "_ConfiguraciÃ³ns de copia de seguranza..."
+
+#: ../plugins/backup-restore/backup-restore.c:355
+msgid "Backup Evolution data and settings to an archive file"
+msgstr ""
+"Facer copia de seguranza e restaurar os datos e a configuraciÃ³n do Evolution"
+
+#: ../plugins/backup-restore/backup-restore.c:360
+msgid "R_estore Settings..."
+msgstr "ConfiguraciÃ³ns de r_estauraciÃ³n..."
+
+#: ../plugins/backup-restore/backup-restore.c:362
+msgid "Restore Evolution data and settings from an archive file"
+msgstr ""
+"Facer copia de seguranza e restaurar os datos e a configuraciÃ³n do Evolution"
+
 #: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "Facer unha copia de seguranza do directorio do Evolution"
@@ -15399,44 +16297,44 @@ msgstr "Eliminando os ficheiros temporais da copia de seguranza"
 msgid "Ensuring local sources"
 msgstr "Asegurando as orixes locais"
 
-#: ../plugins/backup-restore/backup.c:429
+#: ../plugins/backup-restore/backup.c:427
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Facendo a copia de seguranza no cartafol %s"
 
-#: ../plugins/backup-restore/backup.c:434
+#: ../plugins/backup-restore/backup.c:432
 #, c-format
 msgid "Restoring from the folder %s"
-msgstr "Restaurando dende o cartafol %s"
+msgstr "Restaurando desde o cartafol %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:452
 msgid "Evolution Backup"
 msgstr "Copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:452
 msgid "Evolution Restore"
 msgstr "RestauraciÃ³n do Evolution"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:487
 msgid "Backing up Evolution Data"
 msgstr "Facendo unha copia de seguranza dos datos do Evolution"
 
-#: ../plugins/backup-restore/backup.c:490
+#: ../plugins/backup-restore/backup.c:488
 msgid "Please wait while Evolution is backing up your data."
 msgstr ""
 "Agarde mentres o Evolution estÃ¡ facendo unha copia de seguranza dos seus "
 "datos."
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:490
 msgid "Restoring Evolution Data"
 msgstr "Restaurando os datos do Evolution"
 
-#: ../plugins/backup-restore/backup.c:493
+#: ../plugins/backup-restore/backup.c:491
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Agarde mentres o Evolution restaura os seus datos."
 
-#: ../plugins/backup-restore/backup.c:511
+#: ../plugins/backup-restore/backup.c:509
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Isto poderÃa levar algÃºn tempo, dependendo da cantidade de datos da sÃºa "
@@ -15460,7 +16358,7 @@ msgstr "EstÃ¡ seguro de que quere pechar o Evolution?"
 msgid ""
 "Are you sure you want to restore Evolution from the selected backup file?"
 msgstr ""
-"EstÃ¡ seguro de que quere restaurar o Evolution dende o ficheiro de copia de "
+"EstÃ¡ seguro de que quere restaurar o Evolution desde o ficheiro de copia de "
 "seguranza seleccionado?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
@@ -15500,58 +16398,45 @@ msgid ""
 "restore, please enable the toggle button."
 msgstr ""
 "Isto eliminarÃ¡ todos os datos e configuraciÃ³ns actuais do Evolution e "
-"restauraraos dende a sua copia de seguranza. A restauraciÃ³n do Evolution sÃ³ "
+"restauraraos desde a sua copia de seguranza. A restauraciÃ³n do Evolution sÃ³ "
 "pode comezar cando o Evolution non se estea executando. AsegÃºrese de que "
 "pecha todas as xanelas non gardadas antes de proceder. Se quere que o "
 "Evolution se reinicie automaticamente despois da restauraciÃ³n, active o "
 "botÃ³n de estado."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup and restore Evolution data and settings"
-msgstr ""
-"Facer copia de seguranza e restaurar os datos e a configuraciÃ³n do Evolution"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-msgid "R_estore Settings..."
-msgstr "ConfiguraciÃ³ns de r_estauraciÃ³n..."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "_Backup Settings..."
-msgstr "_ConfiguraciÃ³ns de copia de seguranza..."
-
-#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
+#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactos automÃ¡ticos"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:646
+#: ../plugins/bbdb/bbdb.c:710
 msgid "Create _address book entries when sending mails"
 msgstr ""
 "Crear _automaticamente as entradas da axenda de enderezos ao enviar as "
 "mensaxes"
 
-#: ../plugins/bbdb/bbdb.c:652
+#: ../plugins/bbdb/bbdb.c:716
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccione a axenda de enderezos para contactos automÃ¡ticos"
 
-#: ../plugins/bbdb/bbdb.c:667
+#: ../plugins/bbdb/bbdb.c:731
 msgid "Instant Messaging Contacts"
 msgstr "Contactos de mensaxerÃa instantÃ¡nea"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:682
+#: ../plugins/bbdb/bbdb.c:746
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
-"Sincronizar a informaciÃ³n de contacto e as imaxes dende a lista de amigos do "
+"Sincronizar a informaciÃ³n de contacto e as imaxes desde a lista de amigos do "
 "Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:688
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Seleccione a axenda de enderezos para a lista de amigos do Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:763
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar coa lista de _amigos agora"
 
@@ -15571,30 +16456,35 @@ msgstr ""
 "\n"
 "Enche automaticamente as sÃºa axenda de enderezos cos nomes e enderezos de "
 "correo electrÃ³nico ao responder as mensaxes. TamÃ©n enche a informaciÃ³n de "
-"contacto IM dende a sÃºa lista de amigos."
+"contacto IM desde a sÃºa lista de amigos."
 
-#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
+msgid "Bogofilter is not available. Please install it first."
+msgstr "Bogofilter non estÃ¡ dispoÃ±Ãbel. InstÃ¡leo primeiro."
+
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Ocorreu un erro ao iniciar %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "O proceso fillo Bogofilter non responde; matÃ¡ndoo..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Interrompeuse a espera polo proceso fillo Bogofilter; terminando..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Fallou a canalizaciÃ³n co Bogofilter; o cÃ³digo de erro Ã©: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
 msgid "Convert message text to _Unicode"
 msgstr "Converter o texto da mensaxe a _Unicode"
 
@@ -15622,39 +16512,132 @@ msgstr "OpciÃ³ns do Bogofilter"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Filtra os correos non desexados usando o Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:64
+#: ../plugins/caldav/caldav-browse-server.c:198
+msgid "Authentication failed. Server requires correct login."
+msgstr ""
+"Produciuse un fallo na autenticaciÃ³n. O servidor require un inicio de sesiÃ³n "
+"correcto."
+
+#: ../plugins/caldav/caldav-browse-server.c:200
+msgid "Given URL cannot be found."
+msgstr "O URL fornecido non se pode encontrar"
+
+#: ../plugins/caldav/caldav-browse-server.c:204
+#, c-format
+msgid ""
+"Server returned unexpected data.\n"
+"%d - %s"
+msgstr ""
+"O servidor devolveu datos non esperados.\n"
+"%d - %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
+msgid "Unknown error"
+msgstr "Erro descoÃ±ecido"
+
+#: ../plugins/caldav/caldav-browse-server.c:334
+#: ../plugins/caldav/caldav-browse-server.c:585
+msgid "Failed to parse server response."
+msgstr "Produciuse un fallo ao actualizar delegados:"
+
+#: ../plugins/caldav/caldav-browse-server.c:428
+msgid "Events"
+msgstr "Finaliza"
+
+#: ../plugins/caldav/caldav-browse-server.c:450
+msgid "User's calendars"
+msgstr "Calendario novo"
+
+#: ../plugins/caldav/caldav-browse-server.c:558
+#: ../plugins/caldav/caldav-browse-server.c:629
+msgid "Failed to get server URL."
+msgstr "Produciuse un fallo ao autenticarse no servidor LDAP."
+
+#: ../plugins/caldav/caldav-browse-server.c:627
+#: ../plugins/caldav/caldav-browse-server.c:668
+#: ../plugins/caldav/caldav-browse-server.c:1272
+msgid "Searching for user's calendars..."
+msgstr "Buscando os contactos..."
+
+#: ../plugins/caldav/caldav-browse-server.c:666
+msgid "Could not find any user calendar."
+msgstr "Non Ã© posÃbel localizar ningÃºn calendario"
+
+#: ../plugins/caldav/caldav-browse-server.c:794
+#, c-format
+msgid "Previous attempt failed: %s"
+msgstr "O intento anterior fallou: %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:796
+#, c-format
+msgid "Previous attempt failed with code %d"
+msgstr "O intento anterior fallou co cÃ³digo %d"
+
+#: ../plugins/caldav/caldav-browse-server.c:799
+#, c-format
+msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgstr "Introduza o contrasinal para %s (usuario %s)"
+
+#: ../plugins/caldav/caldav-browse-server.c:856
+#, c-format
+msgid "Cannot create soup message for URL '%s'"
+msgstr "Non Ã© posÃbel crear a mensaxe para o URL '%s'"
+
+#. fetch content
+#: ../plugins/caldav/caldav-browse-server.c:1091
+msgid "Searching folder content..."
+msgstr "Buscando nos contidos do cartafol..."
+
+#: ../plugins/caldav/caldav-browse-server.c:1134
+msgid "List of available calendars:"
+msgstr "Calendarios locais"
+
+#: ../plugins/caldav/caldav-browse-server.c:1171
+msgid "Supports"
+msgstr "Compatibilidade con Hula"
+
+#: ../plugins/caldav/caldav-browse-server.c:1249
+#, c-format
+msgid "Failed to create thread: %s"
+msgstr "Produciuse un fallo ao crear a canalizaciÃ³n: %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:1357
+#, c-format
+msgid "Server URL '%s' is not a valid URL"
+msgstr "O URL do servidor '%s' non Ã© un URL vÃ¡lido"
+
+#: ../plugins/caldav/caldav-browse-server.c:1363
+msgid "Browse for a CalDAV calendar"
+msgstr "Explorar por un calendario CalDAV"
+
+#: ../plugins/caldav/caldav-source.c:66
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:366
-#: ../plugins/calendar-http/calendar-http.c:171
+#: ../plugins/caldav/caldav-source.c:215
+#: ../plugins/calendar-http/calendar-http.c:92
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:390
-#: ../plugins/google-account-setup/google-contacts-source.c:303
+#: ../plugins/caldav/caldav-source.c:219
+#: ../plugins/google-account-setup/google-contacts-source.c:305
 msgid "Use _SSL"
 msgstr "Usar _SSL"
 
-#. add refresh option
-#: ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-file/calendar-file.c:267
-#: ../plugins/calendar-http/calendar-http.c:308
-#: ../plugins/calendar-weather/calendar-weather.c:508
-#: ../plugins/google-account-setup/google-source.c:698
-#: ../plugins/google-account-setup/google-contacts-source.c:322
+#: ../plugins/caldav/caldav-source.c:228
+msgid "Brows_e server for a calendar"
+msgstr "_Explorar o servidor por un calendario"
+
+#: ../plugins/caldav/caldav-source.c:237
+#: ../plugins/calendar-file/calendar-file.c:178
+#: ../plugins/calendar-http/calendar-http.c:111
+#: ../plugins/calendar-weather/calendar-weather.c:393
+#: ../plugins/google-account-setup/google-contacts-source.c:323
+#: ../plugins/google-account-setup/google-source.c:627
 msgid "Re_fresh:"
 msgstr "Actuali_zar:"
 
-#: ../plugins/caldav/caldav-source.c:451
-#: ../plugins/calendar-file/calendar-file.c:289
-#: ../plugins/calendar-http/calendar-http.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:723
-#: ../plugins/google-account-setup/google-contacts-source.c:333
-msgid "weeks"
-msgstr "semanas"
-
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "Add CalDAV support to Evolution."
 msgstr "Engade a compatibilidade de CalDAV con Evolution."
@@ -15663,31 +16646,31 @@ msgstr "Engade a compatibilidade de CalDAV con Evolution."
 msgid "CalDAV Support"
 msgstr "Compatibilidade de CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:204
+#: ../plugins/calendar-file/calendar-file.c:112
 msgid "_Customize options"
 msgstr "Personalizar as op_ciÃ³ns"
 
-#: ../plugins/calendar-file/calendar-file.c:224
+#: ../plugins/calendar-file/calendar-file.c:131
 msgid "File _name:"
 msgstr "Nome do f_icheiro:"
 
-#: ../plugins/calendar-file/calendar-file.c:228
+#: ../plugins/calendar-file/calendar-file.c:135
 msgid "Choose calendar file"
 msgstr "Escoller ficheiro de calendario"
 
-#: ../plugins/calendar-file/calendar-file.c:272
+#: ../plugins/calendar-file/calendar-file.c:183
 msgid "On open"
 msgstr "Ao abrir"
 
-#: ../plugins/calendar-file/calendar-file.c:273
+#: ../plugins/calendar-file/calendar-file.c:184
 msgid "On file change"
 msgstr "Cambio de ficheiro"
 
-#: ../plugins/calendar-file/calendar-file.c:274
+#: ../plugins/calendar-file/calendar-file.c:185
 msgid "Periodically"
 msgstr "Periodicamente"
 
-#: ../plugins/calendar-file/calendar-file.c:301
+#: ../plugins/calendar-file/calendar-file.c:200
 msgid "Force read _only"
 msgstr "Forzar s_Ã³ lectura"
 
@@ -15699,11 +16682,11 @@ msgstr "Engadir calendarios locais a Evolution."
 msgid "Local Calendars"
 msgstr "Calendarios locais"
 
-#: ../plugins/calendar-http/calendar-http.c:369
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_Secure connection"
 msgstr "ConexiÃ³n _segura"
 
-#: ../plugins/calendar-http/calendar-http.c:455
+#: ../plugins/calendar-http/calendar-http.c:186
 msgid "Userna_me:"
 msgstr "No_me de usuario:"
 
@@ -15715,55 +16698,62 @@ msgstr "Engadir calendarios web a Evolution."
 msgid "Web Calendars"
 msgstr "Calendarios web"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Fog"
 msgstr "Tempo: nÃ©boa"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Cloudy"
 msgstr "Tempo: anubrado"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Cloudy Night"
 msgstr "Tempo: noite anubrada"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Overcast"
 msgstr "Tempo: con nubes"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Showers"
 msgstr "Tempo: chuvascos"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Snow"
 msgstr "Tempo: neve"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Sunny"
 msgstr "Tempo: sol"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Clear Night"
 msgstr "Tempo: noite despexada"
 
-#: ../plugins/calendar-weather/calendar-weather.c:69
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Thunderstorms"
 msgstr "Tempo: treboadas"
 
-#: ../plugins/calendar-weather/calendar-weather.c:230
+#: ../plugins/calendar-weather/calendar-weather.c:221
 msgid "Select a location"
 msgstr "Seleccione unha localizaciÃ³n"
 
-#: ../plugins/calendar-weather/calendar-weather.c:606
+#. Translators: "None" location for a weather calendar
+#: ../plugins/calendar-weather/calendar-weather.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:371
+msgctxt "weather-cal-location"
+msgid "None"
+msgstr "NingÃºn"
+
+#: ../plugins/calendar-weather/calendar-weather.c:446
 msgid "_Units:"
 msgstr "_Unidades:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:613
+#: ../plugins/calendar-weather/calendar-weather.c:453
 msgid "Metric (Celsius, cm, etc)"
 msgstr "MÃ©trico (CentÃgrados, cm etc.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:614
+#: ../plugins/calendar-weather/calendar-weather.c:454
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Non mÃ©trico (Fahrenheit, polgadas etc.)"
 
@@ -15775,104 +16765,125 @@ msgstr "Engadir calendarios de metereoloxÃa a Evolution."
 msgid "Weather Calendars"
 msgstr "Calendarios meteorolÃ³xicos"
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid "Copy Tool"
-msgstr "Ferramenta de copia"
+#: ../plugins/contacts-map/contacts-map.c:55
+#: ../plugins/contacts-map/contacts-map.c:201
+msgid "Contacts map"
+msgstr "Contactos: "
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy things to the clipboard."
-msgstr "Copia obxectos no portapapeis."
+#: ../plugins/contacts-map/contacts-map.c:56
+msgid "Show a map of all the contacts"
+msgstr "Enviar unha mensaxe aos contactos seleccionados"
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
+msgid "Add a map showing the location of contacts when possible."
+msgstr ""
+"Engadir un mapa que mostre a localizaciÃ³n dos contactos cando sexa posÃbel."
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
+msgid "Map for contacts"
+msgstr "Sen contactos"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
-msgstr "Verificar se o Evolution Ã© o aplicativo de correo predeterminado"
+msgstr "Verificar se o Evolution Ã© o aplicativo de correo predefinido"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Cada vez que se inicie o Evolution, verificar se Ã© ou non o cliente de "
-"correo predeterminado."
+"correo predefinido."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Check whether Evolution is the default mail client on startup."
-msgstr ""
-"Verificar se o Evolution Ã© o cliente de correo predeterminado ao iniciar."
+msgstr "Verificar se o Evolution Ã© o cliente de correo predefinido ao iniciar."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client"
-msgstr "Cliente de correo predeterminado"
+msgstr "Cliente de correo predefinido"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr ""
-"Quere que o Evolution sexa o seu cliente de correo electrÃ³nico "
-"predeterminado?"
+"Quere que o Evolution sexa o seu cliente de correo electrÃ³nico predefinido?"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:627
-msgid "Evolution"
-msgstr "Evolution"
-
-#: ../plugins/default-source/default-source.c:80
+#: ../plugins/default-source/default-source.c:75
 msgid "Mark as _default address book"
 msgstr "Marcar como a axenda de enderezos pre_determinada"
 
-#: ../plugins/default-source/default-source.c:101
+#: ../plugins/default-source/default-source.c:88
+msgid "A_utocomplete with this address book"
+msgstr "Mostrar o nome completado automaticamente cun enderezo"
+
+#: ../plugins/default-source/default-source.c:97
 msgid "Mark as _default calendar"
 msgstr "Marcar como calendario pre_determinado"
 
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:98
 msgid "Mark as _default task list"
 msgstr "Marcar como a lista de tarefas pre_determinada"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:99
 msgid "Mark as _default memo list"
 msgstr "Marcar como a lista de notas pre_determinada"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
-msgstr "Orixes predeterminadas"
+msgstr "Orixes predefinidas"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
 msgid "Mark your preferred address book and calendar as default."
-msgstr "Marque a sua axenda de enderezos e calendario predeterminado."
+msgstr "Marque a sua axenda de enderezos e calendario predefinido."
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "Listaxe de cabeceiras personalizadas"
+
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"A chave especifica a listaxe de cabeceiras personalizadas que quere engadir "
+"a unha mensaxe saÃnte. O formato para especificar unha cabeceira e un valor "
+"de cabeceira Ã©: Nome da cabeceira personalizada seguido de \"=\" e os "
+"valores separados por \";\""
 
-#: ../plugins/email-custom-header/email-custom-header.c:333
+#: ../plugins/email-custom-header/email-custom-header.c:316
 msgid "Security:"
 msgstr "Seguranza:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../plugins/email-custom-header/email-custom-header.c:321
 msgid "Unclassified"
 msgstr "Sen clasificar"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgid "Protected"
 msgstr "Protexido"
 
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "Secret"
 msgstr "Secreto"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:325
 msgid "Top secret"
 msgstr "Alto secreto"
 
-#: ../plugins/email-custom-header/email-custom-header.c:584
+#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
+#. indicating the header will not be added to a mail message
+#: ../plugins/email-custom-header/email-custom-header.c:379
+msgctxt "email-custom-header"
+msgid "None"
+msgstr "NingÃºn"
+
+#: ../plugins/email-custom-header/email-custom-header.c:569
 msgid "_Custom Header"
 msgstr "Cabeceira p_ersonalizada"
 
-#: ../plugins/email-custom-header/email-custom-header.c:906
-msgid "Key"
-msgstr "Chave"
-
-#: ../plugins/email-custom-header/email-custom-header.c:917
-#: ../plugins/templates/templates.c:395
-msgid "Values"
-msgstr "Valores"
-
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+#: ../plugins/email-custom-header/email-custom-header.c:894
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -15882,9 +16893,14 @@ msgstr ""
 "Nome dos valores da chave para unha Cabeceira personalizada separados por \";"
 "\"."
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
-msgid "Email Custom Header"
-msgstr "Cabeceira personalizada de correo electrÃ³nico"
+#: ../plugins/email-custom-header/email-custom-header.c:948
+msgid "Key"
+msgstr "Chave"
+
+#: ../plugins/email-custom-header/email-custom-header.c:959
+#: ../plugins/templates/templates.c:419
+msgid "Values"
+msgstr "Valores"
 
 #. 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
@@ -15895,984 +16911,9 @@ msgstr "Engade unha cabeceira personalizada nas mensaxes de correo saÃntes."
 msgid "Custom Header"
 msgstr "Cabeceira personalizada"
 
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Headers"
-msgstr "Listaxe de cabeceiras personalizadas"
-
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
-msgstr ""
-"A chave especifica a listaxe de cabeceiras personalizadas que quere engadir "
-"a unha mensaxe saÃnte. O formato para especificar unha cabeceira e un valor "
-"de cabeceira Ã©: Nome da cabeceira personalizada seguido de \"=\" e os "
-"valores separados por \";\""
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Abrir o cartafol doutro usuario"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Conta:"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "Nome do carta_fol:"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Usuario:"
-
-#. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
-msgid "Secure Password"
-msgstr "Contrasinal seguro"
-
-#. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
-msgstr ""
-"Esta opciÃ³n conectarÃ¡ co servidor Exchange usando unha autenticaciÃ³n de "
-"contrasinal segura (NTLM)."
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
-msgid "Plaintext Password"
-msgstr "Contrasinal de texto plano"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
-msgstr ""
-"Esta opciÃ³n conectarÃ¡ co servidor Exchange usando unha autenticaciÃ³n "
-"estÃ¡ndar de texto plano."
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-msgid "Out Of Office"
-msgstr "FÃ³ra da oficina"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
-msgid ""
-"The message specified below will be automatically sent to \n"
-"each person who sends mail to you while you are out of the office."
-msgstr ""
-"A mensaxe especificada abaixo enviarase automaticamente a cada\n"
-"persoa que lle envÃe correo mentres estÃ¡ fÃ³ra da oficina."
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:290
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
-msgid "I am out of the office"
-msgstr "Estou fÃ³ra da oficina"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:294
-msgid "I am in the office"
-msgstr "Estou na oficina"
-
-#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:340
-msgid "Change the password for Exchange account"
-msgstr "Modificar o contrasinal para a conta do Exchange"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:342
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-msgid "Change Password"
-msgstr "Cambiar contrasinal"
-
-#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
-msgid "Manage the delegate settings for Exchange account"
-msgstr "Xestione a configuraciÃ³n dos delegados para a conta Exchange"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
-msgid "Delegation Assistant"
-msgstr "Asistente de delegaciÃ³ns"
-
-#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
-msgid "Miscelleneous"
-msgstr "Varios"
-
-#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:371
-msgid "View the size of all Exchange folders"
-msgstr "Ver o tamaÃ±o de todos os cartafoles Exchange"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:373
-msgid "Folders Size"
-msgstr "TamaÃ±o dos cartafoles"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:380
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
-msgid "Exchange Settings"
-msgstr "ConfiguraciÃ³n do Exchange"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:726
-msgid "_OWA URL:"
-msgstr "URL _OWA:"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:752
-msgid "A_uthenticate"
-msgstr "A_utenticar"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:774
-msgid "Mailbox name is _different than user name"
-msgstr "O nome da caixa de correo Ã© _diferente do nome de usuario"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:787
-msgid "_Mailbox:"
-msgstr "Cai_xa de correo:"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1001
-msgid "_Authentication Type"
-msgstr "Tipo de _autenticaciÃ³n"
-
-# (pofilter) variables: do not translate: %s
-#: ../plugins/exchange-operations/exchange-account-setup.c:1130
-#: ../plugins/exchange-operations/exchange-contacts.c:217
-#, c-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1132
-#: ../plugins/exchange-operations/exchange-contacts.c:219
-#, c-format
-msgid "0 KB"
-msgstr "0 KB"
-
-#. FIXME: Take care of i18n
-#: ../plugins/exchange-operations/exchange-account-setup.c:1137
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "TamaÃ±o:"
-
-#: ../plugins/exchange-operations/exchange-calendar.c:196
-#: ../plugins/exchange-operations/exchange-contacts.c:170
-msgid ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-msgstr ""
-"O Evolution estÃ¡ en modo sen conexiÃ³n. Non pode crear ou modificar "
-"cartafoles agora.\n"
-"Cambie ao modo con conexiÃ³n para esas operaciÃ³ns."
-
-#. User entered a wrong existing
-#. * password. Prompt him again.
-#.
-#: ../plugins/exchange-operations/exchange-change-password.c:114
-msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
-msgstr ""
-"O contrasinal actual non coincide co contrasinal existente para a sÃºa conta. "
-"Introduza o contrasinal correcto"
-
-#: ../plugins/exchange-operations/exchange-change-password.c:121
-msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr "Os dous contrasinais non coinciden. Reintroduza os contrasinais."
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
-msgid "Confirm Password:"
-msgstr "Confirmar contrasinal:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
-msgid "Current Password:"
-msgstr "Contrasinal actual:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
-msgid "New Password:"
-msgstr "Contrasinal novo:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
-msgid "Your current password has expired. Please change your password now."
-msgstr "O seu contrasinal actual caducou. Cambie o seu contrasinal agora."
-
-#: ../plugins/exchange-operations/exchange-config-listener.c:657
-#, c-format
-msgid "Your password will expire in the next %d days"
-msgstr "O contrasinal caducarÃ¡ dentro dos seguintes %d dÃas"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:142
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
-msgid "Custom"
-msgstr "Personalizado"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:168
-msgid "Editor (read, create, edit)"
-msgstr "Editor (ler, crear e editar)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:172
-msgid "Author (read, create)"
-msgstr "Autor (ler e crear)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:176
-msgid "Reviewer (read-only)"
-msgstr "Revisor (sÃ³ de lectura)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:225
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
-msgid "Delegate Permissions"
-msgstr "Permisos delegados"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:236
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
-#, c-format
-msgid "Permissions for %s"
-msgstr "Permisos para %s"
-
-#. To translators: This is a part of the message to be sent to the delegatee
-#. summarizing the permissions assigned to him.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:326
-msgid ""
-"This message was sent automatically by Evolution to inform you that you have "
-"been designated as a delegate. You can now send messages on my behalf."
-msgstr ""
-"O Evolution enviou esta mensaxe automaticamente para informalo de que o "
-"designaron como delegado. A partir de agora poderÃ¡ mandar mensaxes da miÃ±a "
-"parte."
-
-#. To translators: Another chunk of the same message.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:331
-msgid "You have been given the following permissions on my folders:"
-msgstr "OutorgÃ¡ronselle os seguintes permisos sobre os meus cartafoles:"
-
-#. To translators: This message is included if the delegatee has been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:351
-msgid "You are also permitted to see my private items."
-msgstr "Vostede tamÃ©n poderÃ¡ ver os meus elementos privados."
-
-#. To translators: This message is included if the delegatee has not been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
-msgid "However you are not permitted to see my private items."
-msgstr "No entanto, vostede non poderÃ¡ ver os meus elementos privados."
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:390
-#, c-format
-msgid "You have been designated as a delegate for %s"
-msgstr "DesignÃ¡rono como delegado para %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:416
-msgid "Delegate To"
-msgstr "Delegar en"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:581
-#, c-format
-msgid "Remove the delegate %s?"
-msgstr "Quere eliminar o delegado %s?"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:698
-msgid "Could not access Active Directory"
-msgstr "Non se puido acceder ao Active Directory"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:710
-msgid "Could not find self in Active Directory"
-msgstr "Non se puido localizarse a si mesmo no Active Directory"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:723
-#, c-format
-msgid "Could not find delegate %s in Active Directory"
-msgstr "Non se puido localizar o delegado %s no Active Directory"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:735
-#, c-format
-msgid "Could not remove delegate %s"
-msgstr "Non se puido eliminar o delegado %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:795
-msgid "Could not update list of delegates."
-msgstr "Non se puido actualizar a lista de delegados."
-
-#: ../plugins/exchange-operations/exchange-delegates.c:813
-#, c-format
-msgid "Could not add delegate %s"
-msgstr "Non se puido engadir o delegado %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:980
-msgid "Error reading delegates list."
-msgstr "Erro ao ler a lista de delegados."
-
-#. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
-msgid "C_alendar:"
-msgstr "C_alendario:"
-
-#. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-msgid "Co_ntacts:"
-msgstr "Co_ntactos:"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
-msgid "Delegates"
-msgstr "Delegados"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-msgid ""
-"None\n"
-"Reviewer (read-only)\n"
-"Author (read, create)\n"
-"Editor (read, create, edit)"
-msgstr ""
-"NingÃºn\n"
-"Revisor (sÃ³ lectura)\n"
-"Autor (lectura, creaciÃ³n)\n"
-"Editor (lectura, creaciÃ³n, ediciÃ³n)"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Permissions for"
-msgstr "Permisos para"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
-msgid ""
-"These users will be able to send mail on your behalf\n"
-"and access your folders with the permissions you give them."
-msgstr ""
-"Estes usuarios serÃ¡n capaces de enviar correo no seu nome\n"
-"e acceder aos seus cartafoles cos permisos que lles dea."
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
-msgid "_Delegate can see private items"
-msgstr "O _delegado pode ver elementos privados"
-
-#. Translators: This is used for permissions for <user> for the folder Inbox.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
-msgid "_Inbox:"
-msgstr "Caixa de _entrada:"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
-msgid "_Summarize permissions"
-msgstr "Re_sumir os pemisos"
-
-#. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks:"
-msgstr "_Tarefas:"
-
-#: ../plugins/exchange-operations/exchange-folder-permission.c:62
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
-msgid "Permissions..."
-msgstr "Permisos..."
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
-msgid "Folder Name"
-msgstr "Nome do cartafol"
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
-msgid "Folder Size"
-msgstr "TamaÃ±o do cartafol"
-
-#. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
-msgid "User"
-msgstr "Usuario"
-
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
-msgstr "Subscribirse ao cartafol doutro usuario"
-
-#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
-msgid "Exchange Folder Tree"
-msgstr "Ã?rbore de cartafol do Exchange"
-
-#: ../plugins/exchange-operations/exchange-folder.c:65
-#: ../plugins/exchange-operations/exchange-folder.c:233
-#: ../plugins/exchange-operations/exchange-folder.c:243
-msgid "Unsubscribe Folder..."
-msgstr "Eliminar subscriciÃ³n do cartafol..."
-
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:518
-#, c-format
-msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "EstÃ¡ seguro de que quere eliminar subscriciÃ³n do cartafol \"%s\"?"
-
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:530
-#, c-format
-msgid "Unsubscribe from \"%s\""
-msgstr "Eliminar subscriciÃ³n de \"%s\""
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>Actualmente, o seu estado Ã© \"FÃ³ra da oficina\". </b>\n"
-"\n"
-"Quere cambiar o seu estado a \"Na oficina\"? "
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>Mensaxe para FÃ³ra da oficina:</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>Estado:</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>A mensaxe especificada abaixo serÃ¡ enviada automaticamente a cada "
-"persoa que lle envÃe\n"
-"un correo mentres estea fÃ³ra da oficina.</small>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "Estou na oficina"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "Estou fÃ³ra da oficina"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "Non, non cambiar o estado"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "Asistente para FÃ³ra da oficina"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "Si, cambiar o estado"
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
-msgid "Password Expiry Warning..."
-msgstr "Aviso de caducidade do contrasinal..."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
-msgid "Your password will expire in 7 days..."
-msgstr "O seu contrasinal caducarÃ¡ en 7 dÃas..."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
-msgid "_Change Password"
-msgstr "_Cambiar o contrasinal"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
-msgid "(Permission denied.)"
-msgstr "(Permiso denegado)."
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
-msgid "Add User:"
-msgstr "Engadir usuario:"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
-#: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:932
-#: ../plugins/groupwise-features/share-folder.c:713
-msgid "Add User"
-msgstr "Engadir usuario"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-msgid "<b>Permissions</b>"
-msgstr "<b>Permisos</b>"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
-msgid "Cannot Delete"
-msgstr "Non se pode eliminar"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
-msgid "Cannot Edit"
-msgstr "Non se pode editar"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
-msgid "Create items"
-msgstr "Crear elementos"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
-msgid "Create subfolders"
-msgstr "Crear subcartafoles"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
-msgid "Delete Any Items"
-msgstr "Eliminar todos os elementos"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
-msgid "Delete Own Items"
-msgstr "Eliminar os elementos propios"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
-msgid "Edit Any Items"
-msgstr "Editar calquera elemento"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
-msgid "Edit Own Items"
-msgstr "Editar os elementos propios"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
-msgid "Folder contact"
-msgstr "Cartafol de contacto"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
-msgid "Folder owner"
-msgstr "Propietario do cartafol"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
-msgid "Folder visible"
-msgstr "Cartafol visÃbel"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
-msgid "Read items"
-msgstr "Elementos lidos"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
-msgid "Role: "
-msgstr "Rol: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
-msgid "<b>Message Settings</b>"
-msgstr "<b>ConfiguraciÃ³ns de mensaxe</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
-msgid "<b>Tracking Options</b>"
-msgstr "<b>OpciÃ³ns de seguimento</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
-msgid "Exchange - Send Options"
-msgstr "Exchange - opciÃ³ns de envÃo"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
-msgid "I_mportance: "
-msgstr "I_mportancia: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
-msgid ""
-"Normal\n"
-"High\n"
-"Low"
-msgstr ""
-"Normal\n"
-"Alta\n"
-"Baixa"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
-msgid ""
-"Normal\n"
-"Personal\n"
-"Private\n"
-"Confidential"
-msgstr ""
-"Normal\n"
-"Persoal\n"
-"Privado\n"
-"Confidencial"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
-msgid "Request a _delivery receipt for this message"
-msgstr "Solicitar unha notificaciÃ³n de _recepciÃ³n para esta mensaxe"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
-msgid "Request a _read receipt for this message"
-msgstr "Solicitar unha notificaciÃ³n de lec_tura para esta mensaxe"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
-msgid "Send as Delegate"
-msgstr "Enviar como delegado"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
-msgid "_Sensitivity: "
-msgstr "_Sensibilidade: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
-msgid "_User"
-msgstr "_Usuario"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:134
-msgid "Select User"
-msgstr "Seleccionar usuario"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:172
-msgid "Address Book..."
-msgstr "Axenda de enderezos..."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
-msgid "Subscribe to Other User's Contacts"
-msgstr "Subscribirse aos contactos doutro usuario"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
-msgid "Subscribe to Other User's Calendar"
-msgstr "Subscribirse ao calendario doutro usuario"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid "Activates the Evolution-Exchange extension package."
-msgstr "Activa o paquete da extensiÃ³n Exchange a Evolution."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
-msgid "Exchange Operations"
-msgstr "OperaciÃ³ns do Exchange"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
-msgid "Cannot access the \"Exchange settings\" tab in offline mode."
-msgstr ""
-"Non Ã© posÃbel acceder ao separador ConfiguraciÃ³ns do Exchange no modo sen "
-"conexiÃ³n."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
-msgid "Cannot change password due to configuration problems."
-msgstr ""
-"Non se pode modificar o contrasinal debido a problemas de configuraciÃ³n."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot display folders."
-msgstr "Non se poden mostrar os cartafoles."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-msgid "Cannot perform the operation."
-msgstr "Non se pode efectuar a operaciÃ³n."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
-msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
-msgstr ""
-"As modificaciÃ³ns das opciÃ³ns da conta Exchange \"{0}\" sÃ³ serÃ¡n efectivas "
-"despois de reiniciar o Evolution."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
-msgid "Could not authenticate to server."
-msgstr "Non se puido autenticar co servidor."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
-msgid "Could not change password."
-msgstr "Non se puido modificar o contrasinal."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
-msgid ""
-"Could not configure Exchange account because \n"
-"an unknown error occurred. Check the URL, \n"
-"username, and password, and try again."
-msgstr ""
-"Non se puido configurar a conta Exchange porque\n"
-"se produciu un erro descoÃ±ecido. Verifique o URL,\n"
-"nome de usuario e contrasinal e tÃ©nteo de novo."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
-msgid "Could not connect to Exchange server."
-msgstr "Non se puido conectar co servidor Exchange."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
-msgid "Could not connect to server {0}."
-msgstr "Non se puido conectar co servidor {0}."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
-msgid "Could not determine folder permissions for delegates."
-msgstr "Non se puideron determinar os permisos do cartafol para delegados."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
-msgid "Could not find Exchange Web Storage System."
-msgstr "Non se puido localizar o sistema de almacenamento Web do Exchange."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
-msgid "Could not locate server {0}."
-msgstr "Non se puido localizar o servidor {0}."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
-msgid "Could not make {0} a delegate"
-msgstr "Non se puido converter {0} nun delegado"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
-msgid "Could not read folder permissions"
-msgstr "Non se puideron ler os permisos do cartafol"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
-msgid "Could not read folder permissions."
-msgstr "Non se puideron ler os permisos do cartafol."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
-msgid "Could not read out-of-office state"
-msgstr "Non se puido ler o estado de fÃ³ra da oficina"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Could not update folder permissions."
-msgstr "Non se puido actualizar os permisos do cartafol."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
-msgid "Could not update out-of-office state"
-msgstr "Non se puido actualizar o estado FÃ³ra da oficina"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
-msgid "Evolution requires a restart to load the subscribed user's mailbox"
-msgstr ""
-"O Evolution precisa ser reiniciado para cargar a caixa de correo de usuario "
-"subscrita"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
-msgid "Exchange Account is offline."
-msgstr "A conta do Exchange estÃ¡ sen conexiÃ³n."
-
-# (pofilter) newlines: line endings in original don't match line endings in translation
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
-msgid ""
-"Exchange Connector requires access to certain\n"
-"functionality on the Exchange Server that appears\n"
-"to be disabled or blocked. (This is usually \n"
-"unintentional.) Your Exchange Administrator will \n"
-"need to enable this functionality in order for \n"
-"you to be able to use Evolution Exchange Connector.\n"
-"\n"
-"For information to provide to your Exchange \n"
-"administrator, please follow the link below:\n"
-"\n"
-"{0}\n"
-"  "
-msgstr ""
-"O conectador do Exchange require o acceso a certa funcionalidade\n"
-"no servidor do Exchange que parece\n"
-"estar desactivada ou bloqueada\n"
-"(isto normalmente non Ã© intencional). O seu\n"
-"administrador do Exchange terÃ¡ que activar esta\n"
-"funcionalidade para que poida usar o conectador do Evolution Exchange.\n"
-"\n"
-"Para a informaciÃ³n que pode proporcionar ao seu administrador\n"
-"do Exchange, consulte a ligazÃ³n de abaixo:\n"
-"\n"
-"{0}\n"
-"  "
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
-msgid "Failed to update delegates:"
-msgstr "Fallo ao actualizar delegados:"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-msgid "Folder already exists"
-msgstr "O cartafol xa existe"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-msgid "Folder does not exist"
-msgstr "O cartafol non existe"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-msgid "Folder offline"
-msgstr "Cartafol sen conexiÃ³n"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1259
-msgid "Generic error"
-msgstr "Erro xenÃ©rico"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
-msgid "Global Catalog Server is not reachable"
-msgstr "Non Ã© posÃbel atinxir o servidor de catÃ¡logo global"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
-msgid ""
-"If OWA is running on a different path, you must specify that in the account "
-"configuration dialog."
-msgstr ""
-"Se OWA se estÃ¡ executando nun camiÃ±o diferente, debe especificalo no diÃ¡logo "
-"de configuraciÃ³n de conta."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
-msgid "Mailbox for {0} is not on this server."
-msgstr "A caixa de correo de {0} non estÃ¡ neste servidor."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
-msgid "Make sure the URL is correct and try again."
-msgstr "AsegÃºrese de que o URL Ã© correcto e tÃ©nteo de novo."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
-msgid "Make sure the server name is spelled correctly and try again."
-msgstr ""
-"AsegÃºrese de que o nome do servidor estÃ¡ escrito correctamente e tÃ©nteo de "
-"novo."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
-msgid "Make sure the username and password are correct and try again."
-msgstr ""
-"AsegÃºrese de que o nome do usuario e o contrasinal son correctos e tÃ©nteo de "
-"novo."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
-msgid "No Global Catalog server configured for this account."
-msgstr ""
-"Non hai ningÃºn servidor de catÃ¡logo global configurado para esta conta."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "No mailbox for user {0} on {1}."
-msgstr "Non hai ningunha caixa de correo para o usuario {0} en {1}."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "No such user {0}"
-msgstr "Non existe ese usuario {0}"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Password successfully changed."
-msgstr "O contrasinal modificouse correctamente."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
-msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
-msgstr ""
-"Introduza un ID de delegado ou seleccione a opciÃ³n Enviar como delegado."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
-msgid "Please make sure the Global Catalog Server name is correct."
-msgstr "AsegÃºrese de que o nome do servidor de catÃ¡logo global Ã© correcto."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
-msgid "Please restart Evolution for changes to take effect"
-msgstr "Reinicie o Evolution para que sexan efectivas as modificaciÃ³ns"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
-msgid "Please select a user."
-msgstr "Seleccione un usuario."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
-msgid "Server rejected password because it is too weak."
-msgstr "O servidor rexeitou o contrasinal porque Ã© demasiado dÃ©bil."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
-msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr "A conta do Exchange desactivarase ao saÃr do Evolution"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
-msgid "The Exchange account will be removed when you quit Evolution"
-msgstr "A conta do Exchange eliminarase ao saÃr do Evolution"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
-msgid "The Exchange server is not compatible with Exchange Connector."
-msgstr "O servidor Exchange non Ã© compatÃbel co conectador do Exchange."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
-msgid ""
-"The server is running Exchange 5.5. Exchange Connector \n"
-"supports Microsoft Exchange 2000 and 2003 only."
-msgstr ""
-"O servidor estÃ¡ executando o Exchange 5.5. O conector do Exchange \n"
-"sÃ³ Ã© compatÃbel co Microsoft Exchange 2000 e 2003."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
-msgid ""
-"This probably means that your server requires \n"
-"you to specify the Windows domain name \n"
-"as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
-"\n"
-"Or you might have just typed your password wrong."
-msgstr ""
-"Isto probabelmente significa que o seu servidor require\n"
-"que especifique o nome de dominio de Windows\n"
-"como parte do nome do usuario (ex., &quot;DOMINIO\\usuario&quot;).\n"
-"\n"
-"Ou pode que sÃ³ escribira incorrectamente o contrasinal."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
-msgid "Try again with a different password."
-msgstr "TÃ©nteo de novo cun contrasinal diferente."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "Unable to add user to access control list:"
-msgstr "Non Ã© posÃbel engadir o usuario Ã¡ lista de control de acceso:"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
-msgid "Unable to edit delegates."
-msgstr "Non Ã© posÃbel editar os delegados."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-msgid "Unknown error looking up {0}"
-msgstr "Erro descoÃ±ecido ao buscar {0}"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:604
-#: ../plugins/mail-to-task/mail-to-task.c:599
-#: ../plugins/mail-to-task/mail-to-task.c:821
-msgid "Unknown error."
-msgstr "Erro descoÃ±ecido."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-msgid "Unknown type"
-msgstr "Tipo descoÃ±ecido"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-msgid "Unsupported operation"
-msgstr "OperaciÃ³n non compatÃbel"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-msgid "You are nearing your quota available for storing mail on this server."
-msgstr ""
-"EstÃ¡ prÃ³ximo Ã¡ sÃºa cota dispoÃ±Ãbel para almacenar correo neste servidor."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
-msgid ""
-"You are permitted to send a message on behalf of only one delegator at a "
-"time."
-msgstr ""
-"Vostede estÃ¡ autorizado para enviar unha mensaxe de parte dun Ãºnico delegado "
-"de cada vez."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
-msgid "You cannot make yourself your own delegate"
-msgstr "Non pode converterse no seu propio delegado"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
-msgid "You have exceeded your quota for storing mail on this server."
-msgstr "Excedeu a sÃºa cota para almacenar correo neste servidor."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
-msgid "You may only configure a single Exchange account."
-msgstr "SÃ³ pode configurar unha conta do Exchange."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-msgid ""
-"Your current usage is: {0} KB. Try to clear up some space by deleting some "
-"mail."
-msgstr ""
-"O seu uso actual Ã©: {0}KB. Tente liberar algo de espazo eliminando algÃºn "
-"correo."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
-msgid ""
-"Your current usage is: {0} KB. You will not be able to either send or "
-"receive mail now."
-msgstr ""
-"O seu uso actual Ã©: {0}KB. Non poderÃ¡ nin enviar nin recibir correos agora."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
-msgid ""
-"Your current usage is: {0} KB. You will not be able to send mail until you "
-"clear up some space by deleting some mail."
-msgstr ""
-"O seu uso actual Ã©: {0}KB. Non poderÃ¡ enviar correos atÃ© que libere algo de "
-"espazo eliminando algÃºn correo."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
-msgid "Your password has expired."
-msgstr "O seu contrasinal caducou."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
-msgid "{0} cannot be added to an access control list"
-msgstr "{0} non pode engadirse Ã¡ lista de control de acceso"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
-msgid "{0} is already a delegate"
-msgstr "{0} xa Ã© un delegado"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
-msgid "{0} is already in the list"
-msgstr "{0} xa estÃ¡ na lista"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
-msgid "Subscribe to Other User's Tasks"
-msgstr "Subscribirse Ã¡s tarefas doutros usuarios"
-
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
-msgid "Check folder permissions"
-msgstr "Verificar os permisos do cartafol"
+#: ../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
 msgid "Automatically launch editor when key is pressed in the mail composer"
@@ -16880,17 +16921,34 @@ msgstr ""
 "Lanza automaticamente o editor ao presionar unha tecla no editor de correo"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:120
+#: ../plugins/external-editor/external-editor.c:119
 msgid "Automatically launch when a new mail is edited"
 msgstr "Lanzar automaticamente cando se edite un novo correo"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
-msgstr "Editor externo predeterminado"
+msgstr "Editor externo predefinido"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "The default command that must be used as the editor."
-msgstr "O comando predeterminado que debe ser usado como editor."
+msgstr "A orde predefinida que se debe usar como o editor."
+
+#: ../plugins/external-editor/external-editor.c:108
+msgid "Command to be executed to launch the editor: "
+msgstr "A orde que se executarÃ¡ para iniciar o editor: "
+
+#: ../plugins/external-editor/external-editor.c:109
+msgid ""
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
+msgstr ""
+"Para o Emacs use \"xemacs\"\n"
+"Para o VI use \"gvim -f\""
+
+#: ../plugins/external-editor/external-editor.c:375
+#: ../plugins/external-editor/external-editor.c:377
+msgid "Compose in External Editor"
+msgstr "CompoÃ±er no editor externo"
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid "External Editor"
@@ -16934,106 +16992,110 @@ msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 msgstr ""
-"O editor externo configurado nas sÃºas preferencias do plugin non pode ser "
+"O editor externo configurado nas sÃºas preferencias do engadido non pode ser "
 "iniciado. Tente configurar un editor diferente."
 
-#: ../plugins/external-editor/external-editor.c:109
-msgid "Command to be executed to launch the editor: "
-msgstr "O comando que se executarÃ¡ para iniciar o editor: "
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
+msgid "Insert Face picture by default"
+msgstr "Inserir a imaxe da cara predefinida"
 
-#: ../plugins/external-editor/external-editor.c:110
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim -f\""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
 msgstr ""
-"Para o Emacs use \"xemacs\"\n"
-"Para o VI use \"gvim -f\""
+"Indica se inserir unha imaxe de cara Ã¡s mensaxes saÃntes de forma "
+"predefinida. A imaxe debe estabelecerse antes de activar isto, doutro xeito "
+"non acontecerÃ¡ nada."
 
-#: ../plugins/external-editor/external-editor.c:354
-#: ../plugins/external-editor/external-editor.c:356
-msgid "Compose in External Editor"
-msgstr "CompoÃ±er no editor externo"
-
-#: ../plugins/face/face.c:59
-msgid "Select a (48*48) png of size < 700bytes"
+#: ../plugins/face/face.c:286
+msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
 msgstr "Seleccionar un png (48*48) de tamaÃ±o < 700bytes"
 
-#: ../plugins/face/face.c:69
-msgid "PNG files"
-msgstr "Ficheiros PNG"
+#: ../plugins/face/face.c:296
+msgid "Image files"
+msgstr "ImportaciÃ³n de ficheiros"
+
+#: ../plugins/face/face.c:355
+msgid "_Insert Face picture by default"
+msgstr "_Inserir a imaxe de cara predefinida"
 
-#: ../plugins/face/face.c:126
-msgid "_Face"
-msgstr "_Cara"
+#: ../plugins/face/face.c:366
+msgid "Load new _Face picture"
+msgstr "Caragar a imaxe da nova _cara"
+
+#: ../plugins/face/face.c:415
+msgid "Include _Face"
+msgstr "I_ncluÃr fÃos"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid ""
-"Attach a small picture of your face to outgoing messages.\n"
-"\n"
-"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
-"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
-"sent messages."
-msgstr ""
-"Anexar unha pequena imaxe da sÃºa cara para as mensaxes saÃntes. \n"
-"\n"
-"A primeira vez a persoa usuaria deberÃ¡ configurar unha imaxe PNG 48*48. TerÃ¡ "
-"unha codificaciÃ³n de base64 e serÃ¡ almacenada en ~/.evolution/faces. Esta "
-"opciÃ³n usarase nas mensaxes que se manden mÃ¡is adiante."
+msgid "Attach a small picture of your face to outgoing messages."
+msgstr "Anexa unha pequena imaxe da sÃºa cara Ã¡s mensaxes saÃntes"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "Eliminando a subscriciÃ³n do cartafol \"%s\""
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+msgid "Failed Read"
+msgstr "Cabeceira da tÃ¡boa"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Unsubscribe Folders"
-msgstr "Eliminar a subscriciÃ³n de cartafoles"
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+msgid "Invalid Image Size"
+msgstr "O valor da data non Ã© vÃ¡lido"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
-msgid ""
-"Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
-msgstr ""
-"DesubscrÃbase do cartafol IMAP facendo clic co botÃ³n dereito sobre Ã©l na "
-"Ã¡rbore de cartafoles."
+#: ../plugins/face/org-gnome-face.error.xml.h:3
+msgid "Not an image"
+msgstr "_Sen imaxe"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "Eliminar s_ubscriciÃ³n"
+#: ../plugins/face/org-gnome-face.error.xml.h:4
+msgid "Please select an image of size 48 * 48"
+msgstr "Escolla unha imaxe para este contacto"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+msgid "The file cannot be read"
+msgstr "Non foi posÃbel enviar o elemento!"
 
-#: ../plugins/google-account-setup/google-source.c:81
-#: ../plugins/google-account-setup/google-contacts-source.c:51
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid "The file you selected does not look like a valid .png image. Error: {0}"
+msgstr "O ficheiro que seleccionou non semella ser unha imaxe .png. Erro: {0}"
+
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:82
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:499
+#: ../plugins/google-account-setup/google-contacts-source.c:273
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
+msgid "<b>Server</b>"
+msgstr "<b>Servidor</b>"
+
+#: ../plugins/google-account-setup/google-source.c:439
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Introduza o contrasinal para que o usuario %s acceda aos calendarios "
 "subscritos."
 
-#: ../plugins/google-account-setup/google-source.c:604
+#: ../plugins/google-account-setup/google-source.c:545
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
 "%s"
 msgstr ""
-"Non Ã© posÃbel ler datos dende o servidor do Google.\n"
+"Non Ã© posÃbel ler datos desde o servidor do Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:739
+#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:941
+msgid "Unknown error."
+msgstr "Erro descoÃ±ecido."
+
+#: ../plugins/google-account-setup/google-source.c:631
 msgid "Cal_endar:"
 msgstr "Cal_endario:"
 
-#: ../plugins/google-account-setup/google-source.c:774
+#: ../plugins/google-account-setup/google-source.c:666
 msgid "Retrieve _list"
 msgstr "Obter _lista"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:270
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
-msgid "<b>Server</b>"
-msgstr "<b>Servidor</b>"
-
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "Add Google Calendars to Evolution."
 msgstr "Engadir calendario de Google a Evolution."
@@ -17042,19 +17104,44 @@ msgstr "Engadir calendario de Google a Evolution."
 msgid "Google Calendars"
 msgstr "Calendarios de Google"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
 msgid "Checklist"
 msgstr "Lista de verificaciÃ³n"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "Add Novell GroupWise support to Evolution."
-msgstr "Engade a compatibilidade para Novel GroupWise con Evolution."
+#: ../plugins/groupwise-features/gw-ui.c:112
+msgid "New _Shared Folder..."
+msgstr "Cartafol _compartido novo..."
+
+#: ../plugins/groupwise-features/gw-ui.c:119
+msgid "_Proxy Login..."
+msgstr "Iniciar sesiÃ³n no _proxy..."
+
+#: ../plugins/groupwise-features/gw-ui.c:170
+msgid "Junk Mail Settings..."
+msgstr "ConfiguraciÃ³n do correo non desexado..."
+
+#: ../plugins/groupwise-features/gw-ui.c:177
+msgid "Track Message Status..."
+msgstr "Seguir o estado da mensaxe..."
+
+#: ../plugins/groupwise-features/gw-ui.c:183
+msgid "Retract Mail"
+msgstr "Anular correo"
+
+#: ../plugins/groupwise-features/gw-ui.c:338
+msgid "Accept Tentatively"
+msgstr "Aceptar provisionalmente"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "GroupWise Account Setup"
-msgstr "ConfiguraciÃ³n de conta Groupwise"
+#: ../plugins/groupwise-features/gw-ui.c:352
+msgid "Rese_nd Meeting..."
+msgstr "Ree_nviar cita..."
+
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
+msgid "Create folder"
+msgstr "Crear cartafol"
 
-#: ../plugins/groupwise-features/install-shared.c:219
+#: ../plugins/groupwise-features/install-shared.c:225
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17065,7 +17152,7 @@ msgid ""
 "%s\n"
 "\n"
 "\n"
-"Click 'Forward' to install the shared folder\n"
+"Click 'Apply' to install the shared folder\n"
 "\n"
 msgstr ""
 "O usuario '%s' compartiu un cartafol con vostede\n"
@@ -17079,67 +17166,69 @@ msgstr ""
 "Prema en 'adiante' para instalar o cartafol compartido\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:224
+#: ../plugins/groupwise-features/install-shared.c:237
 msgid "Install the shared folder"
 msgstr "Instalar o cartafol compartido"
 
-#: ../plugins/groupwise-features/install-shared.c:226
+#: ../plugins/groupwise-features/install-shared.c:241
 msgid "Shared Folder Installation"
 msgstr "InstalaciÃ³n de cartafol compartido"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:80
+#: ../plugins/groupwise-features/junk-mail-settings.c:81
 msgid "Junk Settings"
 msgstr "ConfiguraciÃ³n de correo non desexado"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:93
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
+#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "ConfiguraciÃ³n de correo non desexado"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:117
-msgid "Junk Mail Settings..."
-msgstr "ConfiguraciÃ³n do correo non desexado..."
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List:</b>"
-msgstr "<b>Lista de correo non desexado:</b>"
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:2
+#: ../plugins/groupwise-features/junk-settings.ui.h:1
 msgid "Email:"
 msgstr "Correo electrÃ³nico:"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:45
+#: ../plugins/groupwise-features/junk-settings.ui.h:2
+msgid "Junk List:"
+msgstr "Lista de correo non dese_xado"
+
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:6
+#: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "_Activar"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:7
+#: ../plugins/groupwise-features/junk-settings.ui.h:7
 msgid "_Junk List"
 msgstr "Lista de correo non dese_xado"
 
-#: ../plugins/groupwise-features/mail-retract.c:52
+#: ../plugins/groupwise-features/junk-settings.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "E_liminar"
+
+#: ../plugins/groupwise-features/mail-retract.c:81
 msgid "Message Retract"
 msgstr "Retirada de mensaxe"
 
-#: ../plugins/groupwise-features/mail-retract.c:57
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this ?"
+"sure you want to do this?"
 msgstr ""
 "Ao retirar unha mensaxe pode eliminala da caixa de correo do destinatario. "
 "EstÃ¡ seguro de que quere facer isto?"
 
-#: ../plugins/groupwise-features/mail-retract.c:76
+#: ../plugins/groupwise-features/mail-retract.c:107
 msgid "Message retracted successfully"
 msgstr "Mensaxe anulada con Ã©xito"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
-msgid "Retract Mail"
-msgstr "Anular correo"
+#: ../plugins/groupwise-features/mail-send-options.c:202
+msgid "Insert Send options"
+msgstr "Introducir opciÃ³ns de envÃo"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
@@ -17216,15 +17305,15 @@ msgid "You have to specify a user name which you want to add to the list"
 msgstr "Ten que especificar un nome de usuario que queira engadir Ã¡ lista"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
-msgid "Do you want to resend the meeting ?"
+msgid "Do you want to resend the meeting?"
 msgstr "EstÃ¡ seguro de que quere reenviar esta cita?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-msgid "Do you want to resend the recurring meeting ?"
+msgid "Do you want to resend the recurring meeting?"
 msgstr "EstÃ¡ seguro de que quere reenviar esta cita recorrente?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-msgid "Do you want to retract the original item ?"
+msgid "Do you want to retract the original item?"
 msgstr "Quere retirar o Ãtem orixinal?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
@@ -17257,222 +17346,192 @@ msgstr "Quere aceptala?"
 msgid "Would you like to decline it?"
 msgstr "Quere esquecela?"
 
-#: ../plugins/groupwise-features/process-meeting.c:53
-msgid "Accept Tentatively"
-msgstr "Aceptar provisionalmente"
-
-#: ../plugins/groupwise-features/process-meeting.c:319
-msgid "Rese_nd Meeting..."
-msgstr "Ree_nviar cita..."
-
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.ui.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>Usuarios:</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "Personali_zar a mensaxe de notificaciÃ³n"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Con_tacts..."
 msgstr "Con_tactos..."
 
-#: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:514
-msgid "Message"
-msgstr "Mensaxe"
-
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.ui.h:6
 msgid "Shared Folder Notification"
 msgstr "NotificaciÃ³n de cartafol compartido"
 
-#: ../plugins/groupwise-features/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "Os participantes recibirÃ¡n a seguinte notificaciÃ³n.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "_Non compartido"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.ui.h:14
 msgid "_Shared With..."
 msgstr "_Compartido con..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.ui.h:15
 msgid "_Sharing"
 msgstr "_Compartir"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
-msgid "<b>Name</b>"
-msgstr "<b>Nome</b>"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "Dereitos de acceso"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
 msgid "Add/Edit"
 msgstr "Engadir/editar"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
 msgid "Con_tacts"
 msgstr "Con_tactos"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
 msgid "Modify _folders/options/rules/"
 msgstr "Modificar carta_foles/opciÃ³ns/regras/"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
 msgid "Read items marked _private"
 msgstr "Ler elementos marcados como _privados"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
 msgid "Reminder Notes"
 msgstr "Notas de aviso"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
 msgid "Subscribe to my _alarms"
 msgstr "Subscribir Ã¡s miÃ±as _alarmas"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
 msgid "Subscribe to my _notifications"
 msgstr "Subscribir Ã¡s miÃ±as _notificaciÃ³ns"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
 msgid "_Write"
 msgstr "_Escritura"
 
-#. To Translators: strip the part in front of the | and the | itself
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
 msgid "permission to read|_Read"
 msgstr "_Lectura"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-listing.glade.h:2
+#: ../plugins/groupwise-features/proxy-listing.ui.h:1
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>Nome da conta</b>"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "Iniciar sesiÃ³n no proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:207
-#: ../plugins/groupwise-features/proxy-login.c:250
-#: ../plugins/groupwise-features/proxy.c:488
-#: ../plugins/groupwise-features/send-options.c:86
+#: ../plugins/groupwise-features/proxy-login.c:209
+#: ../plugins/groupwise-features/proxy-login.c:252
+#: ../plugins/groupwise-features/proxy.c:495
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s Introduza o seu contrasinal para %s (usuario %s)"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
-#. * feature by which one person can send/read mails/appointments using another person's identity
-#. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:512
-msgid "_Proxy Login..."
-msgstr "Iniciar sesiÃ³n no _proxy..."
-
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:689
+#: ../plugins/groupwise-features/proxy.c:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "O separador do proxy estarÃ¡ dispoÃ±Ãbel sÃ³ cando a conta estea en liÃ±a."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:695
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "O separador do proxy estarÃ¡ dispoÃ±Ãbel sÃ³ cando a conta estea activada."
 
-#: ../plugins/groupwise-features/send-options.c:214
+#: ../plugins/groupwise-features/proxy.c:931
+#: ../plugins/groupwise-features/share-folder.c:701
+msgid "Add User"
+msgstr "Engadir usuario"
+
+#: ../plugins/groupwise-features/send-options.c:213
 msgid "Advanced send options"
 msgstr "OpciÃ³ns de envÃo avanzadas"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
-#: ../plugins/groupwise-features/share-folder.c:748
+#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder-common.c:318
 msgid "Enter the users and set permissions"
 msgstr "Introduza os usuarios e defina os permisos"
 
-#: ../plugins/groupwise-features/share-folder-common.c:340
-msgid "New _Shared Folder..."
-msgstr "Cartafol _compartido novo..."
-
-#: ../plugins/groupwise-features/share-folder-common.c:447
+#: ../plugins/groupwise-features/share-folder-common.c:415
 msgid "Sharing"
 msgstr "Compartir"
 
-#: ../plugins/groupwise-features/share-folder.c:531
+#: ../plugins/groupwise-features/share-folder.c:529
 msgid "Custom Notification"
 msgstr "NotificaciÃ³n personalizada"
 
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../plugins/groupwise-features/share-folder.c:741
 msgid "Add   "
 msgstr "Engadir   "
 
-#: ../plugins/groupwise-features/share-folder.c:759
+#: ../plugins/groupwise-features/share-folder.c:747
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../plugins/groupwise-features/status-track.c:94
+#: ../plugins/groupwise-features/status-track.c:126
 msgid "Message Status"
 msgstr "Estado da mensaxe"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:108
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: ../plugins/groupwise-features/status-track.c:122
+#: ../plugins/groupwise-features/status-track.c:154
 msgid "From:"
 msgstr "De:"
 
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:169
 msgid "Creation date:"
 msgstr "Data de creaciÃ³n:"
 
-#: ../plugins/groupwise-features/status-track.c:176
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../plugins/groupwise-features/status-track.c:183
+#: ../plugins/groupwise-features/status-track.c:216
 msgid "Delivered: "
 msgstr "Entregada: "
 
-#: ../plugins/groupwise-features/status-track.c:189
+#: ../plugins/groupwise-features/status-track.c:222
 msgid "Opened: "
 msgstr "Aberta: "
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:227
 msgid "Accepted: "
 msgstr "Aceptada: "
 
-#: ../plugins/groupwise-features/status-track.c:199
+#: ../plugins/groupwise-features/status-track.c:232
 msgid "Deleted: "
 msgstr "Eliminada: "
 
-#: ../plugins/groupwise-features/status-track.c:204
+#: ../plugins/groupwise-features/status-track.c:237
 msgid "Declined: "
 msgstr "Rexeitada: "
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:242
 msgid "Completed: "
 msgstr "Terminada: "
 
-#: ../plugins/groupwise-features/status-track.c:214
+#: ../plugins/groupwise-features/status-track.c:247
 msgid "Undelivered: "
 msgstr "Sen entregar: "
 
-#: ../plugins/groupwise-features/status-track.c:238
-msgid "Track Message Status..."
-msgstr "Seguir o estado da mensaxe..."
-
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "Add Hula support to Evolution."
 msgstr "Engade a compatibilidade de Hula con Evolution."
@@ -17481,27 +17540,29 @@ msgstr "Engade a compatibilidade de Hula con Evolution."
 msgid "Hula Support"
 msgstr "Compatibilidade con Hula"
 
-#: ../plugins/imap-features/imap-headers.c:332
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+msgid "Inline Image"
+msgstr "vCards en liÃ±a"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+msgid "View image attachments directly in mail messages."
+msgstr "Mostrar vCards directamente nas mensaxes de correo."
+
+#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Cabeceiras personalizadas"
 
-#: ../plugins/imap-features/imap-headers.c:345
+#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "Cabeceiras IMAP"
 
-#: ../plugins/imap-features/imap-headers.glade.h:1
-msgid "<b>Custom Headers</b>"
-msgstr "<b>Cabeceiras personalizadas</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers</b>"
-msgstr "<b>Cabeceiras IMAP</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:3
+#: ../plugins/imap-features/imap-headers.ui.h:1
 msgid "Basic and _Mailing List Headers (Default)"
-msgstr "Cabeceiras bÃ¡sicas e de lista de _correo (predeterminado)"
+msgstr "Cabeceiras bÃ¡sicas e de lista de _correo (predefinida)"
 
-#: ../plugins/imap-features/imap-headers.glade.h:4
+#: ../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"
@@ -17511,7 +17572,7 @@ msgstr ""
 "estÃ¡ndar de arriba. \n"
 "Pode ignorar isto se selecciona \"Todas as cabeceiras\"."
 
-#: ../plugins/imap-features/imap-headers.glade.h:6
+#: ../plugins/imap-features/imap-headers.ui.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -17519,7 +17580,7 @@ msgstr ""
 "Seleccione as preferencias da sÃºa cabeceira IMAP. \n"
 "Cantas mÃ¡is cabeceiras teÃ±a mÃ¡is tempo levarÃ¡ descargalas."
 
-#: ../plugins/imap-features/imap-headers.glade.h:8
+#: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -17527,7 +17588,7 @@ msgstr ""
 "Cabeceiras _bÃ¡sicas - (o mÃ¡is rÃ¡pido) \n"
 "Use isto se non ten filtros baseados en listas de correo"
 
-#: ../plugins/imap-features/imap-headers.glade.h:10
+#: ../plugins/imap-features/imap-headers.ui.h:10
 msgid "_Fetch All Headers"
 msgstr "Obter to_das as cabeceiras"
 
@@ -17539,175 +17600,143 @@ msgstr "Axuste os detalles das sÃºas contas IMAP."
 msgid "IMAP Features"
 msgstr "CaracterÃsticas IMAP"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
-msgid "Hardware Abstraction Layer not loaded"
-msgstr "Non se cargou o Hardware Abstraction Layer"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
-msgid ""
-"The \"hald\" service is required but not currently running. Please enable "
-"the service and rerun this program, or contact your system administrator."
-msgstr ""
-"RequÃrese o servizo \"hald\", que non estÃ¡ sendo executado. Active este "
-"servizo e reinicie o programa ou contacte co administrador do sistema."
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
-msgid "Search for an iPod failed"
-msgstr "A busca dun iPod fallou"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
-msgid ""
-"Evolution could not find an iPod to synchronize with. Either the iPod is not "
-"connected to the system or it is not powered on."
-msgstr ""
-"O Evolution non puido encontrar un iPod co que sincronizarse. Poida que o "
-"iPod non estea conectado ao sistema ou que non estea aceso."
-
-#: ../plugins/ipod-sync/ical-format.c:119
-#: ../plugins/save-calendar/ical-format.c:164
-msgid "iCalendar format (.ics)"
-msgstr "Formato iCalendar (.ics)"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize to iPod"
-msgstr "Sincronizar cun iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize your data with your Apple iPod."
-msgstr "Sincronizar os seus datos co seu Apple iPod."
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-msgid "iPod Synchronization"
-msgstr "SincronizaciÃ³n con iPod"
-
-#: ../plugins/itip-formatter/itip-formatter.c:482
-#: ../plugins/itip-formatter/itip-formatter.c:607
+#: ../plugins/itip-formatter/itip-formatter.c:494
+#: ../plugins/itip-formatter/itip-formatter.c:619
 #, c-format
 msgid "Failed to load the calendar '%s'"
-msgstr "Fallo ao cargar o calendario '%s'"
+msgstr "Produciuse un fallo ao cargar o calendario '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:627
+#: ../plugins/itip-formatter/itip-formatter.c:639
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Unha cita no calendario '%s' entra en conflito con esta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:663
+#: ../plugins/itip-formatter/itip-formatter.c:675
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Localizouse a cita no calendario '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:753
+#: ../plugins/itip-formatter/itip-formatter.c:774
 msgid "Unable to find any calendars"
 msgstr "Non Ã© posÃbel localizar ningÃºn calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:760
+#: ../plugins/itip-formatter/itip-formatter.c:781
 msgid "Unable to find this meeting in any calendar"
 msgstr "Non Ã© posÃbel localizar esta cita en ningÃºn calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:764
+#: ../plugins/itip-formatter/itip-formatter.c:785
 msgid "Unable to find this task in any task list"
 msgstr "Non Ã© posÃbel localizar esta tarefa en ningunha lista de tarefas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:768
+#: ../plugins/itip-formatter/itip-formatter.c:789
 msgid "Unable to find this memo in any memo list"
 msgstr "Non Ã© posÃbel localizar esta nota en ningunha lista de notas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:839
+#: ../plugins/itip-formatter/itip-formatter.c:860
 msgid "Opening the calendar. Please wait.."
 msgstr "Abrindo o calendario. Agarde..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:842
+#: ../plugins/itip-formatter/itip-formatter.c:863
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando unha versiÃ³n existente desta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1024
+#: ../plugins/itip-formatter/itip-formatter.c:1044
 msgid "Unable to parse item"
 msgstr "Non Ã© posÃbel analizar o elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1111
+#: ../plugins/itip-formatter/itip-formatter.c:1131
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Non Ã© posÃbel enviar o elemento ao calendario '%s'. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1143
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado ao calendario '%s' como aceptado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1127
+#: ../plugins/itip-formatter/itip-formatter.c:1147
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado ao calendario '%s' como provisional"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado ao calendario '%s' como rexeitado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1137
+#: ../plugins/itip-formatter/itip-formatter.c:1157
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado ao calendario '%s' como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1231
+#: ../plugins/itip-formatter/itip-formatter.c:1251
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "O organizador eliminou o delegado %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1238
+#: ../plugins/itip-formatter/itip-formatter.c:1258
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviouse unha notificaciÃ³n de cancelaciÃ³n ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1240
+#: ../plugins/itip-formatter/itip-formatter.c:1260
 msgid "Could not send the cancelation notice to the delegate"
-msgstr "Non se puido enviar unha notificaciÃ³n de cancelaciÃ³n ao delegado"
+msgstr "Non foi posÃbel enviar unha notificaciÃ³n de cancelaciÃ³n ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1348
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
-"O estado de participaciÃ³n non se puido actualizar debido a que o estado non "
-"Ã© vÃ¡lido"
+"Non foi posÃbel actualizar o estado de participaciÃ³n debido a que o estado "
+"non Ã© vÃ¡lido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1377
+#: ../plugins/itip-formatter/itip-formatter.c:1400
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Non Ã© posÃbel actualizar o participante. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1381
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Attendee status updated"
 msgstr "Estado de participaciÃ³n actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1430
 msgid "Meeting information sent"
 msgstr "InformaciÃ³n da cita enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1410
+#: ../plugins/itip-formatter/itip-formatter.c:1433
 msgid "Task information sent"
 msgstr "InformaciÃ³n da tarefa enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1436
 msgid "Memo information sent"
 msgstr "InformaciÃ³n da nota enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Non Ã© posÃbel enviar informaciÃ³n da cita: a cita non existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1425
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "Unable to send task information, the task does not exist"
 msgstr "Non Ã© posÃbel enviar informaciÃ³n da tarefa: a tarefa non existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1428
+#: ../plugins/itip-formatter/itip-formatter.c:1451
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Non Ã© posÃbel enviar informaciÃ³n da nota: a nota non existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1496
-#: ../plugins/itip-formatter/itip-formatter.c:1507
+#. Translators: This is a default filename for a calendar.
+#: ../plugins/itip-formatter/itip-formatter.c:1516
+msgid "calendar.ics"
+msgstr "Calendarios"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1521
+msgid "Save Calendar"
+msgstr "Calendario novo"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1574
+#: ../plugins/itip-formatter/itip-formatter.c:1585
 msgid "The calendar attached is not valid"
 msgstr "O calendario anexo non Ã© vÃ¡lido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1497
-#: ../plugins/itip-formatter/itip-formatter.c:1508
+#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1586
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17715,15 +17744,15 @@ msgstr ""
 "A mensaxe di que contÃ©n un calendario mais o calendario non Ã© un iCalendar "
 "vÃ¡lido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1548
-#: ../plugins/itip-formatter/itip-formatter.c:1576
-#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1626
+#: ../plugins/itip-formatter/itip-formatter.c:1654
+#: ../plugins/itip-formatter/itip-formatter.c:1760
 msgid "The item in the calendar is not valid"
 msgstr "O elemento no calendario non Ã© vÃ¡lido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1549
-#: ../plugins/itip-formatter/itip-formatter.c:1577
-#: ../plugins/itip-formatter/itip-formatter.c:1669
+#: ../plugins/itip-formatter/itip-formatter.c:1627
+#: ../plugins/itip-formatter/itip-formatter.c:1655
+#: ../plugins/itip-formatter/itip-formatter.c:1761
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17731,11 +17760,11 @@ msgstr ""
 "A mensaxe contÃ©n un calendario mais o calendario non contÃ©n eventos, tarefas "
 "nin informaciÃ³n de dispoÃ±ibilidade"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "The calendar attached contains multiple items"
 msgstr "O calendario anexo contÃ©n mÃºltiples elementos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1589
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17743,216 +17772,216 @@ msgstr ""
 "Para procesar todos estes elementos, deberÃa gardarse o ficheiro e "
 "importarse o calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../plugins/itip-formatter/itip-formatter.c:2434
 msgid "This meeting recurs"
 msgstr "Esta cita repÃtese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../plugins/itip-formatter/itip-formatter.c:2437
 msgid "This task recurs"
 msgstr "Esta tarefa repÃtese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2341
+#: ../plugins/itip-formatter/itip-formatter.c:2440
 msgid "This memo recurs"
 msgstr "Esta nota repÃtese"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2574
+#: ../plugins/itip-formatter/itip-formatter.c:2669
 msgid "_Delete message after acting"
 msgstr "E_liminar a mensaxe despois de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2584
-#: ../plugins/itip-formatter/itip-formatter.c:2617
+#: ../plugins/itip-formatter/itip-formatter.c:2679
+#: ../plugins/itip-formatter/itip-formatter.c:2712
 msgid "Conflict Search"
 msgstr "Buscar conflito"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2599
+#: ../plugins/itip-formatter/itip-formatter.c:2694
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione os calendarios nos que buscar conflitos entre reuniÃ³ns"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:196
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M"
 msgstr "Hoxe Ã¡s %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:204
 msgid "Today %H:%M:%S"
 msgstr "Hoxe Ã¡s %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:209
+#: ../plugins/itip-formatter/itip-view.c:213
 msgid "Today %l:%M:%S %p"
 msgstr "Hoxe Ã¡s %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:224
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M"
 msgstr "MaÃ±Ã¡ Ã¡s %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:232
 msgid "Tomorrow %H:%M:%S"
 msgstr "MaÃ±Ã¡ Ã¡s %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:233
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M %p"
 msgstr "MaÃ±Ã¡ Ã¡s %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:241
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "MaÃ±Ã¡ Ã¡s %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:260
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:261
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:270
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:278
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:283
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e"
 msgstr "%A, %e de %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:289
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e de %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e de %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:298
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e de %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e de %B %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:308
+#: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e de %B de %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:313
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e de %B de %Y Ã¡s %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e de %B de %Y, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:322
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e de %B de %Y, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:330
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e de %B de %Y, %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:443
+#: ../plugins/itip-formatter/itip-view.c:530
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Responda de parte de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:353
-#: ../plugins/itip-formatter/itip-view.c:441
-#: ../plugins/itip-formatter/itip-view.c:529
+#: ../plugins/itip-formatter/itip-view.c:357
+#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Recibido de parte de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> publicou a seguinte informaciÃ³n de cita a travÃ©s de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:360
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> publicou a seguinte informaciÃ³n de cita:"
 
-#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> delegoulle a cita seguinte:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:372
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> require a sÃºa presenza na seguinte cita a travÃ©s de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> require a sÃºa presenza na seguinte cita:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> quere apuntarse a unha cita existente a travÃ©s de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> quere apuntarse a unha cita existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -17961,90 +17990,90 @@ msgstr ""
 "<b>%s</b> a travÃ©s de %s quere recibir a Ãºltima informaciÃ³n para a prÃ³xima "
 "cita:"
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> quere recibir a Ãºltima informaciÃ³n da seguinte cita:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> a travÃ©s de %s devolveu a seguinte resposta Ã¡ cita:"
 
-#: ../plugins/itip-formatter/itip-view.c:390
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> devolveu a seguinte resposta Ã¡ cita:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> a travÃ©s de %s cancelou a seguinte cita:"
 
-#: ../plugins/itip-formatter/itip-view.c:396
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> cancelou a cita seguinte."
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr ""
 "<b>%s</b> a travÃ©s de %s propuxo as seguintes modificaciÃ³ns para a cita."
 
-#: ../plugins/itip-formatter/itip-view.c:402
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> propuxo as seguintes modificaciÃ³ns para a cita."
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:410
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr ""
 "<b>%s</b> rexeitou as seguintes modificaciÃ³ns para a cita a travÃ©s de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:408
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> rexeitou as seguintes modificaciÃ³ns para a cita."
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:450
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> publicou a seguinte tarefa a travÃ©s de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> publicou a tarefa seguinte:"
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> require a asignaciÃ³n de %s para a seguinte tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:460
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> a travÃ©s de %s asignoulle unha tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:458
+#: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> asignoulle unha tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> a travÃ©s de %s quere engadirse a unha tarefa existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:466
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> quere engadirse a unha tarefa existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18053,7 +18082,7 @@ msgstr ""
 "<b>%s</b> a travÃ©s de %s quere recibir a Ãºltima informaciÃ³n para a seguinte "
 "tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:472
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18061,7 +18090,7 @@ msgid ""
 msgstr ""
 "<b>%s</b> quere recibir a Ãºltima informaciÃ³n para a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
@@ -18069,22 +18098,22 @@ msgstr ""
 "<b>%s</b> a travÃ©s de %s devolveu a seguinte resposta para a seguinte tarefa "
 "asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:478
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> devolveu a seguinte resposta Ã¡ tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> a travÃ©s de %s cancelou a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> cancelou a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
@@ -18092,147 +18121,165 @@ msgstr ""
 "<b>%s</b> a travÃ©s de %s propuxo as seguintes modificaciÃ³ns na asignaciÃ³n de "
 "tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:490
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> propuxo as seguintes modificaciÃ³ns na asignaciÃ³n de tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:498
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> rexeitou a seguinte tarefa asignada a travÃ©s de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:496
+#: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> rexeitou a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:537
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> publicou a seguinte nota a travÃ©s de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:536
+#: ../plugins/itip-formatter/itip-view.c:539
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> publicou a seguinte nota:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> quere sumarse a unha cita existente a travÃ©s de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:543
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> quere sumarse a unha nota existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:550
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> a travÃ©s de %s cancelou a seguinte nota compartida:"
 
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../plugins/itip-formatter/itip-view.c:552
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> cancelou a seguinte nota compartida:"
 
+#: ../plugins/itip-formatter/itip-view.c:676
+msgid "All day:"
+msgstr "Todo o dÃa:"
+
+#: ../plugins/itip-formatter/itip-view.c:686
+msgid "Start day:"
+msgstr "Data de _comezo:"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:1041
+msgid "Start time:"
+msgstr "Hora de comezo:"
+
+#: ../plugins/itip-formatter/itip-view.c:698
+msgid "End day:"
+msgstr "%d dÃa"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1052
+msgid "End time:"
+msgstr "Hora de finalizaciÃ³n:"
+
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:823
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:839
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:847
+#: ../plugins/itip-formatter/itip-view.c:864
+#: ../plugins/itip-formatter/itip-view.c:869
 msgid "_Decline"
 msgstr "_Rexeitar"
 
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:863
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:866
+#: ../plugins/itip-formatter/itip-view.c:871
 msgid "_Accept"
 msgstr "_Aceptar"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Decline all"
 msgstr "_Rexeitar todo"
 
-#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Tentative all"
 msgstr "Facer _provisional todo"
 
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:857
-#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:865
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Tentative"
 msgstr "_Provisional"
 
-#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Accept all"
 msgstr "_Aceptar todo"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Send Information"
 msgstr "_Enviar informaciÃ³n"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Update Attendee Status"
 msgstr "Act_ualizar o estado do participante"
 
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Update"
 msgstr "Act_ualizar"
 
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:1033
-msgid "Start time:"
-msgstr "Hora de comezo:"
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:1044
-msgid "End time:"
-msgstr "Hora de finalizaciÃ³n:"
-
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1064
-#: ../plugins/itip-formatter/itip-view.c:1118
+#: ../plugins/itip-formatter/itip-view.c:1072
+#: ../plugins/itip-formatter/itip-view.c:1126
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../plugins/itip-formatter/itip-view.c:1103
+#: ../plugins/itip-formatter/itip-view.c:1111
 msgid "Send _reply to sender"
 msgstr "_Responder ao remitente"
 
-#: ../plugins/itip-formatter/itip-view.c:1133
+#: ../plugins/itip-formatter/itip-view.c:1141
 msgid "Send _updates to attendees"
 msgstr "Mandar as act_ualizaciÃ³ns aos participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:1142
+#: ../plugins/itip-formatter/itip-view.c:1150
 msgid "_Apply to all instances"
 msgstr "_Aplicar en todos os casos"
 
-#: ../plugins/itip-formatter/itip-view.c:1151
+#: ../plugins/itip-formatter/itip-view.c:1159
 msgid "Show time as _free"
 msgstr "Mostrar a hora como _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Preserve my reminder"
 msgstr "_Preservar o meu aviso"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1160
+#: ../plugins/itip-formatter/itip-view.c:1168
 msgid "_Inherit reminder"
 msgstr "_Herdar o aviso"
 
-#: ../plugins/itip-formatter/itip-view.c:1914
+#: ../plugins/itip-formatter/itip-view.c:1911
+msgid "_Tasks:"
+msgstr "_Tarefas:"
+
+#: ../plugins/itip-formatter/itip-view.c:1913
 msgid "_Memos:"
 msgstr "_Notas:"
 
@@ -18262,20 +18309,6 @@ msgstr ""
 "Esta resposta non Ã© dun participante actual. Quere engadir o remitente como "
 "un participante?"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
-msgid "Proxy _Logout"
-msgstr "_Terminar a sesiÃ³n proxy"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Disable Account"
-msgstr "Desactivar conta"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
-msgid "Disable an account by right-clicking on it in the folder tree."
-msgstr ""
-"Desactive unha conta facendo clic co botÃ³n dereito nela na Ã¡rbore de "
-"cartafoles."
-
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "Emitir un ton de aviso ou reproducir un ficheiro de son."
@@ -18313,58 +18346,63 @@ msgid "Play sound when new messages arrive."
 msgstr "Reproducir un son cando cheguen mensaxes novas."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr ""
+"O ficheiro de son que quere reproducir cando chegue unha mensaxe nova, se "
+"non estÃ¡ no modo de ton de aviso."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Popup message together with the icon."
 msgstr "Facer emerxer a mensaxe xunto coa icona."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr ""
 "Mostrar a icona de mensaxe nova na Ã¡rea de notificaciÃ³n cando cheguen "
 "mensaxes novas."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file name to be played."
 msgstr "Nome do ficheiro de son que quere reproducir."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "O ficheiro de son que quere reproducir cando chegue unha mensaxe nova, se "
 "non estÃ¡ no modo de ton de aviso."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Use sound theme"
+msgstr "Usar tema de sons"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether play sound or beep when new messages arrive."
 msgstr ""
 "Se emitir ou non un son ou un ton de aviso cando cheguen mensaxes novas."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether show message over the icon when new messages arrive."
 msgstr ""
 "Se mostrar ou non a mensaxe sobre a icona cando cheguen mensaxes novas."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
 msgid "Whether the icon should blink or not."
 msgstr "Se a icona se deberÃa volver intermitente ou non."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Se notificar as mensaxes sÃ³ na caixa de entrada ou non."
 
-# (pofilter) accelerators: accelerator _ is missing from translation
-#: ../plugins/mail-notification/mail-notification.c:245
-msgid "Generate a _D-Bus message"
-msgstr "Xerar unha mensaxe _D-Bus"
-
-#: ../plugins/mail-notification/mail-notification.c:368
+#: ../plugins/mail-notification/mail-notification.c:344
 msgid "Evolution's Mail Notification"
 msgstr "NotificaciÃ³n de correo do Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:389
+#: ../plugins/mail-notification/mail-notification.c:366
 msgid "Mail Notification Properties"
 msgstr "Propiedades da notificaciÃ³n de correo"
 
-#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:498
+#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:495
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18379,59 +18417,72 @@ msgstr[1] ""
 "Recibiu %d mensaxes novas\n"
 "en %s."
 
-#: ../plugins/mail-notification/mail-notification.c:503
+#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:506
+#, c-format
+msgid "From: %s"
+msgstr "De: %s:"
+
+#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:518
+#, c-format
+msgid "Subject: %s"
+msgstr "Asunto: %s"
+
+#: ../plugins/mail-notification/mail-notification.c:527
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Recibiu %d mensaxe nova."
 msgstr[1] "Recibiu %d mensaxes novas."
 
-#: ../plugins/mail-notification/mail-notification.c:520
-#: ../plugins/mail-notification/mail-notification.c:525
+#: ../plugins/mail-notification/mail-notification.c:545
+#: ../plugins/mail-notification/mail-notification.c:550
 msgid "New email"
 msgstr "Novo correo"
 
-#: ../plugins/mail-notification/mail-notification.c:588
+#: ../plugins/mail-notification/mail-notification.c:604
 msgid "Show icon in _notification area"
 msgstr "Mostrar a icona na Ã¡rea de _notificaciÃ³n"
 
 # (pofilter) accelerators: accelerator _ is missing from translation
-#: ../plugins/mail-notification/mail-notification.c:591
+#: ../plugins/mail-notification/mail-notification.c:632
 msgid "B_link icon in notification area"
 msgstr "Volver _intermitente a icona da Ã¡rea de notificaciÃ³n"
 
-#: ../plugins/mail-notification/mail-notification.c:593
+#: ../plugins/mail-notification/mail-notification.c:642
 msgid "Popup _message together with the icon"
 msgstr "Facer emerxer a _mensaxe xunto coa icona"
 
-#: ../plugins/mail-notification/mail-notification.c:774
+#: ../plugins/mail-notification/mail-notification.c:827
 msgid "_Play sound when new messages arrive"
 msgstr "_Reproducir un son cando cheguen mensaxes novas"
 
-#: ../plugins/mail-notification/mail-notification.c:780
+#: ../plugins/mail-notification/mail-notification.c:856
 msgid "_Beep"
 msgstr "_Ton de aviso"
 
-#: ../plugins/mail-notification/mail-notification.c:781
-msgid "Play _sound file"
-msgstr "Reproducir un ficheiro de _son"
+#: ../plugins/mail-notification/mail-notification.c:869
+msgid "Use sound _theme"
+msgstr "Usar _tema de sons"
 
-#: ../plugins/mail-notification/mail-notification.c:792
-msgid "Specify _filename:"
-msgstr "Especificar o nome de _ficheiro:"
+#: ../plugins/mail-notification/mail-notification.c:888
+msgid "Play _file:"
+msgstr "Reproducir un ficheiro de _son"
 
-#: ../plugins/mail-notification/mail-notification.c:793
+#: ../plugins/mail-notification/mail-notification.c:899
 msgid "Select sound file"
 msgstr "Seleccionar un ficheiro de son"
 
-#: ../plugins/mail-notification/mail-notification.c:794
-msgid "Pl_ay"
-msgstr "Repr_oducir"
-
-#: ../plugins/mail-notification/mail-notification.c:851
+#: ../plugins/mail-notification/mail-notification.c:957
 msgid "Notify new messages for _Inbox only"
 msgstr "Notificar mensaxes novas sÃ³ para a caixa de _entrada"
 
+# (pofilter) accelerators: accelerator _ is missing from translation
+#: ../plugins/mail-notification/mail-notification.c:966
+msgid "Generate a _D-Bus message"
+msgstr "Xerar unha mensaxe _D-Bus"
+
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
 msgstr "NotificaciÃ³n de correo"
@@ -18440,7 +18491,13 @@ msgstr "NotificaciÃ³n de correo"
 msgid "Notifies you when new mail messages arrive."
 msgstr "Reproducir un son cando cheguen mensaxes novas."
 
-#: ../plugins/mail-to-task/mail-to-task.c:376
+#. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
+#: ../plugins/mail-to-task/mail-to-task.c:166
+#, c-format
+msgid "Created from a mail by %s"
+msgstr "Creado desde un correo electrÃ³nico por %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:496
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18449,7 +18506,7 @@ msgstr ""
 "O calendario seleccionado contÃ©n xa unha actividade '%s'. Quere editar a  "
 "actividade vella?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:379
+#: ../plugins/mail-to-task/mail-to-task.c:499
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18458,7 +18515,7 @@ msgstr ""
 "A lista de tarefas seleccionadas contÃ©n xa unha tarefa '%s'. Quere editar a "
 "actividade vella?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:382
+#: ../plugins/mail-to-task/mail-to-task.c:502
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18467,7 +18524,7 @@ msgstr ""
 "A lista de notas seleccionada xa contÃ©n unha nota '%s' . Quere editar a nota "
 "vella?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:399
+#: ../plugins/mail-to-task/mail-to-task.c:519
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18475,7 +18532,7 @@ msgstr ""
 "O calendario seleccionado xa contÃ©n algunhas actividades para os correos "
 "dados. Quere crear actividades novas de todas maneiras?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:402
+#: ../plugins/mail-to-task/mail-to-task.c:522
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18483,7 +18540,7 @@ msgstr ""
 "A lista de tarefas seleccionada xa contÃ©n algunhas tarefas para os correos "
 "dados. Quere crear tarefas novas de todas maneiras?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:405
+#: ../plugins/mail-to-task/mail-to-task.c:525
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18491,7 +18548,7 @@ msgstr ""
 "A lista de notas seleccionada xa contÃ©n algunhas notas para os correos "
 "dados. Quere crear notas novas de todas maneiras?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:423
+#: ../plugins/mail-to-task/mail-to-task.c:543
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18505,7 +18562,7 @@ msgstr[1] ""
 "O calendario seleccionado xa contÃ©n unha actividade para o correo dado. "
 "Quere crear actividades novas de todas maneiras?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:429
+#: ../plugins/mail-to-task/mail-to-task.c:549
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18519,7 +18576,7 @@ msgstr[1] ""
 "A lista de tarefas seleccionada xa contÃ©n tarefas para o correo dado. Quere "
 "crear actividades novas de todas maneiras?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:435
+#: ../plugins/mail-to-task/mail-to-task.c:555
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18533,25 +18590,25 @@ msgstr[1] ""
 "A lista de notas seleccionada xa contÃ©n notas para os correos dados. Quere "
 "crear notas novas de todas maneiras?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:494
+#: ../plugins/mail-to-task/mail-to-task.c:614
 msgid "[No Summary]"
 msgstr "[Sen resumo]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:505
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "Invalid object returned from a server"
 msgstr "O obxecto devolto polo servidor non Ã© vÃ¡lido"
 
-#: ../plugins/mail-to-task/mail-to-task.c:570
+#: ../plugins/mail-to-task/mail-to-task.c:696
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Ocorreu un erro no proceso: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:725
 #, c-format
 msgid "Cannot open calendar. %s"
-msgstr "Non se pode abrir o calendario. %s"
+msgstr "Non Ã© posÃbel abrir o calendario. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:606
+#: ../plugins/mail-to-task/mail-to-task.c:732
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18559,7 +18616,7 @@ msgstr ""
 "A orixe seleccionada Ã© sÃ³ de lectura, polo que non se poden crear eventos "
 "nela. Seleccione outra orixe."
 
-#: ../plugins/mail-to-task/mail-to-task.c:609
+#: ../plugins/mail-to-task/mail-to-task.c:735
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18567,7 +18624,7 @@ msgstr ""
 "A orixe seleccionada Ã© sÃ³ de lectura, polo que non se poden crear tarefas "
 "nela. Seleccione outra orixe."
 
-#: ../plugins/mail-to-task/mail-to-task.c:612
+#: ../plugins/mail-to-task/mail-to-task.c:738
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18575,93 +18632,109 @@ msgstr ""
 "A orixe seleccionada Ã© sÃ³ de lectura, polo que non se poden crear notas "
 "nela. Seleccione outra orixe."
 
-#: ../plugins/mail-to-task/mail-to-task.c:821
+#: ../plugins/mail-to-task/mail-to-task.c:941
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Non Ã© posÃbel obter a lista orixe. %s"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-msgid "Convert a mail message to a task."
-msgstr "Converte unha mensaxe nunha tarefa."
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Create a Mem_o"
-msgstr "Crear unha n_ota"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Create a _Meeting"
-msgstr "Crear unha _cita"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
-msgid "Create a _Task"
-msgstr "Crear unha _tarefa"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+#: ../plugins/mail-to-task/mail-to-task.c:1060
 msgid "Create an _Event"
 msgstr "Cr_ear unha actividade"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
-msgid "Mail-to-Task"
-msgstr "Correo para tarefa"
-
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 msgid "Create a new event from the selected message"
 msgstr "Crear unha actividade nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
-msgid "Create a new meeting from the selected message"
-msgstr "Crear unha cita nova a partir da mensaxe seleccionada"
+#: ../plugins/mail-to-task/mail-to-task.c:1067
+msgid "Create a Mem_o"
+msgstr "Crear unha n_ota"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 msgid "Create a new memo from the selected message"
 msgstr "Crear unha nota nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+#: ../plugins/mail-to-task/mail-to-task.c:1074
+msgid "Create a _Task"
+msgstr "Crear unha _tarefa"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1076
 msgid "Create a new task from the selected message"
 msgstr "Crear unha tarefa nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-msgid "Contact list _owner"
-msgstr "Pr_opietario da lista de contactos"
+#: ../plugins/mail-to-task/mail-to-task.c:1084
+msgid "Create a _Meeting"
+msgstr "Crear unha _cita"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-msgid "Get list _archive"
+#: ../plugins/mail-to-task/mail-to-task.c:1086
+msgid "Create a new meeting from the selected message"
+msgstr "Crear unha cita nova a partir da mensaxe seleccionada"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "Converte unha mensaxe nunha tarefa."
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+msgid "Get List _Archive"
 msgstr "Obter _arquivo da lista"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
-msgid "Get list _usage information"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+msgid "Get an archive of the list this message belongs to"
+msgstr "Obter un arquivo da lista Ã¡ que pertence esta mensaxe"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+msgid "Get List _Usage Information"
 msgstr "Obter informaciÃ³n do _uso da lista"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
-msgid "Mailing List Actions"
-msgstr "AcciÃ³ns das listas de correo"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+msgid "Get information about the usage of the list this message belongs to"
+msgstr "Obter informaciÃ³n sobre o uso da lista Ã¡ que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
-msgid "Mailing _List"
-msgstr "_Lista de correo"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+msgid "Contact List _Owner"
+msgstr "Pr_opietario da lista de contactos"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+msgid "Contact the owner of the mailing list this message belongs to"
 msgstr ""
-"Proporciona acciÃ³ns para comandos comÃºns de listas de correo (subscribirse, "
-"eliminar subscriciÃ³n etc.)."
+"Contactar co propietario da lista de correo Ã¡ que pertence esta mensaxe"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
-msgid "_Post message to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+msgid "_Post Message to List"
 msgstr "_Publicar unha mensaxe na lista"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-msgid "_Subscribe to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "Publicar unha mensaxe na lista de correo Ã¡ que pertence esta mensaxe"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+msgid "_Subscribe to List"
 msgstr "_Subscribirse Ã¡ lista"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-msgid "_Un-subscribe to list"
-msgstr "E_liminar subscriciÃ³n Ã¡ lista"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "Subscribirse Ã¡ lista de correo Ã¡ que pertence esta mensaxe"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+msgid "_Unsubscribe from List"
+msgstr "E_liminar subscriciÃ³n da lista"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+msgid "Unsubscribe from the mailing list this message belongs to"
+msgstr "Eliminar subscriciÃ³n da lista de correo Ã¡ que pertence esta mensaxe"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+msgid "Mailing _List"
+msgstr "_Lista de correo"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Mailing List Actions"
+msgstr "AcciÃ³ns das listas de correo"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr ""
+"Proporciona acciÃ³ns para ordes comÃºns de listas de correo (subscribirse, "
+"eliminar subscriciÃ³n etc.)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
@@ -18678,7 +18751,7 @@ msgstr ""
 "Enviarase unha mensaxe de correo ao URL \"{0}\". Pode enviar a mensaxe "
 "automaticamente ou vela e modificala primeiro.\n"
 "\n"
-"DeberÃa recibir unha resposta dende a lista de correo pouco despois de que "
+"DeberÃa recibir unha resposta desde a lista de correo pouco despois de que "
 "se envÃe esta mensaxe."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
@@ -18724,8 +18797,8 @@ msgid ""
 "\n"
 "Header: {1}"
 msgstr ""
-"A cabeceira {0} desta mensaxe estÃ¡ formada incorrectamente e non se puido "
-"procesar.\n"
+"A cabeceira {0} desta mensaxe estÃ¡ formada incorrectamente e non foi posÃbel "
+"procesala.\n"
 "\n"
 "Cabeceira: {1}"
 
@@ -18745,60 +18818,11 @@ msgstr "_Editar a mensaxe"
 msgid "_Send message"
 msgstr "_Enviar a mensaxe"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-msgstr "Pr_opietario da lista de contactos"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
-msgid "Contact the owner of the mailing list this message belongs to"
-msgstr ""
-"Contactar co propietario da lista de correo Ã¡ que pertence esta mensaxe"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get List _Archive"
-msgstr "Obter _arquivo da lista"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-msgstr "Obter informaciÃ³n do _uso da lista"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
-msgid "Get an archive of the list this message belongs to"
-msgstr "Obter un arquivo da lista Ã¡ que pertence esta mensaxe"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
-msgid "Get information about the usage of the list this message belongs to"
-msgstr "Obter informaciÃ³n sobre o uso da lista Ã¡ que pertence esta mensaxe"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
-msgid "Post a message to the mailing list this message belongs to"
-msgstr "Publicar unha mensaxe na lista de correo Ã¡ que pertence esta mensaxe"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
-msgid "Subscribe to the mailing list this message belongs to"
-msgstr "Subscribirse Ã¡ lista de correo Ã¡ que pertence esta mensaxe"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
-msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "Eliminar subscriciÃ³n da lista de correo Ã¡ que pertence esta mensaxe"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "_Publicar unha mensaxe na lista"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "_Subscribirse Ã¡ lista"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "E_liminar subscriciÃ³n da lista"
-
-#: ../plugins/mark-all-read/mark-all-read.c:39
+#: ../plugins/mark-all-read/mark-all-read.c:42
 msgid "Also mark messages in subfolders?"
 msgstr "Quere marcar tamÃ©n as mensaxes nos subcartafoles?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:41
+#: ../plugins/mark-all-read/mark-all-read.c:44
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18806,72 +18830,59 @@ msgstr ""
 "Quere marcar as mensaxes do cartafol actual como lidas ou tamÃ©n as dos seus "
 "subcartafoles?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:166
+#: ../plugins/mark-all-read/mark-all-read.c:168
 msgid "In Current Folder and _Subfolders"
 msgstr "No cartafol actual e _subcartafoles"
 
-#: ../plugins/mark-all-read/mark-all-read.c:180
+#: ../plugins/mark-all-read/mark-all-read.c:182
 msgid "In Current _Folder Only"
 msgstr "SÃ³ no carta_fol actual"
 
+#: ../plugins/mark-all-read/mark-all-read.c:349
+msgid "Mark Me_ssages as Read"
+msgstr "Marcar as men_saxes como lidas"
+
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "Marcar todo como lido"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
-msgstr "Marcar as men_saxes como lidas"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
 msgid "Mark all messages in a folder as read."
 msgstr "Marcar todas as mensaxes do cartafol como lidas."
 
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "Mono Loader"
-msgstr "Cargador de Mono"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
-msgid "Support plugins written in Mono."
-msgstr "Complementos de asistencia escritos en Mono."
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "Manage your Evolution plugins."
-msgstr "Xestione os seus complementos de Evolution."
+msgstr "Xestione os seus engadidos de Evolution."
 
-#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:252
+#: ../plugins/plugin-manager/plugin-manager.c:244
 msgid "Plugin Manager"
-msgstr "Xestor de plugins"
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
-msgid "Enable and disable plugins"
-msgstr "Activar e desactivar plugins"
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "_Plugins"
-msgstr "_Plugins"
+msgstr "Xestor de engadidos"
 
-#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../plugins/plugin-manager/plugin-manager.c:59
 msgid "Author(s)"
 msgstr "AutorÃa"
 
-#: ../plugins/plugin-manager/plugin-manager.c:146
-msgid "Configuration"
-msgstr "ConfiguraciÃ³n"
-
-#: ../plugins/plugin-manager/plugin-manager.c:265
+#: ../plugins/plugin-manager/plugin-manager.c:259
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Nota: algunhas modificaciÃ³ns non serÃ¡n efectivas atÃ© que reinicie"
 
-#: ../plugins/plugin-manager/plugin-manager.c:291
+#: ../plugins/plugin-manager/plugin-manager.c:285
 msgid "Overview"
 msgstr "VisiÃ³n xeral"
 
-#: ../plugins/plugin-manager/plugin-manager.c:362
-#: ../plugins/plugin-manager/plugin-manager.c:424
+#: ../plugins/plugin-manager/plugin-manager.c:356
+#: ../plugins/plugin-manager/plugin-manager.c:418
 msgid "Plugin"
-msgstr "Plugin"
+msgstr "engadido"
+
+#: ../plugins/plugin-manager/plugin-manager.c:430
+msgid "_Plugins"
+msgstr "_engadidos"
+
+#: ../plugins/plugin-manager/plugin-manager.c:432
+msgid "Enable and disable plugins"
+msgstr "Activar e desactivar engadidos"
 
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
@@ -18887,19 +18898,41 @@ msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
 "Ver mensaxes de correo como texto plano aÃnda que conteÃ±an contido HTML."
 
-#: ../plugins/prefer-plain/prefer-plain.c:189
+#: ../plugins/prefer-plain/prefer-plain.c:201
 msgid "Show HTML if present"
 msgstr "Mostrar HTML se estÃ¡ presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:190
-msgid "Prefer PLAIN"
-msgstr "Preferir PLANO"
+#: ../plugins/prefer-plain/prefer-plain.c:201
+msgid "Let Evolution choose the best part to show."
+msgstr "Deixar que Evolution cree a mellor parte a mostrar."
+
+#: ../plugins/prefer-plain/prefer-plain.c:202
+msgid "Show plain text if present"
+msgstr "Mostrar HTML se estÃ¡ presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
-msgid "Only ever show PLAIN"
+#: ../plugins/prefer-plain/prefer-plain.c:202
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
+"Mostrar a parte en texto simple, se estÃ¡ presente, doutro xeito Evolution "
+"seleccionarÃ¡ a mellor parte a mostrar."
+
+#: ../plugins/prefer-plain/prefer-plain.c:203
+msgid "Only ever show plain text"
 msgstr "Mostrar sÃ³ PLANO"
 
-#: ../plugins/prefer-plain/prefer-plain.c:234
+#: ../plugins/prefer-plain/prefer-plain.c:203
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr "Mostrar sempre a parte de texto simple e "
+
+#: ../plugins/prefer-plain/prefer-plain.c:250
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr "Mostra a parte HTML _suprimida como anexos"
+
+#: ../plugins/prefer-plain/prefer-plain.c:270
 msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
@@ -18913,7 +18946,7 @@ msgstr "Perfil para eventos de datos en Evolution (sÃ³ para desenvolvedores)."
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
-msgstr "Importar mensaxes do Outlook dende un ficheiro PST"
+msgstr "Importar mensaxes do Outlook desde un ficheiro PST"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
 msgid "Outlook PST import"
@@ -18923,26 +18956,37 @@ msgstr "ImportaciÃ³n de PST do Outlook"
 msgid "Outlook personal folders (.pst)"
 msgstr "Cartafoles persoais do Outlook (.pst)"
 
+#: ../plugins/pst-import/pst-importer.c:299
+msgid "_Mail"
+msgstr "_Correo"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:315
+#: ../plugins/pst-import/pst-importer.c:317
 msgid "_Address Book"
 msgstr "_Axenda de enderezos"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:322
+#: ../plugins/pst-import/pst-importer.c:324
 msgid "A_ppointments"
 msgstr "Ci_tas"
 
+#. Tasks
+#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tarefas"
+
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:334
+#: ../plugins/pst-import/pst-importer.c:336
 msgid "_Journal entries"
 msgstr "Entradas de _diario"
 
-#: ../plugins/pst-import/pst-importer.c:349
+#: ../plugins/pst-import/pst-importer.c:351
 msgid "Importing Outlook data"
 msgstr "ImportaciÃ³n de datos do Outlook"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../plugins/publish-calendar/publish-calendar.c:146
+#: ../plugins/publish-calendar/publish-calendar.c:153
 msgid "Calendar Publishing"
 msgstr "PublicaciÃ³n de calendarios"
 
@@ -18954,181 +18998,159 @@ msgstr "LocalizaciÃ³ns"
 msgid "Publish calendars to the web."
 msgstr "Publicar calendarios na web."
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
-msgid "_Publish Calendar Information"
-msgstr "_Publicar informaciÃ³n do calendario"
-
-#: ../plugins/publish-calendar/publish-calendar.c:95
-#: ../plugins/publish-calendar/publish-calendar.c:337
+#: ../plugins/publish-calendar/publish-calendar.c:208
+#: ../plugins/publish-calendar/publish-calendar.c:449
 #, c-format
 msgid "Could not open %s:"
-msgstr "Non se puido abrir %s:"
+msgstr "Non foi posÃbel abrir %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:97
+#: ../plugins/publish-calendar/publish-calendar.c:210
 #, c-format
 msgid "Could not open %s: Unknown error"
-msgstr "Non se puido abrir %s: erro descoÃ±ecido"
+msgstr "Non foi posÃbel abrir %s: erro descoÃ±ecido"
 
-#: ../plugins/publish-calendar/publish-calendar.c:117
+#: ../plugins/publish-calendar/publish-calendar.c:230
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "Houbo un erro ao publicar cara %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:119
+#: ../plugins/publish-calendar/publish-calendar.c:232
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Rematouse con Ã©xito a publicaciÃ³n cara %s"
 
-#: ../plugins/publish-calendar/publish-calendar.c:164
+#: ../plugins/publish-calendar/publish-calendar.c:276
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Ocorreu un fallo ao montar %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:624
+#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "E_nable"
+msgstr "A_ctivar"
+
+#: ../plugins/publish-calendar/publish-calendar.c:739
 msgid "Are you sure you want to remove this location?"
 msgstr "EstÃ¡ seguro de que quere eliminar esta localizaciÃ³n?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:788
+#. To Translators: This is shown to a user when creation of a new thread,
+#. where the publishing should be done, fails. Basically, this shouldn't
+#. ever happen, and if so, then something is really wrong.
+#: ../plugins/publish-calendar/publish-calendar.c:1051
 msgid "Could not create publish thread."
-msgstr "Non se puido crear o fÃo publicado."
+msgstr "Non foi posÃbel crear o fÃo publicado."
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:2
-msgid "<span weight=\"bold\">Location</span>"
-msgstr "<span weight=\"bold\">LocalizaciÃ³n</span>"
+#: ../plugins/publish-calendar/publish-calendar.c:1059
+msgid "_Publish Calendar Information"
+msgstr "_Publicar informaciÃ³n do calendario"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:4
-msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">Orixes</span>"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Custom Location"
+msgstr "NotificaciÃ³n personalizada"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:6
-msgid ""
-"Daily\n"
-"Weekly\n"
-"Manual (via Actions menu)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+msgid "Daily"
+msgstr "DÃa"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+msgid "FTP (with login)"
+msgstr "FTP (con login)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+msgid "Manual (via Actions menu)"
 msgstr ""
 "Diariamente\n"
 "Semanalmente\n"
 "Manual (por medio do menÃº AcciÃ³ns)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "A_ctivar"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "P_ort:"
 msgstr "P_orto:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+msgid "Public FTP"
+msgstr "PÃºblico"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Publishing Location"
 msgstr "LocalizaciÃ³n da publicaciÃ³n"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Publishing _Frequency:"
 msgstr "_Frecuencia da publicaciÃ³n:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:13
-msgid ""
-"Secure FTP (SSH)\n"
-"Public FTP\n"
-"FTP (with login)\n"
-"Windows share\n"
-"WebDAV (HTTP)\n"
-"Secure WebDAV (HTTPS)\n"
-"Custom Location"
-msgstr ""
-"FTP seguro (SSH)\n"
-"FTP pÃºblico\n"
-"FTP (con inicio de sesiÃ³n)\n"
-"Compartido con Windows\n"
-"WebDAV (HTTP)\n"
-"WebDAV seguro (HTTPS)\n"
-"LocalizaciÃ³n personalizada"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Secure FTP (SSH)"
+msgstr "FTP seguro (SSH)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "Secure WebDAV (HTTPS)"
+msgstr "WebDAV seguro (HTTPS)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "Service _type:"
 msgstr "_Tipo de servizo:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+msgid "Sources"
+msgstr "Orixe"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
 msgstr "_DuraciÃ³n temporal:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Weekly"
+msgstr "Semana"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+msgid "Windows share"
+msgstr "_Xanela"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_File:"
 msgstr "_Ficheiro:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Password:"
 msgstr "_Contrasinal:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "_Publish as:"
 msgstr "_Publicar como:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "_Remember password"
 msgstr "_Lembrar contrasinal"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Username:"
 msgstr "_Nome de usuario:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:29
-msgid ""
-"days\n"
-"weeks\n"
-"months"
-msgstr ""
-"dÃas\n"
-"semanas\n"
-"meses"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:32
-msgid ""
-"iCal\n"
-"Free/Busy"
-msgstr ""
-"DispoÃ±ibilidade\n"
-"iCal"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+msgid "iCal"
+msgstr "Chamar"
 
 #: ../plugins/publish-calendar/publish-format-fb.c:69
 #: ../plugins/publish-calendar/publish-format-ical.c:82
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr ""
-"Non se puido publicar o calendario: A infraestrutura Calendar xa non existe"
+"Non foi posÃbel publicar o calendario: A infraestrutura Calendar xa non "
+"existe"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:481
+#: ../plugins/publish-calendar/url-editor-dialog.c:474
 msgid "New Location"
 msgstr "LocalizaciÃ³n nova"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:483
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "Edit Location"
 msgstr "Editar localizaciÃ³n"
 
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Hello Python"
-msgstr "Ola Python"
-
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Python Plugin Loader tests"
-msgstr "Probas de cargador de plugin Python"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Plugin de proba de Python"
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Plugin de proba de Python para o cargador Python EPlugin."
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using Python."
-msgstr "Un plugin que carga outros plugins escritos en Python."
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
-msgid "Python Loader"
-msgstr "Cargador de Python"
-
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
@@ -19138,7 +19160,7 @@ msgstr "Non se encontrou o SpamAssassin; cÃ³digo: %d"
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #, c-format
 msgid "Failed to create pipe: %s"
-msgstr "Fallo ao crear a canalizaciÃ³n: %s"
+msgstr "Produciuse un fallo ao crear a canalizaciÃ³n: %s"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, c-format
@@ -19160,17 +19182,17 @@ msgstr "Interrompeuse a espera polo proceso fillo SpamAssassin; terminando..."
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Fallou a canalizaciÃ³n co SpamAssassin; cÃ³digo de erro: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
 #, c-format
-msgid "SpamAssassin is not available."
+msgid "SpamAssassin is not available. Please install it first."
 msgstr "O SpamAssassin non estÃ¡ dispoÃ±Ãbel."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr ""
 "Isto pode facer que o SpamAssassin sexa mÃ¡is fiÃ¡bel, aÃnda que mÃ¡is lento"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
 msgid "I_nclude remote tests"
 msgstr "I_ncluÃr probas remotas"
 
@@ -19190,78 +19212,82 @@ msgstr "OpciÃ³ns do SpamAssassin"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:160
+#: ../plugins/save-calendar/csv-format.c:161
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:356
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:358
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Description List"
 msgstr "Lista de descriciÃ³n"
 
-#: ../plugins/save-calendar/csv-format.c:359
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Categories List"
 msgstr "Lista de categorÃas"
 
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Comment List"
 msgstr "Lista de comentarios"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Contact List"
 msgstr "Lista de contactos"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Start"
 msgstr "Comezar"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "End"
 msgstr "Finalizar"
 
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "percent Done"
 msgstr "porcentaxe feita"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Attendees List"
 msgstr "Lista de participantes"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../plugins/save-calendar/csv-format.c:523
+#: ../plugins/save-calendar/csv-format.c:530
 msgid "A_dvanced options for the CSV format"
 msgstr "OpciÃ³ns avanza_das para o formato CSV"
 
-#: ../plugins/save-calendar/csv-format.c:530
+#: ../plugins/save-calendar/csv-format.c:537
 msgid "Prepend a _header"
 msgstr "Antepor unha ca_beceira"
 
-#: ../plugins/save-calendar/csv-format.c:539
+#: ../plugins/save-calendar/csv-format.c:546
 msgid "_Value delimiter:"
 msgstr "Delimitador de _valor:"
 
-#: ../plugins/save-calendar/csv-format.c:546
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "_Record delimiter:"
 msgstr "Delimitador de _rexistro:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "_Encapsulate values with:"
 msgstr "_Encapsular valores con:"
 
-#: ../plugins/save-calendar/csv-format.c:575
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "Formato de valores separados por comas (.csv)"
 
+#: ../plugins/save-calendar/ical-format.c:162
+msgid "iCalendar format (.ics)"
+msgstr "Formato iCalendar (.ics)"
+
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Gardar os seleccionados"
@@ -19270,50 +19296,38 @@ msgstr "Gardar os seleccionados"
 msgid "Save a calendar or task list to disk."
 msgstr "Garda un calendario ou unha lista de tarefas no disco."
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-msgid "_Save to Disk"
-msgstr "Gardar no _disco"
-
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:150
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:372
+#: ../plugins/save-calendar/rdf-format.c:369
 msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:104
+#: ../plugins/save-calendar/save-calendar.c:111
 msgid "_Format:"
 msgstr "_Formato:"
 
-#: ../plugins/save-calendar/save-calendar.c:165
+#: ../plugins/save-calendar/save-calendar.c:172
 msgid "Select destination file"
 msgstr "Seleccione un ficheiro de destino"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Quickly select a single calendar or task list for viewing."
-msgstr "Selecciona un Ãºnico calendario ou lista de tarefa para velo."
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Select One Source"
-msgstr "Seleccione unha orixe"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-msgid "Show _only this Calendar"
-msgstr "M_ostrar sÃ³ este calendario"
+#: ../plugins/save-calendar/save-calendar.c:325
+msgid "Save the selected calendar to disk"
+msgstr "Gardar as mensaxes como un ficheiro de texto"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "Show _only this Memo List"
-msgstr "M_ostrar sÃ³ esta lista de notas"
+#: ../plugins/save-calendar/save-calendar.c:356
+msgid "Save the selected memo list to disk"
+msgstr "Gardar as mensaxes como un ficheiro de texto"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
-msgid "Show _only this Task List"
-msgstr "M_ostrar sÃ³ esta lista de tarefas"
+#: ../plugins/save-calendar/save-calendar.c:387
+msgid "Save the selected task list to disk"
+msgstr "Garda un calendario ou unha lista de tarefas no disco."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
@@ -19323,15 +19337,15 @@ msgstr "GuÃao durante a configuraciÃ³n inicial da sÃºa conta."
 msgid "Setup Assistant"
 msgstr "Asistente de configuraciÃ³n"
 
-#: ../plugins/startup-wizard/startup-wizard.c:84
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Evolution Setup Assistant"
 msgstr "Asistente de configuraciÃ³n do Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:87
+#: ../plugins/startup-wizard/startup-wizard.c:92
 msgid "Welcome"
 msgstr "Benvido/a"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:97
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -19339,34 +19353,31 @@ msgid ""
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 "Benvido/a ao Evolution. As seguintes pantallas permitiranlle ao Evolution "
-"conectarse Ã¡s sÃºas contas de correo e importar ficheiros dende outros "
+"conectarse Ã¡s sÃºas contas de correo e importar ficheiros desde outros "
 "aplicativos.\n"
 "\n"
 "Prema o botÃ³n \"Adiante\" para continuar. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Importing files"
-msgstr "ImportaciÃ³n de ficheiros"
-
-#: ../plugins/startup-wizard/startup-wizard.c:117
-#: ../shell/e-shell-importer.c:138
+#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../widgets/misc/e-import-assistant.c:385
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccione a informaciÃ³n que quere importar:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:132
-#: ../shell/e-shell-importer.c:419
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../widgets/misc/e-import-assistant.c:542
 #, c-format
 msgid "From %s:"
 msgstr "De: %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:203
-#: ../shell/e-shell-importer.c:548
-#, c-format
+#: ../plugins/startup-wizard/startup-wizard.c:167
+msgid "Importing files"
+msgstr "ImportaciÃ³n de ficheiros"
+
+#: ../plugins/startup-wizard/startup-wizard.c:230
 msgid "Importing data."
 msgstr "Importando datos."
 
-#: ../plugins/startup-wizard/startup-wizard.c:205
-#: ../shell/e-shell-importer.c:562
+#: ../plugins/startup-wizard/startup-wizard.c:232
 msgid "Please wait"
 msgstr "Espere"
 
@@ -19392,25 +19403,25 @@ msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
 msgstr ""
-"Lista dos pares de valor e palabra chave para que o plugin Modelos substitÃºa "
-"nun corpo de mensaxe."
+"Lista dos pares de valor e palabra chave para que o engadido Modelos "
+"substitÃºa nun corpo de mensaxe."
+
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "engadido de modelo baseado en borradores"
 
-#: ../plugins/templates/templates.c:601
-msgid "No title"
+#: ../plugins/templates/templates.c:617
+msgid "No Title"
 msgstr "Sen tÃtulo"
 
-#: ../plugins/templates/templates.c:709
+#: ../plugins/templates/templates.c:688
 msgid "Save as _Template"
 msgstr "Gardar como _modelo"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:690
 msgid "Save as Template"
 msgstr "Gardar como modelo"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "Plugin de modelo baseado en borradores"
-
 #: ../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."
@@ -19427,29 +19438,29 @@ msgstr "vCards en liÃ±a"
 msgid "Show vCards directly in mail messages."
 msgstr "Mostrar vCards directamente nas mensaxes de correo."
 
-#: ../plugins/vcard-inline/vcard-inline.c:159
-#: ../plugins/vcard-inline/vcard-inline.c:243
+#: ../plugins/vcard-inline/vcard-inline.c:160
+#: ../plugins/vcard-inline/vcard-inline.c:245
 msgid "Show Full vCard"
 msgstr "Mostrar vCard completa"
 
-#: ../plugins/vcard-inline/vcard-inline.c:162
+#: ../plugins/vcard-inline/vcard-inline.c:163
 msgid "Show Compact vCard"
 msgstr "Mostrar vCard compacta"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../plugins/vcard-inline/vcard-inline.c:222
+#: ../plugins/vcard-inline/vcard-inline.c:224
 msgid "There is one other contact."
 msgstr "Hai outro contacto mÃ¡is."
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../plugins/vcard-inline/vcard-inline.c:231
+#: ../plugins/vcard-inline/vcard-inline.c:233
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Hai outro contacto mÃ¡is."
 msgstr[1] "Hai outros %d contactos."
 
-#: ../plugins/vcard-inline/vcard-inline.c:252
+#: ../plugins/vcard-inline/vcard-inline.c:254
 msgid "Save in Address Book"
 msgstr "Gardar na axenda de enderezos"
 
@@ -19465,30 +19476,14 @@ msgstr "Contactos WebDAV"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Evit_ar o IfMatch (necesario no Apache < 2.2.8)"
 
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "IntÃ©rprete de comandos do Evolution"
-
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell Config factory"
-msgstr "FactorÃa de configuraciÃ³n do intÃ©rprete de comandos do Evolution"
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Proba do Evolution"
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "CompoÃ±ente de proba do Evolution"
-
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
 msgstr "ConexiÃ³ns autenticadas co servidor proxy"
@@ -19503,48 +19498,56 @@ msgstr "VersiÃ³n de configuraciÃ³n"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
-msgstr "Largura predeterminada da barra lateral"
+msgstr "Largura predefinida da barra lateral"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
-msgid "Default window height"
-msgstr "Altura predeterminada da xanela"
+msgid "Default window X coordinate"
+msgstr "Estado predefinido da xanela"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:6
-msgid "Default window state"
-msgstr "Estado predeterminado da xanela"
+msgid "Default window Y coordinate"
+msgstr "Estado predefinido da xanela"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:7
-msgid "Default window width"
-msgstr "Largura predeterminada da xanela"
+msgid "Default window height"
+msgstr "Altura predefinida da xanela"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid "Default window state"
+msgstr "Estado predefinido da xanela"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:9
+msgid "Default window width"
+msgstr "Largura predefinida da xanela"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
 "Activa as configuraciÃ³ns de proxy ao acceder a HTTP/HTTP Seguro na Internet."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy host name"
 msgstr "Nome do host proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy password"
 msgstr "Contrasinal do proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy port"
 msgstr "Porto do proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy username"
 msgstr "Nome de usuario para o proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 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Ã¡ predeterminadamente ao iniciar."
+"ID ou alias do compoÃ±ente que se mostrarÃ¡ de forma predefinida ao iniciar."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username is retrieved from the \"/apps/evolution/shell/network_config/"
@@ -19556,19 +19559,19 @@ msgstr ""
 "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:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "Initial attachment view"
 msgstr "VisiÃ³n inicial do anexo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "Initial file chooser folder"
 msgstr "Cartafol inicial do seleccionador de ficheiro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Cartafol inicial para os diÃ¡logos GtkFileChooser."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
@@ -19576,47 +19579,47 @@ msgstr ""
 "VisiÃ³n inicial da barra de widgets de anexos. \"0\" Ã© VisiÃ³n de iconas, \"1"
 "\" Ã© VisiÃ³n en lista."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Last upgraded configuration version"
 msgstr "Ã?ltima versiÃ³n da configuraciÃ³n actualizada"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../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 de camiÃ±os aos cartafoles que se sincronizarÃ¡n co disco para o uso sen "
 "conexiÃ³n"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Non-proxy hosts"
 msgstr "Hosts que non usan proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr ""
 "O contrasinal para pasar como autenticaciÃ³n cando se efectÃºe o proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Proxy configuration mode"
 msgstr "Modo de configuraciÃ³n do proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "SOCKS proxy host name"
 msgstr "Nome do host do proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "SOCKS proxy port"
 msgstr "Porto do proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Secure HTTP proxy host name"
 msgstr "Nome do host do proxy HTTP seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../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:28
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19628,23 +19631,23 @@ msgstr ""
 "\"usar a configuraciÃ³n manual do proxy \" e \"usar a configuraciÃ³n do proxy "
 "fornecida no enderezourl autoconfigurado\" respectivamente."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Sidebar is visible"
 msgstr "A barra lateral Ã© visÃbel"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../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:31 ../shell/main.c:489
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:322
 msgid "Start in offline mode"
 msgstr "Iniciar en modo sen conexiÃ³n"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../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:33
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19652,19 +19655,27 @@ msgstr ""
 "A versiÃ³n de configuraciÃ³n do Evolution, co nivel de configuraciÃ³n maior/"
 "menor (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+msgid "The default X coordinate for the main window."
+msgstr "A largura predefinida da xanela principal, en pÃxeles."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+msgid "The default Y coordinate for the main window."
+msgstr "A largura predefinida da xanela principal, en pÃxeles."
+
+#: ../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."
+msgstr "Altura predefinida da xanela principal, en pÃxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The default width for the main window, in pixels."
-msgstr "A largura predeterminada da xanela principal, en pÃxeles."
+msgstr "A largura predefinida da xanela principal, en pÃxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default width for the sidebar, in pixels."
-msgstr "A largura predeterminada para a barra lateral, en pÃxeles."
+msgstr "A largura predefinida para a barra lateral, en pÃxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19672,19 +19683,19 @@ msgstr ""
 "A Ãºltima versiÃ³n actualizada da configuraciÃ³n do Evolution, con nivel de "
 "configuraciÃ³n maior/menor (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The machine name to proxy HTTP through."
 msgstr "A mÃ¡quina a travÃ©s da que efectuar o proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "The machine name to proxy secure HTTP through."
 msgstr "A mÃ¡quina a travÃ©s da que efectuar o proxy HTTP seguro."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy socks through."
 msgstr "A mÃ¡quina a travÃ©s da que efectuar o proxy Socks."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../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."
@@ -19692,7 +19703,7 @@ msgstr ""
 "O porto da mÃ¡quina a travÃ©s da que efectuar o proxy definido en \"/apps/"
 "evolution/shell/network_config/http_host\"."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -19700,7 +19711,7 @@ msgstr ""
 "O porto da mÃ¡quina a travÃ©s da que efectuar o proxy definido en \"/apps/"
 "evolution/shell/network_config/secure_host\"."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -19708,7 +19719,7 @@ msgstr ""
 "O porto da mÃ¡quina a travÃ©s da que efectuar o proxy definido en \"/apps/"
 "evolution/shell/network_config/socks_host\"."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19718,7 +19729,7 @@ msgstr ""
 "\"toolbar\". Se se selecciona \"toolbar\", o estilo dos botÃ³ns serÃ¡ "
 "determinado pola configuraciÃ³n da barra de ferramentas do Gnome."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 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 "
@@ -19731,291 +19742,621 @@ msgstr ""
 "com), enderezos IP de hosts (tanto IPv4 como IPv6) e enderezos de rede cunha "
 "mÃ¡scara (algo do tipo 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Toolbar is visible"
 msgstr "A barra de ferramentas Ã© visÃbel"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 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:48
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Use HTTP proxy"
 msgstr "Usar proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr ""
 "O nome de usuario para pasar como autenticaciÃ³n ao efectuar un proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Se o Evolution se iniciarÃ¡ en modo sen conexiÃ³n en vez de en modo conectado."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether or not the window should be maximized."
 msgstr "Se a xanela deberÃa ou non estar maximizada."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the sidebar should be visible."
 msgstr "Se a barra lateral deberÃa ser visÃbel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether the status bar should be visible."
 msgstr "Se a barra de estado deberÃa ser visÃbel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the toolbar should be visible."
 msgstr "Se a barra de ferramentas deberÃa ser visÃbel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Se se salta o diÃ¡logo de aviso nas versiÃ³n de desenvolvemento do Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the window buttons should be visible."
 msgstr "Se os botÃ³ns da xanela deberÃan ser visÃbeis."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../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:58
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Window buttons are visible"
 msgstr "Os botÃ³ns da xanela son visÃbeis"
 
-#: ../shell/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>ConexiÃ³ns activas</b>"
+#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+msgid "Searches"
+msgstr "Buscas"
 
-#: ../shell/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "ConexiÃ³ns activas"
+#: ../shell/e-shell-content.c:619
+msgid "Save Search"
+msgstr "Gardar a busca"
 
-#: ../shell/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr ""
-"Prema en Aceptar para pechar estas conexiÃ³ns e entrar no modo sen conexiÃ³n"
+#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
 
-#: ../shell/e-shell-importer.c:128
-msgid "Choose the type of importer to run:"
-msgstr "Seleccione o tipo de importador que se executarÃ¡:"
+#. Translators: The "Show:" label precedes a combo box that
+#. * allows the user to filter the current view.  Examples of
+#. * items that appear in the combo box are "Unread Messages",
+#. * "Important Messages", or "Active Appointments".
+#: ../shell/e-shell-searchbar.c:883
+msgid "Sho_w:"
+msgstr "Mos_trar: "
 
-#: ../shell/e-shell-importer.c:131
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
-msgstr ""
-"Escolla o ficheiro que quere importar ao Evolution e seleccione que tipo de "
-"ficheiro Ã© na listaxe."
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:910
+msgid "Sear_ch:"
+msgstr "Busca_r: "
 
-#: ../shell/e-shell-importer.c:135
-msgid "Choose the destination for this import"
-msgstr "Escolla o destino desta importaciÃ³n"
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-searchbar.c:970
+msgid "i_n"
+msgstr " e_n "
 
-#: ../shell/e-shell-importer.c:141
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
-"settings found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
+#: ../shell/e-shell-switcher.c:448
+msgid "Toolbar Style"
+msgstr "Estilo da _barra de ferramentas"
+
+#: ../shell/e-shell-switcher.c:449
+msgid "The switcher's toolbar style"
+msgstr "O estilo da barra de ferramentas do alternador"
+
+#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
+msgid "Toolbar Visible"
+msgstr "A barra de ferramentas Ã© visÃbel"
+
+#: ../shell/e-shell-switcher.c:466
+msgid "Whether the switcher is visible"
+msgstr "Se a barra lateral deberÃa ser visÃbel."
+
+#: ../shell/e-shell-utils.c:220
+msgid "vCard (.vcf)"
+msgstr "vCard (.vcf, .gcrd)"
+
+#: ../shell/e-shell-utils.c:222
+msgid "iCalendar (.ics)"
+msgstr "Ficheiros iCalendar (.ics)"
+
+#: ../shell/e-shell-utils.c:243
+msgid "All Files (*)"
+msgstr "Todos os ficheiros"
+
+#: ../shell/e-shell-view.c:604
+msgid "Switcher Action"
+msgstr "Cambiar a %s"
+
+#: ../shell/e-shell-view.c:605
+msgid "The switcher action for this shell view"
+msgstr "A acciÃ³n do alternador para esta visualizaciÃ³n de terminal de ordes"
+
+#: ../shell/e-shell-view.c:620
+msgid "Page Number"
+msgstr "NÃºmero de serie"
+
+#: ../shell/e-shell-view.c:621
+msgid "The notebook page number of the shell view"
 msgstr ""
-"O Evolution verificou a configuraciÃ³n para importar\n"
-"dos seguintes aplicativos: Pine, Netscape, Elm, iCalendar. Non se\n"
-"localizou ningunha configuraciÃ³n que se poida importar. Se\n"
-"quere tentalo de novo, prema o botÃ³n \"AtrÃ¡s\".\n"
+"O nÃºmero de pÃ¡xina do libro de notas da visualizaciÃ³n de terminal de ordes"
 
-#: ../shell/e-shell-importer.c:295
-msgid "F_ilename:"
-msgstr "Nome do f_icheiro:"
+#: ../shell/e-shell-view.c:637
+msgid "Search Rule"
+msgstr "Filtro de busca"
 
-#: ../shell/e-shell-importer.c:300
-msgid "Select a file"
-msgstr "Seleccionar un ficheiro"
+#: ../shell/e-shell-view.c:638
+msgid "Criteria for the current search results"
+msgstr "Criterio para os resultados da bÃºsqueda actual"
 
-#: ../shell/e-shell-importer.c:309
-msgid "File _type:"
-msgstr "_Tipo de ficheiro:"
+#: ../shell/e-shell-view.c:653
+msgid "The EShellBackend for this shell view"
+msgstr "O EShellBackend para esta visualizacion de terminal de ordes"
 
-#: ../shell/e-shell-importer.c:357
-msgid "Import data and settings from _older programs"
-msgstr "Importar datos e configuraciÃ³n de programas _antigos"
+#: ../shell/e-shell-view.c:668
+msgid "Shell Content Widget"
+msgstr "Widget de contido de intÃ©rprete de ordes"
 
-#: ../shell/e-shell-importer.c:360
-msgid "Import a _single file"
-msgstr "Importar un Ãºni_co ficheiro"
+#: ../shell/e-shell-view.c:669
+msgid "The content widget appears in a shell window's right pane"
+msgstr ""
+"O contido do wiget aparece no panel dereito da xanela da terminal de ordes"
 
-#: ../shell/e-shell-importer.c:743
-msgid "_Import"
-msgstr "_Importar"
+#: ../shell/e-shell-view.c:685
+msgid "Shell Sidebar Widget"
+msgstr "Largura predefinida da barra lateral"
 
-#: ../shell/e-shell-settings-dialog.c:312
-msgid "Evolution Preferences"
-msgstr "Preferencias do Evolution"
+#: ../shell/e-shell-view.c:686
+msgid "The sidebar widget appears in a shell window's left pane"
+msgstr ""
+"A barra lateral do widget aparece no panel da esquerda da xanela da terminal "
+"de ordes"
 
-#. To translators: This is the window title and %s is the
-#. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:324
-#, c-format
-msgid "%s - Evolution"
-msgstr "%s - Evolution"
+#: ../shell/e-shell-view.c:701
+msgid "Shell Taskbar Widget"
+msgstr "Widget da barra de ferramentas da terminal de ordes"
 
-#: ../shell/e-shell-window-commands.c:69
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
+#: ../shell/e-shell-view.c:702
+msgid "The taskbar widget appears at the bottom of a shell window"
 msgstr ""
-"Non parece que as ferramentas Gnome Pilot estean instaladas neste sistema."
+"O widget da barra de ferramentas aparece na parte inferior da xanela da "
+"terminal de ordes"
 
-#: ../shell/e-shell-window-commands.c:78
-#, c-format
-msgid "Error executing %s. (%s)"
-msgstr "Erro ao executar %s.(%s)"
+#: ../shell/e-shell-view.c:717
+msgid "Shell Window"
+msgstr "_Xanela nova"
 
-#: ../shell/e-shell-window-commands.c:135
-msgid "Bug buddy is not installed."
-msgstr "O Bug buddy non estÃ¡ instalado."
+#: ../shell/e-shell-view.c:718
+msgid "The window to which the shell view belongs"
+msgstr "A xanela Ã¡ que pertence a visualizaciÃ³n da terminal de ordes"
 
-#: ../shell/e-shell-window-commands.c:138
-msgid "Bug buddy could not be run."
-msgstr "Non foi posÃbel executar o Bug Buddy."
+#: ../shell/e-shell-view.c:734
+msgid "The key file holding widget state data"
+msgstr "O ficheiro chave que contÃ©n os datos de estado do wiget"
+
+#: ../shell/e-shell-view.c:749
+msgid "The title of the shell view"
+msgstr "O tÃtulo da visualizaciÃ³n da terminal de sesiÃ³n"
+
+#: ../shell/e-shell-view.c:763
+msgid "Current View ID"
+msgstr "_VisualizaciÃ³n actual"
+
+#: ../shell/e-shell-view.c:764
+msgid "The current GAL view ID"
+msgstr "Gardar a visualizaciÃ³n personalizada actual"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:938
+#: ../shell/e-shell-window-actions.c:644
 msgid "translator-credits"
 msgstr ""
+"Fran Dieguez <frandieguez ubuntu com>, 2010:\n"
 "Suso Baleato <suso baleato xunta es>, 2009;\n"
 "AntÃ³n MÃ©ixome <meixome mancomun org>, 2009."
 
-#: ../shell/e-shell-window-commands.c:949
+#: ../shell/e-shell-window-actions.c:655
 msgid "Evolution Website"
 msgstr "Sitio web do Evolution"
 
-#: ../shell/e-shell-window-commands.c:1163
-msgid "_Work Online"
-msgstr "_Traballar con conexiÃ³n"
+#: ../shell/e-shell-window-actions.c:1223
+msgid "Bug Buddy is not installed."
+msgstr "O Bug buddy non estÃ¡ instalado."
+
+#: ../shell/e-shell-window-actions.c:1225
+msgid "Bug Buddy could not be run."
+msgstr "Non foi posÃbel executar o Bug Buddy."
+
+#: ../shell/e-shell-window-actions.c:1327
+msgid "GNOME Pilot is not installed."
+msgstr "O Bug buddy non estÃ¡ instalado."
+
+#: ../shell/e-shell-window-actions.c:1329
+msgid "GNOME Pilot could not be run."
+msgstr "Non foi posÃbel executar o Bug Buddy."
+
+#: ../shell/e-shell-window-actions.c:1423
+msgid "Show information about Evolution"
+msgstr "Mostrar informaciÃ³n sobre o Evolution"
+
+#: ../shell/e-shell-window-actions.c:1428
+msgid "_Close Window"
+msgstr "_Pechar xanela"
+
+#: ../shell/e-shell-window-actions.c:1435
+msgid "_Contents"
+msgstr "Ci_tas"
+
+#: ../shell/e-shell-window-actions.c:1437
+msgid "Open the Evolution User Guide"
+msgstr "Abrir o cartafol doutro usuario"
+
+#: ../shell/e-shell-window-actions.c:1463
+msgid "Evolution _FAQ"
+msgstr "_FAQ do Evolution"
+
+#: ../shell/e-shell-window-actions.c:1465
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "Abrir a pÃ¡xina web das Preguntas frecuentes (FAQ)"
+
+#: ../shell/e-shell-window-actions.c:1470
+msgid "_Forget Passwords"
+msgstr "_Esquecer os contrasinais"
+
+#: ../shell/e-shell-window-actions.c:1472
+msgid "Forget all remembered passwords"
+msgstr "EstÃ¡ seguro de que quere esquecer todos os contrasinais memorizados?"
+
+#: ../shell/e-shell-window-actions.c:1477
+msgid "I_mport..."
+msgstr "I_mportar..."
+
+#: ../shell/e-shell-window-actions.c:1479
+msgid "Import data from other programs"
+msgstr "Importar datos doutros programas"
+
+#: ../shell/e-shell-window-actions.c:1484
+msgid "New _Window"
+msgstr "_Xanela nova"
+
+#: ../shell/e-shell-window-actions.c:1486
+msgid "Create a new window displaying this view"
+msgstr "Crear unha xanela nova ao mostrar este cartafol"
+
+#: ../shell/e-shell-window-actions.c:1500
+msgid "Configure Evolution"
+msgstr "ConfiguraciÃ³n"
+
+#: ../shell/e-shell-window-actions.c:1505
+msgid "_Quick Reference"
+msgstr "_Referencia rÃ¡pida"
+
+#: ../shell/e-shell-window-actions.c:1507
+msgid "Show Evolution's shortcut keys"
+msgstr "Modificar a configuraciÃ³n do Evolution"
+
+#: ../shell/e-shell-window-actions.c:1514
+msgid "Exit the program"
+msgstr "SaÃr do programa"
+
+#: ../shell/e-shell-window-actions.c:1519
+msgid "_Advanced Search..."
+msgstr "Busca _avanzada..."
+
+#: ../shell/e-shell-window-actions.c:1521
+msgid "Construct a more advanced search"
+msgstr "ConstrÃºe unha bÃºsqueda mÃ¡is avanzada"
+
+#: ../shell/e-shell-window-actions.c:1528
+msgid "Clear the current search parameters"
+msgstr "Limpar bÃºsqueda"
+
+#: ../shell/e-shell-window-actions.c:1533
+msgid "_Edit Saved Searches..."
+msgstr "_Editar as buscas gardadas..."
 
-#: ../shell/e-shell-window-commands.c:1176 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-actions.c:1535
+msgid "Manage your saved searches"
+msgstr "Xestionar o seu correo, contactos e calendario"
+
+#: ../shell/e-shell-window-actions.c:1542
+msgid "Click here to change the search type"
+msgstr "Prema aquÃ para cambiar o tipo de busca"
+
+#: ../shell/e-shell-window-actions.c:1547
+msgid "_Find Now"
+msgstr "_Buscar agora"
+
+#. Block the default Ctrl+F.
+#: ../shell/e-shell-window-actions.c:1549
+msgid "Execute the current search parameters"
+msgstr "Cancelar a operaciÃ³n de correo actual"
+
+#: ../shell/e-shell-window-actions.c:1554
+msgid "_Save Search..."
+msgstr "_Gardar a busca..."
+
+#: ../shell/e-shell-window-actions.c:1556
+msgid "Save the current search parameters"
+msgstr "Gardar o ficheiro actual"
+
+#: ../shell/e-shell-window-actions.c:1568
+msgid "Send / _Receive"
+msgstr "Enviar/_Recibir"
+
+#: ../shell/e-shell-window-actions.c:1570
+msgid "Send queued items and retrieve new items"
+msgstr "Enviar elementos da fila e obter elementos novos"
+
+#: ../shell/e-shell-window-actions.c:1575
+msgid "Submit _Bug Report..."
+msgstr "Enviar un _informe de erro"
+
+#: ../shell/e-shell-window-actions.c:1577
+msgid "Submit a bug report using Bug Buddy"
+msgstr "Enviar un informe de erro usando o Bug Buddy"
+
+#: ../shell/e-shell-window-actions.c:1582
+#, fuzzy
+msgid "GNOME Pilot _Synchronization..."
+msgstr "SincronizaciÃ³n con iPod"
+
+#: ../shell/e-shell-window-actions.c:1584
+#, fuzzy
+msgid "Set up GNOME Pilot configuration"
+msgstr "Definir a configuraciÃ³n do Pilot"
+
+#: ../shell/e-shell-window-actions.c:1589
 msgid "_Work Offline"
 msgstr "_Traballar sen conexiÃ³n"
 
-#: ../shell/e-shell-window-commands.c:1189
-msgid "Work Offline"
-msgstr "Traballar sen conexiÃ³n"
+#: ../shell/e-shell-window-actions.c:1591
+msgid "Put Evolution into offline mode"
+msgstr "Iniciar en modo sen conexiÃ³n"
 
-#: ../shell/e-shell-window.c:372
-msgid ""
-"Evolution is currently online.\n"
-"Click on this button to work offline."
-msgstr ""
-"O Evolution estÃ¡ actualmente conectado.\n"
-"Prema neste botÃ³n para traballar desconectado."
+#: ../shell/e-shell-window-actions.c:1596
+msgid "_Work Online"
+msgstr "_Traballar con conexiÃ³n"
 
-#: ../shell/e-shell-window.c:379
-msgid "Evolution is in the process of going offline."
-msgstr "O Evolution estÃ¡ en proceso de desconexiÃ³n."
+#: ../shell/e-shell-window-actions.c:1598
+msgid "Put Evolution into online mode"
+msgstr "Iniciar en modo con conexiÃ³n"
 
-#: ../shell/e-shell-window.c:386
-msgid ""
-"Evolution is currently offline.\n"
-"Click on this button to work online."
+#: ../shell/e-shell-window-actions.c:1626
+msgid "Lay_out"
+msgstr "Disp_osiciÃ³n"
+
+#: ../shell/e-shell-window-actions.c:1633
+msgid "_New"
+msgstr "_Novo"
+
+#: ../shell/e-shell-window-actions.c:1640
+msgid "_Search"
+msgstr "_Buscar"
+
+#: ../shell/e-shell-window-actions.c:1647
+msgid "_Switcher Appearance"
+msgstr "Aparencia do _selector"
+
+#: ../shell/e-shell-window-actions.c:1661
+msgid "_Window"
+msgstr "_Xanela"
+
+#: ../shell/e-shell-window-actions.c:1690
+msgid "Show Side _Bar"
+msgstr "Mostrar _barra lateral"
+
+#: ../shell/e-shell-window-actions.c:1692
+msgid "Show the side bar"
+msgstr "Mostrar _barra lateral"
+
+#: ../shell/e-shell-window-actions.c:1698
+msgid "Show _Buttons"
+msgstr "Mostrar animaciÃ³ns"
+
+#: ../shell/e-shell-window-actions.c:1700
+msgid "Show the switcher buttons"
+msgstr "Mostrar o fuso horario secundario"
+
+#: ../shell/e-shell-window-actions.c:1706
+msgid "Show _Status Bar"
+msgstr "Mostrar _barra de estado"
+
+#: ../shell/e-shell-window-actions.c:1708
+msgid "Show the status bar"
+msgstr "Mostrar _barra de estado"
+
+#: ../shell/e-shell-window-actions.c:1714
+msgid "Show _Tool Bar"
+msgstr "Mostrar barra de _ferramentas"
+
+#: ../shell/e-shell-window-actions.c:1716
+msgid "Show the tool bar"
+msgstr "Mostrar barra de _ferramentas"
+
+#: ../shell/e-shell-window-actions.c:1738
+msgid "_Icons Only"
+msgstr "SÃ³ _iconas"
+
+#: ../shell/e-shell-window-actions.c:1740
+msgid "Display window buttons with icons only"
+msgstr "Mostrar os botÃ³ns da xanela sÃ³ con iconas"
+
+#: ../shell/e-shell-window-actions.c:1745
+msgid "_Text Only"
+msgstr "SÃ³ _texto"
+
+#: ../shell/e-shell-window-actions.c:1747
+msgid "Display window buttons with text only"
+msgstr "Mostrar os botÃ³ns da xanela sÃ³ con texto"
+
+#: ../shell/e-shell-window-actions.c:1752
+msgid "Icons _and Text"
+msgstr "Iconas _e texto"
+
+#: ../shell/e-shell-window-actions.c:1754
+msgid "Display window buttons with icons and text"
+msgstr "Mostrar os botÃ³ns da xanela con iconas e texto"
+
+#: ../shell/e-shell-window-actions.c:1759
+msgid "Tool_bar Style"
+msgstr "Estilo da _barra de ferramentas"
+
+#: ../shell/e-shell-window-actions.c:1761
+msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
-"O Evolution estÃ¡ actualmente desconectado.\n"
-"Prema neste botÃ³n para traballar conectado."
+"Mostrar os botÃ³ns da xanela usando a configuraciÃ³n da barra de ferramentas "
+"do escritorio"
+
+#: ../shell/e-shell-window-actions.c:1769
+msgid "Define Views..."
+msgstr "Definir visualizaciÃ³ns..."
+
+#: ../shell/e-shell-window-actions.c:1771
+msgid "Create or edit views"
+msgstr "Crear ou editar visualizaciÃ³ns"
+
+#: ../shell/e-shell-window-actions.c:1776
+msgid "Save Custom View..."
+msgstr "Gardar visualizaciÃ³n personalizada..."
+
+#: ../shell/e-shell-window-actions.c:1778
+msgid "Save current custom view"
+msgstr "Gardar a visualizaciÃ³n personalizada actual"
+
+#: ../shell/e-shell-window-actions.c:1785
+msgid "C_urrent View"
+msgstr "VisualizaciÃ³n act_ual"
+
+#: ../shell/e-shell-window-actions.c:1795
+msgid "Custom View"
+msgstr "VisualizaciÃ³n personalizada"
+
+#: ../shell/e-shell-window-actions.c:1797
+msgid "Current view is a customized view"
+msgstr "A visualizaciÃ³n actual Ã© unha visualizaciÃ³n personalizada"
 
-#: ../shell/e-shell-window.c:778
+#: ../shell/e-shell-window-actions.c:1807
+msgid "Change the page settings for your current printer"
+msgstr "Definir a configuraciÃ³n da pÃ¡xina para a impresora actual"
+
+#: ../shell/e-shell-window-actions.c:2127
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell.c:634
-msgid "Unknown system error."
-msgstr "Erro de sistema descoÃ±ecido."
+#: ../shell/e-shell-window-actions.c:2337
+msgid "Execute these search parameters"
+msgstr "Executar estes parÃ¡metros de bÃºsqueda"
 
-#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
+#. Translators: This is used for the main window title.
+#: ../shell/e-shell-window-private.c:552
 #, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
 
-#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
-msgid "OK"
-msgstr "Aceptar"
+#: ../shell/e-shell-window.c:366
+msgid "New"
+msgstr "Novo"
 
-#: ../shell/e-shell.c:1253
-msgid "Invalid arguments"
-msgstr "Os argumentos non son vÃ¡lidos"
+#: ../shell/e-shell-window.c:616
+msgid "Active Shell View"
+msgstr "VisualizaciÃ³n da terminal de ordes activa"
 
-#: ../shell/e-shell.c:1255
-msgid "Cannot register on OAF"
-msgstr "Non se pode rexistrar en OAF"
+#: ../shell/e-shell-window.c:617
+msgid "Name of the active shell view"
+msgstr "Nome da visualizaciÃ³n nova:"
 
-#: ../shell/e-shell.c:1257
-msgid "Configuration Database not found"
-msgstr "Non se localizou a base de datos de configuraciÃ³n"
+#: ../shell/e-shell-window.c:632
+msgid "The shell window's EFocusTracker"
+msgstr "O EFocusTracker da xanela da terminal de ordes"
 
-#: ../shell/e-user-creatable-items-handler.c:674
-#: ../shell/e-user-creatable-items-handler.c:684
-#: ../shell/e-user-creatable-items-handler.c:689
-msgid "New"
-msgstr "Novo"
+#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:772
+msgid "Geometry"
+msgstr "XeometrÃa"
 
-#: ../shell/test/evolution-test-component.c:103
-msgid "New Test"
-msgstr "Proba nova"
+#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:773
+msgid "Initial window geometry string"
+msgstr "A cadea da xeometrÃa inicial da xanela"
 
-#: ../shell/test/evolution-test-component.c:104
-msgctxt "New"
-msgid "_Test"
-msgstr "_Proba"
+#: ../shell/e-shell-window.c:662
+msgid "Safe Mode"
+msgstr "Activar _cursor"
 
-#: ../shell/test/evolution-test-component.c:105
-msgid "Create a new test item"
-msgstr "Crear un novo elemento de proba"
+#: ../shell/e-shell-window.c:663
+msgid "Whether the shell window is in safe mode"
+msgstr "Indica se o engadido estÃ¡ activado"
 
-#: ../shell/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"Prema en \"Importar\" para comezar a importar o ficheiro ao Evolution. "
+#: ../shell/e-shell-window.c:694
+msgid "Sidebar Visible"
+msgstr "A barra lateral Ã© visÃbel"
 
-#: ../shell/import.glade.h:2
-msgid "Evolution Import Assistant"
-msgstr "Asistente de importaciÃ³n do Evolution"
+#: ../shell/e-shell-window.c:695
+msgid "Whether the shell window's side bar is visible"
+msgstr "Se os botÃ³ns da xanela deberÃan ser visÃbeis."
+
+#: ../shell/e-shell-window.c:709
+msgid "Switcher Visible"
+msgstr "A barra lateral Ã© visÃbel"
 
-#: ../shell/import.glade.h:3
-msgid "Import File"
-msgstr "Importar ficheiro"
+#: ../shell/e-shell-window.c:710
+msgid "Whether the shell window's switcher buttons are visible"
+msgstr "Se os botÃ³ns da xanela deberÃan ser visÃbeis."
 
-#: ../shell/import.glade.h:4
-msgid "Import Location"
-msgstr "Importar localizaciÃ³n"
+#: ../shell/e-shell-window.c:725
+msgid "Taskbar Visible"
+msgstr "A barra de estado Ã© visÃbel"
 
-#: ../shell/import.glade.h:5
-msgid "Importer Type"
-msgstr "Tipo de importador"
+#: ../shell/e-shell-window.c:726
+msgid "Whether the shell window's task bar is visible"
+msgstr "Se a barra de estado deberÃa ser visÃbel."
 
-#: ../shell/import.glade.h:6
-msgid "Select Information to Import"
-msgstr "Seleccione a informaciÃ³n para importar"
+#: ../shell/e-shell-window.c:741
+msgid "Whether the shell window's tool bar is visible"
+msgstr "Se os botÃ³ns da xanela deberÃan ser visÃbeis."
 
-#: ../shell/import.glade.h:7
-msgid "Select a File"
-msgstr "Seleccionar un ficheiro"
+#: ../shell/e-shell-window.c:755
+msgid "UI Manager"
+msgstr "Xestor"
 
-#: ../shell/import.glade.h:8
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"Benvido ao Asistente de ImportaciÃ³n do Evolution.\n"
-"Este asistente guiarao no proceso de importaciÃ³n de\n"
-"ficheiros externos ao Evolution."
+#: ../shell/e-shell-window.c:756
+msgid "The shell window's GtkUIManager"
+msgstr "O GtkUIManager da xanela da terminal de ordes"
+
+#: ../shell/e-shell.c:213
+msgid "Preparing to go offline..."
+msgstr "Preparando a conta '%s' para o modo sen conexiÃ³n"
+
+#: ../shell/e-shell.c:267
+msgid "Preparing to go online..."
+msgstr "Preparando a conta '%s' para o modo sen conexiÃ³n"
+
+#: ../shell/e-shell.c:339
+msgid "Preparing to quit..."
+msgstr "PreparÃ¡ndose para saÃr..."
+
+#: ../shell/e-shell.c:788
+msgid "Module Directory"
+msgstr "Directorio onde gardar"
+
+#: ../shell/e-shell.c:789
+msgid "The directory from which to load EModules"
+msgstr "O cartafol desde o cal ler EModules"
+
+#: ../shell/e-shell.c:804
+msgid "Network Available"
+msgstr "TLS non dispoÃ±Ãbel"
+
+#: ../shell/e-shell.c:805
+msgid "Whether the network is available"
+msgstr "Indica se o engadido estÃ¡ activado"
+
+#: ../shell/e-shell.c:820 ../widgets/misc/e-online-button.c:130
+msgid "Online"
+msgstr "Conectado"
+
+#: ../shell/e-shell.c:821
+msgid "Whether the shell is online"
+msgstr "Indica se o engadido estÃ¡ activado"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:226
+#: ../shell/main.c:167
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20052,7 +20393,7 @@ msgstr ""
 "Esperamos que lles sexa de proveito o resultado do noso duro traballo, e\n"
 "agardamos ansiosamente as sÃºas colaboraciÃ³ns!\n"
 
-#: ../shell/main.c:250
+#: ../shell/main.c:191
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20060,43 +20401,57 @@ msgstr ""
 "Grazas\n"
 "O equipo do Evolution\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:198
 msgid "Do not tell me again"
 msgstr "Non preguntarme de novo"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:318
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar o Evolution activando o compoÃ±ente especificado"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:320
+msgid "Apply the given geometry to the main window"
+msgstr "Aplicar a xeometrÃa fornecida Ã¡ xanela principal"
+
+#: ../shell/main.c:324
 msgid "Start in online mode"
 msgstr "Iniciar en modo con conexiÃ³n"
 
-#: ../shell/main.c:494
-msgid "Forcibly shut down all Evolution components"
+#: ../shell/main.c:327
+msgid "Forcibly shut down Evolution"
 msgstr "Forzar o peche de todos os compoÃ±entes do Evolution"
 
-#: ../shell/main.c:498
+#: ../shell/main.c:331
 msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Forza a remigraciÃ³n dende o Evolution 1.4"
+msgstr "Forza a remigraciÃ³n desde o Evolution 1.4"
 
-#: ../shell/main.c:501
+#: ../shell/main.c:334
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a saÃda da depuraciÃ³n de todos os compoÃ±entes a un ficheiro."
 
-#: ../shell/main.c:503
+#: ../shell/main.c:336
 msgid "Disable loading of any plugins."
-msgstr "Desactivar a carga de calquera plugin."
+msgstr "Desactivar a carga de calquera engadido."
 
-#: ../shell/main.c:505
+#: ../shell/main.c:338
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar o panel de previsualizaciÃ³n de correo, contactos e tarefas."
 
-#: ../shell/main.c:614
+#: ../shell/main.c:342
+msgid "Import URIs or file names given as rest of arguments."
+msgstr ""
+"Imporatar os URIs ou nomes de ficheiros fornecidos como o resto dos "
+"argumentos."
+
+#: ../shell/main.c:344
+msgid "Request a running Evolution process to quit"
+msgstr "Reiniciando o Evolution"
+
+#: ../shell/main.c:498
 msgid "- The Evolution PIM and Email Client"
 msgstr "- O cliente de correo e PIM do Evolution"
 
-#: ../shell/main.c:642
+#: ../shell/main.c:524
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20110,22 +20465,14 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "EstÃ¡ seguro de que quere esquecer todos os contrasinais memorizados?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Cannot start Evolution"
-msgstr "Non Ã© posÃbel iniciar o Evolution"
-
-#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
 msgstr "Quere eliminar os datos antigos da versiÃ³n {0}?"
 
-#: ../shell/shell.error.xml.h:5
-msgid "Evolution can not start."
-msgstr "O Evolution non pode iniciar."
-
-#: ../shell/shell.error.xml.h:6
+#: ../shell/shell.error.xml.h:4
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
@@ -20133,15 +20480,15 @@ 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:8
+#: ../shell/shell.error.xml.h:6
 msgid "Insufficient disk space for upgrade."
 msgstr "Espazo en disco insuficiente para a actualizaciÃ³n."
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:7
 msgid "Really delete old data?"
 msgstr "EstÃ¡ seguro de que quere eliminar os datos antigos?"
 
-#: ../shell/shell.error.xml.h:10
+#: ../shell/shell.error.xml.h:8
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -20163,7 +20510,7 @@ msgstr ""
 "Unha vez eliminados, non poderÃ¡ desactualizarse Ã¡ versiÃ³n anterior do "
 "Evolution sen intervenciÃ³n manual.\n"
 
-#: ../shell/shell.error.xml.h:16
+#: ../shell/shell.error.xml.h:14
 msgid ""
 "The previous version of Evolution stored its data in a different location.\n"
 "\n"
@@ -20180,11 +20527,11 @@ msgstr ""
 "datos, entÃ³n poderÃ¡ eliminar os contidos de &quot;evolution&quot; cando o "
 "vexa conveniente.\n"
 
-#: ../shell/shell.error.xml.h:20
-msgid "Upgrade from previous version failed: {0}"
-msgstr "A actualizaciÃ³n dende a versiÃ³n anterior fallou: {0}"
+#: ../shell/shell.error.xml.h:18
+msgid "Upgrade from previous version failed:"
+msgstr "A actualizaciÃ³n desde a versiÃ³n anterior fallou: {0}"
 
-#: ../shell/shell.error.xml.h:21
+#: ../shell/shell.error.xml.h:19
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -20198,45 +20545,21 @@ msgstr ""
 "NecesitarÃ¡ facer mÃ¡is espazo dispoÃ±Ãbel no seu cartafol persoal antes de que "
 "poida continuar."
 
-#: ../shell/shell.error.xml.h:24
-msgid ""
-"Your system configuration does not match your Evolution configuration.\n"
-"\n"
-"Click help for details"
-msgstr ""
-"A configuraciÃ³n do sistema non coincide coa configuraciÃ³n do Evolution.\n"
-"\n"
-"Prema na axuda para mÃ¡is detalles"
-
-#: ../shell/shell.error.xml.h:27
-msgid ""
-"Your system configuration does not match your Evolution configuration:\n"
-"\n"
-"{0}\n"
-"\n"
-"Click help for details."
-msgstr ""
-"A configuraciÃ³n do sistema non coincide coa configuraciÃ³n do Evolution.\n"
-"\n"
-"{0}\n"
-"\n"
-"Prema na axuda para mÃ¡is detalles."
-
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:22
 msgid "_Forget"
 msgstr "_Esquecer"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:23
 msgid "_Keep Data"
 msgstr "_Conservar os datos"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:24
 msgid "_Remind Me Later"
 msgstr "_Avisarme mÃ¡is tarde"
 
-#: ../shell/shell.error.xml.h:35
+#: ../shell/shell.error.xml.h:25
 msgid ""
-"{1}\n"
+"{0}\n"
 "\n"
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
@@ -20246,7 +20569,89 @@ msgstr ""
 "Se escolle continuar, pode que non teÃ±a acceso a algÃºns dos seus datos "
 "antigos.\n"
 
-#: ../smime/gui/ca-trust-dialog.c:102
+#: ../shell/test/e-test-shell-backend.c:60
+msgctxt "New"
+msgid "_Test Item"
+msgstr "_Proba"
+
+#: ../shell/test/e-test-shell-backend.c:62
+msgid "Create a new test item"
+msgstr "Crear un novo elemento de proba"
+
+#: ../shell/test/e-test-shell-backend.c:70
+msgctxt "New"
+msgid "Test _Source"
+msgstr "Recurso"
+
+#: ../shell/test/e-test-shell-backend.c:72
+msgid "Create a new test source"
+msgstr "Crear un novo elemento de proba"
+
+#: ../smclient/eggdesktopfile.c:165
+#, c-format
+msgid "File is not a valid .desktop file"
+msgstr "O ficeiro non Ã© un ficheiro .desktop vÃ¡lido"
+
+#: ../smclient/eggdesktopfile.c:188
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr "VersiÃ³n '%s' de ficheiro desktop non recoÃ±ecida"
+
+#: ../smclient/eggdesktopfile.c:958
+#, c-format
+msgid "Starting %s"
+msgstr "Examinando %s"
+
+#: ../smclient/eggdesktopfile.c:1100
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr "O aplicativo non acepta documentos pola liÃ±a de ordes"
+
+#: ../smclient/eggdesktopfile.c:1168
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr "OpciÃ³n de lanzado non recoÃ±ecida: %d"
+
+#: ../smclient/eggdesktopfile.c:1373
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr ""
+"Non Ã© posÃble pasar URIs de documento a unha entrada de desktop 'Type=Link'"
+
+#: ../smclient/eggdesktopfile.c:1394
+#, c-format
+msgid "Not a launchable item"
+msgstr "O editor non Ã© iniciÃ¡bel"
+
+#: ../smclient/eggsmclient.c:227
+msgid "Disable connection to session manager"
+msgstr "ConexiÃ³n _directa a Internet"
+
+#: ../smclient/eggsmclient.c:230
+msgid "Specify file containing saved configuration"
+msgstr "Definir a configuraciÃ³n do Pilot"
+
+#: ../smclient/eggsmclient.c:230
+msgid "FILE"
+msgstr "FICHEIRO"
+
+#: ../smclient/eggsmclient.c:233
+msgid "Specify session management ID"
+msgstr "Especifique o ID de xestiÃ³n de sesiÃ³n"
+
+#: ../smclient/eggsmclient.c:233
+msgid "ID"
+msgstr "UID"
+
+#: ../smclient/eggsmclient.c:254
+msgid "Session management options:"
+msgstr "OpciÃ³ns de xestiÃ³n de sesiÃ³n:"
+
+#: ../smclient/eggsmclient.c:255
+msgid "Show session management options"
+msgstr "Mostrar as animaciÃ³ns de imaxe "
+
+#: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20257,7 +20662,7 @@ msgstr ""
 "\n"
 "Edite a configuraciÃ³n de confianza:"
 
-#: ../smime/gui/cert-trust-dialog.c:150
+#: ../smime/gui/cert-trust-dialog.c:144
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -20267,7 +20672,7 @@ msgstr ""
 "certificado, entÃ³n confÃa na autoridade deste certificado a non ser que se "
 "indique outra cousa aquÃ"
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:148
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -20277,55 +20682,59 @@ msgstr ""
 "certificado, entÃ³n non confÃa na autenticidade deste certificado a non ser "
 "que se indique outra cousa aquÃ"
 
-#: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:611
+#: ../smime/gui/certificate-manager.c:135
+#: ../smime/gui/certificate-manager.c:382
+#: ../smime/gui/certificate-manager.c:610
 msgid "Select a certificate to import..."
 msgstr "Seleccione un certificado para importar..."
 
-#: ../smime/gui/certificate-manager.c:145
+#: ../smime/gui/certificate-manager.c:144
 msgid "All PKCS12 files"
 msgstr "Todos os ficheiros PKCS12"
 
-#: ../smime/gui/certificate-manager.c:151
-#: ../smime/gui/certificate-manager.c:398
-#: ../smime/gui/certificate-manager.c:625
+#: ../smime/gui/certificate-manager.c:150
+#: ../smime/gui/certificate-manager.c:397
+#: ../smime/gui/certificate-manager.c:624
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../smime/gui/certificate-manager.c:275
-#: ../smime/gui/certificate-manager.c:488
-#: ../smime/gui/certificate-manager.c:713
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:487
+#: ../smime/gui/certificate-manager.c:712
 msgid "Certificate Name"
 msgstr "Nome do certificado"
 
-#: ../smime/gui/certificate-manager.c:284
-#: ../smime/gui/certificate-manager.c:506
+#: ../smime/gui/certificate-manager.c:283
+#: ../smime/gui/certificate-manager.c:505
 msgid "Purposes"
 msgstr "Obxectivos"
 
-#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:552
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "NÃºmero de serie"
 
-#: ../smime/gui/certificate-manager.c:301
+#: ../smime/gui/certificate-manager.c:300
 msgid "Expires"
 msgstr "Caduca"
 
-#: ../smime/gui/certificate-manager.c:392
+#: ../smime/gui/certificate-manager.c:391
 msgid "All email certificate files"
 msgstr "Todos os ficheiros de certificaciÃ³n de correo"
 
-#: ../smime/gui/certificate-manager.c:497
+#: ../smime/gui/certificate-manager.c:496
 msgid "E-Mail Address"
 msgstr "Enderezo de correo electrÃ³nico"
 
-#: ../smime/gui/certificate-manager.c:620
+#: ../smime/gui/certificate-manager.c:619
 msgid "All CA certificate files"
 msgstr "Todos os ficheiros CA de certificaciÃ³n de correo"
 
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-manager.c:1050
+msgid "Certificates"
+msgstr "Certificados"
+
+#: ../smime/gui/certificate-viewer.c:332
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualizador de certificados: %s"
@@ -20345,7 +20754,7 @@ msgid "Enter new password"
 msgstr "Introduza un contrasinal novo"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20354,7 +20763,7 @@ msgstr ""
 "Emitido a:\n"
 "  Asunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:118
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20363,59 +20772,27 @@ msgstr ""
 "Emitido por:\n"
 "  Asunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:170
+#: ../smime/gui/e-cert-selector.c:165
 msgid "Select certificate"
 msgstr "Seleccione o certificado"
 
-#: ../smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.ui.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Non Ã© parte do certificado>"
 
-#: ../smime/gui/smime-ui.glade.h:2
-msgid "<b>Certificate Fields</b>"
-msgstr "<b>Campos do certificado</b>"
-
-#: ../smime/gui/smime-ui.glade.h:3
-msgid "<b>Certificate Hierarchy</b>"
-msgstr "<b>XerarquÃa do certificado</b>"
-
-#: ../smime/gui/smime-ui.glade.h:4
-msgid "<b>Field Value</b>"
-msgstr "<b>Valor do campo</b>"
-
-#: ../smime/gui/smime-ui.glade.h:5
-msgid "<b>Fingerprints</b>"
-msgstr "<b>ImpresiÃ³ns dixitais</b>"
-
-#: ../smime/gui/smime-ui.glade.h:6
-msgid "<b>Issued By</b>"
-msgstr "<b>Emitido por</b>"
-
-#: ../smime/gui/smime-ui.glade.h:7
-msgid "<b>Issued To</b>"
-msgstr "<b>Emitido para</b>"
-
-#: ../smime/gui/smime-ui.glade.h:8
-msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr "<b>Este certificado verificouse para os seguintes usos:</b>"
-
-#: ../smime/gui/smime-ui.glade.h:9
-msgid "<b>Validity</b>"
-msgstr "<b>ValidaciÃ³n</b>"
-
-#: ../smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.ui.h:2
 msgid "Authorities"
 msgstr "Autoridades"
 
-#: ../smime/gui/smime-ui.glade.h:11
+#: ../smime/gui/smime-ui.ui.h:3
 msgid "Backup"
 msgstr "Facer unha copia de seguranza"
 
-#: ../smime/gui/smime-ui.glade.h:12
+#: ../smime/gui/smime-ui.ui.h:4
 msgid "Backup All"
 msgstr "Facer unha copia de seguranza para todo"
 
-#: ../smime/gui/smime-ui.glade.h:13
+#: ../smime/gui/smime-ui.ui.h:5
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -20423,1625 +20800,341 @@ msgstr ""
 "Antes de confiar nesta CA para calquera obxectivo, deberÃa examinar o seu "
 "certificado e as sÃºas directrices e procedementos (se estÃ¡n dispoÃ±Ãbeis)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
+#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
 msgid "Certificate"
 msgstr "Certificado"
 
-#: ../smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Authority Trust"
 msgstr "Confianza na autoridade do certificado"
 
-#: ../smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.ui.h:8
+msgid "Certificate Fields"
+msgstr "<b>Campos do certificado</b>"
+
+#: ../smime/gui/smime-ui.ui.h:9
+msgid "Certificate Hierarchy"
+msgstr "<b>XerarquÃa do certificado</b>"
+
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificate details"
 msgstr "Detalles do certificado"
 
-#: ../smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Certificates Table"
 msgstr "TÃ¡boa de certificados"
 
-#: ../smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Common Name (CN)"
 msgstr "Nome comÃºn (CN)"
 
-#: ../smime/gui/smime-ui.glade.h:19
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Contact Certificates"
 msgstr "Certificados de contactos"
 
-#: ../smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Non confiar na autenticidade deste certificado"
 
-#: ../smime/gui/smime-ui.glade.h:22
-msgid "Dummy window only"
-msgstr "SÃ³ xanela de proba"
-
-#: ../smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Edit"
 msgstr "Editar"
 
-#: ../smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Certificate Trust Settings"
 msgstr "Control de confianza de certificados de correo"
 
-#: ../smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Email Recipient Certificate"
 msgstr "Certificado do destinatario do correo"
 
-#: ../smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Email Signer Certificate"
 msgstr "Certificado do asinante do correo"
 
-#: ../smime/gui/smime-ui.glade.h:27
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Expires On"
 msgstr "Caduca o"
 
-#: ../smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "Field Value"
+msgstr "Nome do campo"
+
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "Fingerprints"
+msgstr "ImpresiÃ³n dixital MD5"
+
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Import"
 msgstr "Importar"
 
-#: ../smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.ui.h:25
+msgid "Issued By"
+msgstr "Emitido o"
+
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "Issued On"
 msgstr "Emitido o"
 
-#: ../smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.ui.h:27
+msgid "Issued To"
+msgstr "Emitido o"
+
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "MD5 Fingerprint"
 msgstr "ImpresiÃ³n dixital MD5"
 
-#: ../smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "Organization (O)"
 msgstr "OrganizaciÃ³n (O)"
 
-#: ../smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.ui.h:30
 msgid "Organizational Unit (OU)"
 msgstr "Unidade organizacional (OU)"
 
-#: ../smime/gui/smime-ui.glade.h:34
+#: ../smime/gui/smime-ui.ui.h:31
 msgid "SHA1 Fingerprint"
 msgstr "ImpresiÃ³n dixital SHA1"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
+#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
 msgid "SSL Client Certificate"
 msgstr "Certificado de cliente SSL"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
+#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
 msgid "SSL Server Certificate"
 msgstr "Certificado de servidor SSL"
 
-#: ../smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.ui.h:35
+msgid "This certificate has been verified for the following uses:"
+msgstr "<b>Este certificado verificouse para os seguintes usos:</b>"
+
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust the authenticity of this certificate"
 msgstr "Confiar na autenticidade deste certificado"
 
-#: ../smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.ui.h:37
 msgid "Trust this CA to identify email users."
 msgstr "Confiar nesta AC para identificar a usuarios de correo."
 
-#: ../smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Trust this CA to identify software developers."
 msgstr "Confiar nesta AC para identificar desenvolvedores de software."
 
-#: ../smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "Trust this CA to identify web sites."
 msgstr "Confiar nesta AC para identificar sitios web."
 
-#: ../smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.ui.h:40
+msgid "Validity"
+msgstr "<b>ValidaciÃ³n</b>"
+
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "View"
 msgstr "Ver"
 
-#: ../smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Ten certificados destas organizaciÃ³ns que o identifican:"
 
-#: ../smime/gui/smime-ui.glade.h:44
+#: ../smime/gui/smime-ui.ui.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Ten nun ficheiro os certificados que identifican a estas autoridades de "
 "certificaciÃ³n:"
 
-#: ../smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Ten nun ficheiro os certificados que identifican a estas persoas:"
 
-#: ../smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "Your Certificates"
 msgstr "Os seus certificados"
 
-#: ../smime/gui/smime-ui.glade.h:47
+#: ../smime/gui/smime-ui.ui.h:46
 msgid "_Edit CA Trust"
 msgstr "_Editar confianza na CA"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:652
+#: ../smime/lib/e-cert-db.c:711
 msgid "Certificate already exists"
 msgstr "O certificado xa existe"
 
-#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
+#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:407
+#: ../smime/lib/e-cert.c:414
 msgid "Sign"
 msgstr "Sinatura"
 
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:415
 msgid "Encrypt"
 msgstr "Cifrado"
 
-#: ../smime/lib/e-cert.c:513
+#: ../smime/lib/e-cert.c:527
 msgid "Version"
 msgstr "VersiÃ³n"
 
-#: ../smime/lib/e-cert.c:528
+#: ../smime/lib/e-cert.c:542
 msgid "Version 1"
 msgstr "VersiÃ³n 1"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:545
 msgid "Version 2"
 msgstr "VersiÃ³n 2"
 
-#: ../smime/lib/e-cert.c:534
+#: ../smime/lib/e-cert.c:548
 msgid "Version 3"
 msgstr "VersiÃ³n 3"
 
-#: ../smime/lib/e-cert.c:616
+#: ../smime/lib/e-cert.c:630
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:619
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:622
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:649
+#: ../smime/lib/e-cert.c:663
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 cifrado RSA"
 
-#: ../smime/lib/e-cert.c:652
+#: ../smime/lib/e-cert.c:666
 msgid "Certificate Key Usage"
 msgstr "Uso da chave de certificado"
 
-#: ../smime/lib/e-cert.c:655
+#: ../smime/lib/e-cert.c:669
 msgid "Netscape Certificate Type"
 msgstr "Tipo de certificado Netscape"
 
-#: ../smime/lib/e-cert.c:658
+#: ../smime/lib/e-cert.c:672
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador da chave da autoridade do certificado"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:684
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador do obxecto (%s)"
 
-#: ../smime/lib/e-cert.c:720
+#: ../smime/lib/e-cert.c:735
 msgid "Algorithm Identifier"
 msgstr "Identificador do algoritmo"
 
-#: ../smime/lib/e-cert.c:728
+#: ../smime/lib/e-cert.c:743
 msgid "Algorithm Parameters"
 msgstr "ParÃ¡metros do algoritmo"
 
-#: ../smime/lib/e-cert.c:750
+#: ../smime/lib/e-cert.c:765
 msgid "Subject Public Key Info"
 msgstr "InformaciÃ³n do asunto da chave pÃºblica"
 
-#: ../smime/lib/e-cert.c:755
+#: ../smime/lib/e-cert.c:770
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritmo da chave pÃºblica do asunto"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:785
 msgid "Subject's Public Key"
 msgstr "Chave pÃºblica do asunto"
 
-#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
 msgid "Error: Unable to process extension"
 msgstr "Erro: non Ã© posÃbel procesar a extensiÃ³n"
 
-#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
+#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
 msgid "Object Signer"
 msgstr "Asinante do obxecto"
 
-#: ../smime/lib/e-cert.c:816
+#: ../smime/lib/e-cert.c:831
 msgid "SSL Certificate Authority"
 msgstr "Autoridade do certificado SSL"
 
-#: ../smime/lib/e-cert.c:820
+#: ../smime/lib/e-cert.c:835
 msgid "Email Certificate Authority"
 msgstr "Autoridade do certificado de correo"
 
-#: ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:863
 msgid "Signing"
 msgstr "Sinatura"
 
-#: ../smime/lib/e-cert.c:852
+#: ../smime/lib/e-cert.c:867
 msgid "Non-repudiation"
 msgstr "Non rexeitar"
 
-#: ../smime/lib/e-cert.c:856
+#: ../smime/lib/e-cert.c:871
 msgid "Key Encipherment"
 msgstr "Cifrado da chave"
 
-#: ../smime/lib/e-cert.c:860
+#: ../smime/lib/e-cert.c:875
 msgid "Data Encipherment"
 msgstr "Cifrado de datos"
 
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:879
 msgid "Key Agreement"
 msgstr "Acordo de chaves"
 
-#: ../smime/lib/e-cert.c:868
+#: ../smime/lib/e-cert.c:883
 msgid "Certificate Signer"
 msgstr "Asinante do certificado"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:887
 msgid "CRL Signer"
 msgstr "Asinante da LRC"
 
-#: ../smime/lib/e-cert.c:920
+#: ../smime/lib/e-cert.c:935
 msgid "Critical"
 msgstr "CrÃtico"
 
-#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
+#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
 msgid "Not Critical"
 msgstr "Non crÃtico"
 
-#: ../smime/lib/e-cert.c:946
+#: ../smime/lib/e-cert.c:961
 msgid "Extensions"
 msgstr "ExtensiÃ³ns"
 
-#: ../smime/lib/e-cert.c:1017
+#: ../smime/lib/e-cert.c:1030
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
+#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmo de sinatura do certificado"
 
-#: ../smime/lib/e-cert.c:1081
+#: ../smime/lib/e-cert.c:1094
 msgid "Issuer"
 msgstr "Emisor"
 
-#: ../smime/lib/e-cert.c:1135
+#: ../smime/lib/e-cert.c:1149
 msgid "Issuer Unique ID"
 msgstr "ID Ãºnico do emisor"
 
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1168
 msgid "Subject Unique ID"
 msgstr "ID Ãºnico do asunto"
 
-#: ../smime/lib/e-cert.c:1197
+#: ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Value"
 msgstr "Valor da sinatura do certificado"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:250
 msgid "PKCS12 File Password"
 msgstr "Contrasinal para o ficheiro PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:251
 msgid "Enter password for PKCS12 file:"
 msgstr "Introduza un contrasinal para o ficheiro PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:348
+#: ../smime/lib/e-pkcs12.c:353
 msgid "Imported Certificate"
 msgstr "Certificado importado"
 
-#. This most likely means that KILL_PROCESS_CMD wasn't
-#. * found, so just bail completely.
-#.
-#: ../tools/killev.c:61
-#, c-format
-msgid "Could not execute '%s': %s\n"
-msgstr "Non se puido executar '%s': %s\n"
-
-#: ../tools/killev.c:76
-#, c-format
-msgid "Shutting down %s (%s)\n"
-msgstr "Pechando %s (%s)\n"
-
-#: ../ui/evolution-addressbook.xml.h:1
-msgid "Address _Book Properties"
-msgstr "Propiedades da a_xenda de enderezos"
-
-#: ../ui/evolution-addressbook.xml.h:3
-msgid "Change the properties of the selected folder"
-msgstr "Modificar as propiedades do cartafol seleccionado"
-
-#: ../ui/evolution-addressbook.xml.h:4
-msgid "Co_py All Contacts To..."
-msgstr "Co_piar todos os contactos a..."
-
-#: ../ui/evolution-addressbook.xml.h:5
-msgid "Contact _Preview"
-msgstr "_PrevisualizaciÃ³n de contactos"
-
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Copiar"
-
-#: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy selected contacts to another folder"
-msgstr "Copiar os contactos seleccionados a outro cartafol"
-
-#: ../ui/evolution-addressbook.xml.h:8
-msgid "Copy the contacts of the selected folder into another folder"
-msgstr "Copiar os contactos do cartafol seleccionado noutro cartafol"
-
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
-msgid "Copy the selection"
-msgstr "Copiar a selecciÃ³n"
-
-#: ../ui/evolution-addressbook.xml.h:10
-msgid "Copy to Folder..."
-msgstr "Copiar ao cartafol..."
-
-#: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new address book folder"
-msgstr "Crear un cartafol novo de axenda de enderezos"
-
-#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Cortar"
-
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
-msgid "Cut the selection"
-msgstr "Cortar a selecciÃ³n"
-
-#: ../ui/evolution-addressbook.xml.h:14
-msgid "Del_ete Address Book"
-msgstr "E_liminar a axenda de enderezos"
-
-#: ../ui/evolution-addressbook.xml.h:16
-msgid "Delete selected contacts"
-msgstr "Eliminar os contactos seleccionados"
-
-#: ../ui/evolution-addressbook.xml.h:17
-msgid "Delete the selected folder"
-msgstr "Eliminar o cartafol seleccionado"
-
-#: ../ui/evolution-addressbook.xml.h:18
-msgid "Forward Contact"
-msgstr "Reenviar contacto"
-
-#: ../ui/evolution-addressbook.xml.h:19
-msgid "Mo_ve All Contacts To..."
-msgstr "Mo_ver todos os contactos a..."
-
-#: ../ui/evolution-addressbook.xml.h:20
-msgid "Move selected contacts to another folder"
-msgstr "Mover os contactos seleccionados a outro cartafol"
-
-#: ../ui/evolution-addressbook.xml.h:21
-msgid "Move the contacts of the selected folder into another folder"
-msgstr "Mover os contactos do cartafol seleccionado a outro cartafol"
-
-#: ../ui/evolution-addressbook.xml.h:22
-msgid "Move to Folder..."
-msgstr "Mover ao cartafol..."
-
-#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
-#: ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Colar"
-
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
-msgid "Paste the clipboard"
-msgstr "Colar o contido do portapapeis"
-
-#: ../ui/evolution-addressbook.xml.h:25
-msgid "Previews the contacts to be printed"
-msgstr "Previsualiza os contactos que se van imprimir"
-
-#: ../ui/evolution-addressbook.xml.h:28
-msgid "Print selected contacts"
-msgstr "Imprimir os contactos seleccionados"
-
-#: ../ui/evolution-addressbook.xml.h:29
-msgid "Rename the selected folder"
-msgstr "Renomear o cartafol seleccionado"
-
-#: ../ui/evolution-addressbook.xml.h:30
-msgid "S_ave Address Book As VCard"
-msgstr "G_ardar axenda de enderezos como VCard"
-
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "Gardar como VCard..."
-
-#: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard"
-msgstr "Gardar os contactos seleccionados como unha VCard"
-
-#: ../ui/evolution-addressbook.xml.h:33
-msgid "Save the contacts of the selected folder as VCard"
-msgstr "Gardar os contactos do cartafol seleccionado como unha VCard"
-
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2719
-msgid "Select All"
-msgstr "Seleccionar todo"
-
-#: ../ui/evolution-addressbook.xml.h:35
-msgid "Select _All"
-msgstr "Seleccionar _todo"
-
-#: ../ui/evolution-addressbook.xml.h:36
-msgid "Select all contacts"
-msgstr "Seleccionar todos os contactos"
-
-#: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts"
-msgstr "Enviar unha mensaxe aos contactos seleccionados"
-
-#: ../ui/evolution-addressbook.xml.h:38
-msgid "Send message to contact"
-msgstr "Enviar mensaxe a un contacto"
-
-#: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person"
-msgstr "Enviar os contactos seleccionados a outra persoa"
-
-#: ../ui/evolution-addressbook.xml.h:40
-msgid "Show contact preview window"
-msgstr "Mostrar a xanela de previsualizaciÃ³n de contactos"
-
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "St_op"
-msgstr "Det_er"
-
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "Stop"
-msgstr "Deter"
-
-#: ../ui/evolution-addressbook.xml.h:43
-msgid "Stop Loading"
-msgstr "Deter a carga"
-
-#: ../ui/evolution-addressbook.xml.h:44
-msgid "View the current contact"
-msgstr "Ver o contacto actual"
-
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-tasks.xml.h:21
-msgid "_Actions"
-msgstr "_AcciÃ³ns"
-
-#: ../ui/evolution-addressbook.xml.h:47
-msgid "_Copy Contact to..."
-msgstr "_Copiar contacto a..."
-
-#: ../ui/evolution-addressbook.xml.h:48
-msgid "_Copy Folder Contacts To"
-msgstr "_Copiar cartafol de contactos a"
-
-#: ../ui/evolution-addressbook.xml.h:50
-msgid "_Delete Contact"
-msgstr "E_liminar contacto"
-
-#: ../ui/evolution-addressbook.xml.h:52
-msgid "_Forward Contact..."
-msgstr "_Reenviar contacto..."
-
-#: ../ui/evolution-addressbook.xml.h:53
-msgid "_Move Contact to..."
-msgstr "_Mover contacto a..."
-
-#: ../ui/evolution-addressbook.xml.h:54
-msgid "_Move Folder Contacts To"
-msgstr "_Mover o cartafol de contactos a"
-
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
-msgid "_New"
-msgstr "_Novo"
-
-#: ../ui/evolution-addressbook.xml.h:60
-msgid "_Rename"
-msgstr "_Renomear"
-
-#: ../ui/evolution-addressbook.xml.h:61
-msgid "_Save Contact as VCard..."
-msgstr "_Gardar contacto como VCard..."
-
-#: ../ui/evolution-addressbook.xml.h:62
-msgid "_Save Folder Contacts As VCard"
-msgstr "_Gardar o cartafol de contactos como VCard"
-
-#: ../ui/evolution-addressbook.xml.h:63
-msgid "_Send Message to Contact..."
-msgstr "_Enviar mensaxe ao contacto..."
-
-#: ../ui/evolution-calendar.xml.h:4
-msgid "Day"
-msgstr "DÃa"
-
-#: ../ui/evolution-calendar.xml.h:6
-msgid "Delete _all Occurrences"
-msgstr "Eliminar _todas as ocorrencias"
-
-#: ../ui/evolution-calendar.xml.h:7
-msgid "Delete all occurrences"
-msgstr "Eliminar todas as ocorrencias"
-
-#: ../ui/evolution-calendar.xml.h:8
-msgid "Delete the appointment"
-msgstr "Eliminar esta cita"
-
-#: ../ui/evolution-calendar.xml.h:10
-msgid "Delete this occurrence"
-msgstr "Eliminar esta ocorrencia"
-
-#: ../ui/evolution-calendar.xml.h:11
-msgid "Go To"
-msgstr "Ir a"
-
-#: ../ui/evolution-calendar.xml.h:12
-msgid "Go back"
-msgstr "AtrÃ¡s"
-
-#: ../ui/evolution-calendar.xml.h:13
-msgid "Go forward"
-msgstr "Adiante"
-
-#: ../ui/evolution-calendar.xml.h:14
-msgid "List"
-msgstr "Lista"
-
-#: ../ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "Mes"
-
-#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:193
-msgid "Next"
-msgstr "Seguinte"
-
-#: ../ui/evolution-calendar.xml.h:18
-msgid "Previews the calendar to be printed"
-msgstr "Previsualiza o calendario que se vai imprimir"
-
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70
-#: ../widgets/misc/e-calendar.c:169
-msgid "Previous"
-msgstr "Anterior"
-
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Print this calendar"
-msgstr "Imprimir este calendario"
-
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
-msgid "Purg_e"
-msgstr "D_epurar"
-
-#: ../ui/evolution-calendar.xml.h:24
-msgid "Purge old appointments and meetings"
-msgstr "Depurar as reuniÃ³ns e as citas antigas"
-
-#: ../ui/evolution-calendar.xml.h:25
-msgid "Select _Date"
-msgstr "Seleccionar _data"
-
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "Seleccionar _hoxe"
-
-#: ../ui/evolution-calendar.xml.h:27
-msgid "Select a specific date"
-msgstr "Seleccionar unha data especÃfica"
-
-#: ../ui/evolution-calendar.xml.h:28
-msgid "Select today"
-msgstr "Seleccionar hoxe"
-
-#: ../ui/evolution-calendar.xml.h:29
-msgid "Show as list"
-msgstr "Mostrar como unha lista"
-
-#: ../ui/evolution-calendar.xml.h:30
-msgid "Show one day"
-msgstr "Mostrar un dÃa"
-
-#: ../ui/evolution-calendar.xml.h:31
-msgid "Show one month"
-msgstr "Mostrar un mes"
-
-#: ../ui/evolution-calendar.xml.h:32
-msgid "Show one week"
-msgstr "Mostrar unha semana"
-
-#: ../ui/evolution-calendar.xml.h:33
-msgid "Show the working week"
-msgstr "Mostrar a semana laboral"
-
-#: ../ui/evolution-calendar.xml.h:35
-msgid "View the current appointment"
-msgstr "Ver a cita actual"
-
-#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "Visualizar a consola de depuraciÃ³n para as mensaxes de rexistro"
-
-#: ../ui/evolution-calendar.xml.h:37
-msgid "Week"
-msgstr "Semana"
-
-#: ../ui/evolution-calendar.xml.h:38
-msgid "Work Week"
-msgstr "Semana laboral"
-
-#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "Rexistros de _depuraciÃ³n"
-
-#: ../ui/evolution-calendar.xml.h:45
-msgid "_Open Appointment"
-msgstr "_Abrir cita"
-
-#: ../ui/evolution-mail-global.xml.h:2
-msgid "Cancel the current mail operation"
-msgstr "Cancelar a operaciÃ³n de correo actual"
-
-#: ../ui/evolution-mail-global.xml.h:3
-msgid "Copy the selected folder into another folder"
-msgstr "Copiar o cartafol seleccionado noutro cartafol"
-
-#: ../ui/evolution-mail-global.xml.h:4
-msgid "Create a new folder for storing mail"
-msgstr "Crear un cartafol novo para almacenar correo"
-
-#: ../ui/evolution-mail-global.xml.h:5
-msgid "Create or edit Search Folder definitions"
-msgstr "Crear ou editar as definiciÃ³ns de cartafoles de busca"
-
-#: ../ui/evolution-mail-global.xml.h:6
-msgid "Create or edit rules for filtering new mail"
-msgstr "Crear ou editar regras para a filtraxe do correo novo"
-
-#: ../ui/evolution-mail-global.xml.h:7
-msgid "Download messages of accounts/folders marked for offline"
-msgstr ""
-"Descargar as mensaxes para as contas ou cartafoles marcados para o modo sen "
-"conexiÃ³n"
-
-#: ../ui/evolution-mail-global.xml.h:8
-msgid "Empty _Trash"
-msgstr "Baleirar o _lixo"
-
-#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-msgid "F_older"
-msgstr "Cartaf_ol"
-
-#: ../ui/evolution-mail-global.xml.h:10
-msgid "Move the selected folder into another folder"
-msgstr "Mover o cartafol seleccionado a outro cartafol"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:12
-msgid "Permanently remove all deleted messages from all folders"
-msgstr ""
-"Eliminar permanentemente todas as mensaxes eliminadas en todos os cartafoles"
-
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Search F_olders"
-msgstr "Cartaf_oles de busca"
-
-#: ../ui/evolution-mail-global.xml.h:14
-msgid "Show Message _Preview"
-msgstr "Mostrar _previsualizaciÃ³n da mensaxe"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview below the message list"
-msgstr "Mostrar a previsualizaciÃ³n da mensaxe baixo a lista de mensaxes"
-
-#: ../ui/evolution-mail-global.xml.h:16
-msgid "Show message preview side-by-side with the message list"
-msgstr "Mostrar a previsualizaciÃ³n de mensaxes ao lado da lista de mensaxes"
-
-#: ../ui/evolution-mail-global.xml.h:17
-msgid "Show message preview window"
-msgstr "Mostrar a xanela de previsualizaciÃ³n da mensaxe"
-
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr ""
-"Subscribirse ou eliminar subscriciÃ³n dos cartafoles en servidores remotos"
-
-#: ../ui/evolution-mail-global.xml.h:20
-msgid "_Classic View"
-msgstr "VisualizaciÃ³n _clÃ¡sica"
-
-#: ../ui/evolution-mail-global.xml.h:21
-msgid "_Copy Folder To..."
-msgstr "_Copiar cartafol a..."
-
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Download Messages for Offline Usage"
-msgstr "_Descargar as mensaxes para o uso sen conexiÃ³n"
-
-#: ../ui/evolution-mail-global.xml.h:25
-msgid "_Message Filters"
-msgstr "Filtros de _mensaxe"
-
-#: ../ui/evolution-mail-global.xml.h:26
-msgid "_Move Folder To..."
-msgstr "_Mover o cartafol a..."
-
-#: ../ui/evolution-mail-global.xml.h:27
-msgid "_New..."
-msgstr "_Novo..."
-
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Preview"
-msgstr "_PrevisualizaciÃ³n"
-
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions..."
-msgstr "_SubscriciÃ³ns..."
-
-#: ../ui/evolution-mail-global.xml.h:33
-msgid "_Vertical View"
-msgstr "VisualizaciÃ³n _vertical"
-
-#: ../ui/evolution-mail-list.xml.h:1
-msgid "Change the name of this folder"
-msgstr "Modificar o nome deste cartafol"
-
-#: ../ui/evolution-mail-list.xml.h:2
-msgid "Change the properties of this folder"
-msgstr "Modificar as propiedades deste cartafol"
-
-#: ../ui/evolution-mail-list.xml.h:3
-msgid "Collapse All _Threads"
-msgstr "Contraer todos os _fÃos"
-
-#: ../ui/evolution-mail-list.xml.h:4
-msgid "Collapse all message threads"
-msgstr "Contraer todos os fÃos de mensaxe"
-
-#: ../ui/evolution-mail-list.xml.h:5
-msgid "Copy selected message(s) to the clipboard"
-msgstr "Copiar as mensaxes seleccionadas ao portapapeis"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:7
-msgid "Cut selected message(s) to the clipboard"
-msgstr "Cortar as mensaxes seleccionadas ao portapapeis"
-
-#: ../ui/evolution-mail-list.xml.h:8
-msgid "E_xpand All Threads"
-msgstr "E_xpandir todos os fÃos"
-
-#: ../ui/evolution-mail-list.xml.h:9
-msgid "E_xpunge"
-msgstr "Com_pactar"
-
-#: ../ui/evolution-mail-list.xml.h:10
-msgid "Expand all message threads"
-msgstr "Expandir todos os fÃos de mensaxe"
-
-#: ../ui/evolution-mail-list.xml.h:12
-msgid "Hide S_elected Messages"
-msgstr "Ocultar as mensaxes s_eleccionadas"
-
-#: ../ui/evolution-mail-list.xml.h:13
-msgid "Hide _Deleted Messages"
-msgstr "Ocultar as mensaxes elimina_das"
-
-#: ../ui/evolution-mail-list.xml.h:14
-msgid "Hide _Read Messages"
-msgstr "Ocultar as mensaxes _lidas"
-
-#: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "Ocultar as mensaxes eliminadas en vez de mostralas riscadas"
-
-#: ../ui/evolution-mail-list.xml.h:16
-msgid "Mar_k All Messages as Read"
-msgstr "Ma_rcar todas as mensaxes como lidas"
-
-#: ../ui/evolution-mail-list.xml.h:17
-msgid "Mark all messages in the folder as read"
-msgstr "Marcar todas as mensaxes do cartafol como lidas"
-
-#: ../ui/evolution-mail-list.xml.h:18
-msgid "Paste message(s) from the clipboard"
-msgstr "Colar as mensaxes dende o portapapeis"
-
-#: ../ui/evolution-mail-list.xml.h:19
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "Eliminar permanentemente as mensaxes eliminadas deste cartafol"
-
-#: ../ui/evolution-mail-list.xml.h:20
-msgid "Permanently remove this folder"
-msgstr "Eliminar permanentemente este cartafol"
-
-#: ../ui/evolution-mail-list.xml.h:22
-msgid "Refresh the folder"
-msgstr "Actualizar o cartafol"
-
-#: ../ui/evolution-mail-list.xml.h:23
-msgid "Select Message S_ubthread"
-msgstr "Seleccionar o fÃo sec_undario da mensaxe"
-
-#: ../ui/evolution-mail-list.xml.h:24
-msgid "Select Message _Thread"
-msgstr "Seleccionar o _fÃo da mensaxe"
-
-#: ../ui/evolution-mail-list.xml.h:25
-msgid "Select _All Messages"
-msgstr "Seleccionar _todas as mensaxes"
-
-#: ../ui/evolution-mail-list.xml.h:26
-msgid "Select all and only the messages that are not currently selected"
-msgstr ""
-"Seleccionar todas e unicamente as mensaxes non seleccionadas actualmente"
-
-#: ../ui/evolution-mail-list.xml.h:27
-msgid "Select all messages in the same thread as the selected message"
-msgstr "Seleccionar todas as mensaxes do mesmo fÃo que a mensaxe seleccionada"
-
-#: ../ui/evolution-mail-list.xml.h:28
-msgid "Select all replies to the currently selected message"
-msgstr "Seleccionar todas as respostas Ã¡ mensaxe seleccionada"
-
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "Select all visible messages"
-msgstr "Seleccionar todas as mensaxes visÃbeis"
-
-#: ../ui/evolution-mail-list.xml.h:30
-msgid "Show Hidde_n Messages"
-msgstr "Mostrar as mensaxes o_cultas"
-
-#: ../ui/evolution-mail-list.xml.h:31
-msgid "Show messages that have been temporarily hidden"
-msgstr "Mostrar as mensaxes ocultas temporalmente"
-
-#: ../ui/evolution-mail-list.xml.h:32
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Ocultar temporalmente todas as mensaxes lidas"
-
-#: ../ui/evolution-mail-list.xml.h:33
-msgid "Temporarily hide the selected messages"
-msgstr "Ocultar temporalmente as mensaxes seleccionadas"
-
-#: ../ui/evolution-mail-list.xml.h:34
-msgid "Threaded Message list"
-msgstr "Lista de mensaxes por fÃos"
-
-#: ../ui/evolution-mail-list.xml.h:36
-msgid "_Group By Threads"
-msgstr "Agr_upar por fÃos"
-
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111
-#: ../ui/evolution-mail-messagedisplay.xml.h:7
-msgid "_Message"
-msgstr "_Mensaxe"
-
-#: ../ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Address Book"
-msgstr "_Engadir o remitente Ã¡ axenda de enderezos"
-
-#: ../ui/evolution-mail-message.xml.h:2
-msgid "A_pply Filters"
-msgstr "_Aplicar filtros"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
-msgid "Add Sender to Address Book"
-msgstr "Engadir o remitente Ã¡ axenda de enderezos"
-
-#: ../ui/evolution-mail-message.xml.h:5
-msgid "All Message _Headers"
-msgstr "Todas as ca_beceiras da mensaxe"
-
-#: ../ui/evolution-mail-message.xml.h:6
-msgid "Apply filter rules to the selected messages"
-msgstr "Aplicar as regras de filtraxe Ã¡s mensaxes seleccionadas"
-
-#: ../ui/evolution-mail-message.xml.h:7
-msgid "Check for _Junk"
-msgstr "Verificar se hai correo non dese_xado"
-
-#: ../ui/evolution-mail-message.xml.h:8
-msgid "Compose _New Message"
-msgstr "Redactar unha mensaxe _nova"
-
-#: ../ui/evolution-mail-message.xml.h:9
-msgid "Compose a reply to all of the recipients of the selected message"
-msgstr ""
-"Redactar unha resposta para todos os destinatarios da mensaxe seleccionada"
-
-#: ../ui/evolution-mail-message.xml.h:10
-msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Redactar unha resposta para a lista de correo da mensaxe seleccionada"
-
-#: ../ui/evolution-mail-message.xml.h:11
-msgid "Compose a reply to the sender of the selected message"
-msgstr "Redactar unha resposta para o remitente da mensaxe seleccionada"
-
-#: ../ui/evolution-mail-message.xml.h:12
-msgid "Copy selected messages to another folder"
-msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
-
-#: ../ui/evolution-mail-message.xml.h:13
-msgid "Copy selected messages to the clipboard"
-msgstr "Copiar as mensaxes seleccionadas ao portapapeis"
-
-#: ../ui/evolution-mail-message.xml.h:14
-msgid "Create R_ule"
-msgstr "Crear r_egra"
-
-#: ../ui/evolution-mail-message.xml.h:15
-msgid "Create a Search Folder for these recipients"
-msgstr "Crear un cartafol de busca para estes destinatarios"
-
-#: ../ui/evolution-mail-message.xml.h:16
-msgid "Create a Search Folder for this mailing list"
-msgstr "Crear un cartafol de busca para esta lista de correo"
-
-#: ../ui/evolution-mail-message.xml.h:17
-msgid "Create a Search Folder for this sender"
-msgstr "Crear un cartafol de busca para este remitente"
-
-#: ../ui/evolution-mail-message.xml.h:18
-msgid "Create a Search Folder for this subject"
-msgstr "Crear un cartafol de busca para este asunto"
-
-#: ../ui/evolution-mail-message.xml.h:19
-msgid "Create a rule to filter messages from this sender"
-msgstr "Crear unha regra para filtrar mensaxes deste remitente"
-
-#: ../ui/evolution-mail-message.xml.h:20
-msgid "Create a rule to filter messages to these recipients"
-msgstr "Crear unha regra para filtrar mensaxes a estes destinatarios"
-
-#: ../ui/evolution-mail-message.xml.h:21
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "Crear unha regra para filtrar mensaxes a esta lista de correo"
-
-#: ../ui/evolution-mail-message.xml.h:22
-msgid "Create a rule to filter messages with this subject"
-msgstr "Crear unha regra para filtrar mensaxes con este asunto"
-
-#: ../ui/evolution-mail-message.xml.h:23
-msgid "Cut selected messages to the clipboard"
-msgstr "Cortar as mensaxes seleccionadas ao portapapeis"
-
-#: ../ui/evolution-mail-message.xml.h:24
-msgid "Decrease the text size"
-msgstr "DiminuÃr o tamaÃ±o do texto"
-
-#: ../ui/evolution-mail-message.xml.h:26
-msgid "Display the next important message"
-msgstr "Mostrar a seguinte mensaxe importante"
-
-#: ../ui/evolution-mail-message.xml.h:27
-msgid "Display the next message"
-msgstr "Mostrar a seguinte mensaxe"
-
-#: ../ui/evolution-mail-message.xml.h:28
-msgid "Display the next thread"
-msgstr "Mostrar o seguinte fÃo"
-
-#: ../ui/evolution-mail-message.xml.h:29
-msgid "Display the next unread message"
-msgstr "Mostrar a seguinte mensaxe non lida"
-
-#: ../ui/evolution-mail-message.xml.h:30
-msgid "Display the previous important message"
-msgstr "Mostrar a anterior mensaxe importante"
-
-#: ../ui/evolution-mail-message.xml.h:31
-msgid "Display the previous message"
-msgstr "Mostrar a mensaxe anterior"
-
-#: ../ui/evolution-mail-message.xml.h:32
-msgid "Display the previous unread message"
-msgstr "Mostrar a anterior mensaxe non lida"
-
-#: ../ui/evolution-mail-message.xml.h:33
-msgid "F_orward As..."
-msgstr "Reen_viar como..."
-
-#: ../ui/evolution-mail-message.xml.h:34
-msgid "Filter on Mailing _List..."
-msgstr "Filtrar por _lista de correo..."
-
-#: ../ui/evolution-mail-message.xml.h:35
-msgid "Filter on Se_nder..."
-msgstr "Filtrar por re_mitente..."
-
-#: ../ui/evolution-mail-message.xml.h:36
-msgid "Filter on _Recipients..."
-msgstr "Filtrar por _destinatarios..."
-
-#: ../ui/evolution-mail-message.xml.h:37
-msgid "Filter on _Subject..."
-msgstr "Filtrar por a_sunto..."
-
-#: ../ui/evolution-mail-message.xml.h:38
-msgid "Filter the selected messages for junk status"
-msgstr "Filtrar as mensaxes seleccionadas polo estado de correo non desexado"
-
-#: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected messages for follow-up"
-msgstr "Marcar as mensaxes seleccionadas para o seguimento"
-
-#: ../ui/evolution-mail-message.xml.h:40
-msgid "Follow _Up..."
-msgstr "Seg_uimento..."
-
-#: ../ui/evolution-mail-message.xml.h:41
-msgid "Force images in HTML mail to be loaded"
-msgstr "Forzar a carga de imaxes no correo HTML"
-
-#: ../ui/evolution-mail-message.xml.h:43
-msgid "Forward the selected message in the body of a new message"
-msgstr "Reenviar a mensaxe seleccionada no corpo dunha mensaxe nova"
-
-#: ../ui/evolution-mail-message.xml.h:44
-msgid "Forward the selected message quoted like a reply"
-msgstr "Reenviar a mensaxe seleccionada citada como unha resposta"
-
-#: ../ui/evolution-mail-message.xml.h:45
-msgid "Forward the selected message to someone"
-msgstr "Reenviar a alguÃ©n a mensaxe seleccionada"
-
-#: ../ui/evolution-mail-message.xml.h:46
-msgid "Forward the selected message to someone as an attachment"
-msgstr "Reenviar a alguÃ©n a mensaxe seleccionada como un anexo"
-
-#: ../ui/evolution-mail-message.xml.h:47
-msgid "Increase the text size"
-msgstr "Aumentar o tamaÃ±o do texto"
-
-#: ../ui/evolution-mail-message.xml.h:49
-msgid "Mar_k as"
-msgstr "Mar_car como"
-
-#: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as having been read"
-msgstr "Marcar as mensaxes seleccionadas como lidas"
-
-#: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected messages as important"
-msgstr "Marcar as mensaxes seleccionadas como importantes"
-
-#: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected messages as junk"
-msgstr "Marcar as mensaxes seleccionadas como correo non desexado"
-
-#: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected messages as not being junk"
-msgstr "Marcar as mensaxes seleccionadas como non lixo"
-
-#: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected messages as not having been read"
-msgstr "Marcar as mensaxes seleccionadas como non lidas"
-
-#: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected messages as unimportant"
-msgstr "Marcar as mensaxes seleccionadas como non importantes"
-
-#: ../ui/evolution-mail-message.xml.h:56
-msgid "Mark the selected messages for deletion"
-msgstr "Marcar as mensaxes seleccionadas para eliminalas"
-
-#: ../ui/evolution-mail-message.xml.h:57
-msgid "Move selected messages to another folder"
-msgstr "Mover as mensaxes seleccionadas a outro cartafol"
-
-#: ../ui/evolution-mail-message.xml.h:59
-msgid "Next _Important Message"
-msgstr "Seguinte mensaxe _importante"
-
-#: ../ui/evolution-mail-message.xml.h:60
-msgid "Next _Thread"
-msgstr "Seguinte _fÃo"
-
-#: ../ui/evolution-mail-message.xml.h:61
-msgid "Next _Unread Message"
-msgstr "Seguinte mensaxe _non lida"
-
-#: ../ui/evolution-mail-message.xml.h:62
-msgid "Not Junk"
-msgstr "Non Ã© correo non desexado"
-
-#: ../ui/evolution-mail-message.xml.h:63
-msgid "Open a window for composing a mail message"
-msgstr "Abrir unha xanela para compor unha mensaxe de correo"
-
-#: ../ui/evolution-mail-message.xml.h:64
-msgid "Open the selected messages in a new window"
-msgstr "Abrir as mensaxes seleccionadas nunha xanela nova"
-
-#: ../ui/evolution-mail-message.xml.h:65
-msgid "Open the selected messages in the composer for editing"
-msgstr "Abrir as mensaxes seleccionadas no editor para editalas"
-
-#: ../ui/evolution-mail-message.xml.h:66
-msgid "P_revious Unread Message"
-msgstr "Ante_rior mensaxe non lida"
-
-#: ../ui/evolution-mail-message.xml.h:67
-msgid "Paste messages from the clipboard"
-msgstr "Colar as mensaxes dende o portapapeis"
-
-#: ../ui/evolution-mail-message.xml.h:68
-msgid "Pr_evious Important Message"
-msgstr "Ant_erior mensaxe importante"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Preview the message to be printed"
-msgstr "Previsualizar a mensaxe que se vai imprimir"
-
-#: ../ui/evolution-mail-message.xml.h:73
-msgid "Print this message"
-msgstr "Imprimir esta mensaxe"
-
-#: ../ui/evolution-mail-message.xml.h:74
-msgid "Re_direct"
-msgstr "Re_direccionar"
-
-#: ../ui/evolution-mail-message.xml.h:75
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "Redireccionar a alguÃ©n (rebotar) a mensaxe seleccionada"
-
-#: ../ui/evolution-mail-message.xml.h:80
-msgid "Reset the text to its original size"
-msgstr "Restabelecer o texto ao seu tamaÃ±o orixinal"
-
-#: ../ui/evolution-mail-message.xml.h:81
-msgid "Save the selected messages as a text file"
-msgstr "Gardar as mensaxes como un ficheiro de texto"
-
-#: ../ui/evolution-mail-message.xml.h:82
-msgid "Search Folder from Mailing _List..."
-msgstr "Cartafol de busca por _lista de correo..."
-
-#: ../ui/evolution-mail-message.xml.h:83
-msgid "Search Folder from Recipien_ts..."
-msgstr "Cartafol de busca por des_tinatarios..."
-
-#: ../ui/evolution-mail-message.xml.h:84
-msgid "Search Folder from S_ubject..."
-msgstr "Cartafol de busca por as_unto..."
-
-#: ../ui/evolution-mail-message.xml.h:85
-msgid "Search Folder from Sen_der..."
-msgstr "Cartafol de busca por _remitente..."
-
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Search for text in the body of the displayed message"
-msgstr "Buscar texto no corpo da mensaxe mostrada"
-
-#: ../ui/evolution-mail-message.xml.h:87
-msgid "Select _All Text"
-msgstr "Seleccionar _todo o texto"
-
-#: ../ui/evolution-mail-message.xml.h:88
-msgid "Select all the text in a message"
-msgstr "Seleccionar todo o texto dunha mensaxe"
-
-#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
-msgid "Set up the page settings for your current printer"
-msgstr "Definir a configuraciÃ³n da pÃ¡xina para a impresora actual"
-
-#: ../ui/evolution-mail-message.xml.h:90
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Mostrar un cursor intermitente no corpo das mensaxes mostradas"
-
-#: ../ui/evolution-mail-message.xml.h:91
-msgid "Show messages with all email headers"
-msgstr "Mostrar as mensaxes con todas as cabeceiras de correo electrÃ³nico"
-
-#: ../ui/evolution-mail-message.xml.h:92
-msgid "Show the raw email source of the message"
-msgstr "Mostrar o cÃ³digo fonte da mensaxe"
-
-#: ../ui/evolution-mail-message.xml.h:93
-msgid "Undelete the selected messages"
-msgstr "Recuperar as mensaxes seleccionadas"
-
-#: ../ui/evolution-mail-message.xml.h:94
-msgid "Uni_mportant"
-msgstr "Non i_mportante"
-
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "Zoom _Out"
-msgstr "_Reducir"
-
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "_Attached"
-msgstr "_Anexada"
-
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "_Caret Mode"
-msgstr "Activar _cursor"
-
-#: ../ui/evolution-mail-message.xml.h:98
-msgid "_Clear Flag"
-msgstr "E_liminar marca"
-
-#: ../ui/evolution-mail-message.xml.h:101
-msgid "_Delete Message"
-msgstr "E_liminar mensaxe"
-
-#: ../ui/evolution-mail-message.xml.h:103
-msgid "_Find in Message..."
-msgstr "_Buscar na mensaxe..."
-
-#: ../ui/evolution-mail-message.xml.h:104
-msgid "_Flag Completed"
-msgstr "_Marcar como terminado"
-
-#: ../ui/evolution-mail-message.xml.h:106
-msgid "_Go To"
-msgstr "_Ir a"
-
-#: ../ui/evolution-mail-message.xml.h:107
-msgid "_Important"
-msgstr "_Importante"
-
-#: ../ui/evolution-mail-message.xml.h:108
-msgid "_Inline"
-msgstr "_En liÃ±a"
-
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Junk"
-msgstr "_Correo non desexado"
-
-#: ../ui/evolution-mail-message.xml.h:110
-msgid "_Load Images"
-msgstr "_Cargar imaxes"
-
-#: ../ui/evolution-mail-message.xml.h:112
-msgid "_Message Source"
-msgstr "Orixe da _mensaxe"
-
-#: ../ui/evolution-mail-message.xml.h:114
-msgid "_Next Message"
-msgstr "_Seguinte mensaxe"
-
-#: ../ui/evolution-mail-message.xml.h:115
-msgid "_Normal Size"
-msgstr "TamaÃ±o _normal"
-
-#: ../ui/evolution-mail-message.xml.h:116
-msgid "_Not Junk"
-msgstr "_Non Ã© correo non desexado"
-
-#: ../ui/evolution-mail-message.xml.h:117
-msgid "_Open in New Window"
-msgstr "_Abrir nunha xanela nova"
-
-#: ../ui/evolution-mail-message.xml.h:118
-msgid "_Previous Message"
-msgstr "_Mensaxe anterior"
-
-#: ../ui/evolution-mail-message.xml.h:120
-msgid "_Quoted"
-msgstr "_Citada"
-
-#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:122
-msgid "_Read"
-msgstr "_Lida"
-
-#: ../ui/evolution-mail-message.xml.h:124
-msgid "_Save Message..."
-msgstr "_Gardar mensaxe..."
-
-#: ../ui/evolution-mail-message.xml.h:125
-msgid "_Undelete Message"
-msgstr "_Recuperar a mensaxe"
-
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Unread"
-msgstr "_Non lida"
-
-#: ../ui/evolution-mail-message.xml.h:127
-msgid "_Zoom"
-msgstr "_Zoom"
-
-#: ../ui/evolution-mail-message.xml.h:128
-msgid "_Zoom In"
-msgstr "_Ampliar"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "Pechar"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
-msgid "Main toolbar"
-msgstr "Barra de ferramentas principal"
-
-#: ../ui/evolution-memos.xml.h:3
-msgid "Copy selected memo"
-msgstr "Copiar a nota seleccionada"
-
-#: ../ui/evolution-memos.xml.h:5
-msgid "Cut selected memo"
-msgstr "Cortar a nota seleccionada"
-
-#: ../ui/evolution-memos.xml.h:7
-msgid "Delete selected memos"
-msgstr "Eliminar as notas seleccionadas"
-
-#: ../ui/evolution-memos.xml.h:9
-msgid "Paste memo from the clipboard"
-msgstr "Colar nota dende o portapapeis"
-
-#: ../ui/evolution-memos.xml.h:10
-msgid "Previews the list of memos to be printed"
-msgstr "Previsualiza a lista de notas para imprimir"
-
-#: ../ui/evolution-memos.xml.h:13
-msgid "Print the list of memos"
-msgstr "Imprimir a lista de notas"
-
-#: ../ui/evolution-memos.xml.h:14
-msgid "View the selected memo"
-msgstr "Ver a nota seleccionada"
-
-#: ../ui/evolution-memos.xml.h:18
-msgid "_Open Memo"
-msgstr "_Abrir nota"
-
-#: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected tasks"
-msgstr "Copiar as tarefas seleccionadas"
-
-#: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected tasks"
-msgstr "Cortar as tarefas seleccionadas"
-
-#: ../ui/evolution-tasks.xml.h:7
-msgid "Delete completed tasks"
-msgstr "Eliminar as tarefas terminadas"
-
-#: ../ui/evolution-tasks.xml.h:8
-msgid "Delete selected tasks"
-msgstr "Eliminar as tarefas seleccionadas"
-
-#: ../ui/evolution-tasks.xml.h:9
-msgid "Mar_k as Complete"
-msgstr "Mar_car como terminada"
-
-#: ../ui/evolution-tasks.xml.h:10
-msgid "Mark selected tasks as complete"
-msgstr "Marcar as tarefas seleccionadas como terminadas"
-
-#: ../ui/evolution-tasks.xml.h:12
-msgid "Paste tasks from the clipboard"
-msgstr "Colar as tarefas dende o portapapeis"
-
-#: ../ui/evolution-tasks.xml.h:13
-msgid "Previews the list of tasks to be printed"
-msgstr "Previsualiza a lista de tarefas para imprimir"
-
-#: ../ui/evolution-tasks.xml.h:16
-msgid "Print the list of tasks"
-msgstr "Imprimir a lista de tarefas"
-
-#: ../ui/evolution-tasks.xml.h:18
-msgid "Show task preview window"
-msgstr "Mostrar a xanela de previsualizaciÃ³n de tarefa"
-
-#: ../ui/evolution-tasks.xml.h:19
-msgid "Task _Preview"
-msgstr "_Previsualizar tarefa"
-
-#: ../ui/evolution-tasks.xml.h:20
-msgid "View the selected task"
-msgstr "Ver a tarefa seleccionada"
-
-#: ../ui/evolution-tasks.xml.h:27
-msgid "_Open Task"
-msgstr "_Abrir tarefa"
-
-#: ../ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "Sobre o Evolution..."
-
-#: ../ui/evolution.xml.h:2
-msgid "Change Evolution's settings"
-msgstr "Modificar a configuraciÃ³n do Evolution"
-
-#: ../ui/evolution.xml.h:3
-msgid "Change the visibility of the toolbar"
-msgstr "Modificar a visibilidade da barra de ferramentas"
-
-#: ../ui/evolution.xml.h:5
-msgid "Create a new window displaying this folder"
-msgstr "Crear unha xanela nova ao mostrar este cartafol"
-
-#: ../ui/evolution.xml.h:6
-msgid "Display window buttons using the desktop toolbar setting"
-msgstr ""
-"Mostrar os botÃ³ns da xanela usando a configuraciÃ³n da barra de ferramentas "
-"do escritorio"
-
-#: ../ui/evolution.xml.h:7
-msgid "Display window buttons with icons and text"
-msgstr "Mostrar os botÃ³ns da xanela con iconas e texto"
-
-#: ../ui/evolution.xml.h:8
-msgid "Display window buttons with icons only"
-msgstr "Mostrar os botÃ³ns da xanela sÃ³ con iconas"
-
-#: ../ui/evolution.xml.h:9
-msgid "Display window buttons with text only"
-msgstr "Mostrar os botÃ³ns da xanela sÃ³ con texto"
-
-#: ../ui/evolution.xml.h:10
-msgid "Evolution _FAQ"
-msgstr "_FAQ do Evolution"
-
-#: ../ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "SaÃr do programa"
-
-#: ../ui/evolution.xml.h:12
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "Esquecer todos os contrasinais memorizados para pedilos de novo"
-
-#: ../ui/evolution.xml.h:13
-msgid "Hide window buttons"
-msgstr "Ocultar os botÃ³ns da xanela"
-
-#: ../ui/evolution.xml.h:14
-msgid "I_mport..."
-msgstr "I_mportar..."
-
-#: ../ui/evolution.xml.h:15
-msgid "Icons _and Text"
-msgstr "Iconas _e texto"
-
-#: ../ui/evolution.xml.h:16
-msgid "Import data from other programs"
-msgstr "Importar datos doutros programas"
-
-#: ../ui/evolution.xml.h:17
-msgid "Lay_out"
-msgstr "Disp_osiciÃ³n"
-
-#: ../ui/evolution.xml.h:19
-msgid "New _Window"
-msgstr "_Xanela nova"
-
-#: ../ui/evolution.xml.h:20
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "Abrir a pÃ¡xina web das Preguntas frecuentes (FAQ)"
-
-#: ../ui/evolution.xml.h:21
-msgid "Page Set_up..."
-msgstr "Config_uraciÃ³n da pÃ¡xina..."
-
-#: ../ui/evolution.xml.h:22
-msgid "Prefere_nces"
-msgstr "Prefere_ncias"
-
-#: ../ui/evolution.xml.h:23
-msgid "Send / Receive"
-msgstr "Enviar/Recibir"
-
-#: ../ui/evolution.xml.h:24
-msgid "Send / _Receive"
-msgstr "Enviar/_Recibir"
-
-#: ../ui/evolution.xml.h:25
-msgid "Send queued items and retrieve new items"
-msgstr "Enviar elementos da fila e obter elementos novos"
-
-#: ../ui/evolution.xml.h:26
-msgid "Set up Pilot configuration"
-msgstr "Definir a configuraciÃ³n do Pilot"
-
-#: ../ui/evolution.xml.h:28
-msgid "Show Side _Bar"
-msgstr "Mostrar _barra lateral"
-
-#: ../ui/evolution.xml.h:29
-msgid "Show _Status Bar"
-msgstr "Mostrar _barra de estado"
-
-#: ../ui/evolution.xml.h:30
-msgid "Show _Toolbar"
-msgstr "Mostrar barra de _ferramentas"
-
-#: ../ui/evolution.xml.h:31
-msgid "Show information about Evolution"
-msgstr "Mostrar informaciÃ³n sobre o Evolution"
-
-#: ../ui/evolution.xml.h:32
-msgid "Submit Bug Report"
-msgstr "Enviar un informe de erro"
-
-#: ../ui/evolution.xml.h:33
-msgid "Submit _Bug Report"
-msgstr "Enviar un _informe de erro"
-
-#: ../ui/evolution.xml.h:34
-msgid "Submit a bug report using Bug Buddy"
-msgstr "Enviar un informe de erro usando o Bug Buddy"
-
-#: ../ui/evolution.xml.h:35
-msgid "Toggle whether we are working offline."
-msgstr "Alternar entre se estamos traballando sen conexiÃ³n ou non."
-
-#: ../ui/evolution.xml.h:36
-msgid "Tool_bar Style"
-msgstr "Estilo da _barra de ferramentas"
-
-#: ../ui/evolution.xml.h:37
-msgid "View/Hide the Side Bar"
-msgstr "Ver/Ocultar a barra lateral"
-
-#: ../ui/evolution.xml.h:38
-msgid "View/Hide the Status Bar"
-msgstr "Ver/Ocultar a barra de estado"
-
-#: ../ui/evolution.xml.h:39
-msgid "Work _Offline"
-msgstr "Traballar s_en conexiÃ³n"
-
-#: ../ui/evolution.xml.h:40
-msgid "_About"
-msgstr "_Sobre"
-
-#: ../ui/evolution.xml.h:41
-msgid "_Close Window"
-msgstr "_Pechar xanela"
-
-#: ../ui/evolution.xml.h:44
-msgid "_Forget Passwords"
-msgstr "_Esquecer os contrasinais"
-
-#: ../ui/evolution.xml.h:45
-msgid "_Frequently Asked Questions"
-msgstr "Preguntas _frecuentes (FAQ)"
-
-#: ../ui/evolution.xml.h:47
-msgid "_Hide Buttons"
-msgstr "_Ocultar botÃ³ns"
-
-#: ../ui/evolution.xml.h:48
-msgid "_Icons Only"
-msgstr "SÃ³ _iconas"
-
-#: ../ui/evolution.xml.h:50
-msgid "_Quick Reference"
-msgstr "_Referencia rÃ¡pida"
-
-#: ../ui/evolution.xml.h:51
-msgid "_Quit"
-msgstr "_SaÃr"
-
-#: ../ui/evolution.xml.h:52
-msgid "_Switcher Appearance"
-msgstr "Aparencia do _selector"
-
-#: ../ui/evolution.xml.h:53
-msgid "_Synchronization Options..."
-msgstr "OpciÃ³ns de _sincronizaciÃ³n..."
-
-#: ../ui/evolution.xml.h:54
-msgid "_Text Only"
-msgstr "SÃ³ _texto"
-
-#: ../ui/evolution.xml.h:56
-msgid "_Window"
-msgstr "_Xanela"
-
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Por _empresa"
@@ -22115,31 +21208,27 @@ msgid "With _Status"
 msgstr "Con e_stado"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-msgid "<b>Time Zones</b>"
-msgstr "<b>Fusos horarios</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "<b>_Selection</b>"
-msgstr "<b>_SelecciÃ³n</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid "Select a Time Zone"
 msgstr "Seleccionar un fuso horario"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
+msgid "Time Zones"
+msgstr "_Fuso horario"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
 msgid "Timezone drop-down combination box"
 msgstr "Caixa de combinaciÃ³n despregÃ¡bel para o fuso horario"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -22149,30 +21238,32 @@ msgstr ""
 "fuso horario.\n"
 "Use o botÃ³n dereito para reducir."
 
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "Modo de selecciÃ³n"
+
 #: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "ColecciÃ³n"
 
-#: ../widgets/menus/gal-define-views-dialog.c:356
-#: ../widgets/menus/gal-define-views.glade.h:4
+#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Definir visualizaciÃ³ns para %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:364
-#: ../widgets/menus/gal-define-views-dialog.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:337
 msgid "Define Views"
 msgstr "Definir visualizaciÃ³ns"
 
-#: ../widgets/menus/gal-define-views.glade.h:2
+#: ../widgets/menus/gal-define-views.ui.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
 msgstr "Definir visualizaciÃ³ns para \"%s\""
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-scrolled.c:215
-#: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "TÃ¡boa"
 
@@ -22180,130 +21271,57 @@ msgstr "TÃ¡boa"
 msgid "Instance"
 msgstr "Instancia"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "Gardar visualizaciÃ³n actual"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
 msgstr "_Crear visualizaciÃ³n nova"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
 msgid "_Replace existing view"
 msgstr "_SubstituÃr visualizaciÃ³n existente"
 
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:580
-#: ../widgets/menus/gal-view-menus.c:365
-msgid "Custom View"
-msgstr "VisualizaciÃ³n personalizada"
-
-#: ../widgets/menus/gal-view-instance.c:581
-msgid "Save Custom View"
-msgstr "Gardar visualizaciÃ³n personalizada"
-
-#: ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:388
-msgid "Define Views..."
-msgstr "Definir visualizaciÃ³ns..."
-
-#: ../widgets/menus/gal-view-menus.c:304
-msgid "C_urrent View"
-msgstr "VisualizaciÃ³n act_ual"
-
-#: ../widgets/menus/gal-view-menus.c:327
-#, c-format
-msgid "Select View: %s"
-msgstr "Seleccionar visualizaciÃ³n: %s"
-
-#: ../widgets/menus/gal-view-menus.c:370
-msgid "Current view is a customized view"
-msgstr "A visualizaciÃ³n actual Ã© unha visualizaciÃ³n personalizada"
-
-#: ../widgets/menus/gal-view-menus.c:374
-msgid "Save Custom View..."
-msgstr "Gardar visualizaciÃ³n personalizada..."
-
-#: ../widgets/menus/gal-view-menus.c:379
-msgid "Save current custom view"
-msgstr "Gardar a visualizaciÃ³n personalizada actual"
-
-#: ../widgets/menus/gal-view-menus.c:393
-msgid "Create or edit views"
-msgstr "Crear ou editar visualizaciÃ³ns"
-
-#: ../widgets/menus/gal-view-new-dialog.c:68
+#: ../widgets/menus/gal-view-new-dialog.c:67
 msgid "Factory"
 msgstr "FactorÃa"
 
-#: ../widgets/menus/gal-view-new-dialog.c:103
+#: ../widgets/menus/gal-view-new-dialog.c:98
 msgid "Define New View"
 msgstr "Definir visualizaciÃ³ns novas"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.ui.h:1
 msgid "Name of new view:"
 msgstr "Nome da visualizaciÃ³n nova:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.ui.h:2
 msgid "Type of View"
 msgstr "Tipo de visualizaciÃ³n"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of view:"
 msgstr "Tipo de visualizaciÃ³n:"
 
-# (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../widgets/misc/e-attachment.c:990
-msgid "Attached message"
-msgstr "Mensaxe anexa"
-
-#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
-#: ../widgets/misc/e-attachment-store.c:636
-msgid "attachment.dat"
-msgstr "attachment.dat"
-
-#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
-msgid "A load operation is already in progress"
-msgstr "Xa se estÃ¡ a executar unha operaciÃ³n de cargado"
-
-#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
-msgid "A save operation is already in progress"
-msgstr "Xa se estÃ¡ a executar unha operaciÃ³n de gardado"
-
-#: ../widgets/misc/e-attachment.c:1923
-#, c-format
-msgid "Could not load '%s'"
-msgstr "Non se puido cargar '%s'"
-
-#: ../widgets/misc/e-attachment.c:1926
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Non se puido cargar o anexo"
-
-#: ../widgets/misc/e-attachment.c:2190
-#, c-format
-msgid "Could not open '%s'"
-msgstr "Non se puido abrir '%s'"
+#: ../widgets/misc/e-account-manager.c:348
+msgid "De_fault"
+msgstr "Pre_determinado"
 
-#: ../widgets/misc/e-attachment.c:2193
-#, c-format
-msgid "Could not open the attachment"
-msgstr "Non se puido abrir o anexo"
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "Nome da conta"
 
-#: ../widgets/misc/e-attachment.c:2635
-msgid "Attachment contents not loaded"
-msgstr "Os contidos dos anexos non foron cargados"
+#: ../widgets/misc/e-account-tree-view.c:255
+msgid "Protocol"
+msgstr "Protocolo"
 
-#: ../widgets/misc/e-attachment.c:2712
-#, c-format
-msgid "Could not save '%s'"
-msgstr "Non se puido gardar '%s'"
+#: ../widgets/misc/e-action-combo-box.c:388
+msgid "Action"
+msgstr "_AcciÃ³ns"
 
-#: ../widgets/misc/e-attachment.c:2715
-#, c-format
-msgid "Could not save the attachment"
-msgstr "Non se puido gardar o anexo"
+#: ../widgets/misc/e-action-combo-box.c:389
+msgid "A GtkRadioAction"
+msgstr "Un GtkRadioAction"
 
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
@@ -22317,15 +21335,24 @@ msgstr "Nome do _ficheiro:"
 msgid "MIME Type:"
 msgstr "Tipo MIME:"
 
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:550
+msgid "_Suggest automatic display of attachment"
+msgstr "_Suxerir mostrar o anexo automaticamente"
+
 #: ../widgets/misc/e-attachment-handler-image.c:95
 msgid "Could not set as background"
-msgstr "Non se puido definir como fondo"
+msgstr "Non foi posÃbel definir como fondo"
+
+#: ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "Definir como _fondo"
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:87
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
-msgstr[0] "Non se puido enviar o anexo"
-msgstr[1] "Non se puideron enviar os anexos"
+msgstr[0] "Non foi posÃbel enviar o anexo"
+msgstr[1] "Non foi posÃbel enviar os anexos"
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:129
 msgid "_Send To..."
@@ -22346,48 +21373,121 @@ msgid "Saving"
 msgstr "Gargando"
 
 #: ../widgets/misc/e-attachment-paned.c:87
-msgid "Hide _Attachment Bar"
+msgid "Hide Attachment _Bar"
 msgstr "Ocultar a _barra de anexos"
 
 #: ../widgets/misc/e-attachment-paned.c:89
-#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show Attachment _Bar"
+msgstr "Mostrar a _barra de anexos"
+
+#: ../widgets/misc/e-attachment-paned.c:631
 msgid "Show _Attachment Bar"
 msgstr "Mostrar a _barra de anexos"
 
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "Engadir anexo"
 
-#: ../widgets/misc/e-attachment-store.c:544
+#: ../widgets/misc/e-attachment-store.c:541
 msgid "A_ttach"
 msgstr "A_nexar"
 
-#: ../widgets/misc/e-attachment-store.c:607
+#: ../widgets/misc/e-attachment-store.c:604
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Gardar anexo"
 msgstr[1] "Gardar anexos"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment-store.c:633
+#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2317
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../widgets/misc/e-attachment-view.c:299
 msgid "S_ave All"
 msgstr "G_ardar todos"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:325
 msgid "A_dd Attachment..."
 msgstr "_Engadir anexo..."
 
-#: ../widgets/misc/e-attachment-view.c:643
+#: ../widgets/misc/e-attachment-view.c:349
+msgid "_Hide"
+msgstr "_Ocultar"
+
+#: ../widgets/misc/e-attachment-view.c:356
+msgid "_View Inline"
+msgstr "_Ver en liÃ±a"
+
+#: ../widgets/misc/e-attachment-view.c:638
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Abrir con \"%s\""
 
-#: ../widgets/misc/e-attachment-view.c:646
+#: ../widgets/misc/e-attachment-view.c:641
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Abrir os anexos en %s"
 
+# (pofilter) variables: (u'translation contains variables not in original: %d',)
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../widgets/misc/e-attachment.c:1002
+msgid "Attached message"
+msgstr "Mensaxe anexa"
+
+#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2619
+msgid "A load operation is already in progress"
+msgstr "Xa se estÃ¡ a executar unha operaciÃ³n de cargado"
+
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2627
+msgid "A save operation is already in progress"
+msgstr "Xa se estÃ¡ a executar unha operaciÃ³n de gardado"
+
+#: ../widgets/misc/e-attachment.c:1920
+#, c-format
+msgid "Could not load '%s'"
+msgstr "Non foi posÃbel cargar '%s'"
+
+#: ../widgets/misc/e-attachment.c:1923
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Non foi posÃbel cargar o anexo"
+
+#: ../widgets/misc/e-attachment.c:2197
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Non foi posÃbel abrir '%s'"
+
+#: ../widgets/misc/e-attachment.c:2200
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Non foi posÃbel abrir o anexo"
+
+#: ../widgets/misc/e-attachment.c:2635
+msgid "Attachment contents not loaded"
+msgstr "Os contidos dos anexos non foron cargados"
+
+#: ../widgets/misc/e-attachment.c:2711
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Non foi posÃbel gardar '%s'"
+
+#: ../widgets/misc/e-attachment.c:2714
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Non foi posÃbel gardar o anexo"
+
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
+#: ../widgets/misc/e-buffer-tagger.c:359
+msgid "Ctrl-click to open a link"
+msgstr "Prema para abrir %s"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1253
+#: ../widgets/misc/e-calendar-item.c:1249
 msgid "%B %Y"
 msgstr "%B de %Y"
 
@@ -22395,58 +21495,58 @@ msgstr "%B de %Y"
 msgid "Month Calendar"
 msgstr "Calendario mensual"
 
-#: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
-#: ../widgets/text/e-text.c:3633
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3387
+#: ../widgets/text/e-text.c:3388
 msgid "Fill color"
 msgstr "Encher con cor"
 
-#: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:462
-#: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
-#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
-#: ../widgets/text/e-text.c:3647
+#: ../widgets/misc/e-canvas-background.c:474
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482 ../widgets/text/e-text.c:3394
+#: ../widgets/text/e-text.c:3395 ../widgets/text/e-text.c:3401
+#: ../widgets/text/e-text.c:3402
 msgid "GDK fill color"
 msgstr "Encher con cor GDK"
 
-#: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
-#: ../widgets/text/e-text.c:3654
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489 ../widgets/text/e-text.c:3408
+#: ../widgets/text/e-text.c:3409
 msgid "Fill stipple"
 msgstr "Encher con liÃ±a de puntos"
 
-#: ../widgets/misc/e-canvas-background.c:482
-#: ../widgets/misc/e-canvas-background.c:483
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:489
-#: ../widgets/misc/e-canvas-background.c:490
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:496
-#: ../widgets/misc/e-canvas-background.c:497
+#: ../widgets/misc/e-canvas-background.c:509
+#: ../widgets/misc/e-canvas-background.c:510
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:503
-#: ../widgets/misc/e-canvas-background.c:504
+#: ../widgets/misc/e-canvas-background.c:516
+#: ../widgets/misc/e-canvas-background.c:517
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
-#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/misc/e-canvas-vbox.c:89
+#: ../widgets/table/e-table-group-container.c:1009
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3062
+#: ../widgets/table/e-table-item.c:2872
 msgid "Minimum width"
 msgstr "Largura mÃnima"
 
-#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
-#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/misc/e-canvas-vbox.c:90
+#: ../widgets/table/e-table-group-container.c:1010
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3063
+#: ../widgets/table/e-table-item.c:2873
 msgid "Minimum Width"
 msgstr "Largura mÃnima"
 
@@ -22454,198 +21554,162 @@ msgstr "Largura mÃnima"
 msgid "Spacing"
 msgstr "Espazamento"
 
-#: ../widgets/misc/e-cell-date-edit.c:296
-msgid "Now"
-msgstr "Agora"
-
-#: ../widgets/misc/e-cell-date-edit.c:846
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "A data ten que ser introducida no formato: %s"
-
-#: ../widgets/misc/e-cell-percent.c:76
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "A porcentaxe ten que ser un valor entre 0 e 100, incluÃdos"
-
-#: ../widgets/misc/e-charset-picker.c:57
-msgid "Arabic"
-msgstr "Ã?rabe"
-
-#: ../widgets/misc/e-charset-picker.c:58
-msgid "Baltic"
-msgstr "BÃ¡ltico"
-
-#: ../widgets/misc/e-charset-picker.c:59
-msgid "Central European"
-msgstr "Centroeuropeo"
-
-#: ../widgets/misc/e-charset-picker.c:60
-msgid "Chinese"
-msgstr "ChinÃ©s"
-
-#: ../widgets/misc/e-charset-picker.c:61
-msgid "Cyrillic"
-msgstr "CirÃlico"
-
-#: ../widgets/misc/e-charset-picker.c:62
-msgid "Greek"
-msgstr "Grego"
-
-#: ../widgets/misc/e-charset-picker.c:63
-msgid "Hebrew"
-msgstr "Hebreo"
-
-#: ../widgets/misc/e-charset-picker.c:64
-msgid "Japanese"
-msgstr "XaponÃ©s"
-
-#: ../widgets/misc/e-charset-picker.c:65
-msgid "Korean"
-msgstr "Coreano"
-
-#: ../widgets/misc/e-charset-picker.c:66
-msgid "Thai"
-msgstr "TailandÃ©s"
-
-#: ../widgets/misc/e-charset-picker.c:67
-msgid "Turkish"
-msgstr "Turco"
-
-#: ../widgets/misc/e-charset-picker.c:68
-msgid "Unicode"
-msgstr "Unicode"
-
-#: ../widgets/misc/e-charset-picker.c:69
-msgid "Western European"
-msgstr "Europeo occidental"
-
-#: ../widgets/misc/e-charset-picker.c:70
-msgid "Western European, New"
-msgstr "Europeo occidental, novo"
-
-#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
-#: ../widgets/misc/e-charset-picker.c:91
-msgid "Traditional"
-msgstr "Tradicional"
-
-#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-msgid "Simplified"
-msgstr "Simplificado"
-
-#: ../widgets/misc/e-charset-picker.c:98
-msgid "Ukrainian"
-msgstr "UcraÃno"
-
-#: ../widgets/misc/e-charset-picker.c:101
-msgid "Visual"
-msgstr "Visual"
-
-#: ../widgets/misc/e-charset-picker.c:170
-#, c-format
-msgid "Unknown character set: %s"
-msgstr "Conxunto de caracteres descoÃ±ecido: %s"
-
-#: ../widgets/misc/e-charset-picker.c:215
+#: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "CodificaciÃ³n de caracteres"
 
-#: ../widgets/misc/e-charset-picker.c:230
+#: ../widgets/misc/e-charset-combo-box.c:117
 msgid "Enter the character set to use"
 msgstr "Introduza o conxunto de caracteres que se vai usar"
 
-#: ../widgets/misc/e-charset-picker.c:337
+#: ../widgets/misc/e-charset-combo-box.c:336
 msgid "Other..."
 msgstr "Outro..."
 
-#: ../widgets/misc/e-charset-picker.c:599
-msgid "Ch_aracter Encoding"
-msgstr "CodificaciÃ³n de car_acteres"
-
-#: ../widgets/misc/e-dateedit.c:295
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "Data e hora"
 
-#: ../widgets/misc/e-dateedit.c:315
+#: ../widgets/misc/e-dateedit.c:544
 msgid "Text entry to input date"
 msgstr "Entrada de texto para introducir a data"
 
-#: ../widgets/misc/e-dateedit.c:337
+#: ../widgets/misc/e-dateedit.c:566
 msgid "Click this button to show a calendar"
 msgstr "Prema este botÃ³n para mostrar un calendario"
 
-#: ../widgets/misc/e-dateedit.c:379
+#: ../widgets/misc/e-dateedit.c:612
 msgid "Drop-down combination box to select time"
 msgstr "Caixa de combinaciÃ³n despregÃ¡bel para seleccionar a hora"
 
-#: ../widgets/misc/e-dateedit.c:455
+#: ../widgets/misc/e-dateedit.c:684
 msgid "No_w"
 msgstr "Ago_ra"
 
-#: ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-dateedit.c:690
 msgid "_Today"
 msgstr "_Hoxe"
 
-#: ../widgets/misc/e-dateedit.c:1583
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../widgets/misc/e-dateedit.c:698
+msgid "_None"
+msgstr "_NingÃºn"
+
+#. Translators: "None" for date field of a date edit, shown when
+#. * there is no date set.
+#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1935
+msgctxt "date"
+msgid "None"
+msgstr "NingÃºn"
+
+#: ../widgets/misc/e-dateedit.c:1830
 msgid "Invalid Date Value"
 msgstr "O valor da data non Ã© vÃ¡lido"
 
-#: ../widgets/misc/e-dateedit.c:1613
+#: ../widgets/misc/e-dateedit.c:1874
 msgid "Invalid Time Value"
 msgstr "O valor da hora non Ã© vÃ¡lido"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:123 ../widgets/misc/e-filter-bar.c:178
-#: ../widgets/misc/e-filter-bar.c:306 ../widgets/misc/e-filter-bar.c:737
-msgid "Advanced Search"
-msgstr "Busca avanzada"
+#: ../widgets/misc/e-import-assistant.c:238
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr ""
+"Escolla o ficheiro que quere importar ao Evolution e seleccione que tipo de "
+"ficheiro Ã© na listaxe."
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:229
-msgid "Save Search"
-msgstr "Gardar a busca"
+#: ../widgets/misc/e-import-assistant.c:255
+msgid "F_ilename:"
+msgstr "Nome do f_icheiro:"
 
-#: ../widgets/misc/e-filter-bar.c:266
-msgid "_Searches"
-msgstr "_Buscas"
+#: ../widgets/misc/e-import-assistant.c:265
+msgid "Select a file"
+msgstr "Seleccionar un ficheiro"
 
-#: ../widgets/misc/e-filter-bar.c:268
-msgid "Searches"
-msgstr "Buscas"
+#: ../widgets/misc/e-import-assistant.c:279
+#: ../widgets/misc/e-import-assistant.c:455
+msgid "File _type:"
+msgstr "_Tipo de ficheiro:"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
-msgid "_Save Search..."
-msgstr "_Gardar a busca..."
+#: ../widgets/misc/e-import-assistant.c:322
+msgid "Choose the destination for this import"
+msgstr "Escolla o destino desta importaciÃ³n"
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
-msgid "_Edit Saved Searches..."
-msgstr "_Editar as buscas gardadas..."
+#: ../widgets/misc/e-import-assistant.c:347
+msgid "Choose the type of importer to run:"
+msgstr "Seleccione o tipo de importador que se executarÃ¡:"
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
-msgid "_Advanced Search..."
-msgstr "Busca _avanzada..."
+#: ../widgets/misc/e-import-assistant.c:355
+msgid "Import data and settings from _older programs"
+msgstr "Importar datos e configuraciÃ³n de programas _antigos"
 
-#: ../widgets/misc/e-filter-bar.h:103
-msgid "All Accounts"
-msgstr "Todas as contas"
+#: ../widgets/misc/e-import-assistant.c:363
+msgid "Import a _single file"
+msgstr "Importar un Ãºni_co ficheiro"
 
-#: ../widgets/misc/e-filter-bar.h:104
-msgid "Current Account"
-msgstr "Conta actual"
+#: ../widgets/misc/e-import-assistant.c:439
+msgid "Select what type of file you want to import from the list."
+msgstr "Seleccione o tipo de ficheiro que quere importar desde a lista."
 
-#: ../widgets/misc/e-filter-bar.h:105
-msgid "Current Folder"
-msgstr "Cartafol actual"
+#: ../widgets/misc/e-import-assistant.c:516
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"O Evolution verificou a configuraciÃ³n para importar\n"
+"dos seguintes aplicativos: Pine, Netscape, Elm, iCalendar. Non se\n"
+"localizou ningunha configuraciÃ³n que se poida importar. Se\n"
+"quere tentalo de novo, prema o botÃ³n \"AtrÃ¡s\"."
+
+#: ../widgets/misc/e-import-assistant.c:1187
+#: ../widgets/misc/e-import-assistant.c:1214
+msgid "Evolution Import Assistant"
+msgstr "Asistente de importaciÃ³n do Evolution"
+
+#: ../widgets/misc/e-import-assistant.c:1196
+#: ../widgets/misc/e-import-assistant.c:1248
+msgid "Import Location"
+msgstr "Importar localizaciÃ³n"
+
+#: ../widgets/misc/e-import-assistant.c:1207
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"Benvido ao Asistente de ImportaciÃ³n do Evolution.\n"
+"Este asistente guiarao no proceso de importaciÃ³n de\n"
+"ficheiros externos ao Evolution."
+
+#: ../widgets/misc/e-import-assistant.c:1223
+msgid "Importer Type"
+msgstr "Tipo de importador"
+
+#: ../widgets/misc/e-import-assistant.c:1232
+msgid "Select Information to Import"
+msgstr "Seleccione a informaciÃ³n para importar"
+
+#: ../widgets/misc/e-import-assistant.c:1240
+msgid "Select a File"
+msgstr "Seleccionar un ficheiro"
+
+#: ../widgets/misc/e-import-assistant.c:1255
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr ""
+"Prema en \"Importar\" para comezar a importar o ficheiro ao Evolution. "
 
-#: ../widgets/misc/e-image-chooser.c:168
-msgid "Choose Image"
-msgstr "Seleccione unha imaxe"
+#: ../widgets/misc/e-import-assistant.c:1261
+#: ../widgets/misc/e-import-assistant.c:1271
+msgid "Import Data"
+msgstr "Importante"
 
-#: ../widgets/misc/e-map.c:605
+#: ../widgets/misc/e-map.c:621
 msgid "World Map"
 msgstr "Mapa do mundo"
 
-#: ../widgets/misc/e-map.c:607
+#: ../widgets/misc/e-map.c:623
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -22654,85 +21718,120 @@ msgstr ""
 "horario. Os usuarios de teclado deberÃan seleccionar en vez diso o fuso "
 "horario na caixa de combinaciÃ³n despregÃ¡bel de abaixo."
 
-#: ../widgets/misc/e-online-button.c:106
-msgid "Online"
-msgstr "Conectado"
+#: ../widgets/misc/e-online-button.c:27
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr ""
+"O Evolution estÃ¡ actualmente conectado.\n"
+"Prema neste botÃ³n para traballar desconectado."
+
+#: ../widgets/misc/e-online-button.c:30
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr ""
+"O Evolution estÃ¡ actualmente desconectado.\n"
+"Prema neste botÃ³n para traballar conectado."
 
-#: ../widgets/misc/e-online-button.c:107
+#: ../widgets/misc/e-online-button.c:33
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr ""
+"O Evolution estÃ¡ actualmente desconectado.\n"
+"Prema neste botÃ³n para traballar conectado."
+
+#: ../widgets/misc/e-online-button.c:131
 msgid "The button state is online"
 msgstr "O estado do botÃ³n Ã© conectado"
 
-#: ../widgets/misc/e-pilot-settings.c:99
+#: ../widgets/misc/e-paned.c:306
+msgid "Horizontal Position"
+msgstr "PosiciÃ³n horizontal do panel"
+
+#: ../widgets/misc/e-paned.c:307
+msgid "Pane position when oriented horizontally"
+msgstr "PosiciÃ³n do panel ao orientalo horizontalmente"
+
+#: ../widgets/misc/e-paned.c:318
+msgid "Vertical Position"
+msgstr "PosiciÃ³n vertical do panel"
+
+#: ../widgets/misc/e-paned.c:319
+msgid "Pane position when oriented vertically"
+msgstr "PosiciÃ³n do panel ao orientalo verticalmente"
+
+#: ../widgets/misc/e-paned.c:330
+msgid "Proportion"
+msgstr "_Propiedades"
+
+#: ../widgets/misc/e-paned.c:331
+msgid "Proportion of the 2nd pane size"
+msgstr "ProporciÃ³n do tamaÃ±o do segundo panel"
+
+#: ../widgets/misc/e-paned.c:342
+msgid "Fixed Resize"
+msgstr "_Redimensionar"
+
+#: ../widgets/misc/e-paned.c:343
+msgid "Keep the 2nd pane fixed during resize"
+msgstr "Manter o segundo panel fixo durante o redimensionado"
+
+#: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "Sincronizar con:"
 
-#: ../widgets/misc/e-pilot-settings.c:107
+#: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync Private Records:"
 msgstr "Sincronizar rexistros privados:"
 
-#: ../widgets/misc/e-pilot-settings.c:116
+#: ../widgets/misc/e-pilot-settings.c:112
 msgid "Sync Categories:"
 msgstr "Sincronizar categorÃas:"
 
-#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
-msgid "Empty message"
-msgstr "Mensaxe baleira"
-
-#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
-msgid "Reflow model"
-msgstr "Modelo de refluxo"
+#: ../widgets/misc/e-preferences-window.c:218
+msgid "Evolution Preferences"
+msgstr "Preferencias do Evolution"
 
-#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
-msgid "Column width"
-msgstr "Largura de columna"
+#: ../widgets/misc/e-search-bar.c:77
+#, c-format
+msgid "Matches: %d"
+msgstr "Equivalencias: %d"
 
-#: ../widgets/misc/e-search-bar.c:92 ../widgets/misc/e-search-bar.c:359
-#: ../widgets/misc/e-search-bar.c:503 ../widgets/misc/e-search-bar.c:505
-#: ../widgets/misc/e-search-bar.c:1021
-msgid "Search"
-msgstr "Buscar"
+#: ../widgets/misc/e-search-bar.c:554
+msgid "Close the find bar"
+msgstr "Pechar esta barra de bÃºsqueda"
 
-#: ../widgets/misc/e-search-bar.c:359 ../widgets/misc/e-search-bar.c:503
-#: ../widgets/misc/e-search-bar.c:505
-msgid "Click here to change the search type"
-msgstr "Prema aquÃ para cambiar o tipo de busca"
+#: ../widgets/misc/e-search-bar.c:562
+msgid "Fin_d:"
+msgstr "_Buscar:"
 
-#: ../widgets/misc/e-search-bar.c:637
-msgid "_Search"
-msgstr "_Buscar"
+#: ../widgets/misc/e-search-bar.c:574
+msgid "Clear the search"
+msgstr "Limpar bÃºsqueda"
 
-#: ../widgets/misc/e-search-bar.c:643
-msgid "_Find Now"
-msgstr "_Buscar agora"
+#: ../widgets/misc/e-search-bar.c:597
+msgid "_Previous"
+msgstr "_Anterior"
 
-#: ../widgets/misc/e-search-bar.c:644
-msgid "_Clear"
-msgstr "_Limpar"
+#: ../widgets/misc/e-search-bar.c:603
+msgid "Find the previous occurrence of the phrase"
+msgstr "Buscar a anterior apariciÃ³n na frase"
 
-#: ../widgets/misc/e-search-bar.c:899
-msgid "Item ID"
-msgstr "ID de elemento"
+#: ../widgets/misc/e-search-bar.c:613
+msgid "_Next"
+msgstr "_Seguinte"
 
-#: ../widgets/misc/e-search-bar.c:906 ../widgets/text/e-text.c:3555
-#: ../widgets/text/e-text.c:3556
-msgid "Text"
-msgstr "Texto"
+#: ../widgets/misc/e-search-bar.c:619
+msgid "Find the next occurrence of the phrase"
+msgstr "Buscar a seguinte apariciÃ³n na frase"
 
-#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
-#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1053
-msgid "Sho_w: "
-msgstr "Mos_trar: "
+#: ../widgets/misc/e-search-bar.c:629
+msgid "Mat_ch case"
+msgstr "_Coincidir maiÃºsculas e minÃºsculas"
 
-#: ../widgets/misc/e-search-bar.c:1072
-msgid "Sear_ch: "
-msgstr "Busca_r: "
+#: ../widgets/misc/e-search-bar.c:657
+msgid "Reached bottom of page, continued from top"
+msgstr "Atinxiuse o final da pÃ¡xina, continÃºase pola parte superior"
 
-#. To Translators: The " in " label is part of the Quick Search Bar, example:
-#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1088
-msgid " i_n "
-msgstr " e_n "
+#: ../widgets/misc/e-search-bar.c:679
+msgid "Reached top of page, continued from bottom"
+msgstr "Atinxiuse a parte superior da pÃ¡xina, continÃºase pola parte inferior"
 
 #: ../widgets/misc/e-selection-model-array.c:593
 #: ../widgets/table/e-tree-selection-model.c:803
@@ -22744,320 +21843,414 @@ msgstr "Fila de cursor"
 msgid "Cursor Column"
 msgstr "Columna de cursor"
 
-#: ../widgets/misc/e-selection-model.c:208
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Sorter"
 msgstr "Clasificador"
 
-#: ../widgets/misc/e-selection-model.c:215
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Selection Mode"
 msgstr "Modo de selecciÃ³n"
 
-#: ../widgets/misc/e-selection-model.c:223
+#: ../widgets/misc/e-selection-model.c:231
 msgid "Cursor Mode"
 msgstr "Modo do cursor"
 
-#: ../widgets/misc/e-send-options.c:519
+#: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "Ao e_liminar:"
 
-#: ../widgets/misc/e-send-options.glade.h:1
-msgid "<b>Delivery Options</b>"
-msgstr "<b>OpciÃ³ns de entrega</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:2
-msgid "<b>Replies</b>"
-msgstr "<b>Respostas</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:3
-msgid "<b>Return Notification</b>"
-msgstr "<b>Devolver notificaciÃ³n</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:4
-msgid "<b>Status Tracking</b>"
-msgstr "<b>Seguimento de estado</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:5
+#: ../widgets/misc/e-send-options.ui.h:1
 msgid "A_uto-delete sent item"
 msgstr "E_liminar automaticamente o elemento enviado"
 
-#: ../widgets/misc/e-send-options.glade.h:6
+#: ../widgets/misc/e-send-options.ui.h:3
 msgid "Creat_e a sent item to track information"
 msgstr "Cr_ear un elemento enviado para o seguimento da informaciÃ³n"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.ui.h:4
 msgid "Deli_vered and opened"
 msgstr "_Entregado e aberto"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.ui.h:5
+msgid "Delivery Options"
+msgstr "<b>OpciÃ³ns de entrega</b>"
+
+#: ../widgets/misc/e-send-options.ui.h:6
+msgid "For Your Eyes Only"
+msgstr "SÃ³ para os seus ollos"
+
+#: ../widgets/misc/e-send-options.ui.h:7
 msgid "Gene_ral Options"
 msgstr "OpciÃ³ns _xerais"
 
-#: ../widgets/misc/e-send-options.glade.h:9
-msgid ""
-"None\n"
-"Mail Receipt"
+#: ../widgets/misc/e-send-options.ui.h:10
+msgid "Mail Receipt"
 msgstr ""
 "Ningunha\n"
 "NotificaciÃ³n de recepciÃ³n de correo"
 
-#: ../widgets/misc/e-send-options.glade.h:11
-msgid ""
-"Normal\n"
-"Proprietary\n"
-"Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
-msgstr ""
-"Normal\n"
-"Privado\n"
-"Confidencial\n"
-"Secreto\n"
-"Alto secreto\n"
-"SÃ³ para ti"
+#: ../widgets/misc/e-send-options.ui.h:14
+msgid "Proprietary"
+msgstr "Prioridade"
 
-#: ../widgets/misc/e-send-options.glade.h:17
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "R_eply requested"
 msgstr "R_esposta requirida"
 
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.ui.h:17
+msgid "Return Notification"
+msgstr "<b>Devolver notificaciÃ³n</b>"
+
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Sta_tus Tracking"
 msgstr "Seguimento de es_tado"
 
-#: ../widgets/misc/e-send-options.glade.h:20
-msgid ""
-"Undefined\n"
-"High\n"
-"Standard\n"
-"Low"
-msgstr ""
-"Sen definir\n"
-"Alto\n"
-"EstÃ¡ndar\n"
-"Baixo"
+#: ../widgets/misc/e-send-options.ui.h:21
+msgid "Standard"
+msgstr "Tipo de letra es_tÃ¡ndar:"
+
+#: ../widgets/misc/e-send-options.ui.h:22
+msgid "Status Tracking"
+msgstr "Seguimento de es_tado"
 
-#: ../widgets/misc/e-send-options.glade.h:24
+#: ../widgets/misc/e-send-options.ui.h:23
+msgid "Top Secret"
+msgstr "Alto secreto"
+
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "When acce_pted:"
 msgstr "Ao ace_ptar:"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "When co_mpleted:"
 msgstr "Ao co_mpletar:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "When decli_ned:"
 msgstr "Ao _rexeitar:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "Wi_thin"
 msgstr "Den_tro"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "_After:"
 msgstr "_Despois:"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "_All information"
 msgstr "_Toda a informaciÃ³n"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.ui.h:31
 msgid "_Classification:"
 msgstr "_ClasificaciÃ³n:"
 
-#. To translators: This means Delay the message delivery for some time
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Delay message delivery"
 msgstr "_Atrasar a entrega da mensaxe"
 
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delivered"
 msgstr "_Entregada"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Set expiration date"
 msgstr "_Definir a data de vencemento"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Until:"
 msgstr "_AtÃ©:"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
 msgstr "_Cando sexa conveniente"
 
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.ui.h:38
 msgid "_When opened:"
 msgstr "_Ao abrir:"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:251
-#, c-format
-msgid "%s (...)"
-msgstr "%s (...)"
+#: ../widgets/misc/e-signature-editor.c:133
+#: ../widgets/misc/e-signature-editor.c:549
+#: ../widgets/misc/e-signature-manager.c:349
+#: ../widgets/misc/e-signature-script-dialog.c:218
+msgid "Unnamed"
+msgstr "Sen nome"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
-#. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:257
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% terminada)"
+#: ../widgets/misc/e-signature-editor.c:210
+msgid "_Save and Close"
+msgstr "_Gardar e saÃr"
+
+#: ../widgets/misc/e-signature-editor.c:389
+msgid "Edit Signature"
+msgstr "Editar a sinatura"
+
+#: ../widgets/misc/e-signature-editor.c:404
+msgid "_Signature Name:"
+msgstr "Nome da _sinatura:"
+
+#: ../widgets/misc/e-signature-manager.c:294
+msgid "Add Signature Script"
+msgstr "Engadir script de sinatura"
+
+#: ../widgets/misc/e-signature-manager.c:359
+msgid "Edit Signature Script"
+msgstr "Editar a sinatura"
+
+#: ../widgets/misc/e-signature-manager.c:576
+msgid "Add _Script"
+msgstr "Engadir _script"
+
+#: ../widgets/misc/e-signature-script-dialog.c:266
+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 especifique usarase sÃ³ para os efectos de visualizaciÃ³n."
 
-#: ../widgets/misc/e-url-entry.c:103
+#: ../widgets/misc/e-signature-script-dialog.c:311
+msgid "S_cript:"
+msgstr "_Script:"
+
+#: ../widgets/misc/e-signature-script-dialog.c:342
+msgid "Script file must be executable."
+msgstr "O ficheiro de script debe existir e ser executÃ¡bel."
+
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "Prema aquÃ para ir ao URL"
 
+#: ../widgets/misc/e-web-view.c:348
+msgid "_Copy Link Location"
+msgstr "_Copiar a localizaciÃ³n da ligazÃ³n"
+
+#: ../widgets/misc/e-web-view.c:350
+msgid "Copy the link to the clipboard"
+msgstr "Copia obxectos no portapapeis."
+
+#: ../widgets/misc/e-web-view.c:358
+msgid "_Open Link in Browser"
+msgstr "_Abrir ligazÃ³n no navegador"
+
+#: ../widgets/misc/e-web-view.c:360
+msgid "Open the link in a web browser"
+msgstr "_Abrir ligazÃ³n no navegador"
+
+#: ../widgets/misc/e-web-view.c:368
+msgid "_Copy Email Address"
+msgstr "Copiar enderezo de _correo"
+
+#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+msgid "Select all text and images"
+msgstr "Seleccionar todo o texto dunha mensaxe"
+
+#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
+#: ../widgets/misc/e-web-view.c:756
+#, c-format
+msgid "Click to call %s"
+msgstr "Prema para chamar %s"
+
+#: ../widgets/misc/e-web-view.c:758
+msgid "Click to hide/unhide addresses"
+msgstr "Prema para ocultar ou mostrar os enderezos"
+
+#: ../widgets/misc/e-web-view.c:760
+#, c-format
+msgid "Click to open %s"
+msgstr "Prema para abrir %s"
+
+#: ../widgets/misc/ea-calendar-item.c:299
+#: ../widgets/misc/ea-calendar-item.c:308
+msgid "%d %B %Y"
+msgstr "%d de %B de %Y"
+
+#: ../widgets/misc/ea-calendar-item.c:311
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Calendario: desde %s atÃ© %s"
+
+#: ../widgets/misc/ea-calendar-item.c:347
+msgid "evolution calendar item"
+msgstr "elemento de calendario do Evolution"
+
 #: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "lista emerxente"
 
-#: ../widgets/table/e-cell-pixbuf.c:360
+#: ../widgets/table/e-cell-date-edit.c:303
+msgid "Now"
+msgstr "Agora"
+
+#. Translators: "None" as a label of a button to unset date in a date table cell
+#: ../widgets/table/e-cell-date-edit.c:320
+msgctxt "table-date"
+msgid "None"
+msgstr "NingÃºn"
+
+#: ../widgets/table/e-cell-date-edit.c:328
+msgid "OK"
+msgstr "Aceptar"
+
+#: ../widgets/table/e-cell-date-edit.c:862
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "A data ten que ser introducida no formato: %s"
+
+#: ../widgets/table/e-cell-percent.c:76
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "A porcentaxe ten que ser un valor entre 0 e 100, incluÃdos"
+
+#: ../widgets/table/e-cell-pixbuf.c:357
 msgid "Selected Column"
 msgstr "Columna seleccionada"
 
-#: ../widgets/table/e-cell-pixbuf.c:367
+#: ../widgets/table/e-cell-pixbuf.c:364
 msgid "Focused Column"
 msgstr "Columna enfocada"
 
-#: ../widgets/table/e-cell-pixbuf.c:374
+#: ../widgets/table/e-cell-pixbuf.c:371
 msgid "Unselected Column"
 msgstr "Columna non seleccionada"
 
-#: ../widgets/table/e-cell-text.c:1788
+#: ../widgets/table/e-cell-text.c:1627
 msgid "Strikeout Column"
 msgstr "Riscar columna"
 
-#: ../widgets/table/e-cell-text.c:1795
+#: ../widgets/table/e-cell-text.c:1634
 msgid "Underline Column"
 msgstr "SubliÃ±ar columna"
 
-#: ../widgets/table/e-cell-text.c:1802
+#: ../widgets/table/e-cell-text.c:1641
 msgid "Bold Column"
 msgstr "Columna en negra"
 
-#: ../widgets/table/e-cell-text.c:1809
+#: ../widgets/table/e-cell-text.c:1648
 msgid "Color Column"
 msgstr "Cor da columna"
 
-#: ../widgets/table/e-cell-text.c:1823
+#: ../widgets/table/e-cell-text.c:1662
 msgid "BG Color Column"
 msgstr "Cor de fondo da columna"
 
-#: ../widgets/table/e-table-config.c:152
+#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+msgid "click to add"
+msgstr "prema para engadir"
+
+#: ../widgets/table/e-table-config.c:150
 msgid "State"
 msgstr "Estado"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(Ascendente)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Descending)"
 msgstr "(Descendente)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:388
 msgid "Not sorted"
 msgstr "Sen ordenar"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:429
 msgid "No grouping"
 msgstr "Sen agrupar"
 
-#: ../widgets/table/e-table-config.c:642
-#: ../widgets/table/e-table-config.glade.h:11
+#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Mostrar os campos"
 
-#: ../widgets/table/e-table-config.c:663
+#: ../widgets/table/e-table-config.c:658
 msgid "Available Fields"
 msgstr "Campos dispoÃ±Ãbeis"
 
-#: ../widgets/table/e-table-config.glade.h:1
+#: ../widgets/table/e-table-config.ui.h:1
 msgid "A_vailable Fields:"
 msgstr "Campos _dispoÃ±Ãbeis:"
 
-#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-config.ui.h:2
+#: ../widgets/table/e-table-header-item.c:1637
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: ../widgets/table/e-table-config.glade.h:3
+#: ../widgets/table/e-table-config.ui.h:3
 msgid "Clear All"
 msgstr "Limpar todo"
 
-#: ../widgets/table/e-table-config.glade.h:4
+#: ../widgets/table/e-table-config.ui.h:4
 msgid "Clear _All"
 msgstr "Limp_ar todo"
 
-#: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-config.ui.h:5
+#: ../widgets/table/e-table-header-item.c:1637
 msgid "Descending"
 msgstr "Descendente"
 
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.ui.h:8
 msgid "Group Items By"
 msgstr "Agrupar os elementos por"
 
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.ui.h:9
 msgid "Move _Down"
 msgstr "Mover _abaixo"
 
-#: ../widgets/table/e-table-config.glade.h:10
+#: ../widgets/table/e-table-config.ui.h:10
 msgid "Move _Up"
 msgstr "Mover _arriba"
 
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.ui.h:12
 msgid "Show _field in View"
 msgstr "M_ostrar o campo na visualizaciÃ³n"
 
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.ui.h:13
 msgid "Show field i_n View"
 msgstr "Mos_trar o campo na visualizaciÃ³n"
 
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.ui.h:14
 msgid "Show field in _View"
 msgstr "Mostrar o campo na _visualizaciÃ³n"
 
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../widgets/table/e-table-config.ui.h:15
 msgid "Sort"
 msgstr "Ordenar"
 
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.ui.h:16
 msgid "Sort Items By"
 msgstr "Ordenar os elementos por"
 
-#: ../widgets/table/e-table-config.glade.h:17
+#: ../widgets/table/e-table-config.ui.h:17
 msgid "Then By"
 msgstr "Despois por"
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.ui.h:19
 msgid "_Fields Shown..."
 msgstr "_Campos mostrados..."
 
-#: ../widgets/table/e-table-config.glade.h:20
+#: ../widgets/table/e-table-config.ui.h:20
 msgid "_Group By..."
 msgstr "_Agrupar por..."
 
-#: ../widgets/table/e-table-config.glade.h:22
+#: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "Mo_strar o campo na visualizaciÃ³n"
 
-#: ../widgets/table/e-table-config.glade.h:23
+#: ../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.glade.h:24
+#: ../widgets/table/e-table-config.ui.h:24
 msgid "_Sort..."
 msgstr "_Ordenar..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:114
-msgid "Add a column..."
-msgstr "Engadir unha columna..."
-
-#: ../widgets/table/e-table-field-chooser.glade.h:1
-msgid "Field Chooser"
-msgstr "Selector de campos"
+msgid "Add a Column"
+msgstr "Engadir unha c_olumna..."
 
-#: ../widgets/table/e-table-field-chooser.glade.h:2
+#: ../widgets/table/e-table-field-chooser.c:151
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -23065,306 +22258,2629 @@ msgstr ""
 "Para engadir unha columna Ã¡ sÃºa tÃ¡boa, arrÃ¡strea Ã¡\n"
 "localizaciÃ³n na que quere que apareza."
 
-#: ../widgets/table/e-table-group-container.c:341
+#: ../widgets/table/e-table-group-container.c:342
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (%d elemento)"
 msgstr[1] "%s : %s (%d elementos)"
 
-#: ../widgets/table/e-table-group-container.c:347
+#: ../widgets/table/e-table-group-container.c:348
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d elemento)"
 msgstr[1] "%s (%d elementos)"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
+#: ../widgets/table/e-table-item.c:2830 ../widgets/table/e-table-item.c:2831
 msgid "Alternating Row Colors"
 msgstr "Alternar as cores das filas"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
-#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
+#: ../widgets/table/e-table-item.c:2837 ../widgets/table/e-table-item.c:2838
+#: ../widgets/table/e-tree.c:3370 ../widgets/table/e-tree.c:3371
 msgid "Horizontal Draw Grid"
 msgstr "Debuxar a grade horizontal"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
-#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
+#: ../widgets/table/e-table-item.c:2844 ../widgets/table/e-table-item.c:2845
+#: ../widgets/table/e-tree.c:3376 ../widgets/table/e-tree.c:3377
 msgid "Vertical Draw Grid"
 msgstr "Debuxar a grade vertical"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:954
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
-#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
+#: ../widgets/table/e-table-item.c:2851 ../widgets/table/e-table-item.c:2852
+#: ../widgets/table/e-tree.c:3382 ../widgets/table/e-tree.c:3383
 msgid "Draw focus"
 msgstr "Debuxar o foco"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
+#: ../widgets/table/e-table-item.c:2858 ../widgets/table/e-table-item.c:2859
 msgid "Cursor mode"
 msgstr "Modo de cursor"
 
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
+#: ../widgets/table/e-table-item.c:2823 ../widgets/table/e-table-item.c:2824
 msgid "Selection model"
 msgstr "Modelo de selecciÃ³n"
 
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
-#: ../widgets/table/e-tree.c:3334
+#: ../widgets/table/e-table-item.c:2865 ../widgets/table/e-table-item.c:2866
+#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3364
+#: ../widgets/table/e-tree.c:3365
 msgid "Length Threshold"
 msgstr "LÃmite de lonxitude"
 
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-container.c:982
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
-#: ../widgets/table/e-tree.c:3366
+#: ../widgets/table/e-table-item.c:2899 ../widgets/table/e-table-item.c:2900
+#: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3396
+#: ../widgets/table/e-tree.c:3397
 msgid "Uniform row height"
 msgstr "Altura uniforme da fila"
 
-#: ../widgets/table/e-table-group-container.c:980
-#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-group-container.c:989
 #: ../widgets/table/e-table-group-leaf.c:656
 #: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "Conxelado"
 
-#: ../widgets/table/e-table-header-item.c:1449
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Customize Current View"
 msgstr "Personalizar a visualizaciÃ³n actual"
 
-#: ../widgets/table/e-table-header-item.c:1469
+#: ../widgets/table/e-table-header-item.c:1502
 msgid "Sort _Ascending"
 msgstr "Orde _ascendente"
 
-#: ../widgets/table/e-table-header-item.c:1470
+#: ../widgets/table/e-table-header-item.c:1505
 msgid "Sort _Descending"
 msgstr "Orde _descendente"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1508
 msgid "_Unsort"
 msgstr "Sen ord_enar"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1511
 msgid "Group By This _Field"
 msgstr "Agrupar por este ca_mpo"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1514
 msgid "Group By _Box"
 msgstr "Agrupar por cai_xa"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1518
 msgid "Remove This _Column"
 msgstr "Eliminar esta _columna"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1521
 msgid "Add a C_olumn..."
 msgstr "Engadir unha c_olumna..."
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1525
 msgid "A_lignment"
 msgstr "A_liÃ±amento"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1528
 msgid "B_est Fit"
 msgstr "Axuste Ã³pt_imo"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1531
 msgid "Format Column_s..."
 msgstr "Formatar columna_s..."
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1535
 msgid "Custo_mize Current View..."
 msgstr "Perso_nalizar a visualizaciÃ³n actual..."
 
-#: ../widgets/table/e-table-header-item.c:1539
+#: ../widgets/table/e-table-header-item.c:1594
 msgid "_Sort By"
 msgstr "O_rdenar por"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1557
+#: ../widgets/table/e-table-header-item.c:1612
 msgid "_Custom"
 msgstr "_Personalizado"
 
-#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
+#: ../widgets/table/e-table-item.c:2809 ../widgets/table/e-table-item.c:2810
 msgid "Table header"
 msgstr "Cabeceira da tÃ¡boa"
 
-#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
+#: ../widgets/table/e-table-item.c:2816 ../widgets/table/e-table-item.c:2817
 msgid "Table model"
 msgstr "Modelo da tÃ¡boa"
 
-#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
+#: ../widgets/table/e-table-item.c:2892 ../widgets/table/e-table-item.c:2893
 msgid "Cursor row"
 msgstr "Fila do cursor"
 
-#: ../widgets/table/e-table-sorter.c:172
+#: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "Ordenar a informaciÃ³n"
 
-#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
-#: ../widgets/table/e-tree.c:3373
+#: ../widgets/table/e-table.c:3345 ../widgets/table/e-tree.c:3403
+#: ../widgets/table/e-tree.c:3404
 msgid "Always search"
 msgstr "Buscar sempre"
 
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3352
 msgid "Use click to add"
 msgstr "Premer para engadir"
 
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "Ã?rbore"
+#: ../widgets/table/e-table.c:3366
+msgid "Vertical Row Spacing"
+msgstr "Debuxar a grade vertical"
+
+#: ../widgets/table/e-table.c:3367
+msgid "Vertical space between rows. It is added to top and to bottom of a row"
+msgstr ""
+"Espazo vertical entre filas. EngÃ¡dese na parte superior e inferior dunha fila"
 
-#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
+#: ../widgets/table/e-tree.c:3389 ../widgets/table/e-tree.c:3390
 msgid "ETree table adapter"
 msgstr "Adaptador de tÃ¡boa Etree"
 
-#: ../widgets/table/e-tree.c:3379
+#: ../widgets/table/e-tree.c:3410
 msgid "Retro Look"
 msgstr "Aparencia retro"
 
-#: ../widgets/table/e-tree.c:3380
+#: ../widgets/table/e-tree.c:3411
 msgid "Draw lines and +/- expanders."
 msgstr "Debuxar liÃ±as e expansores +/-."
 
-#: ../widgets/table/e-tree.c:3386
+#: ../widgets/table/e-tree.c:3417
 msgid "Expander Size"
 msgstr "TamaÃ±o do expansor"
 
-#: ../widgets/table/e-tree.c:3387
+#: ../widgets/table/e-tree.c:3418
 msgid "Size of the expander arrow"
 msgstr "TamaÃ±o da frecha do expansor"
 
-#: ../widgets/text/e-text.c:2731
+#: ../widgets/table/gal-a11y-e-cell-popup.c:121
+msgid "popup"
+msgstr "emerxente"
+
+#. action name
+#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+msgid "popup a child"
+msgstr "emerxer un fillo"
+
+#: ../widgets/table/gal-a11y-e-cell-text.c:616
+msgid "edit"
+msgstr "editar"
+
+#: ../widgets/table/gal-a11y-e-cell-text.c:617
+msgid "begin editing this cell"
+msgstr "comezar a editar esta cela"
+
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
+msgid "toggle"
+msgstr "alternar o estado"
+
+#. action name
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+msgid "toggle the cell"
+msgstr "alternar o estado da cela"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:210
+msgid "expand"
+msgstr "expandir"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+msgid "expands the row in the ETree containing this cell"
+msgstr "expande a fila no ETree que contÃ©n esta cela"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:216
+msgid "collapse"
+msgstr "contraer"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+msgid "collapses the row in the ETree containing this cell"
+msgstr "contrae a fila no ETree que contÃ©n esta cela"
+
+#: ../widgets/table/gal-a11y-e-cell.c:119
+msgid "Table Cell"
+msgstr "Cela da tÃ¡boa"
+
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+msgid "click"
+msgstr "premer"
+
+#: ../widgets/table/gal-a11y-e-table-column-header.c:154
+msgid "sort"
+msgstr "ordenar"
+
+#: ../widgets/text/e-text.c:2474
+msgid "Select All"
+msgstr "Seleccionar todo"
+
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "MÃ©todos de entrada"
 
-#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
+#: ../widgets/text/e-text.c:3303 ../widgets/text/e-text.c:3304
 msgid "Event Processor"
 msgstr "Procesador de eventos"
 
-#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3310 ../widgets/text/e-text.c:3311
+msgid "Text"
+msgstr "Texto"
+
+#: ../widgets/text/e-text.c:3317 ../widgets/text/e-text.c:3318
 msgid "Bold"
 msgstr "Negra"
 
-#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3324 ../widgets/text/e-text.c:3325
 msgid "Strikeout"
 msgstr "Riscado"
 
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3331 ../widgets/text/e-text.c:3332
 msgid "Anchor"
 msgstr "Ã?ncora"
 
-#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
+#: ../widgets/text/e-text.c:3338 ../widgets/text/e-text.c:3339
 msgid "Justification"
 msgstr "AliÃ±amento"
 
-#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
+#: ../widgets/text/e-text.c:3345 ../widgets/text/e-text.c:3346
 msgid "Clip Width"
 msgstr "Largura do clip"
 
-#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
+#: ../widgets/text/e-text.c:3352 ../widgets/text/e-text.c:3353
 msgid "Clip Height"
 msgstr "Altura do clip"
 
-#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
+#: ../widgets/text/e-text.c:3359 ../widgets/text/e-text.c:3360
 msgid "Clip"
 msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
+#: ../widgets/text/e-text.c:3366 ../widgets/text/e-text.c:3367
 msgid "Fill clip rectangle"
 msgstr "Encher o rectÃ¡ngulo do clip"
 
-#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
+#: ../widgets/text/e-text.c:3373 ../widgets/text/e-text.c:3374
 msgid "X Offset"
 msgstr "Desprazamento X"
 
-#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
+#: ../widgets/text/e-text.c:3380 ../widgets/text/e-text.c:3381
 msgid "Y Offset"
 msgstr "Desprazamento Y"
 
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3415 ../widgets/text/e-text.c:3416
 msgid "Text width"
 msgstr "Largura do texto"
 
-#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
+#: ../widgets/text/e-text.c:3422 ../widgets/text/e-text.c:3423
 msgid "Text height"
 msgstr "Altura do texto"
 
-#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
+#: ../widgets/text/e-text.c:3436 ../widgets/text/e-text.c:3437
 msgid "Use ellipsis"
 msgstr "Usar a elipse"
 
-#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
+#: ../widgets/text/e-text.c:3443 ../widgets/text/e-text.c:3444
 msgid "Ellipsis"
 msgstr "Elipse"
 
-#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
+#: ../widgets/text/e-text.c:3450 ../widgets/text/e-text.c:3451
 msgid "Line wrap"
 msgstr "Axuste de liÃ±a"
 
-#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
+#: ../widgets/text/e-text.c:3457 ../widgets/text/e-text.c:3458
 msgid "Break characters"
 msgstr "Caracteres de quebra"
 
-#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
+#: ../widgets/text/e-text.c:3464 ../widgets/text/e-text.c:3465
 msgid "Max lines"
 msgstr "MÃ¡ximo de liÃ±as"
 
-#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
+#: ../widgets/text/e-text.c:3485 ../widgets/text/e-text.c:3486
 msgid "Draw borders"
 msgstr "Debuxar os bordos"
 
-#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Allow newlines"
 msgstr "Permitir liÃ±as novas"
 
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Draw background"
 msgstr "Debuxar o fondo"
 
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Draw button"
 msgstr "Debuxar o botÃ³n"
 
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3513 ../widgets/text/e-text.c:3514
 msgid "Cursor position"
 msgstr "PosiciÃ³n do cursor"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3523
 msgid "IM Context"
 msgstr "Contexto MI"
 
-#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
+#: ../widgets/text/e-text.c:3529 ../widgets/text/e-text.c:3530
 msgid "Handle Popup"
 msgstr "Tirador emerxente"
+
+#~ msgid "Loading appointments at %s"
+#~ msgstr "Cargando citas en %s"
+
+#~ msgid "_Security"
+#~ msgstr "_Seguranza"
+
+#~ msgid "Copying `%s' to `%s'"
+#~ msgstr "Copiando `%s' a `%s'"
+
+#~| msgid "Deleting selected objects..."
+#~ msgid "Deleting selected memos..."
+#~ msgstr "Eliminando os obxectos seleccionados..."
+
+#~| msgid "Deleting selected objects..."
+#~ msgid "Deleting selected tasks..."
+#~ msgstr "Eliminando os obxectos seleccionados..."
+
+#~ msgid "_Synchronization Options..."
+#~ msgstr "OpciÃ³ns de _sincronizaciÃ³n..."
+
+#~ msgid "search bar"
+#~ msgstr "barra de busca"
+
+#~ msgid "evolution calendar search bar"
+#~ msgstr "barra de busca do calendario do Evolution"
+
+#~ msgid "Combo Button"
+#~ msgstr "BotÃ³n de combinaciÃ³n"
+
+#~ msgid "Activate Default"
+#~ msgstr "Activar os predeterminados"
+
+#~ msgid "Popup Menu"
+#~ msgstr "MenÃº emerxente"
+
+#~ msgid "Error loading address book."
+#~ msgstr "Erro ao cargar a axenda de enderezos."
+
+#~ msgid "Server Version"
+#~ msgstr "VersiÃ³n do servidor"
+
+#~ msgid "C_ontacts"
+#~ msgstr "C_ontactos"
+
+#~ msgid "Configure contacts and autocompletion here"
+#~ msgstr "Configurar aquÃ os contactos e o completado automÃ¡tico"
+
+#~ msgid "Evolution Address Book"
+#~ msgstr "Axenda de enderezos do Evolution"
+
+#~ msgid "Evolution Address Book address popup"
+#~ msgstr "MenÃº emerxente de enderezos da axenda de enderezos do Evolution"
+
+#~ msgid "Evolution Address Book address viewer"
+#~ msgstr "Visualizador de enderezos da axenda de enderezos do Evolution"
+
+#~ msgid "Evolution Address Book card viewer"
+#~ msgstr "Visualizador de tarxetas da axenda de enderezos do Evolution"
+
+#~ msgid "Evolution Address Book component"
+#~ msgstr "CompoÃ±ente da axenda de enderezos do Evolution"
+
+#~ msgid "Evolution S/MIME Certificate Management Control"
+#~ msgstr "Control de xestiÃ³n de certificados S/MIME do Evolution"
+
+#~ msgid "Evolution folder settings configuration control"
+#~ msgstr ""
+#~ "Control de configuraciÃ³n das propiedades dos cartafoles do Evolution"
+
+#~ msgid "Manage your S/MIME certificates here"
+#~ msgstr "Xestione os seus certificados S/MIME aquÃ"
+
+#~ msgid "Failed upgrading Address Book settings or folders."
+#~ msgstr ""
+#~ "Fallo ao actualizar a configuraciÃ³n ou os cartafoles da axenda de "
+#~ "enderezos."
+
+#~ msgid "Base"
+#~ msgstr "Base"
+
+#~ msgid "Rename the \"%s\" folder to:"
+#~ msgstr "Renomear o cartafol \"%s\" como:"
+
+#~ msgid "Rename Folder"
+#~ msgstr "Renomear o cartafol"
+
+#~ msgid "Save As vCard..."
+#~ msgstr "Gardar como vCard..."
+
+#~ msgid "Contact Source Selector"
+#~ msgstr "Selector de orixe de contactos"
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the card and list views and the "
+#~ "preview pane, in pixels."
+#~ msgstr ""
+#~ "PosiciÃ³n do panel vertical, entre as visualizaciÃ³ns de tarxeta e de lista "
+#~ "e o panel de previsualizaciÃ³n, en pÃxeles."
+
+#~ msgid "Look up in address books"
+#~ msgstr "Buscar nas axendas de enderezos"
+
+#~ msgid ""
+#~ "389\n"
+#~ "636\n"
+#~ "3268"
+#~ msgstr ""
+#~ "389\n"
+#~ "636\n"
+#~ "3268"
+
+#~ msgid "<b>Authentication</b>"
+#~ msgstr "<b>AutenticaciÃ³n</b>"
+
+#~ msgid "<b>Downloading</b>"
+#~ msgstr "<b>Descargando</b>"
+
+#~ msgid "<b>Searching</b>"
+#~ msgstr "<b>Buscando</b>"
+
+#~ msgid ""
+#~ "Evolution will use this email address to authenticate you with the server."
+#~ msgstr ""
+#~ "O Evolution empregarÃ¡ este enderezo de correo para autenticalo no "
+#~ "servidor."
+
+#~ msgid ""
+#~ "One\n"
+#~ "Sub"
+#~ msgstr ""
+#~ "Un\n"
+#~ "Sub"
+
+#~ msgid ""
+#~ "SSL encryption\n"
+#~ "TLS encryption\n"
+#~ "No encryption"
+#~ msgstr ""
+#~ "Cifrado SSL\n"
+#~ "Cifrado TLS\n"
+#~ "Sen cifrado"
+
+#~ msgid ""
+#~ "The search base is the distinguished name (DN) of the entry where your "
+#~ "searches will begin. If you leave this blank, the search will begin at "
+#~ "the root of the directory tree."
+#~ msgstr ""
+#~ "A base de busca Ã© o nome distintivo (DN) da entrada onde comezarÃ¡n as "
+#~ "buscas. Se deixa isto en branco a busca comezarÃ¡ na raÃz da Ã¡rbore de "
+#~ "directorios."
+
+#~ msgid ""
+#~ "This is the full name of your LDAP server. For example, \"ldap.mycompany."
+#~ "com\"."
+#~ msgstr ""
+#~ "Este Ã© o nome completo do seu servidor LDAP. Por exemplo: \"ldap."
+#~ "amiÃ±aempresa.com\"."
+
+#~ msgid ""
+#~ "This is the maximum number of entries to download. Setting this number to "
+#~ "be too large will slow down your address book."
+#~ msgstr ""
+#~ "Este Ã© o nÃºmero mÃ¡ximo de entradas para descargar. Configuralo cun nÃºmero "
+#~ "demasiado grande poderÃa ralentizar a sÃºa axenda de enderezos."
+
+#~ msgid ""
+#~ "This is the name for this server that will appear in your Evolution "
+#~ "folder list. It is for display purposes only. "
+#~ msgstr ""
+#~ "Este Ã© o nome que identificarÃ¡ este servidor na lista de cartafoles do "
+#~ "Evolution. Ã? sÃ³ para poder mostralo no monitor. "
+
+#~ msgid "<b>Email</b>"
+#~ msgstr "<b>Correo electrÃ³nico</b>"
+
+#~ msgid "<b>Home</b>"
+#~ msgstr "<b>Enderezo</b>"
+
+#~ msgid "<b>Job</b>"
+#~ msgstr "<b>ProfesiÃ³n</b>"
+
+#~ msgid "<b>Miscellaneous</b>"
+#~ msgstr "<b>Varios</b>"
+
+#~ msgid "<b>Notes</b>"
+#~ msgstr "<b>Notas</b>"
+
+#~ msgid "<b>Other</b>"
+#~ msgstr "<b>Outro</b>"
+
+#~ msgid "<b>Telephone</b>"
+#~ msgstr "<b>TelÃ©fono</b>"
+
+#~ msgid "<b>Work</b>"
+#~ msgstr "<b>Traballo</b>"
+
+#~ msgid ""
+#~ "\n"
+#~ "Mr.\n"
+#~ "Mrs.\n"
+#~ "Ms.\n"
+#~ "Miss\n"
+#~ "Dr."
+#~ msgstr ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Sra.\n"
+#~ "Srto.\n"
+#~ "Srta.\n"
+#~ "Dr."
+
+#~ msgid ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq."
+#~ msgstr ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq."
+
+#~ msgid "<b>Members</b>"
+#~ msgstr "<b>Integrantes</b>"
+
+#~ msgid "Name begins with"
+#~ msgstr "O nome comeza por"
+
+#~ msgid "_Open"
+#~ msgstr "_Abrir"
+
+#~ msgid "_Print"
+#~ msgstr "Im_primir"
+
+#~ msgid "Cop_y to Address Book..."
+#~ msgstr "Copia_r Ã¡ axenda de enderezos..."
+
+#~ msgid "Mo_ve to Address Book..."
+#~ msgstr "Mo_ver Ã¡ axenda de enderezos..."
+
+#~ msgid "Cu_t"
+#~ msgstr "Cor_tar"
+
+#~ msgid "_Copy"
+#~ msgstr "_Copiar"
+
+#~ msgid "P_aste"
+#~ msgstr "Col_ar"
+
+#~ msgid ""
+#~ "%s already exists\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s xa existe\n"
+#~ "Quere sobrescribilo?"
+
+#~ msgid "Overwrite"
+#~ msgstr "Sobrescribir"
+
+#~ msgid "contact"
+#~ msgid_plural "contacts"
+#~ msgstr[0] "contacto"
+#~ msgstr[1] "contactos"
+
+#~ msgid "Querying Address Book..."
+#~ msgstr "Consultando a axenda de enderezos..."
+
+#~ msgid "Save Appointment"
+#~ msgstr "Gardar cita"
+
+#~ msgid "Save Memo"
+#~ msgstr "Gardar Nota"
+
+#~ msgid "Save Task"
+#~ msgstr "Gardar tarefa"
+
+#~ msgid "Configure your timezone, Calendar and Task List here "
+#~ msgstr "Configure aquÃ o seu fuso horario, calendario e lista de tarefas "
+
+#~ msgid "Evolution Calendar and Tasks"
+#~ msgstr "Calendario e tarefas do Evolution"
+
+#~ msgid "Evolution Calendar configuration control"
+#~ msgstr "Control de configuraciÃ³n do calendario do Evolution"
+
+#~ msgid "Evolution Calendar scheduling message viewer"
+#~ msgstr "Visualizador de mensaxes de programaciÃ³n do calendario do Evolution"
+
+#~ msgid "Evolution Calendar/Task editor"
+#~ msgstr "Editor de Calendario/Tarefas do Evolution"
+
+#~ msgid "Evolution's Calendar component"
+#~ msgstr "CompoÃ±ente de calendario do Evolution"
+
+#~ msgid "Evolution's Memos component"
+#~ msgstr "CompoÃ±ente de notas do Evolution"
+
+#~ msgid "Evolution's Tasks component"
+#~ msgstr "CompoÃ±ente de tarefas do Evolution"
+
+#~ msgid "Memo_s"
+#~ msgstr "Nota_s"
+
+#~ msgid "_Calendars"
+#~ msgstr "_Calendarios"
+
+#~ msgid "Evolution Calendar alarm notification service"
+#~ msgstr "Servizo de notificaciÃ³n por alarma do calendario do Evolution"
+
+#~ msgid "Could not initialize Bonobo"
+#~ msgstr "Non se puido inicializar o Bonobo"
+
+#~ msgid ""
+#~ "Could not create the alarm notify service factory, maybe it's already "
+#~ "running..."
+#~ msgstr ""
+#~ "Non se puido crear a factorÃa do servizo de notificaciÃ³n de alarmas, "
+#~ "poida que xa se estea executando..."
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the task list and the task preview "
+#~ "pane, in pixels."
+#~ msgstr ""
+#~ "PosiciÃ³n do panel vertical, entre a lista de tarefas e o panel de "
+#~ "previsualizaciÃ³n de tarefas, en pÃxeles."
+
+#~ msgid "Show the \"Preview\" pane."
+#~ msgstr "Mostrar o panel de \"PrevisualizaciÃ³n\"."
+
+#~ msgid "Category is"
+#~ msgstr "A categorÃa Ã©"
+
+#~ msgid "Comment contains"
+#~ msgstr "O comentario contÃ©n"
+
+#~ msgid "Location contains"
+#~ msgstr "A localizaciÃ³n contÃ©n"
+
+#~ msgid "_Make available for offline use"
+#~ msgstr "_Mostrar como dispoÃ±Ãbel para o uso sen conexiÃ³n"
+
+#~ msgid "_Do not make available for offline use"
+#~ msgstr "_Non mostrar como dispoÃ±Ãbel para o uso sen conexiÃ³n"
+
+#~ msgid "Failed upgrading calendars."
+#~ msgstr "Fallou ao actualizar os calendarios."
+
+#~ msgid "Unable to open the calendar '%s' for creating events and meetings"
+#~ msgstr "Non se puido abrir o calendario '%s' para crear eventos e reuniÃ³ns"
+
+#~ msgid "There is no calendar available for creating events and meetings"
+#~ msgstr "Non hai ningÃºn calendario dispoÃ±Ãbel para crear eventos e reuniÃ³ns"
+
+#~ msgid "New meeting"
+#~ msgstr "ReuniÃ³n nova"
+
+#~ msgid "New all day appointment"
+#~ msgstr "Cita nova para todo o dÃa"
+
+#~ msgid "Error while opening the calendar"
+#~ msgstr "Erro ao abrir o calendario"
+
+#~ msgid "Method not supported when opening the calendar"
+#~ msgstr "MÃ©todo non compatÃbel ao abrir o calendario"
+
+#~ msgid "Permission denied to open the calendar"
+#~ msgstr "Permiso denegado para abrir o calendario"
+
+#~ msgid "<b>Alarm</b>"
+#~ msgstr "<b>Alarma</b>"
+
+#~ msgid "<b>Options</b>"
+#~ msgstr "<b>OpciÃ³ns</b>"
+
+#~ msgid ""
+#~ "before\n"
+#~ "after"
+#~ msgstr ""
+#~ "antes\n"
+#~ "despois"
+
+#~ msgid ""
+#~ "minute(s)\n"
+#~ "hour(s)\n"
+#~ "day(s)"
+#~ msgstr ""
+#~ "minutos(s)\n"
+#~ "hora(s)\n"
+#~ "dÃa(s)"
+
+#~ msgid ""
+#~ "minutes\n"
+#~ "hours\n"
+#~ "days"
+#~ msgstr ""
+#~ "minutos\n"
+#~ "horas\n"
+#~ "dÃas"
+
+#~ msgid ""
+#~ "start of appointment\n"
+#~ "end of appointment"
+#~ msgstr ""
+#~ "comezo da cita\n"
+#~ "final da cita"
+
+#~ msgid "Attach file(s)"
+#~ msgstr "Anexar ficheiro(s)"
+
+#~ msgid ""
+#~ "60 minutes\n"
+#~ "30 minutes\n"
+#~ "15 minutes\n"
+#~ "10 minutes\n"
+#~ "05 minutes"
+#~ msgstr ""
+#~ "60 minutos\n"
+#~ "30 minutos\n"
+#~ "15 minutos\n"
+#~ "10 minutos\n"
+#~ "05 minutos"
+
+#~ msgid "<span weight=\"bold\">Alarms</span>"
+#~ msgstr "<span weight=\"bold\">Alertas</span>"
+
+#~ msgid "<span weight=\"bold\">Alerts</span>"
+#~ msgstr "<span weight=\"bold\">Alertas</span>"
+
+#~ msgid "<span weight=\"bold\">Date/Time Format</span>"
+#~ msgstr "<span weight=\"bold\">Data/Formato de hora</span>"
+
+#~ msgid "<span weight=\"bold\">General</span>"
+#~ msgstr "<span weight=\"bold\">Xeral</span>"
+
+#~ msgid "<span weight=\"bold\">Task List</span>"
+#~ msgstr "<span weight=\"bold\">Lista de tarefas</span>"
+
+#~ msgid "<span weight=\"bold\">Time</span>"
+#~ msgstr "<span weight=\"bold\">Hora</span>"
+
+#~ msgid "<span weight=\"bold\">Work Week</span>"
+#~ msgstr "<span weight=\"bold\">Semana laboral</span>"
+
+#~ msgid ""
+#~ "Minutes\n"
+#~ "Hours\n"
+#~ "Days"
+#~ msgstr ""
+#~ "Minutos\n"
+#~ "Horas\n"
+#~ "DÃas"
+
+#~ msgid ""
+#~ "Monday\n"
+#~ "Tuesday\n"
+#~ "Wednesday\n"
+#~ "Thursday\n"
+#~ "Friday\n"
+#~ "Saturday\n"
+#~ "Sunday"
+#~ msgstr ""
+#~ "Luns\n"
+#~ "Martes\n"
+#~ "MÃ©rcores\n"
+#~ "Xoves\n"
+#~ "Venres\n"
+#~ "SÃ¡bado\n"
+#~ "Domingo"
+
+#~ msgid "_Add "
+#~ msgstr "_Engadir "
+
+#~ msgid ""
+#~ "15 minutes before appointment\n"
+#~ "1 hour before appointment\n"
+#~ "1 day before appointment"
+#~ msgstr ""
+#~ "15 minutos antes da cita\n"
+#~ "1 hora antes da cita\n"
+#~ "1 dÃa antes da cita"
+
+#~ msgid ""
+#~ "a\n"
+#~ "b"
+#~ msgstr ""
+#~ "a\n"
+#~ "b"
+
+#~ msgid "<b>Preview</b>"
+#~ msgstr "<b>Previsualizar</b>"
+
+#~ msgid "<b>Recurrence</b>"
+#~ msgstr "<b>Recorrencia</b>"
+
+#~ msgid ""
+#~ "day(s)\n"
+#~ "week(s)\n"
+#~ "month(s)\n"
+#~ "year(s)"
+#~ msgstr ""
+#~ "dÃas(s)\n"
+#~ "semana(s)\n"
+#~ "mes(es)\n"
+#~ "ano(s)"
+
+#~ msgid ""
+#~ "for\n"
+#~ "until\n"
+#~ "forever"
+#~ msgstr ""
+#~ "para\n"
+#~ "ata\n"
+#~ "sempre"
+
+#~ msgid "<span weight=\"bold\">Miscellaneous</span>"
+#~ msgstr "<span weight=\"bold\">Varios</span>"
+
+#~ msgid "<span weight=\"bold\">Status</span>"
+#~ msgstr "<span weight=\"bold\">Estado</span>"
+
+#~ msgid ""
+#~ "High\n"
+#~ "Normal\n"
+#~ "Low\n"
+#~ "Undefined"
+#~ msgstr ""
+#~ "Alta\n"
+#~ "Normal\n"
+#~ "Baixa\n"
+#~ "Non definida"
+
+#~ msgid ""
+#~ "Not Started\n"
+#~ "In Progress\n"
+#~ "Completed\n"
+#~ "Canceled"
+#~ msgstr ""
+#~ "Sen inicar\n"
+#~ "En progreso\n"
+#~ "Completada\n"
+#~ "Cancelada"
+
+#~ msgid "_Save As..."
+#~ msgstr "_Gardar como..."
+
+#~ msgid "P_rint..."
+#~ msgstr "Imp_rimir..."
+
+#~ msgid "C_ut"
+#~ msgstr "Co_rtar"
+
+#~ msgid "_Paste"
+#~ msgstr "Co_lar"
+
+#~ msgid "_Mark Selected Tasks as Complete"
+#~ msgstr "_Marcar as tarefas seleccionadas como terminadas"
+
+#~ msgid "_Mark Selected Tasks as Incomplete"
+#~ msgstr "_Marcar as tarefas seleccionadas como non terminadas"
+
+#~ msgid "_Delete Selected Tasks"
+#~ msgstr "E_liminar as tarefas seleccionadas"
+
+#~ msgid "Select T_oday"
+#~ msgstr "Seleccionar _hoxe"
+
+#~ msgid "_Select Date..."
+#~ msgstr "_Seleccionar data..."
+
+#~ msgid "Pri_nt..."
+#~ msgstr "_Imprimir..."
+
+#~ msgid "_Delete Selected Memos"
+#~ msgstr "E_liminar as notas seleccionadas"
+
+#~ msgid "Completing tasks..."
+#~ msgstr "Finalizando tarefas..."
+
+#~ msgid "_Custom View"
+#~ msgstr "VisualizaciÃ³n _personalizada"
+
+#~ msgid "_Save Custom View"
+#~ msgstr "_Gardar visualizaciÃ³n personalizada"
+
+#~ msgid "_Define Views..."
+#~ msgstr "_Definir visualizaciÃ³ns..."
+
+#~ msgid "Loading tasks at %s"
+#~ msgstr "Cargando tarefas en %s"
+
+#~ msgid "Loading memos at %s"
+#~ msgstr "Cargando notas en %s"
+
+#~ msgid ""
+#~ "January\n"
+#~ "February\n"
+#~ "March\n"
+#~ "April\n"
+#~ "May\n"
+#~ "June\n"
+#~ "July\n"
+#~ "August\n"
+#~ "September\n"
+#~ "October\n"
+#~ "November\n"
+#~ "December"
+#~ msgstr ""
+#~ "Xaneiro\n"
+#~ "Febreiro\n"
+#~ "Marzo\n"
+#~ "Abril\n"
+#~ "Maio\n"
+#~ "XuÃ±o\n"
+#~ "Xullo\n"
+#~ "Agosto\n"
+#~ "Setembro\n"
+#~ "Outubro\n"
+#~ "Novembro\n"
+#~ "Decembro"
+
+#~ msgid "Failed upgrading memos."
+#~ msgstr "Fallou ao actualizar as notas."
+
+#~ msgid "Unable to open the memo list '%s' for creating events and meetings"
+#~ msgstr ""
+#~ "Non Ã© posÃbel abrir a lista de notas '%s' para crear eventos e reuniÃ³ns"
+
+#~ msgid "There is no calendar available for creating memos"
+#~ msgstr "Non hai un calendario dispoÃ±Ãbel para crear notas"
+
+#~ msgid "New shared memo"
+#~ msgstr "Nota compartida nova"
+
+#~ msgid "New memo list"
+#~ msgstr "Lista de notas nova"
+
+#~ msgctxt "New"
+#~ msgid "Memo li_st"
+#~ msgstr "Li_sta de notas"
+
+#~ msgid "Failed upgrading tasks."
+#~ msgstr "Fallou ao actualizar as tarefas."
+
+#~ msgid "Unable to open the task list '%s' for creating events and meetings"
+#~ msgstr ""
+#~ "Non Ã© posÃbel abrir a lista de tarefas '%s' para crear eventos e reuniÃ³ns"
+
+#~ msgid "There is no calendar available for creating tasks"
+#~ msgstr "Non hai ningÃºn calendario dispoÃ±Ãbel para crear tarefas"
+
+#~ msgid "New task"
+#~ msgstr "Tarefa nova"
+
+#~ msgid "New assigned task"
+#~ msgstr "Tarefa asignada nova"
+
+#~ msgid "New task list"
+#~ msgstr "Lista de tarefas nova"
+
+#~ msgctxt "New"
+#~ msgid "Tas_k list"
+#~ msgstr "Lista de tare_fas"
+
+#~ msgid "Directories can not be attached to Messages."
+#~ msgstr "Os directorios non se poden anexar Ã¡s mensaxes."
+
+#~ msgid ""
+#~ "Send options available only for Novell GroupWise and Microsoft Exchange "
+#~ "accounts."
+#~ msgstr ""
+#~ "As opciÃ³ns de envÃo sÃ³ estÃ¡n dispoÃ±Ãbeis para as contas Novell GroupWise "
+#~ "e Microsoft Exchange."
+
+#~ msgid "Send options not available."
+#~ msgstr "As opciÃ³ns de envÃo non estÃ¡n dispoÃ±Ãbeis."
+
+#~ msgid ""
+#~ "To attach the contents of this directory, either attach the files in this "
+#~ "directory individually, or create an archive of the directory and attach "
+#~ "it."
+#~ msgstr ""
+#~ "Para anexar os contidos deste directorio, anexe individualmente cada "
+#~ "ficheiro ou cree un arquivo do directorio e anÃ©xeo."
+
+#~ msgid "Unfinished messages found"
+#~ msgstr "LocalizÃ¡ronse mensaxes non finalizadas"
+
+#~ msgid "Warning: Modified Message"
+#~ msgstr "Aviso: modificouse a mensaxe"
+
+#~ msgid "Evolution Information"
+#~ msgstr "InformaciÃ³n do Evolution"
+
+#~ msgid "Evolution Query"
+#~ msgstr "Consulta do Evolution"
+
+#~ msgid "Component"
+#~ msgstr "CompoÃ±ente"
+
+#~ msgid "Overwrite file?"
+#~ msgstr "Quere sobrescribir o ficheiro?"
+
+#~ msgid "Label name cannot be empty."
+#~ msgstr "O nome da etiqueta non pode estar baleiro."
+
+#~ msgid ""
+#~ "A label having the same tag already exists on the server. Please rename "
+#~ "your label."
+#~ msgstr ""
+#~ "Unha etiqueta que ten a mesma etiqueta (tag) xa existe no servidor. "
+#~ "Renomee a sÃºa etiqueta."
+
+#~ msgid "Test"
+#~ msgstr "Proba"
+
+#~ msgid "<b>_Filter Rules</b>"
+#~ msgstr "<b>Regras de _filtro</b>"
+
+#~ msgid ""
+#~ "seconds\n"
+#~ "minutes\n"
+#~ "hours\n"
+#~ "days\n"
+#~ "weeks\n"
+#~ "months\n"
+#~ "years"
+#~ msgstr ""
+#~ "segundos\n"
+#~ "minutos\n"
+#~ "horas\n"
+#~ "dÃas\n"
+#~ "semanas\n"
+#~ "meses\n"
+#~ "anos"
+
+#~ msgid "Rule name"
+#~ msgstr "Nome da regra"
+
+#~ msgid ""
+#~ "Configure mail preferences, including security and message display, here"
+#~ msgstr ""
+#~ "Configurar aquÃ as preferencias de correo incluÃndo seguranza e "
+#~ "visualizaciÃ³n de mensaxes"
+
+#~ msgid "Configure spell-checking, signatures, and the message composer here"
+#~ msgstr ""
+#~ "Configurar aquÃ a verificaciÃ³n ortogrÃ¡fica, as sinaturas e o editor de "
+#~ "mensaxes"
+
+#~ msgid "Configure your email accounts here"
+#~ msgstr "Configurar aquÃ as sÃºas contas de correo"
+
+#~ msgid "Configure your network connection settings here"
+#~ msgstr "Configure as sÃºas definiciÃ³ns de conexiÃ³n de rede aquÃ"
+
+#~ msgid "Evolution Mail"
+#~ msgstr "Correo do Evolution"
+
+#~ msgid "Evolution Mail accounts configuration control"
+#~ msgstr "Control de configuraciÃ³n de contas de correo do Evolution"
+
+#~ msgid "Evolution Mail component"
+#~ msgstr "CompoÃ±ente de correo do Evolution"
+
+#~ msgid "Evolution Mail composer"
+#~ msgstr "Editor de correo do Evolution"
+
+#~ msgid "Evolution Mail composer configuration control"
+#~ msgstr "Control de configuraciÃ³n do editor de correo do Evolution"
+
+#~ msgid "Evolution Mail preferences control"
+#~ msgstr "Control de preferencias do Evolution"
+
+#~ msgid "Evolution Network configuration control"
+#~ msgstr "Control de configuraciÃ³n de rede do Evolution"
+
+#~ msgid "[Default]"
+#~ msgstr "[Predeterminado]"
+
+#~ msgid "Signature(s)"
+#~ msgstr "Sinatura(s)"
+
+#~ msgid "_Copy to Folder"
+#~ msgstr "_Copiar ao cartafol"
+
+#~ msgid "_Move to Folder"
+#~ msgstr "_Mover ao cartafol"
+
+#~ msgid "Cancel _Drag"
+#~ msgstr "Cancelar o _arrastre"
+
+#~ msgid "Open in _New Window"
+#~ msgstr "Abrir nunha _nova xanela"
+
+#~ msgid "_Move..."
+#~ msgstr "_Mover..."
+
+#~ msgid "_Unread Search Folder"
+#~ msgstr "Cartafol de busca de mensaxes sen _ler"
+
+#~ msgid "U_ndelete"
+#~ msgstr "Rec_uperar"
+
+#~ msgid "Fla_g Completed"
+#~ msgstr "M_arcar como terminado"
+
+#~ msgid "Cl_ear Flag"
+#~ msgstr "E_liminar marca"
+
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "Crear reg_ra a partir da mensaxe"
+
+#~ msgid "Search Folder based on _Subject"
+#~ msgstr "Cartafol de busca por _tema"
+
+#~ msgid "Search Folder based on Se_nder"
+#~ msgstr "Cartafol de busca por re_mitente"
+
+#~ msgid "Search Folder based on _Recipients"
+#~ msgstr "Cartafol de busca por _destinatarios"
+
+#~ msgid "Filter based on Sub_ject"
+#~ msgstr "Filtrar por t_ema"
+
+#~ msgid "Filter based on Sen_der"
+#~ msgstr "Filtrar por re_mitente"
+
+#~ msgid "Filter based on Re_cipients"
+#~ msgstr "Filtrar por desti_natarios"
+
+#~ msgid "Filter based on _Mailing List"
+#~ msgstr "Filtrar por lista de _correo"
+
+#~ msgid "_Fit to Width"
+#~ msgstr "A_xustar Ã¡ largura"
+
+#~ msgid "Save As..."
+#~ msgstr "Gardar como..."
+
+#~ msgid "untitled_image.%s"
+#~ msgstr "imaxe_sen tÃtulo.%s"
+
+#~ msgid "_Reply to sender"
+#~ msgstr "_Responder ao remitente"
+
+#~ msgid "Open in %s..."
+#~ msgstr "Abrir en %s..."
+
+#~ msgid "message"
+#~ msgstr "mensaxe"
+
+#~ msgid "Add address"
+#~ msgstr "Engadir enderezo"
+
+#~ msgid "Default height of the message window."
+#~ msgstr "Altura predeterminada da xanela de mensaxe."
+
+#~ msgid "Default width of the message window."
+#~ msgstr "Largura predeterminada da xanela de mensaxe."
+
+#~ msgid ""
+#~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
+#~ "vertically."
+#~ msgstr ""
+#~ "Se o panel de \"PrevisualizaciÃ³n\" estÃ¡ activado, mÃ³strao de lado a lado "
+#~ "en vez de verticalmente."
+
+#~ msgid ""
+#~ "It disables/enables the repeated prompts to ask if offline sync is "
+#~ "required before going into offline mode."
+#~ msgstr ""
+#~ "Activa e desactiva as preguntas repetitivas para confirmar se se require "
+#~ "a sincronizaciÃ³n sen conexiÃ³n ao activar o modo desconectado."
+
+#~ msgid "Message Window default height"
+#~ msgstr "Altura predeterminada da xanela de mensaxes"
+
+#~ msgid "Message Window default width"
+#~ msgstr "Largura predeterminada da xanela de mensaxes"
+
+#~ msgid "Prompt to check if the user wants to go offline immediately"
+#~ msgstr ""
+#~ "Preguntar para verificar se o usuario se quere desconectar inmediatamente"
+
+#~ msgid "Thread the message list."
+#~ msgstr "Lista de mensaxes por fÃos."
+
+#~ msgid "Thread the message-list"
+#~ msgstr "Lista de mensaxes por fÃos"
+
+#~ msgid "Use side-by-side or wide layout"
+#~ msgstr "Usar a disposiciÃ³n lado a lado ou longa"
+
+#~ msgid "New Mail Message"
+#~ msgstr "Nova mensaxe de correo"
+
+#~ msgid "New Mail Folder"
+#~ msgstr "Novo cartafol de correo"
+
+#~ msgid "Failed upgrading Mail settings or folders."
+#~ msgstr "Fallou ao actualizar a configuraciÃ³n do correo ou os cartafoles."
+
+#~ msgid "<b>Sig_natures</b>"
+#~ msgstr "<b>Si_naturas</b>"
+
+#~ msgid "<b>_Languages</b>"
+#~ msgstr "<b>_Idiomas</b>"
+
+#~ msgid "<span weight=\"bold\">Account Information</span>"
+#~ msgstr "<span weight=\"bold\">InformaciÃ³n da conta</span>"
+
+#~ msgid "<span weight=\"bold\">Authentication</span>"
+#~ msgstr "<span weight=\"bold\">AutenticaciÃ³n</span>"
+
+#~ msgid "<span weight=\"bold\">Composing Messages</span>"
+#~ msgstr "<span weight=\"bold\">RedacciÃ³n de mensaxes</span>"
+
+#~ msgid "<span weight=\"bold\">Configuration</span>"
+#~ msgstr "<span weight=\"bold\">ConfiguraciÃ³n</span>"
+
+#~ msgid "<span weight=\"bold\">Default Behavior</span>"
+#~ msgstr "<span weight=\"bold\">Comportamento predeterminado</span>"
+
+#~ msgid "<span weight=\"bold\">Delete Mail</span>"
+#~ msgstr "<span weight=\"bold\">Eliminar correo</span>"
+
+#~ msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+#~ msgstr "<span weight=\"bold\">Ca_beceiras das mensaxes mostradas</span>"
+
+#~ msgid "<span weight=\"bold\">Labels</span>"
+#~ msgstr "<span weight=\"bold\">Etiquetas</span>"
+
+#~ msgid "<span weight=\"bold\">Loading Images</span>"
+#~ msgstr "<span weight=\"bold\">Cargando imaxes</span>"
+
+#~ msgid "<span weight=\"bold\">Message Display</span>"
+#~ msgstr "<span weight=\"bold\">Visualizador de mensaxes</span>"
+
+#~ msgid "<span weight=\"bold\">Message Fonts</span>"
+#~ msgstr "<span weight=\"bold\">Tipos de letra das mensaxes</span>"
+
+#~ msgid "<span weight=\"bold\">Message Receipts</span>"
+#~ msgstr "<span weight=\"bold\">NotificaciÃ³ns de recepciÃ³n de mensaxes</span>"
+
+#~ msgid "<span weight=\"bold\">Optional Information</span>"
+#~ msgstr "<span weight=\"bold\">InformaciÃ³n opcional</span>"
+
+#~ msgid "<span weight=\"bold\">Options</span>"
+#~ msgstr "<span weight=\"bold\">OpciÃ³ns</span>"
+
+#~ msgid "<span weight=\"bold\">Printed Fonts</span>"
+#~ msgstr "<span weight=\"bold\">Tipos de letra para imprimir</span>"
+
+#~ msgid "<span weight=\"bold\">Proxy Settings</span>"
+#~ msgstr "<span weight=\"bold\">ConfiguraciÃ³ns de Proxy</span>"
+
+#~ msgid "<span weight=\"bold\">Required Information</span>"
+#~ msgstr "<span weight=\"bold\">InformaciÃ³n requirida</span>"
+
+#~ msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+#~ msgstr "<span weight=\"bold\">MIME seguro (S/MIME)</span>"
+
+#~ msgid "<span weight=\"bold\">Security</span>"
+#~ msgstr "<span weight=\"bold\">Seguranza</span>"
+
+#~ msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+#~ msgstr "<span weight=\"bold\">Mensaxes enviadas e borradores</span>"
+
+#~ msgid "<span weight=\"bold\">Server Configuration</span>"
+#~ msgstr "<span weight=\"bold\">ConfiguraciÃ³n do servidor</span>"
+
+#~ msgid "<span weight=\"bold\">_Authentication Type</span>"
+#~ msgstr "<span weight=\"bold\">Tipo de _autenticaciÃ³n</span>"
+
+#~ msgid ""
+#~ "Attachment\n"
+#~ "Inline\n"
+#~ "Quoted"
+#~ msgstr ""
+#~ "Anexo\n"
+#~ "En liÃ±a\n"
+#~ "Citado"
+
+#~ msgid ""
+#~ "Attachment\n"
+#~ "Inline (Outlook style)\n"
+#~ "Quoted\n"
+#~ "Do not quote"
+#~ msgstr ""
+#~ "Anexo\n"
+#~ "Inserido (estilo Outlook)\n"
+#~ "Citado\n"
+#~ "Non citar"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "BÃ¡ltico (ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "BÃ¡ltico (ISO-8859-4)"
+
+#~ msgid "Email Accounts"
+#~ msgstr "Contas de correo"
+
+#~ msgid ""
+#~ "If the server uses a non-standard port then specify the server address as "
+#~ "\"server-name:port-number\""
+#~ msgstr ""
+#~ "Se o servidor usa un porto non estÃ¡ndar entÃ³n especifique o enderezo do "
+#~ "servidor tal como \"servidor-nome:porto-nÃºmero\""
+
+#~ msgid "Message Composer"
+#~ msgstr "Editor de mensaxes"
+
+#~ msgid "Signatures Table"
+#~ msgstr "TÃ¡boa de sinaturas"
+
+#~ msgid "<b>Search Folder Sources</b>"
+#~ msgstr "<b>Orixes do cartafol de busca</b>"
+
+#~ msgid "<span weight=\"bold\">Digital Signature</span>"
+#~ msgstr "<span weight=\"bold\">Sinatura dixital</span>"
+
+#~ msgid "<span weight=\"bold\">Encryption</span>"
+#~ msgstr "<span weight=\"bold\">Cifrado</span>"
+
+#~ msgid "Delete \"{0}\"?"
+#~ msgstr "Quere eliminar \"{0}\"?"
+
+#~ msgid "Delete account?"
+#~ msgstr "Quere eliminar a conta?"
+
+#~ msgid "Delete messages in Search Folder?"
+#~ msgstr "Quere eliminar as mensaxes do cartafol de busca?"
+
+#~ msgid "Discard changes?"
+#~ msgstr "Quere rexeitar as modificaciÃ³ns?"
+
+#~ msgid "Mark all messages as read"
+#~ msgstr "Marcar todas as mensaxes como lidas"
+
+#~ msgid "Querying server"
+#~ msgstr "Consultando o servidor"
+
+#~ msgid "Subject or Recipients contains"
+#~ msgstr "O asunto ou o destinatario contÃ©n"
+
+#~ msgid "Subject or Sender contains"
+#~ msgstr "O asunto ou o remitente conteÃ±en"
+
+#~ msgid "Audio Inline"
+#~ msgstr "Son en liÃ±a"
+
+#~ msgid "Copy Tool"
+#~ msgstr "Ferramenta de copia"
+
+#~ msgid "_Account:"
+#~ msgstr "_Conta:"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "Nome do carta_fol:"
+
+#~ msgid "_User:"
+#~ msgstr "_Usuario:"
+
+#~ msgid "Secure Password"
+#~ msgstr "Contrasinal seguro"
+
+#~ msgid ""
+#~ "This option will connect to the Exchange server using secure password "
+#~ "(NTLM) authentication."
+#~ msgstr ""
+#~ "Esta opciÃ³n conectarÃ¡ co servidor Exchange usando unha autenticaciÃ³n de "
+#~ "contrasinal segura (NTLM)."
+
+#~ msgid "Plaintext Password"
+#~ msgstr "Contrasinal de texto plano"
+
+#~ msgid ""
+#~ "This option will connect to the Exchange server using standard plaintext "
+#~ "password authentication."
+#~ msgstr ""
+#~ "Esta opciÃ³n conectarÃ¡ co servidor Exchange usando unha autenticaciÃ³n "
+#~ "estÃ¡ndar de texto plano."
+
+#~ msgid "Out Of Office"
+#~ msgstr "FÃ³ra da oficina"
+
+#~ msgid ""
+#~ "The message specified below will be automatically sent to \n"
+#~ "each person who sends mail to you while you are out of the office."
+#~ msgstr ""
+#~ "A mensaxe especificada abaixo enviarase automaticamente a cada\n"
+#~ "persoa que lle envÃe correo mentres estÃ¡ fÃ³ra da oficina."
+
+#~ msgid "I am out of the office"
+#~ msgstr "Estou fÃ³ra da oficina"
+
+#~ msgid "I am in the office"
+#~ msgstr "Estou na oficina"
+
+#~ msgid "Change the password for Exchange account"
+#~ msgstr "Modificar o contrasinal para a conta do Exchange"
+
+#~ msgid "Change Password"
+#~ msgstr "Cambiar contrasinal"
+
+#~ msgid "Manage the delegate settings for Exchange account"
+#~ msgstr "Xestione a configuraciÃ³n dos delegados para a conta Exchange"
+
+#~ msgid "Delegation Assistant"
+#~ msgstr "Asistente de delegaciÃ³ns"
+
+#~ msgid "View the size of all Exchange folders"
+#~ msgstr "Ver o tamaÃ±o de todos os cartafoles Exchange"
+
+#~ msgid "Folders Size"
+#~ msgstr "TamaÃ±o dos cartafoles"
+
+#~ msgid "_OWA URL:"
+#~ msgstr "URL _OWA:"
+
+#~ msgid "A_uthenticate"
+#~ msgstr "A_utenticar"
+
+#~ msgid "Mailbox name is _different than user name"
+#~ msgstr "O nome da caixa de correo Ã© _diferente do nome de usuario"
+
+#~ msgid "_Mailbox:"
+#~ msgstr "Cai_xa de correo:"
+
+# (pofilter) variables: do not translate: %s
+#~ msgid "%s KB"
+#~ msgstr "%s KB"
+
+#~ msgid "0 KB"
+#~ msgstr "0 KB"
+
+#~ msgid "Size:"
+#~ msgstr "TamaÃ±o:"
+
+#~ msgid ""
+#~ "Evolution is in offline mode. You cannot create or modify folders now.\n"
+#~ "Please switch to online mode for such operations."
+#~ msgstr ""
+#~ "O Evolution estÃ¡ en modo sen conexiÃ³n. Non pode crear ou modificar "
+#~ "cartafoles agora.\n"
+#~ "Cambie ao modo con conexiÃ³n para esas operaciÃ³ns."
+
+#~ msgid ""
+#~ "The current password does not match the existing password for your "
+#~ "account. Please enter the correct password"
+#~ msgstr ""
+#~ "O contrasinal actual non coincide co contrasinal existente para a sÃºa "
+#~ "conta. Introduza o contrasinal correcto"
+
+#~ msgid "The two passwords do not match. Please re-enter the passwords."
+#~ msgstr "Os dous contrasinais non coinciden. Reintroduza os contrasinais."
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Confirmar contrasinal:"
+
+#~ msgid "Current Password:"
+#~ msgstr "Contrasinal actual:"
+
+#~ msgid "New Password:"
+#~ msgstr "Contrasinal novo:"
+
+#~ msgid "Your current password has expired. Please change your password now."
+#~ msgstr "O seu contrasinal actual caducou. Cambie o seu contrasinal agora."
+
+#~ msgid "Your password will expire in the next %d days"
+#~ msgstr "O contrasinal caducarÃ¡ dentro dos seguintes %d dÃas"
+
+#~ msgid "Custom"
+#~ msgstr "Personalizado"
+
+#~ msgid "Editor (read, create, edit)"
+#~ msgstr "Editor (ler, crear e editar)"
+
+#~ msgid "Author (read, create)"
+#~ msgstr "Autor (ler e crear)"
+
+#~ msgid "Reviewer (read-only)"
+#~ msgstr "Revisor (sÃ³ de lectura)"
+
+#~ msgid "Delegate Permissions"
+#~ msgstr "Permisos delegados"
+
+#~ msgid "Permissions for %s"
+#~ msgstr "Permisos para %s"
+
+#~ msgid ""
+#~ "This message was sent automatically by Evolution to inform you that you "
+#~ "have been designated as a delegate. You can now send messages on my "
+#~ "behalf."
+#~ msgstr ""
+#~ "O Evolution enviou esta mensaxe automaticamente para informalo de que o "
+#~ "designaron como delegado. A partir de agora poderÃ¡ mandar mensaxes da "
+#~ "miÃ±a parte."
+
+#~ msgid "You have been given the following permissions on my folders:"
+#~ msgstr "OutorgÃ¡ronselle os seguintes permisos sobre os meus cartafoles:"
+
+#~ msgid "You are also permitted to see my private items."
+#~ msgstr "Vostede tamÃ©n poderÃ¡ ver os meus elementos privados."
+
+#~ msgid "However you are not permitted to see my private items."
+#~ msgstr "No entanto, vostede non poderÃ¡ ver os meus elementos privados."
+
+#~ msgid "You have been designated as a delegate for %s"
+#~ msgstr "DesignÃ¡rono como delegado para %s"
+
+#~ msgid "Remove the delegate %s?"
+#~ msgstr "Quere eliminar o delegado %s?"
+
+#~ msgid "Could not access Active Directory"
+#~ msgstr "Non se puido acceder ao Active Directory"
+
+#~ msgid "Could not find self in Active Directory"
+#~ msgstr "Non se puido localizarse a si mesmo no Active Directory"
+
+#~ msgid "Could not find delegate %s in Active Directory"
+#~ msgstr "Non se puido localizar o delegado %s no Active Directory"
+
+#~ msgid "Could not remove delegate %s"
+#~ msgstr "Non se puido eliminar o delegado %s"
+
+#~ msgid "Could not update list of delegates."
+#~ msgstr "Non se puido actualizar a lista de delegados."
+
+#~ msgid "Could not add delegate %s"
+#~ msgstr "Non se puido engadir o delegado %s"
+
+#~ msgid "Error reading delegates list."
+#~ msgstr "Erro ao ler a lista de delegados."
+
+#~ msgid "C_alendar:"
+#~ msgstr "C_alendario:"
+
+#~ msgid "Co_ntacts:"
+#~ msgstr "Co_ntactos:"
+
+#~ msgid "Delegates"
+#~ msgstr "Delegados"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Reviewer (read-only)\n"
+#~ "Author (read, create)\n"
+#~ "Editor (read, create, edit)"
+#~ msgstr ""
+#~ "NingÃºn\n"
+#~ "Revisor (sÃ³ lectura)\n"
+#~ "Autor (lectura, creaciÃ³n)\n"
+#~ "Editor (lectura, creaciÃ³n, ediciÃ³n)"
+
+#~ msgid "Permissions for"
+#~ msgstr "Permisos para"
+
+#~ msgid ""
+#~ "These users will be able to send mail on your behalf\n"
+#~ "and access your folders with the permissions you give them."
+#~ msgstr ""
+#~ "Estes usuarios serÃ¡n capaces de enviar correo no seu nome\n"
+#~ "e acceder aos seus cartafoles cos permisos que lles dea."
+
+#~ msgid "_Delegate can see private items"
+#~ msgstr "O _delegado pode ver elementos privados"
+
+#~ msgid "_Inbox:"
+#~ msgstr "Caixa de _entrada:"
+
+#~ msgid "_Summarize permissions"
+#~ msgstr "Re_sumir os pemisos"
+
+#~ msgid "Permissions..."
+#~ msgstr "Permisos..."
+
+#~ msgid "Folder Name"
+#~ msgstr "Nome do cartafol"
+
+#~ msgid "Folder Size"
+#~ msgstr "TamaÃ±o do cartafol"
+
+#~ msgid "User"
+#~ msgstr "Usuario"
+
+#~ msgid "Subscribe to Other User's Folder"
+#~ msgstr "Subscribirse ao cartafol doutro usuario"
+
+#~ msgid "Exchange Folder Tree"
+#~ msgstr "Ã?rbore de cartafol do Exchange"
+
+#~ msgid "Unsubscribe Folder..."
+#~ msgstr "Eliminar subscriciÃ³n do cartafol..."
+
+#~ msgid "Really unsubscribe from folder \"%s\"?"
+#~ msgstr "EstÃ¡ seguro de que quere eliminar subscriciÃ³n do cartafol \"%s\"?"
+
+#~ msgid "Unsubscribe from \"%s\""
+#~ msgstr "Eliminar subscriciÃ³n de \"%s\""
+
+#~ msgid ""
+#~ "<b>Currently, your status is \"Out of the Office\". </b>\n"
+#~ "\n"
+#~ "Would you like to change your status to \"In the Office\"? "
+#~ msgstr ""
+#~ "<b>Actualmente, o seu estado Ã© \"FÃ³ra da oficina\". </b>\n"
+#~ "\n"
+#~ "Quere cambiar o seu estado a \"Na oficina\"? "
+
+#~ msgid "<b>Out of Office Message:</b>"
+#~ msgstr "<b>Mensaxe para FÃ³ra da oficina:</b>"
+
+#~ msgid "<b>Status:</b>"
+#~ msgstr "<b>Estado:</b>"
+
+#~ msgid ""
+#~ "<small>The message specified below will be automatically sent to each "
+#~ "person who sends\n"
+#~ "mail to you while you are out of the office.</small>"
+#~ msgstr ""
+#~ "<small>A mensaxe especificada abaixo serÃ¡ enviada automaticamente a cada "
+#~ "persoa que lle envÃe\n"
+#~ "un correo mentres estea fÃ³ra da oficina.</small>"
+
+#~ msgid "I am currently in the office"
+#~ msgstr "Estou na oficina"
+
+#~ msgid "I am currently out of the office"
+#~ msgstr "Estou fÃ³ra da oficina"
+
+#~ msgid "No, Don't Change Status"
+#~ msgstr "Non, non cambiar o estado"
+
+#~ msgid "Out of Office Assistant"
+#~ msgstr "Asistente para FÃ³ra da oficina"
+
+#~ msgid "Yes, Change Status"
+#~ msgstr "Si, cambiar o estado"
+
+#~ msgid "Password Expiry Warning..."
+#~ msgstr "Aviso de caducidade do contrasinal..."
+
+#~ msgid "Your password will expire in 7 days..."
+#~ msgstr "O seu contrasinal caducarÃ¡ en 7 dÃas..."
+
+#~ msgid "_Change Password"
+#~ msgstr "_Cambiar o contrasinal"
+
+#~ msgid "(Permission denied.)"
+#~ msgstr "(Permiso denegado)."
+
+#~ msgid "Add User:"
+#~ msgstr "Engadir usuario:"
+
+#~ msgid "<b>Permissions</b>"
+#~ msgstr "<b>Permisos</b>"
+
+#~ msgid "Cannot Delete"
+#~ msgstr "Non se pode eliminar"
+
+#~ msgid "Cannot Edit"
+#~ msgstr "Non se pode editar"
+
+#~ msgid "Create items"
+#~ msgstr "Crear elementos"
+
+#~ msgid "Create subfolders"
+#~ msgstr "Crear subcartafoles"
+
+#~ msgid "Delete Any Items"
+#~ msgstr "Eliminar todos os elementos"
+
+#~ msgid "Delete Own Items"
+#~ msgstr "Eliminar os elementos propios"
+
+#~ msgid "Edit Any Items"
+#~ msgstr "Editar calquera elemento"
+
+#~ msgid "Edit Own Items"
+#~ msgstr "Editar os elementos propios"
+
+#~ msgid "Folder contact"
+#~ msgstr "Cartafol de contacto"
+
+#~ msgid "Folder owner"
+#~ msgstr "Propietario do cartafol"
+
+#~ msgid "Folder visible"
+#~ msgstr "Cartafol visÃbel"
+
+#~ msgid "Read items"
+#~ msgstr "Elementos lidos"
+
+#~ msgid "Role: "
+#~ msgstr "Rol: "
+
+#~ msgid "<b>Message Settings</b>"
+#~ msgstr "<b>ConfiguraciÃ³ns de mensaxe</b>"
+
+#~ msgid "<b>Tracking Options</b>"
+#~ msgstr "<b>OpciÃ³ns de seguimento</b>"
+
+#~ msgid "Exchange - Send Options"
+#~ msgstr "Exchange - opciÃ³ns de envÃo"
+
+#~ msgid "I_mportance: "
+#~ msgstr "I_mportancia: "
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "High\n"
+#~ "Low"
+#~ msgstr ""
+#~ "Normal\n"
+#~ "Alta\n"
+#~ "Baixa"
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "Personal\n"
+#~ "Private\n"
+#~ "Confidential"
+#~ msgstr ""
+#~ "Normal\n"
+#~ "Persoal\n"
+#~ "Privado\n"
+#~ "Confidencial"
+
+#~ msgid "Request a _delivery receipt for this message"
+#~ msgstr "Solicitar unha notificaciÃ³n de _recepciÃ³n para esta mensaxe"
+
+#~ msgid "Request a _read receipt for this message"
+#~ msgstr "Solicitar unha notificaciÃ³n de lec_tura para esta mensaxe"
+
+#~ msgid "Send as Delegate"
+#~ msgstr "Enviar como delegado"
+
+#~ msgid "_Sensitivity: "
+#~ msgstr "_Sensibilidade: "
+
+#~ msgid "_User"
+#~ msgstr "_Usuario"
+
+#~ msgid "Select User"
+#~ msgstr "Seleccionar usuario"
+
+#~ msgid "Address Book..."
+#~ msgstr "Axenda de enderezos..."
+
+#~ msgid "Subscribe to Other User's Contacts"
+#~ msgstr "Subscribirse aos contactos doutro usuario"
+
+#~ msgid "Subscribe to Other User's Calendar"
+#~ msgstr "Subscribirse ao calendario doutro usuario"
+
+#~ msgid "Activates the Evolution-Exchange extension package."
+#~ msgstr "Activa o paquete da extensiÃ³n Exchange a Evolution."
+
+#~ msgid "Exchange Operations"
+#~ msgstr "OperaciÃ³ns do Exchange"
+
+#~ msgid "Cannot access the \"Exchange settings\" tab in offline mode."
+#~ msgstr ""
+#~ "Non Ã© posÃbel acceder ao separador ConfiguraciÃ³ns do Exchange no modo sen "
+#~ "conexiÃ³n."
+
+#~ msgid "Cannot change password due to configuration problems."
+#~ msgstr ""
+#~ "Non se pode modificar o contrasinal debido a problemas de configuraciÃ³n."
+
+#~ msgid "Cannot display folders."
+#~ msgstr "Non se poden mostrar os cartafoles."
+
+#~ msgid ""
+#~ "Changes to options for Exchange account \"{0}\" will only take effect "
+#~ "after restarting Evolution."
+#~ msgstr ""
+#~ "As modificaciÃ³ns das opciÃ³ns da conta Exchange \"{0}\" sÃ³ serÃ¡n efectivas "
+#~ "despois de reiniciar o Evolution."
+
+#~ msgid "Could not authenticate to server."
+#~ msgstr "Non se puido autenticar co servidor."
+
+#~ msgid "Could not change password."
+#~ msgstr "Non se puido modificar o contrasinal."
+
+#~ msgid ""
+#~ "Could not configure Exchange account because \n"
+#~ "an unknown error occurred. Check the URL, \n"
+#~ "username, and password, and try again."
+#~ msgstr ""
+#~ "Non se puido configurar a conta Exchange porque\n"
+#~ "se produciu un erro descoÃ±ecido. Verifique o URL,\n"
+#~ "nome de usuario e contrasinal e tÃ©nteo de novo."
+
+#~ msgid "Could not connect to Exchange server."
+#~ msgstr "Non se puido conectar co servidor Exchange."
+
+#~ msgid "Could not connect to server {0}."
+#~ msgstr "Non se puido conectar co servidor {0}."
+
+#~ msgid "Could not determine folder permissions for delegates."
+#~ msgstr "Non se puideron determinar os permisos do cartafol para delegados."
+
+#~ msgid "Could not find Exchange Web Storage System."
+#~ msgstr "Non se puido localizar o sistema de almacenamento Web do Exchange."
+
+#~ msgid "Could not locate server {0}."
+#~ msgstr "Non se puido localizar o servidor {0}."
+
+#~ msgid "Could not make {0} a delegate"
+#~ msgstr "Non se puido converter {0} nun delegado"
+
+#~ msgid "Could not read folder permissions"
+#~ msgstr "Non se puideron ler os permisos do cartafol"
+
+#~ msgid "Could not read folder permissions."
+#~ msgstr "Non se puideron ler os permisos do cartafol."
+
+#~ msgid "Could not read out-of-office state"
+#~ msgstr "Non se puido ler o estado de fÃ³ra da oficina"
+
+#~ msgid "Could not update folder permissions."
+#~ msgstr "Non se puido actualizar os permisos do cartafol."
+
+#~ msgid "Could not update out-of-office state"
+#~ msgstr "Non se puido actualizar o estado FÃ³ra da oficina"
+
+#~ msgid "Evolution requires a restart to load the subscribed user's mailbox"
+#~ msgstr ""
+#~ "O Evolution precisa ser reiniciado para cargar a caixa de correo de "
+#~ "usuario subscrita"
+
+#~ msgid "Exchange Account is offline."
+#~ msgstr "A conta do Exchange estÃ¡ sen conexiÃ³n."
+
+# (pofilter) newlines: line endings in original don't match line endings in translation
+#~ msgid ""
+#~ "Exchange Connector requires access to certain\n"
+#~ "functionality on the Exchange Server that appears\n"
+#~ "to be disabled or blocked. (This is usually \n"
+#~ "unintentional.) Your Exchange Administrator will \n"
+#~ "need to enable this functionality in order for \n"
+#~ "you to be able to use Evolution Exchange Connector.\n"
+#~ "\n"
+#~ "For information to provide to your Exchange \n"
+#~ "administrator, please follow the link below:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "  "
+#~ msgstr ""
+#~ "O conectador do Exchange require o acceso a certa funcionalidade\n"
+#~ "no servidor do Exchange que parece\n"
+#~ "estar desactivada ou bloqueada\n"
+#~ "(isto normalmente non Ã© intencional). O seu\n"
+#~ "administrador do Exchange terÃ¡ que activar esta\n"
+#~ "funcionalidade para que poida usar o conectador do Evolution Exchange.\n"
+#~ "\n"
+#~ "Para a informaciÃ³n que pode proporcionar ao seu administrador\n"
+#~ "do Exchange, consulte a ligazÃ³n de abaixo:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "  "
+
+#~ msgid "Folder already exists"
+#~ msgstr "O cartafol xa existe"
+
+#~ msgid "Folder does not exist"
+#~ msgstr "O cartafol non existe"
+
+#~ msgid "Folder offline"
+#~ msgstr "Cartafol sen conexiÃ³n"
+
+#~ msgid "Generic error"
+#~ msgstr "Erro xenÃ©rico"
+
+#~ msgid "Global Catalog Server is not reachable"
+#~ msgstr "Non Ã© posÃbel atinxir o servidor de catÃ¡logo global"
+
+#~ msgid ""
+#~ "If OWA is running on a different path, you must specify that in the "
+#~ "account configuration dialog."
+#~ msgstr ""
+#~ "Se OWA se estÃ¡ executando nun camiÃ±o diferente, debe especificalo no "
+#~ "diÃ¡logo de configuraciÃ³n de conta."
+
+#~ msgid "Mailbox for {0} is not on this server."
+#~ msgstr "A caixa de correo de {0} non estÃ¡ neste servidor."
+
+#~ msgid "Make sure the URL is correct and try again."
+#~ msgstr "AsegÃºrese de que o URL Ã© correcto e tÃ©nteo de novo."
+
+#~ msgid "Make sure the server name is spelled correctly and try again."
+#~ msgstr ""
+#~ "AsegÃºrese de que o nome do servidor estÃ¡ escrito correctamente e tÃ©nteo "
+#~ "de novo."
+
+#~ msgid "Make sure the username and password are correct and try again."
+#~ msgstr ""
+#~ "AsegÃºrese de que o nome do usuario e o contrasinal son correctos e tÃ©nteo "
+#~ "de novo."
+
+#~ msgid "No Global Catalog server configured for this account."
+#~ msgstr ""
+#~ "Non hai ningÃºn servidor de catÃ¡logo global configurado para esta conta."
+
+#~ msgid "No mailbox for user {0} on {1}."
+#~ msgstr "Non hai ningunha caixa de correo para o usuario {0} en {1}."
+
+#~ msgid "No such user {0}"
+#~ msgstr "Non existe ese usuario {0}"
+
+#~ msgid "Password successfully changed."
+#~ msgstr "O contrasinal modificouse correctamente."
+
+#~ msgid ""
+#~ "Please enter a Delegate's ID or deselect the Send as a Delegate option."
+#~ msgstr ""
+#~ "Introduza un ID de delegado ou seleccione a opciÃ³n Enviar como delegado."
+
+#~ msgid "Please make sure the Global Catalog Server name is correct."
+#~ msgstr "AsegÃºrese de que o nome do servidor de catÃ¡logo global Ã© correcto."
+
+#~ msgid "Please restart Evolution for changes to take effect"
+#~ msgstr "Reinicie o Evolution para que sexan efectivas as modificaciÃ³ns"
+
+#~ msgid "Please select a user."
+#~ msgstr "Seleccione un usuario."
+
+#~ msgid "Server rejected password because it is too weak."
+#~ msgstr "O servidor rexeitou o contrasinal porque Ã© demasiado dÃ©bil."
+
+#~ msgid "The Exchange account will be disabled when you quit Evolution"
+#~ msgstr "A conta do Exchange desactivarase ao saÃr do Evolution"
+
+#~ msgid "The Exchange account will be removed when you quit Evolution"
+#~ msgstr "A conta do Exchange eliminarase ao saÃr do Evolution"
+
+#~ msgid "The Exchange server is not compatible with Exchange Connector."
+#~ msgstr "O servidor Exchange non Ã© compatÃbel co conectador do Exchange."
+
+#~ msgid ""
+#~ "The server is running Exchange 5.5. Exchange Connector \n"
+#~ "supports Microsoft Exchange 2000 and 2003 only."
+#~ msgstr ""
+#~ "O servidor estÃ¡ executando o Exchange 5.5. O conector do Exchange \n"
+#~ "sÃ³ Ã© compatÃbel co Microsoft Exchange 2000 e 2003."
+
+#~ msgid ""
+#~ "This probably means that your server requires \n"
+#~ "you to specify the Windows domain name \n"
+#~ "as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
+#~ "\n"
+#~ "Or you might have just typed your password wrong."
+#~ msgstr ""
+#~ "Isto probabelmente significa que o seu servidor require\n"
+#~ "que especifique o nome de dominio de Windows\n"
+#~ "como parte do nome do usuario (ex., &quot;DOMINIO\\usuario&quot;).\n"
+#~ "\n"
+#~ "Ou pode que sÃ³ escribira incorrectamente o contrasinal."
+
+#~ msgid "Try again with a different password."
+#~ msgstr "TÃ©nteo de novo cun contrasinal diferente."
+
+#~ msgid "Unable to add user to access control list:"
+#~ msgstr "Non Ã© posÃbel engadir o usuario Ã¡ lista de control de acceso:"
+
+#~ msgid "Unable to edit delegates."
+#~ msgstr "Non Ã© posÃbel editar os delegados."
+
+#~ msgid "Unknown error looking up {0}"
+#~ msgstr "Erro descoÃ±ecido ao buscar {0}"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "OperaciÃ³n non compatÃbel"
+
+#~ msgid ""
+#~ "You are nearing your quota available for storing mail on this server."
+#~ msgstr ""
+#~ "EstÃ¡ prÃ³ximo Ã¡ sÃºa cota dispoÃ±Ãbel para almacenar correo neste servidor."
+
+#~ msgid ""
+#~ "You are permitted to send a message on behalf of only one delegator at a "
+#~ "time."
+#~ msgstr ""
+#~ "Vostede estÃ¡ autorizado para enviar unha mensaxe de parte dun Ãºnico "
+#~ "delegado de cada vez."
+
+#~ msgid "You cannot make yourself your own delegate"
+#~ msgstr "Non pode converterse no seu propio delegado"
+
+#~ msgid "You have exceeded your quota for storing mail on this server."
+#~ msgstr "Excedeu a sÃºa cota para almacenar correo neste servidor."
+
+#~ msgid "You may only configure a single Exchange account."
+#~ msgstr "SÃ³ pode configurar unha conta do Exchange."
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. Try to clear up some space by deleting "
+#~ "some mail."
+#~ msgstr ""
+#~ "O seu uso actual Ã©: {0}KB. Tente liberar algo de espazo eliminando algÃºn "
+#~ "correo."
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. You will not be able to either send or "
+#~ "receive mail now."
+#~ msgstr ""
+#~ "O seu uso actual Ã©: {0}KB. Non poderÃ¡ nin enviar nin recibir correos "
+#~ "agora."
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. You will not be able to send mail until "
+#~ "you clear up some space by deleting some mail."
+#~ msgstr ""
+#~ "O seu uso actual Ã©: {0}KB. Non poderÃ¡ enviar correos atÃ© que libere algo "
+#~ "de espazo eliminando algÃºn correo."
+
+#~ msgid "Your password has expired."
+#~ msgstr "O seu contrasinal caducou."
+
+#~ msgid "{0} cannot be added to an access control list"
+#~ msgstr "{0} non pode engadirse Ã¡ lista de control de acceso"
+
+#~ msgid "{0} is already a delegate"
+#~ msgstr "{0} xa Ã© un delegado"
+
+#~ msgid "{0} is already in the list"
+#~ msgstr "{0} xa estÃ¡ na lista"
+
+#~ msgid "Subscribe to Other User's Tasks"
+#~ msgstr "Subscribirse Ã¡s tarefas doutros usuarios"
+
+#~ msgid "Check folder permissions"
+#~ msgstr "Verificar os permisos do cartafol"
+
+#~ msgid "PNG files"
+#~ msgstr "Ficheiros PNG"
+
+#~ msgid "_Face"
+#~ msgstr "_Cara"
+
+#~ msgid ""
+#~ "Attach a small picture of your face to outgoing messages.\n"
+#~ "\n"
+#~ "First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+#~ "encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+#~ "sent messages."
+#~ msgstr ""
+#~ "Anexar unha pequena imaxe da sÃºa cara para as mensaxes saÃntes. \n"
+#~ "\n"
+#~ "A primeira vez a persoa usuaria deberÃ¡ configurar unha imaxe PNG 48*48. "
+#~ "TerÃ¡ unha codificaciÃ³n de base64 e serÃ¡ almacenada en ~/.evolution/faces. "
+#~ "Esta opciÃ³n usarase nas mensaxes que se manden mÃ¡is adiante."
+
+#~ msgid "Unsubscribe Folders"
+#~ msgstr "Eliminar a subscriciÃ³n de cartafoles"
+
+#~ msgid ""
+#~ "Unsubscribe from an IMAP folder by right-clicking on it in the folder "
+#~ "tree."
+#~ msgstr ""
+#~ "DesubscrÃbase do cartafol IMAP facendo clic co botÃ³n dereito sobre Ã©l na "
+#~ "Ã¡rbore de cartafoles."
+
+#~ msgid "Add Novell GroupWise support to Evolution."
+#~ msgstr "Engade a compatibilidade para Novel GroupWise con Evolution."
+
+#~ msgid "GroupWise Account Setup"
+#~ msgstr "ConfiguraciÃ³n de conta Groupwise"
+
+#~ msgid "<b>Junk List:</b>"
+#~ msgstr "<b>Lista de correo non desexado:</b>"
+
+#~ msgid "<b>Name</b>"
+#~ msgstr "<b>Nome</b>"
+
+#~ msgid "<b>Custom Headers</b>"
+#~ msgstr "<b>Cabeceiras personalizadas</b>"
+
+#~ msgid "<b>IMAP Headers</b>"
+#~ msgstr "<b>Cabeceiras IMAP</b>"
+
+#~ msgid "Hardware Abstraction Layer not loaded"
+#~ msgstr "Non se cargou o Hardware Abstraction Layer"
+
+#~ msgid ""
+#~ "The \"hald\" service is required but not currently running. Please enable "
+#~ "the service and rerun this program, or contact your system administrator."
+#~ msgstr ""
+#~ "RequÃrese o servizo \"hald\", que non estÃ¡ sendo executado. Active este "
+#~ "servizo e reinicie o programa ou contacte co administrador do sistema."
+
+#~ msgid "Search for an iPod failed"
+#~ msgstr "A busca dun iPod fallou"
+
+#~ msgid ""
+#~ "Evolution could not find an iPod to synchronize with. Either the iPod is "
+#~ "not connected to the system or it is not powered on."
+#~ msgstr ""
+#~ "O Evolution non puido encontrar un iPod co que sincronizarse. Poida que o "
+#~ "iPod non estea conectado ao sistema ou que non estea aceso."
+
+#~ msgid "Synchronize to iPod"
+#~ msgstr "Sincronizar cun iPod"
+
+#~ msgid "Synchronize your data with your Apple iPod."
+#~ msgstr "Sincronizar os seus datos co seu Apple iPod."
+
+#~ msgid "Disable an account by right-clicking on it in the folder tree."
+#~ msgstr ""
+#~ "Desactive unha conta facendo clic co botÃ³n dereito nela na Ã¡rbore de "
+#~ "cartafoles."
+
+#~ msgid "Specify _filename:"
+#~ msgstr "Especificar o nome de _ficheiro:"
+
+#~ msgid "Pl_ay"
+#~ msgstr "Repr_oducir"
+
+#~ msgid "Mail-to-Task"
+#~ msgstr "Correo para tarefa"
+
+#~ msgid "Contact list _owner"
+#~ msgstr "Pr_opietario da lista de contactos"
+
+#~ msgid "Get list _archive"
+#~ msgstr "Obter _arquivo da lista"
+
+#~ msgid "Get list _usage information"
+#~ msgstr "Obter informaciÃ³n do _uso da lista"
+
+#~ msgid "_Post message to list"
+#~ msgstr "_Publicar unha mensaxe na lista"
+
+#~ msgid "_Subscribe to list"
+#~ msgstr "_Subscribirse Ã¡ lista"
+
+#~ msgid "_Un-subscribe to list"
+#~ msgstr "E_liminar subscriciÃ³n Ã¡ lista"
+
+#~ msgid "Mono Loader"
+#~ msgstr "Cargador de Mono"
+
+#~ msgid "Support plugins written in Mono."
+#~ msgstr "Complementos de asistencia escritos en Mono."
+
+#~ msgid "Prefer PLAIN"
+#~ msgstr "Preferir PLANO"
+
+#~ msgid "<span weight=\"bold\">Location</span>"
+#~ msgstr "<span weight=\"bold\">LocalizaciÃ³n</span>"
+
+#~ msgid "<span weight=\"bold\">Sources</span>"
+#~ msgstr "<span weight=\"bold\">Orixes</span>"
+
+#~ msgid ""
+#~ "Secure FTP (SSH)\n"
+#~ "Public FTP\n"
+#~ "FTP (with login)\n"
+#~ "Windows share\n"
+#~ "WebDAV (HTTP)\n"
+#~ "Secure WebDAV (HTTPS)\n"
+#~ "Custom Location"
+#~ msgstr ""
+#~ "FTP seguro (SSH)\n"
+#~ "FTP pÃºblico\n"
+#~ "FTP (con inicio de sesiÃ³n)\n"
+#~ "Compartido con Windows\n"
+#~ "WebDAV (HTTP)\n"
+#~ "WebDAV seguro (HTTPS)\n"
+#~ "LocalizaciÃ³n personalizada"
+
+#~ msgid ""
+#~ "days\n"
+#~ "weeks\n"
+#~ "months"
+#~ msgstr ""
+#~ "dÃas\n"
+#~ "semanas\n"
+#~ "meses"
+
+#~ msgid ""
+#~ "iCal\n"
+#~ "Free/Busy"
+#~ msgstr ""
+#~ "DispoÃ±ibilidade\n"
+#~ "iCal"
+
+#~ msgid "A plugin which loads other plugins written using Python."
+#~ msgstr "Un plugin que carga outros plugins escritos en Python."
+
+#~ msgid "Python Loader"
+#~ msgstr "Cargador de Python"
+
+#~ msgid "_Save to Disk"
+#~ msgstr "Gardar no _disco"
+
+#~ msgid "Quickly select a single calendar or task list for viewing."
+#~ msgstr "Selecciona un Ãºnico calendario ou lista de tarefa para velo."
+
+#~ msgid "Select One Source"
+#~ msgstr "Seleccione unha orixe"
+
+#~ msgid "Evolution Shell"
+#~ msgstr "IntÃ©rprete de comandos do Evolution"
+
+#~ msgid "Evolution Shell Config factory"
+#~ msgstr "FactorÃa de configuraciÃ³n do intÃ©rprete de comandos do Evolution"
+
+#~ msgid "Evolution Test"
+#~ msgstr "Proba do Evolution"
+
+#~ msgid "Evolution Test component"
+#~ msgstr "CompoÃ±ente de proba do Evolution"
+
+#~ msgid "<b>Active Connections</b>"
+#~ msgstr "<b>ConexiÃ³ns activas</b>"
+
+#~ msgid "Active Connections"
+#~ msgstr "ConexiÃ³ns activas"
+
+#~ msgid "Click OK to close these connections and go offline"
+#~ msgstr ""
+#~ "Prema en Aceptar para pechar estas conexiÃ³ns e entrar no modo sen conexiÃ³n"
+
+#~ msgid "_Import"
+#~ msgstr "_Importar"
+
+#~ msgid "The GNOME Pilot tools do not appear to be installed on this system."
+#~ msgstr ""
+#~ "Non parece que as ferramentas Gnome Pilot estean instaladas neste sistema."
+
+#~ msgid "Error executing %s. (%s)"
+#~ msgstr "Erro ao executar %s.(%s)"
+
+#~ msgid "Work Offline"
+#~ msgstr "Traballar sen conexiÃ³n"
+
+#~ msgid "Evolution is in the process of going offline."
+#~ msgstr "O Evolution estÃ¡ en proceso de desconexiÃ³n."
+
+#~ msgid "Unknown system error."
+#~ msgstr "Erro de sistema descoÃ±ecido."
+
+#~ msgid "Invalid arguments"
+#~ msgstr "Os argumentos non son vÃ¡lidos"
+
+#~ msgid "Cannot register on OAF"
+#~ msgstr "Non se pode rexistrar en OAF"
+
+#~ msgid "Configuration Database not found"
+#~ msgstr "Non se localizou a base de datos de configuraciÃ³n"
+
+#~ msgid "New Test"
+#~ msgstr "Proba nova"
+
+#~ msgid "Import File"
+#~ msgstr "Importar ficheiro"
+
+#~ msgid "Cannot start Evolution"
+#~ msgstr "Non Ã© posÃbel iniciar o Evolution"
+
+#~ msgid "Evolution can not start."
+#~ msgstr "O Evolution non pode iniciar."
+
+#~ msgid ""
+#~ "Your system configuration does not match your Evolution configuration.\n"
+#~ "\n"
+#~ "Click help for details"
+#~ msgstr ""
+#~ "A configuraciÃ³n do sistema non coincide coa configuraciÃ³n do Evolution.\n"
+#~ "\n"
+#~ "Prema na axuda para mÃ¡is detalles"
+
+#~ msgid ""
+#~ "Your system configuration does not match your Evolution configuration:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "\n"
+#~ "Click help for details."
+#~ msgstr ""
+#~ "A configuraciÃ³n do sistema non coincide coa configuraciÃ³n do Evolution.\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "\n"
+#~ "Prema na axuda para mÃ¡is detalles."
+
+#~ msgid "<b>Field Value</b>"
+#~ msgstr "<b>Valor do campo</b>"
+
+#~ msgid "<b>Fingerprints</b>"
+#~ msgstr "<b>ImpresiÃ³ns dixitais</b>"
+
+#~ msgid "<b>Issued By</b>"
+#~ msgstr "<b>Emitido por</b>"
+
+#~ msgid "<b>Issued To</b>"
+#~ msgstr "<b>Emitido para</b>"
+
+#~ msgid "Dummy window only"
+#~ msgstr "SÃ³ xanela de proba"
+
+#~ msgid "Could not execute '%s': %s\n"
+#~ msgstr "Non se puido executar '%s': %s\n"
+
+#~ msgid "Shutting down %s (%s)\n"
+#~ msgstr "Pechando %s (%s)\n"
+
+#~ msgid "Copy"
+#~ msgstr "Copiar"
+
+#~ msgid "Copy to Folder..."
+#~ msgstr "Copiar ao cartafol..."
+
+#~ msgid "Create a new address book folder"
+#~ msgstr "Crear un cartafol novo de axenda de enderezos"
+
+#~ msgid "Cut"
+#~ msgstr "Cortar"
+
+#~ msgid "Forward Contact"
+#~ msgstr "Reenviar contacto"
+
+#~ msgid "Move to Folder..."
+#~ msgstr "Mover ao cartafol..."
+
+#~ msgid "Paste"
+#~ msgstr "Colar"
+
+#~ msgid "Save as VCard..."
+#~ msgstr "Gardar como VCard..."
+
+#~ msgid "Select _All"
+#~ msgstr "Seleccionar _todo"
+
+#~ msgid "Send message to contact"
+#~ msgstr "Enviar mensaxe a un contacto"
+
+#~ msgid "St_op"
+#~ msgstr "Det_er"
+
+#~ msgid "Stop"
+#~ msgstr "Deter"
+
+#~ msgid "_Copy Folder Contacts To"
+#~ msgstr "_Copiar cartafol de contactos a"
+
+#~ msgid "_Move Folder Contacts To"
+#~ msgstr "_Mover o cartafol de contactos a"
+
+#~ msgid "_Rename"
+#~ msgstr "_Renomear"
+
+#~ msgid "_Save Contact as VCard..."
+#~ msgstr "_Gardar contacto como VCard..."
+
+#~ msgid "_Save Folder Contacts As VCard"
+#~ msgstr "_Gardar o cartafol de contactos como VCard"
+
+#~ msgid "Delete _all Occurrences"
+#~ msgstr "Eliminar _todas as ocorrencias"
+
+#~ msgid "Show the working week"
+#~ msgstr "Mostrar a semana laboral"
+
+#~ msgid "View the debug console for log messages"
+#~ msgstr "Visualizar a consola de depuraciÃ³n para as mensaxes de rexistro"
+
+#~ msgid "_Debug Logs"
+#~ msgstr "Rexistros de _depuraciÃ³n"
+
+#~ msgid "Show message preview side-by-side with the message list"
+#~ msgstr "Mostrar a previsualizaciÃ³n de mensaxes ao lado da lista de mensaxes"
+
+#~ msgid "Copy selected message(s) to the clipboard"
+#~ msgstr "Copiar as mensaxes seleccionadas ao portapapeis"
+
+#~ msgid "Cut selected message(s) to the clipboard"
+#~ msgstr "Cortar as mensaxes seleccionadas ao portapapeis"
+
+#~ msgid "Paste message(s) from the clipboard"
+#~ msgstr "Colar as mensaxes dende o portapapeis"
+
+#~ msgid "Select _All Messages"
+#~ msgstr "Seleccionar _todas as mensaxes"
+
+#~ msgid "Select all and only the messages that are not currently selected"
+#~ msgstr ""
+#~ "Seleccionar todas e unicamente as mensaxes non seleccionadas actualmente"
+
+#~ msgid "Not Junk"
+#~ msgstr "Non Ã© correo non desexado"
+
+#~ msgid "Paste messages from the clipboard"
+#~ msgstr "Colar as mensaxes dende o portapapeis"
+
+#~ msgid "Select _All Text"
+#~ msgstr "Seleccionar _todo o texto"
+
+#~ msgid "_Save Message..."
+#~ msgstr "_Gardar mensaxe..."
+
+#~ msgid "Close"
+#~ msgstr "Pechar"
+
+#~ msgid "Main toolbar"
+#~ msgstr "Barra de ferramentas principal"
+
+#~ msgid "Copy selected memo"
+#~ msgstr "Copiar a nota seleccionada"
+
+#~ msgid "Cut selected memo"
+#~ msgstr "Cortar a nota seleccionada"
+
+#~ msgid "Copy selected tasks"
+#~ msgstr "Copiar as tarefas seleccionadas"
+
+#~ msgid "Cut selected tasks"
+#~ msgstr "Cortar as tarefas seleccionadas"
+
+#~ msgid "Mar_k as Complete"
+#~ msgstr "Mar_car como terminada"
+
+#~ msgid "Show task preview window"
+#~ msgstr "Mostrar a xanela de previsualizaciÃ³n de tarefa"
+
+#~ msgid "About Evolution..."
+#~ msgstr "Sobre o Evolution..."
+
+#~ msgid "Change the visibility of the toolbar"
+#~ msgstr "Modificar a visibilidade da barra de ferramentas"
+
+#~ msgid "Forget remembered passwords so you will be prompted for them again"
+#~ msgstr "Esquecer todos os contrasinais memorizados para pedilos de novo"
+
+#~ msgid "Hide window buttons"
+#~ msgstr "Ocultar os botÃ³ns da xanela"
+
+#~ msgid "Page Set_up..."
+#~ msgstr "Config_uraciÃ³n da pÃ¡xina..."
+
+#~ msgid "Prefere_nces"
+#~ msgstr "Prefere_ncias"
+
+#~ msgid "Send / Receive"
+#~ msgstr "Enviar/Recibir"
+
+#~ msgid "Submit Bug Report"
+#~ msgstr "Enviar un informe de erro"
+
+#~ msgid "Toggle whether we are working offline."
+#~ msgstr "Alternar entre se estamos traballando sen conexiÃ³n ou non."
+
+#~ msgid "View/Hide the Side Bar"
+#~ msgstr "Ver/Ocultar a barra lateral"
+
+#~ msgid "View/Hide the Status Bar"
+#~ msgstr "Ver/Ocultar a barra de estado"
+
+#~ msgid "Work _Offline"
+#~ msgstr "Traballar s_en conexiÃ³n"
+
+#~ msgid "_About"
+#~ msgstr "_Sobre"
+
+#~ msgid "_Frequently Asked Questions"
+#~ msgstr "Preguntas _frecuentes (FAQ)"
+
+#~ msgid "_Hide Buttons"
+#~ msgstr "_Ocultar botÃ³ns"
+
+#~ msgid "_Quit"
+#~ msgstr "_SaÃr"
+
+#~ msgid "<b>Time Zones</b>"
+#~ msgstr "<b>Fusos horarios</b>"
+
+#~ msgid "<b>_Selection</b>"
+#~ msgstr "<b>_SelecciÃ³n</b>"
+
+#~ msgid "Save Custom View"
+#~ msgstr "Gardar visualizaciÃ³n personalizada"
+
+#~ msgid "Unknown character set: %s"
+#~ msgstr "Conxunto de caracteres descoÃ±ecido: %s"
+
+#~ msgid "_Searches"
+#~ msgstr "_Buscas"
+
+#~ msgid "Choose Image"
+#~ msgstr "Seleccione unha imaxe"
+
+#~ msgid "Empty message"
+#~ msgstr "Mensaxe baleira"
+
+#~ msgid "Reflow model"
+#~ msgstr "Modelo de refluxo"
+
+#~ msgid "Column width"
+#~ msgstr "Largura de columna"
+
+#~ msgid "_Clear"
+#~ msgstr "_Limpar"
+
+#~ msgid "Item ID"
+#~ msgstr "ID de elemento"
+
+#~ msgid "<b>Replies</b>"
+#~ msgstr "<b>Respostas</b>"
+
+#~ msgid "<b>Status Tracking</b>"
+#~ msgstr "<b>Seguimento de estado</b>"
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "Proprietary\n"
+#~ "Confidential\n"
+#~ "Secret\n"
+#~ "Top Secret\n"
+#~ "For Your Eyes Only"
+#~ msgstr ""
+#~ "Normal\n"
+#~ "Privado\n"
+#~ "Confidencial\n"
+#~ "Secreto\n"
+#~ "Alto secreto\n"
+#~ "SÃ³ para ti"
+
+#~ msgid ""
+#~ "Undefined\n"
+#~ "High\n"
+#~ "Standard\n"
+#~ "Low"
+#~ msgstr ""
+#~ "Sen definir\n"
+#~ "Alto\n"
+#~ "EstÃ¡ndar\n"
+#~ "Baixo"
+
+#~ msgid "Add a column..."
+#~ msgstr "Engadir unha columna..."
+
+#~ msgid "Field Chooser"
+#~ msgstr "Selector de campos"
+
+#~ msgid "Tree"
+#~ msgstr "Ã?rbore"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]