[evolution/foocanvas] Updated Galician translations

From: Henning Habighorst <hhabig src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution/foocanvas] Updated Galician translations
Date: Sun, 25 Apr 2010 20:59:13 +0000 (UTC)
commit 5d0b3896c31da5d19f93398bf93e4fc17be3cd2d
Author: Francisco DiÃ©guez <fran dieguez mabishu com>
Date:   Sun Apr 18 12:42:40 2010 +0200

    Updated Galician translations

 po/gl.po | 8037 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 4018 insertions(+), 4019 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 8e64f6d..65c91da 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -16,14 +16,13 @@
 # AntÃ³n MÃ©ixome <meixome mancomun org>, 2009.
 # AntÃ³n MÃ©ixome <meixome certima net>, 2010.
 # Fran DiÃ©guez <frandieguez ubuntu com>, 2009, 2010.
-#: ../shell/main.c:508
+#: ../shell/main.c:454
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-master-po-gl-53747.merged\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution\n"
-"POT-Creation-Date: 2010-03-12 17:24+0000\n"
-"PO-Revision-Date: 2010-03-07 21:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-18 12:42+0200\n"
+"PO-Revision-Date: 2010-04-18 12:42+0200\n"
 "Last-Translator: Fran DiÃ©guez <frandieguez ubuntu com>\n"
 "Language-Team: Galician <gnome g11n net>\n"
 "MIME-Version: 1.0\n"
@@ -111,7 +110,7 @@ msgstr "Produciuse un fallo ao autenticarse no servidor LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1267
 msgid "Failed to delete contact"
 msgstr "Produciuse un fallo ao eliminar o contacto"
 
@@ -226,7 +225,7 @@ msgstr ""
 "Os seus contactos para {0} non estarÃ¡n dispoÃ±Ãbeis atÃ© que o Evolution sexa "
 "reiniciado."
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:521
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
@@ -249,16 +248,6 @@ msgstr "_Redimensionar"
 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:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
 #: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "Enderezo de sincronizaciÃ³n predefinido:"
@@ -275,7 +264,7 @@ msgstr "Non foi posÃbel ler o bloque de Aplicativo de enderezos do pilot"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2005
 msgid "Anniversary"
 msgstr "Aniversario"
 
@@ -286,36 +275,39 @@ msgstr "Aniversario"
 #. * 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
+#: ../calendar/gui/e-calendar-view.c:2004 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:107
 msgid "Birthday"
 msgstr "Aniversario"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Blog:"
+msgstr "Blog:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
 #: ../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.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 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
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../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:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2568
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:291
 #: ../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
@@ -324,221 +316,189 @@ msgstr "Editor de contactos"
 msgid "Email"
 msgstr "Correo ElectrÃ³nico"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "_DispoÃ±ibilidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "_Nome completo..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../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
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "PÃ¡xina de _inicio:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "Imaxe"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "<b>MensaxarÃa instantÃ¡nea</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "Traballo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "Enderezo de correo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "_Alcume:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../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
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "Notas"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../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
+#: ../calendar/gui/e-calendar-view.c:1711
 msgid "Other"
 msgstr "Outros"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "Datos persoais"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "TelÃ©fono"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "_Videoconferencia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 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/contact-editor.ui.h:26
 #: ../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
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Address:"
 msgstr "_Enderezo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Anniversary:"
 msgstr "_Aniversario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Assistant:"
 msgstr "_Asistente:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Birthday:"
 msgstr "_Aniversario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+msgid "_Blog:"
+msgstr "_Blog:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 #: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../plugins/itip-formatter/itip-view.c:1905
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Company:"
 msgstr "_Empresa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Country:"
 msgstr "_PaÃs:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_File under:"
 msgstr "_Arquivar como:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Free/Busy:"
 msgstr "_DispoÃ±ibilidade:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Home Page:"
 msgstr "PÃ¡xina de _inicio:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Manager:"
 msgstr "_Xestor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_PO Box:"
 msgstr "_Apdo. de correos:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Profession:"
 msgstr "_ProfesiÃ³n:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Spouse:"
 msgstr "_CÃ³nxuxe:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_TÃtulo:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Video Chat:"
 msgstr "_Videoconferencia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Wants to receive HTML mail"
 msgstr "_Quere recibir correo en HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "Rexistro _web:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "_Onde:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "_Zip/Postal Code:"
 msgstr "_CÃ³digo Postal:"
 
-#: ../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:60
-msgid "Name"
-msgstr "Nome"
-
-#: ../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: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:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "EditÃ¡bel"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
@@ -580,7 +540,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:377
 msgid "Error adding contact"
 msgstr "Produciuse un erro ao engadir o contacto"
 
@@ -592,45 +552,21 @@ msgstr "Produciuse un erro ao modificar o contacto"
 msgid "Error removing contact"
 msgstr "Produciuse un erro ao eliminar o contacto"
 
-#: ../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:303
-msgid "Target Book"
-msgstr "Axenda de enderezos de destino"
-
-#: ../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:324
-msgid "Writable Fields"
-msgstr "Campos que se poden escribir"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "Campos requiridos"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "Modificado"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2563
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de Contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2971
 msgid "Please select an image for this contact"
 msgstr "Escolla unha imaxe para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2972
 msgid "_No image"
 msgstr "_Sen imaxe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -638,56 +574,46 @@ msgstr ""
 "Os datos de contacto non son vÃ¡lidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3249
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ten un formato non vÃ¡lido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3256
 #, 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:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3282
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' estÃ¡ baleiro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3296
 msgid "Invalid contact."
 msgstr "Contacto non vÃ¡lido."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "AdiciÃ³n rÃ¡pida de contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "_Editar completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "Nome _completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "Correo _electrÃ³nico"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "_Seleccione a axenda de enderezos"
 
-#: ../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: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/fullname.ui.h:1
 msgid "Dr."
 msgstr "Dr."
@@ -754,7 +680,7 @@ msgid "_Suffix:"
 msgstr "_Sufixo:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:674
 msgid "Contact List Editor"
 msgstr "Editor da lista de contactos"
 
@@ -771,7 +697,7 @@ msgid "_List name:"
 msgstr "_Nome da lista:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:155
 msgid "_Select..."
 msgstr "_Seleccionar..."
 
@@ -780,39 +706,27 @@ 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:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:767
 msgid "Contact List Members"
 msgstr "Membros da lista de contactos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:915
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1331
 msgid "_Members"
 msgstr "_Integrantes"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1170
 msgid "Error adding list"
 msgstr "Produciuse un erro ao engadir a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1184
 msgid "Error modifying list"
 msgstr "Produciuse un erro ao modificar a lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1198
 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:1257
-msgid "Is New List"
-msgstr "Ã? unha lista nova"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Contacto modificado:"
@@ -851,31 +765,31 @@ msgstr ""
 "cartafol. Quere engadilo de todas as formas?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:237
 msgid "_Merge"
 msgstr "_Combinar"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:220
 msgid "Merge Contact"
 msgstr "Combinar contacto"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 #: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:958
 msgid "Any field contains"
 msgstr "Calquera campo contÃ©n"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 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
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "O nome contÃ©n"
 
@@ -894,91 +808,62 @@ msgstr[1] "%d contactos"
 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:706
 msgid "Search Interrupted"
 msgstr "BÃºsqueda interrompida"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../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:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "Modelo"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Produciuse un erro ao modificar a tarxeta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:618
 msgid "Cut selected contacts to the clipboard"
 msgstr "Cortar o texto seleccionado para o portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Copy selected contacts to the clipboard"
 msgstr "Copiar o texto seleccionado ao portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Paste contacts from the clipboard"
 msgstr "Pegar os contactos desde o portapapeis"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "Eliminar os contactos seleccionados"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
 msgid "Select all visible contacts"
 msgstr "Seleccionar todos os contactos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "VisualizaciÃ³n de terminal"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "Orixe"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
 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:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1289
 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:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1293
 #, 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:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 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:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 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:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
 #, 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:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1462
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -987,11 +872,11 @@ 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:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1467
 msgid "_Don't Display"
 msgstr "_Non mostrar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
 msgid "Display _All Contacts"
 msgstr "Mostrar _todos os contactos"
 
@@ -1151,7 +1036,6 @@ msgid "Telex"
 msgstr "TÃ©lex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:818
 msgid "Title"
 msgstr "TÃtulo"
 
@@ -1163,59 +1047,7 @@ msgstr "Unidade"
 msgid "Web Site"
 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/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:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-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/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:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "Altura"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "Ten foco"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Campo"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Nome do campo"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Modelo de texto"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Lonxitude mÃ¡xima do campo"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "Largura da columna"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1225,7 +1057,7 @@ msgstr ""
 "\n"
 "Buscando os contactos..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1239,7 +1071,7 @@ msgstr ""
 "\n"
 "ou prema dÃºas veces aquÃ para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1253,7 +1085,7 @@ msgstr ""
 "\n"
 "Prema aquÃ dÃºas veces para crear un contacto novo."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1263,7 +1095,7 @@ msgstr ""
 "\n"
 "Buscar o contacto."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1273,10 +1105,6 @@ msgstr ""
 "\n"
 "Non hai elementos para mostrar nesta visualizaciÃ³n."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "Adaptador"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Correo electrÃ³nico do traballo"
@@ -1286,18 +1114,10 @@ msgid "Home Email"
 msgstr "Correo electrÃ³nico particular"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:805
 msgid "Other Email"
 msgstr "Outro correo electrÃ³nico"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "Seleccionado"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "PosÃºe cursor"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
 #: ../addressbook/gui/widgets/ea-minicard-view.c:178
@@ -1340,17 +1160,17 @@ msgid "Copy _Email Address"
 msgstr "Copiar enderezo de _correo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:381
 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
+#: ../widgets/misc/e-web-view.c:386
 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
+#: ../widgets/misc/e-web-view.c:388
 msgid "Send a mail message to this address"
 msgstr "Converte unha mensaxe nunha tarefa."
 
@@ -1386,22 +1206,21 @@ msgid "Video Chat"
 msgstr "Videoconferencia"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../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
+#: ../modules/calendar/e-cal-shell-view.c:496
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "Calendario"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:116
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "DispoÃ±ibilidade"
@@ -1428,21 +1247,20 @@ msgstr "PÃ¡xina persoal"
 msgid "Web Log"
 msgstr "Blogue"
 
-#. 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
+#: ../capplet/settings/mail-capplet-shell.c:350
 #: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
+#: ../modules/addressbook/e-book-shell-migrate.c:134
 #: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../modules/calendar/e-cal-shell-migrate.c:151
 #: ../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
+#: ../modules/calendar/e-task-shell-migrate.c:119
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "Persoal"
@@ -1459,8 +1277,8 @@ msgstr "PÃ¡xina de inicio"
 msgid "Blog"
 msgstr "Blogue"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:838
 #, c-format
 msgid "Click to mail %s"
 msgstr "Prema para enviar un correo a %s"
@@ -1517,11 +1335,11 @@ msgstr "O protocolo non Ã© compatÃbel"
 #. 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:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2659
 msgid "Canceled"
 msgstr "Cancelado"
 
@@ -1654,27 +1472,27 @@ msgstr "Esta consulta non terminou con Ã©xito."
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:248
 msgid "Select Address Book"
 msgstr "Seleccione a axenda de enderezos"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:438
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
@@ -1686,7 +1504,7 @@ msgstr "VisualizaciÃ³n de tarxeta"
 #: ../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:685 ../shell/shell.error.xml.h:5
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importando..."
 
@@ -1807,19 +1625,19 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Accedendo anonimamente ao servidor LDAP"
 
 #: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "Produciuse un fallo ao autenticarse.\n"
 
 #: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, 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/caldav/caldav-browse-server.c:808
 #: ../plugins/google-account-setup/google-source.c:440
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
@@ -1967,46 +1785,42 @@ 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:29
-msgid "Calendar repository is offline."
-msgstr "O repositorio de calendarios estÃ¡ desconectado."
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "Non Ã© posÃbel crear un novo actividade"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "Non Ã© posÃbel gardar o actividade"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Quere eliminar o calendario '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Quere eliminar a lista de notas '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Quere eliminar a lista de tarefas '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "_Non enviar"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:35
 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:37
+#: ../calendar/calendar.error.xml.h:36
 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:38
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "Non foi posÃbel cargar o editor."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -2014,31 +1828,26 @@ msgstr ""
 "Enviaranse convites por correo electrÃ³nico a todos os participantes e "
 "permitirÃ¡selles aceptar esta tarefa."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Enviaranse convites por correo electrÃ³nico a todos os participantes e "
 "permitirÃ¡selles confirmalos."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "Produciuse un erro ao cargar o calendario"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "Produciuse un erro ao cargar a lista de notas"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "Produciuse un erro ao cargar a lista de tarefas"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "Erro en '{0}'"
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2046,7 +1855,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:47
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2054,7 +1863,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:48
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2062,11 +1871,7 @@ 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:49
-msgid "No response from the server."
-msgstr "Non hai resposta do servidor."
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2074,7 +1879,7 @@ msgstr ""
 "Ao enviar informaciÃ³n actualizada permite que outros participantes manteÃ±an "
 "os seus calendarios ao dÃa."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2082,7 +1887,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:52
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2090,7 +1895,7 @@ msgstr ""
 "Estanse descargando algÃºns anexos. Gardar a cita farÃ¡ que se perdan eses "
 "anexos."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2098,98 +1903,94 @@ msgstr ""
 "Estanse descargando algÃºns anexos. Gardar a tarefa farÃ¡ que se perdan eses "
 "anexos."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:50
 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:55
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "O calendario do Evolution saÃu inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Os calendarios do Evolution saÃron inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "As notas do Evolution saÃron inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "As tarefas do Evolution saÃron inesperadamente."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:55
 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:60
+#: ../calendar/calendar.error.xml.h:56
 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:61
+#: ../calendar/calendar.error.xml.h:57
 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:62
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "Este calendario eliminarase permanentemente."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:59
 msgid "This memo list will be removed permanently."
 msgstr "Esta lista de notas vaise eliminar permanentemente."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "Esta lista de tarefas vaise eliminar permanentemente."
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "Non Ã© posÃbel cargar o calendario"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:61
 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:67
+#: ../calendar/calendar.error.xml.h:62
 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
+#: ../calendar/calendar.error.xml.h:63
 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:69
+#: ../calendar/calendar.error.xml.h:64
 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:70
+#: ../calendar/calendar.error.xml.h:65
 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:71
+#: ../calendar/calendar.error.xml.h:66
 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:72
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Quere enviar convites para a cita aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send this task to participants?"
 msgstr "Quere enviar esta tarefa aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:69
 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:75
+#: ../calendar/calendar.error.xml.h:70
 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:76
+#: ../calendar/calendar.error.xml.h:71
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2199,62 +2000,58 @@ 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:77
+#: ../calendar/calendar.error.xml.h:72
 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:78
+#: ../calendar/calendar.error.xml.h:73
 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
+#: ../calendar/calendar.error.xml.h:74
 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:80
+#: ../calendar/calendar.error.xml.h:75
 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:81
+#: ../calendar/calendar.error.xml.h:76
 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:82
+#: ../calendar/calendar.error.xml.h:77
 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:83
+#: ../calendar/calendar.error.xml.h:78
 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:84
+#: ../calendar/calendar.error.xml.h:79
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "_Rexeitar as modificaciÃ³ns"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:309
 msgid "_Save"
 msgstr "_Gardar"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "_Gardar modificaciÃ³ns"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:82
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:133
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "_Enviar notificaciÃ³n"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
 #: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "Dividir eventos de dÃas mÃºltiples:"
@@ -2310,7 +2107,7 @@ msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "Hora de comezo"
 
@@ -2328,7 +2125,7 @@ msgstr "Ignorar _todo"
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1573
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1579
 #: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../plugins/itip-formatter/itip-view.c:1027
 msgid "Location:"
 msgstr "LocalizaciÃ³n:"
 
@@ -2345,7 +2142,7 @@ msgstr "_Ignorar"
 #: ../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
+#: ../shell/e-shell-window-actions.c:1625
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Editar"
@@ -2355,8 +2152,8 @@ msgid "_Snooze"
 msgstr "_Pospor"
 
 #: ../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
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
 #: ../plugins/google-account-setup/google-contacts-source.c:332
 msgid "hours"
@@ -2366,9 +2163,10 @@ msgstr "horas"
 msgid "location of appointment"
 msgstr "localizaciÃ³n da cita"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
 #: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "minutes"
@@ -2393,13 +2191,13 @@ msgstr "Non hai informaciÃ³n da localizaciÃ³n dispoÃ±Ãbel."
 msgid "You have %d alarms"
 msgstr "Ten %d alarmas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../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"
@@ -2411,7 +2209,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:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1708
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2428,7 +2226,7 @@ msgstr ""
 "\n"
 "EstÃ¡ seguro de que quere executar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "Non volver preguntar sobre este programa."
 
@@ -2470,7 +2268,7 @@ msgid "Alarm programs"
 msgstr "Programas de alarma"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 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."
 
@@ -2492,155 +2290,151 @@ msgid "Calendars to run alarms for"
 msgstr "Os calendarios nos que se activarÃ¡n alarmas"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid "Check this to use system timezone in Evolution."
-msgstr "Active isto para empregar o fuso horario do sistema en Evolution."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 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 "
 "predefinida)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Cor para debuxar a liÃ±a de Marcus Bains na visualizaciÃ³n diaria."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "Comprimir as fins de semana na visualizaciÃ³n mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "Confirmar a compactaciÃ³n"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Count of default recurrence for a new event. -1 means forever."
 msgstr ""
 "Conta de recorrencia predefinida para unha actividade nova. -1 significa "
 "sempre."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "DÃas nos que debe indicarse o inicio e fin das horas de traballo."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "Aviso de cita predefinido"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default recurrence count"
 msgstr "Conta de recorrencia predefinida"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "Unidades de aviso predefinidas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Valor de aviso predefinido"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Directory for saving alarm audio files"
 msgstr "Cartafol para gardar ficheiros de audio para alarmas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "GradaciÃ³n de eventos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "Transparencia de actividade"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
 msgstr "Os URL do servidor de dispoÃ±ibilidade"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
 msgstr "URL do modelo de dispoÃ±ibilidade"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Gradient of the events in calendar views."
 msgstr "GradaciÃ³n de eventos nas visualizaciÃ³ns de calendario."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
 msgstr "Ocultar as tarefas terminadas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
 msgstr "Ocultar as unidades da tarefa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
 msgstr "Ocultar o valor da tarefa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
 msgstr "PosiciÃ³n horizontal do panel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Hora de fin da xornada laboral, en formato de vinte e catro horas, de 0 a 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Hora de comezo da xornada laboral, en formato de vinte e catro horas, de 0 a "
 "23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 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:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "Hora da Ãºltima alarma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 #: ../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:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 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:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 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:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
 msgstr "LiÃ±a de Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 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:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 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:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -2648,52 +2442,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:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 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:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Memo layout style"
 msgstr "Estilo da _resposta:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 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:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 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:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
 msgstr "PosiciÃ³n do panel horizontal da visualizaciÃ³n mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
 msgstr "PosiciÃ³n do panel vertical na visualizaciÃ³n mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Number of units for determining a default reminder."
 msgstr "NÃºmero de unidades para determinar un aviso predefinido."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 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:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Overdue tasks color"
 msgstr "Cor para as tarefas pendentes"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -2702,7 +2496,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:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2710,25 +2504,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:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -2736,7 +2530,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:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2744,7 +2538,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:59
+#: ../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 when not in the month view, in pixels."
@@ -2753,86 +2547,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:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary calendar"
 msgstr "Calendario primario"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary memo list"
 msgstr "Lista de notas primaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary task list"
 msgstr "Lista de tarefas primaria"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 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:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 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:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
 msgstr "Cartafol onde gardar a alarma de audio"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
 msgstr "Desprazar a vista de mes por semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Mostrar o campo RSVP no editor de eventos/tarefas/reuniÃ³ns"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 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:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 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:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Mostrar o campo categorÃas no editor de eventos/reuniÃ³ns/tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 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:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 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:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
 msgstr "Mostrar o panel de \"PrevisualizaciÃ³n\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the task preview pane"
 msgstr "Mostrar o panel de \"PrevisualizaciÃ³n\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 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:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 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:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 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:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 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:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -2840,23 +2634,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:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task layout style"
 msgstr "Estilo da disposiciÃ³n de tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (horizontal)"
 msgstr "PosiciÃ³n do panel vertical de tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Task preview pane position (vertical)"
 msgstr "PosiciÃ³n do panel vertical de tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Tasks due today color"
 msgstr "Cor para as tarefas que vencen hoxe"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2866,7 +2660,7 @@ 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:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -2875,7 +2669,7 @@ msgstr ""
 "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:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 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 "
@@ -2887,7 +2681,7 @@ msgstr ""
 "\" (VisualizaciÃ³n vertical) mostra o panel de previsualizaciÃ³n ao lado da "
 "lista de recordatorios."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 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 "
@@ -2898,11 +2692,11 @@ msgstr ""
 "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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 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:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -2910,19 +2704,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:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time divisions"
 msgstr "DivisiÃ³ns horarias"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 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:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Timezone"
 msgstr "Fuso horario"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -2930,70 +2724,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:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Twenty four hour time format"
 msgstr "Formato de hora en vinte e catro horas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "URI do calendario realzado (\"primario\")"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 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:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 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:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"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:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para determinar cando ocultar as tarefas: \"minutes\", \"hours\" ou "
 "\"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use system timezone"
 msgstr "Empregar o fuso horario do sistema"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr ""
 "Usar o fuso horario do sistema no canto do fuso horario seleccionado no "
 "Evolution."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Vertical pane position"
 msgstr "PosiciÃ³n vertical do panel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Week start"
 msgstr "Comezo da semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "O dÃa no que comeza a semana, desde o domingo (0) atÃ© o sÃ¡bado (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 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:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Indica se se solicita confirmaciÃ³n ao eliminar unha cita ou tarefa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 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:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -3001,94 +2795,94 @@ 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:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Indica se se mostra a hora de finalizaciÃ³n dos eventos nas visualizaciÃ³ns "
 "semanais e mensuais."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Indica se se debuxa a liÃ±a Marcus Bains (liÃ±a na hora actual) no calendario."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr ""
 "Indica se se ocultan as tarefas terminadas na visualizaciÃ³n de tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 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:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to set a default reminder for appointments."
 msgstr "Indica se se define un aviso predefinido para as citas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 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:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 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:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 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:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 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:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 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:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 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:121
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 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:122
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 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:123
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 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:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Work days"
 msgstr "DÃas laborÃ¡beis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday end hour"
 msgstr "Hora de finalizaciÃ³n da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end minute"
 msgstr "Minuto de finalizaciÃ³n da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday start hour"
 msgstr "Hora de comezo da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start minute"
 msgstr "Minuto de comezo da xornada laboral"
 
@@ -3138,7 +2932,7 @@ msgid "Classification"
 msgstr "ClasificaciÃ³n"
 
 #: ../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:488
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -3182,19 +2976,19 @@ msgid "Organizer"
 msgstr "Organizador"
 
 #: ../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:487
+#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privado"
 
 #: ../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:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
+#: ../calendar/gui/e-task-table.c:487 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "PÃºblico"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:299
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Recorrencia"
@@ -3277,7 +3071,7 @@ msgstr "Son de alarma personalizado"
 msgid "Mes_sage:"
 msgstr "Mensa_xes:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:77
 msgid "Options"
 msgstr "_OpciÃ³ns"
 
@@ -3324,11 +3118,12 @@ 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
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
 #: ../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
+#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "dÃas"
 
@@ -3336,19 +3131,20 @@ msgstr "dÃas"
 msgid "end of appointment"
 msgstr "Cita nova"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "tempos adicionais a cada"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "horas"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "minutos"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "localizaciÃ³n da cita"
 
@@ -3376,7 +3172,7 @@ msgstr "NingÃºn"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "Seleccionar..."
 
@@ -3385,12 +3181,12 @@ msgid "Selected Calendars for Alarms"
 msgstr "Seleccionar calendario para alarmas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
-msgstr "Hora e data:"
+msgid "Ti_me and date:"
+msgstr "_Hora e data:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
-msgstr "SÃ³ data:"
+msgid "_Date only:"
+msgstr "SÃ³ _data:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
@@ -3423,12 +3219,12 @@ msgstr "minutos"
 msgid "60 minutes"
 msgstr "minutos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 msgid "Alerts"
 msgstr "Alarmas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 #: ../modules/addressbook/autocompletion-config.c:153
 msgid "Date/Time Format"
 msgstr "Data/Formato de hora"
@@ -3454,18 +3250,18 @@ msgid "Display alarms in _notification area only"
 msgstr "Mostrar as alertas sÃ³ na Ã¡rea de _notificaciÃ³n"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Venres"
 
 #: ../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:2666
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:278 ../mail/mail-config.ui.h:54
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2660
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "General"
@@ -3480,7 +3276,7 @@ msgid "Minutes"
 msgstr "minutos"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Luns"
@@ -3494,184 +3290,196 @@ msgid "None"
 msgstr "NingÃºn"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:81
 msgid "Pick a color"
 msgstr "Seleccionar unha cor"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "_Dom"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "SÃ¡bado"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "Desp_razar a vista de mes por semana"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "Seg_undo fuso horario:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "Seleccione os calendarios para a notificaciÃ³n de alarma"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "M_ostrar un aviso"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "Mostrar un a_viso"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "Show week _numbers in date navigator"
 msgstr "Mostrar os _nÃºmeros das semanas no navegador de datas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 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.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Domingo"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_asks due today:"
 msgstr "T_arefas que vencen hoxe:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "T_hu"
 msgstr "_Xov"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "Lista de tarefas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Template:"
 msgstr "Modelo:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Xoves"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Hora"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Time _zone:"
 msgstr "Fuso _horario:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Time format:"
 msgstr "Formato da hora:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Martes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Empregar o fuso horario do s_istema"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "MÃ©rcores"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "A _semana comeza en:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
 msgid "Work Week"
 msgstr "Semana laboral"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "Work days:"
 msgstr "DÃas laborÃ¡beis:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Pedir confirmaciÃ³n ao eliminar elementos"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir as fins de semana na visualizaciÃ³n mensual"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Day begins:"
 msgstr "A _xornada comeza Ã¡s:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Fri"
 msgstr "_Ven"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "_Ocultar as tarefas terminadas despois de"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Mon"
 msgstr "_Lun"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "Tarefas _atrasadas:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Sat"
 msgstr "_SÃ¡b"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 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.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Time divisions:"
 msgstr "Di_visiÃ³ns horarias:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Tue"
 msgstr "_Mar"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "_Wed"
 msgstr "MÃ©_r"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "antes de cada data especial ou aniversario"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
@@ -3680,12 +3488,12 @@ msgid "Type:"
 msgstr "Tipo:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:147
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../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
@@ -3709,35 +3517,35 @@ msgstr ""
 "Copia_r localmente os contidos da lista de notas para unha operaciÃ³n sen "
 "conexiÃ³n"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "Co_r:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "Lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "Propiedades do calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "Calendario novo"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "Propiedades da lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "Lista de tarefas nova"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "Propiedades da lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "Lista de notas nova"
 
@@ -3794,31 +3602,11 @@ 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:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " para "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (Terminada "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "Terminada "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (Pendente "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "Pendente "
-
-#: ../calendar/gui/dialogs/comp-editor.c:246
+#: ../calendar/gui/dialogs/comp-editor.c:237
 msgid "Could not save attachments"
 msgstr "Non foi posÃbel gardar os anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:509
+#: ../calendar/gui/dialogs/comp-editor.c:505
 msgid "Could not update object"
 msgstr "Non foi posÃbel actualizar o obxecto"
 
@@ -3864,21 +3652,21 @@ msgid "Click here to close the current window"
 msgstr "Prema aquÃ para pechar a xanela actual"
 
 #: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1464
 #: ../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
+#: ../widgets/misc/e-web-view.c:398 ../widgets/misc/e-web-view.c:1051
 msgid "Copy the selection"
 msgstr "Copiar a selecciÃ³n"
 
 #: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1471
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1045
 msgid "Cut the selection"
 msgstr "Cortar a selecciÃ³n"
 
 #: ../calendar/gui/dialogs/comp-editor.c:959
-#: ../shell/e-shell-window-actions.c:1458
+#: ../shell/e-shell-window-actions.c:1478
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "Cortar a selecciÃ³n"
@@ -3888,9 +3676,9 @@ msgid "Click here to view help available"
 msgstr "Prema aquÃ para ver a axuda dispoÃ±Ãbel"
 
 #: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1513
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1057
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portapapeis"
 
@@ -3899,7 +3687,7 @@ msgid "Click here to save the current window"
 msgstr "Prema aquÃ para gardar a xanela actual"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1583
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "Seleccionar todo o texto"
@@ -3909,13 +3697,13 @@ msgid "_Classification"
 msgstr "_ClasificaciÃ³n"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1632
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_Ficheiro"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1029
-#: ../shell/e-shell-window-actions.c:1619
+#: ../shell/e-shell-window-actions.c:1639
 msgid "_Help"
 msgstr "A_xuda"
 
@@ -3924,17 +3712,17 @@ msgid "_Insert"
 msgstr "_Inserir"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1043
-#: ../composer/e-composer-actions.c:351
+#: ../composer/e-composer-actions.c:353
 msgid "_Options"
 msgstr "_OpciÃ³ns"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
-#: ../shell/e-shell-window-actions.c:1654
+#: ../shell/e-shell-window-actions.c:1674
 msgid "_View"
 msgstr "_Ver"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1060
-#: ../composer/e-composer-actions.c:279
+#: ../composer/e-composer-actions.c:281
 msgid "_Attachment..."
 msgstr "_Anexo..."
 
@@ -4020,7 +3808,7 @@ msgid "Recent _Documents"
 msgstr "_Documentos recentes"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1683
-#: ../composer/e-composer-actions.c:475
+#: ../composer/e-composer-actions.c:477
 msgid "Attach"
 msgstr "Anexar"
 
@@ -4030,18 +3818,18 @@ msgstr "Gardar"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2015
 #: ../calendar/gui/dialogs/comp-editor.c:2064
-#: ../calendar/gui/dialogs/comp-editor.c:2955
+#: ../calendar/gui/dialogs/comp-editor.c:2958
 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:2923
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:2926
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2985
+#: ../calendar/gui/dialogs/comp-editor.c:2988
 msgid "Unable to use current version!"
 msgstr "Non Ã© posÃbel usar a versiÃ³n actual!"
 
@@ -4063,6 +3851,10 @@ msgstr ""
 "Quere e_liminar este elemento das caixas de correo de todos os outros "
 "destinatarios?"
 
+#: ../calendar/gui/dialogs/delete-comp.c:217
+msgid "_Retract comment"
+msgstr "_Retirar comentario"
+
 #: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "Non foi posÃbel eliminar a actividade debido a un erro de Corba"
@@ -4123,60 +3915,60 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Introducir delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Alarms"
 msgstr "_Alarmas"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:207
 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:208
+#: ../calendar/gui/dialogs/event-editor.c:212
 msgid "_Recurrence"
 msgstr "_Recorrencia"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "Make this a recurring event"
 msgstr "Converter en actividade recorrente"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:219
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
+#: ../plugins/groupwise-features/send-options.c:210
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "OpciÃ³ns de envÃo"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:221
 #: ../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:225
+#: ../calendar/gui/dialogs/event-editor.c:229
 msgid "All _Day Event"
 msgstr "Evento de _dÃa completo"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:231
 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:233
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "Show Time as _Busy"
 msgstr "Mostrar hora como oc_upada"
 
-#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/event-editor.c:239
 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:244
+#: ../calendar/gui/dialogs/event-editor.c:248
 msgid "_Free/Busy"
 msgstr "_DispoÃ±ibilidade"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:250
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar informaciÃ³n de dispoÃ±ibilidade para os participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "_Cita"
 
@@ -4192,7 +3984,7 @@ msgstr ""
 "Incluso se non pode ser totalmente editada porque vostede Ã© o organizador"
 
 #: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "Este actividade ten alarmas"
 
@@ -4253,7 +4045,7 @@ msgstr "RequÃrese un organizador."
 msgid "At least one attendee is required."
 msgstr "RequÃrese polo menos un participante."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../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'."
@@ -4264,40 +4056,40 @@ 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:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:915
 #: ../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:2941
+#: ../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:2947
+#: ../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:2953
+#: ../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:2966
+#: ../calendar/gui/dialogs/event-page.c:2962
 msgid "Customize"
 msgstr "Personalizar"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:2964
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "NingÃºn"
@@ -4315,8 +4107,10 @@ msgid "15 minutes before appointment"
 msgstr "%d minuto antes da cita"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
-msgstr "Participante_s..."
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "Participa_ntes..."
 
 #: ../calendar/gui/dialogs/event-page.ui.h:6
 #: ../calendar/gui/e-meeting-list-view.c:148
@@ -4331,28 +4125,26 @@ msgstr "Alarma personalizada:"
 msgid "Event Description"
 msgstr "DescriciÃ³n da actividade"
 
-#: ../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.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "_Alarm"
 msgstr "_Alarma"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 #: ../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.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "_LocalizaciÃ³n:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgid "_Summary:"
+msgstr "_Resumo:"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "_Hora:"
@@ -4369,7 +4161,7 @@ msgstr ""
 "para\n"
 "atÃ©"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2576
 msgid "Memo"
 msgstr "Nota"
 
@@ -4381,15 +4173,15 @@ msgstr "A nota non pode ser editada porque a nota solicitado Ã© de sÃ³ lectura"
 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:875
+#: ../calendar/gui/dialogs/memo-page.c:876
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Non Ã© posÃbel abrir as notas en '%s'."
 
-#: ../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:2301 ../mail/em-format-html.c:2343
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1043 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2242
+#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2325
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:78
 msgid "To"
 msgstr "Para"
 
@@ -4398,6 +4190,11 @@ msgstr "Para"
 msgid "Sta_rt date:"
 msgstr "Data de _comezo:"
 
+#: ../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/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "_Para:"
@@ -4408,58 +4205,58 @@ msgstr "_Para:"
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "EstÃ¡ modificando unha actividade recorrente. Que quere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "EstÃ¡ delegando unha actividade recorrente. Que quere delegar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "EstÃ¡ modificando unha tarefa recorrente. Que quere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "EstÃ¡ modificando unha nota recorrente. Que Ã© o que quere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "Unicamente esta instancia"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "Esta instancia e as anteriores"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "Esta instancia e as futuras"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "Todas as instancias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 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:889
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "A data da recorrencia non Ã© vÃ¡lida"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:933
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 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:962
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "en"
 
@@ -4467,7 +4264,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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "primeiro"
 
@@ -4476,7 +4273,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:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "segundo"
 
@@ -4484,7 +4281,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:1030
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "terceiro"
 
@@ -4492,7 +4289,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:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "cuarto"
 
@@ -4500,7 +4297,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:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "quinto"
 
@@ -4508,13 +4305,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:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 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:1069
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Outra data"
 
@@ -4522,7 +4319,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:1075
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "Do 1 ao 10"
 
@@ -4530,7 +4327,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:1081
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "do 11 ao 20"
 
@@ -4538,45 +4335,45 @@ 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:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 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:1112
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 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:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "apariciÃ³ns"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2121
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "Engadir excepciÃ³n"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2162
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "Non foi posÃbel obter unha selecciÃ³n para modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2168
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "Modificar excepciÃ³n"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2212
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "Non foi posÃbel obter unha selecciÃ³n para eliminar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "Data e hora"
 
@@ -4588,7 +4385,7 @@ msgstr "Cada"
 msgid "Exceptions"
 msgstr "<b>ExcepciÃ³ns</b>"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:85
 msgid "Preview"
 msgstr "_PrevisualizaciÃ³n"
 
@@ -4612,11 +4409,11 @@ msgstr "semanas"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "Enviar as miÃ±as alarmas con este actividade"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "Notificar mensaxes n_ovas"
 
@@ -4625,66 +4422,66 @@ msgstr "Notificar mensaxes n_ovas"
 msgid "Completed date is wrong"
 msgstr "A data de finalizaciÃ³n Ã© incorrecta"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "PÃ¡xina web"
 
 #. 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:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2656 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "Terminada"
 
 #. 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:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:313
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1123 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "Alta"
 
 #. 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:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2653
 msgid "In Progress"
 msgstr "En progreso"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1121 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "Baixa"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:511
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1122
 #: ../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:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/print.c:2650 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Non Iniciada"
 
@@ -4700,7 +4497,7 @@ msgstr "Esta_do:"
 #. 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-calendar-view.c:1759
 #: ../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
@@ -4710,7 +4507,7 @@ msgstr "Estado"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "Indefinida"
@@ -4720,7 +4517,7 @@ msgid "_Date completed:"
 msgstr "_Data completada:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "_Prioridade:"
 
@@ -4741,11 +4538,11 @@ msgstr "Prema para cambiar ou ver os detalles da tarefa"
 msgid "_Send Options"
 msgstr "OpciÃ³n_s de envÃo"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:322
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:325
 msgid "Task Details"
 msgstr "Detalles da tarefa"
 
@@ -4773,10 +4570,6 @@ msgstr "A data de vencemento Ã© incorrecta"
 msgid "Unable to open tasks in '%s'."
 msgstr "Non Ã© posÃbel abrir as tarefas en '%s'."
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "Participa_ntes..."
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "Ca_tegorÃas..."
@@ -4865,46 +4658,46 @@ msgstr "%s a %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de activador descoÃ±ecido"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:191 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "Sen tÃtulo"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:197
 msgid "Categories:"
 msgstr "CategorÃas"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-cal-component-preview.c:236
 #: ../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:246
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:258
 msgid "Start Date:"
 msgstr "Data de inicio:"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Due Date:"
 msgstr "Data de vencemento:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-cal-component-preview.c:284
 #: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../plugins/itip-formatter/itip-view.c:1058
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-component-preview.c:311
 msgid "Priority:"
 msgstr "Prioridade:"
 
-#: ../calendar/gui/e-cal-component-preview.c:337
+#: ../calendar/gui/e-cal-component-preview.c:336
 #: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Description:"
 msgstr "DescriciÃ³n:"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
+#: ../calendar/gui/e-cal-component-preview.c:367
 msgid "Web Page:"
 msgstr "PÃ¡xina Web:"
 
@@ -4931,16 +4724,16 @@ msgid "Start Date"
 msgstr "Data de inicio"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:562
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:563
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4951,63 +4744,49 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 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-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Si"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Non"
 
-#: ../calendar/gui/e-cal-model.c:377
-msgid "Default Client"
-msgstr "Cliente predefinido"
-
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:825
-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:826
-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:562 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-cal-model.c:501 ../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:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:976
+#: ../plugins/itip-formatter/itip-formatter.c:450
+#: ../plugins/itip-formatter/itip-formatter.c:2327
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "DescoÃ±ecido"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "Recorrencia"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "Asignada"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
@@ -5051,90 +4830,90 @@ msgstr "Data de inicio"
 msgid "Type"
 msgstr "Tipo"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:404
 msgid "Cut selected events to the clipboard"
 msgstr "Cortar o texto seleccionado para o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:410
 msgid "Copy selected events to the clipboard"
 msgstr "Copiar o texto seleccionado ao portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:416
 msgid "Paste events from the clipboard"
 msgstr "Pegar eventos desde o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:422
 msgid "Delete selected events"
 msgstr "Eliminar os eventos seleccionados"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:441 ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "Eliminar os obxectos seleccionados"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:629 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/e-task-table.c:1067
 msgid "Updating objects"
 msgstr "Actualizando obxectos"
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1706
 #: ../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:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2315
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1707
 #: ../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:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2321
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1708
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "Provisional"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1709
 #: ../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:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2324
 msgid "Delegated"
 msgstr "Delegado"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1710
 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:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1852 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:742
 #, 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:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1856 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/print.c:2608
 #, c-format
 msgid "Location: %s"
 msgstr "LocalizaciÃ³n: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1903
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -5177,8 +4956,8 @@ 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:864 ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:865 ../calendar/gui/e-day-view.c:1879
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
@@ -5188,10 +4967,10 @@ msgstr "%A %d de %B"
 #. %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:1901
-#: ../calendar/gui/e-week-view-main-item.c:231
+#: ../calendar/gui/e-day-view-top-item.c:869 ../calendar/gui/e-day-view.c:1896
+#: ../calendar/gui/e-week-view-main-item.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:901
+#: ../modules/calendar/e-cal-shell-view-private.c:913
 msgid "%a %d %b"
 msgstr "%a, %d de %b"
 
@@ -5200,27 +4979,27 @@ msgstr "%a, %d de %b"
 #. 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:872 ../calendar/gui/e-day-view.c:1917
-#: ../calendar/gui/e-week-view-main-item.c:245
+#: ../calendar/gui/e-day-view-top-item.c:873 ../calendar/gui/e-day-view.c:1912
+#: ../calendar/gui/e-week-view-main-item.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:937
+#: ../modules/calendar/e-cal-shell-view-private.c:949
 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:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1076 ../calendar/gui/e-week-view.c:748
 #: ../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:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1079 ../calendar/gui/e-week-view.c:751
 #: ../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:2614
+#: ../calendar/gui/e-day-view.c:2609
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
@@ -5322,11 +5101,11 @@ msgstr "Erro de iCalendar"
 
 #: ../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
+#: ../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
 msgid "An unknown person"
 msgstr "Unha persoa descoÃ±ecida"
 
@@ -5339,13 +5118,13 @@ msgstr ""
 
 #. 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:2313
+#: ../plugins/itip-formatter/itip-formatter.c:2302
 msgctxt "cal-itip"
 msgid "None"
 msgstr "NingÃºn"
 
 #: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../plugins/itip-formatter/itip-formatter.c:2318
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
@@ -5569,7 +5348,7 @@ msgid "Attendee status updated\n"
 msgstr "Estado do participante actualizado\n"
 
 #: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Non foi posÃbel actualizar estado do participante porque xa non existe o "
@@ -5625,8 +5404,8 @@ msgid "Send Latest Information"
 msgstr "Enviar a Ãºltima informaciÃ³n"
 
 #: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../modules/mail/e-mail-shell-view-actions.c:970
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -5675,56 +5454,56 @@ msgid "Resources"
 msgstr "Recursos"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "Presidente"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Participante requirido"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "Non-participante"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "Necesita acciÃ³n"
 
@@ -5733,14 +5512,14 @@ msgstr "Necesita acciÃ³n"
 msgid "Attendee                          "
 msgstr "Participante                          "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 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:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2366
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -5749,7 +5528,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:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -5759,67 +5538,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "FÃ³ra da oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "Sen informaciÃ³n"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "Par_ticipantes..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "O_pciÃ³ns"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "Mostrar _sÃ³ as horas de traballo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "Mostrar _reducido"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "_Actualizar dispoÃ±ibilidade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "Seleccionar _automaticamente"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "_Todas as persoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "Todas as _persoas e un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "Persoas _requiridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "Persoas requiridas e _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "Hora de _finalizaciÃ³n:"
 
@@ -5848,44 +5623,46 @@ msgid "Member"
 msgstr "Integrante"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:399
+#: ../modules/calendar/e-cal-shell-content.c:461
 #: ../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
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "Notas"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:706
 msgid "* No Summary *"
 msgstr "* Sen resumo *"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:574 ../calendar/gui/e-task-table.c:786
 msgid "Start: "
 msgstr "Comezo: "
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:593 ../calendar/gui/e-task-table.c:804
 msgid "Due: "
 msgstr "Pendente: "
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:709
 msgid "Cut selected memos to the clipboard"
 msgstr "Cortar as mensaxes seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:715
 msgid "Copy selected memos to the clipboard"
 msgstr "Copiar as mensaxes seleccionadas ao portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:721
 msgid "Paste memos from the clipboard"
 msgstr "Pegar recordatorios desde o portapapeis"
 
-#: ../calendar/gui/e-memo-table.c:725
+#: ../calendar/gui/e-memo-table.c:727
 #: ../modules/calendar/e-memo-shell-view-actions.c:556
 msgid "Delete selected memos"
 msgstr "Eliminar as notas seleccionadas"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:733
 msgid "Select all visible memos"
 msgstr "Seleccionar todas as mensaxes visÃbeis"
 
@@ -5893,86 +5670,51 @@ msgstr "Seleccionar todas as mensaxes visÃbeis"
 msgid "Click to add a memo"
 msgstr "Prema para engadir unha nota"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
 #: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
+#: ../calendar/gui/e-task-table.c:628 ../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-cal-shell-content.c:423
 #: ../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/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:932
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cortar o texto seleccionado para o portapapeis"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:938
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copiar o texto seleccionado ao portapapeis"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:944
 msgid "Paste tasks from the clipboard"
 msgstr "Pegar as tarefas desde o portapapeis"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "Delete selected tasks"
 msgstr "Eliminar as tarefas seleccionadas"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:956
 msgid "Select all visible tasks"
 msgstr "Seleccionar todas as mensaxes visÃbeis"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "Seleccionar fuso horario"
 
@@ -5980,7 +5722,7 @@ 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:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%d de %B"
 
@@ -6009,7 +5751,7 @@ msgstr "Evento de calendario: non ten resumo."
 msgid "calendar view event"
 msgstr "visualizaciÃ³n de actividades de calendario"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:541
 msgid "Grab Focus"
 msgstr "Obter o foco"
 
@@ -6038,7 +5780,7 @@ msgstr "Ir Ã¡ data"
 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/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -6047,14 +5789,14 @@ 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:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
 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."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "VisualizaciÃ³n de semana laboral: %s. %s"
@@ -6062,16 +5804,16 @@ 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."
-#: ../calendar/gui/ea-day-view.c:170
+#: ../calendar/gui/ea-day-view.c:166
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "VisualizaciÃ³n diaria: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../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:203
+#: ../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"
 
@@ -6082,16 +5824,16 @@ msgid "Gnome Calendar"
 msgstr "Calendario do GNOME"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:909
 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:904
-#: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:922
+#: ../modules/calendar/e-cal-shell-view-private.c:925
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -6099,10 +5841,10 @@ msgstr "%a %d %b %Y"
 #: ../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:930
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:948
-#: ../modules/calendar/e-cal-shell-view-private.c:951
+#: ../modules/calendar/e-cal-shell-view-private.c:942
+#: ../modules/calendar/e-cal-shell-view-private.c:953
+#: ../modules/calendar/e-cal-shell-view-private.c:960
+#: ../modules/calendar/e-cal-shell-view-private.c:963
 msgid "%d %b %Y"
 msgstr "%d de %b de %Y"
 
@@ -6114,25 +5856,25 @@ msgstr "BotÃ³n de salto"
 msgid "Click here, you can find more events."
 msgstr "Prema aquÃ para localizar mÃ¡is eventos."
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../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:161
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "VisualizaciÃ³n semanal: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../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:194
+#: ../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:2148
+#: ../calendar/gui/gnome-cal.c:2242
 msgid "Purging"
 msgstr "Depurando"
 
@@ -6185,39 +5927,40 @@ msgid "Select Date"
 msgstr "Seleccionar data"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "Integrante"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+msgid "Select _Today"
+msgstr "Seleccionar _hoxe"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "_Seleccionar hoxe"
+msgid "September"
+msgstr "Integrante"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "DÃ©bese definir un organizador."
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "Ã? necesario polo menos un participante"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "InformaciÃ³n do actividade"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "InformaciÃ³n da tarefa"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "InformaciÃ³n da nota"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "InformaciÃ³n de dispoÃ±ibilidade"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "InformaciÃ³n do calendario"
 
@@ -6225,7 +5968,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:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Aceptado"
@@ -6234,7 +5977,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:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
@@ -6246,7 +5989,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:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Rexeitado"
@@ -6255,7 +5998,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:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegado"
@@ -6263,7 +6006,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:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Actualizado"
@@ -6271,7 +6014,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:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancelar"
@@ -6279,7 +6022,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:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Actualizar"
@@ -6287,31 +6030,31 @@ 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:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contraproposta"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "InformaciÃ³n de dispoÃ±ibilidade (de %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "InformaciÃ³n de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Non foi posÃbel almacenar un recurso, o novo evento colisiona con algÃºn "
 "outro."
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "Non foi posÃbel almacenar un recurso, erro:"
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante no actividade."
 
@@ -6467,49 +6210,74 @@ msgstr "Ve"
 msgid "Sa"
 msgstr "SÃ¡"
 
-#: ../calendar/gui/print.c:2564
+#. Translators: This is part of "START to END" text, where START and END are date/times
+#: ../calendar/gui/print.c:2419
+msgid " to "
+msgstr " para "
+
+#. Translators: This is part of "START to END (Completed COMPLETED)", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2425
+msgid " (Completed "
+msgstr " (Terminada "
+
+#. Translators: This is part of "Completed COMPLETED", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2428
+msgid "Completed "
+msgstr "Terminada "
+
+#. Translators: This is part of "START (Due DUE)", where START and DUE are dates/times
+#: ../calendar/gui/print.c:2435
+msgid " (Due "
+msgstr " (Pendente "
+
+#. Translators: This is part of "Due DUE", where DUE is a date/time due the event should be finished
+#: ../calendar/gui/print.c:2438
+msgid "Due "
+msgstr "Pendente "
+
+#: ../calendar/gui/print.c:2572
 msgid "Appointment"
 msgstr "Cita"
 
-#: ../calendar/gui/print.c:2566
+#: ../calendar/gui/print.c:2574 ../widgets/misc/e-send-options.c:502
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2599
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2623
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2666
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2681
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2699
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada: %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2710
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2723
 #, c-format
 msgid "Categories: %s"
 msgstr "CategorÃas: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2734
 msgid "Contacts: "
 msgstr "Contactos: "
 
@@ -6540,7 +6308,7 @@ msgstr "Citas e reuniÃ³ns"
 
 #: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../plugins/itip-formatter/itip-formatter.c:1822
 msgid "Opening calendar"
 msgstr "Abrir calendario"
 
@@ -8125,157 +7893,157 @@ msgstr "PacÃfico/Wallis"
 msgid "Pacific/Yap"
 msgstr "PacÃfico/Yap"
 
-#: ../composer/e-composer-actions.c:79
+#: ../composer/e-composer-actions.c:81
 msgid "Untitled Message"
 msgstr "Mensaxe sen tÃtulo"
 
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:204
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: ../composer/e-composer-actions.c:281
+#: ../composer/e-composer-actions.c:283
 #: ../widgets/misc/e-attachment-view.c:327
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:288
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:290
 msgid "Close the current file"
 msgstr "Pechar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:295
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:302
 msgid "Print Pre_view"
 msgstr "Pre_visualizaciÃ³n da impresiÃ³n"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:311
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:316
 msgid "Save _As..."
 msgstr "Gardar _como..."
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file with a different name"
 msgstr "Gardar o ficheiro actual cun nome diferente"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:323
 msgid "Save as _Draft"
 msgstr "Gardar como borra_dor"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:325
 msgid "Save as draft"
 msgstr "Gardar como borrador"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:281
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:332
 msgid "Send this message"
 msgstr "Enviar esta mensaxe"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:337
 msgid "New _Message"
 msgstr "_Mensaxe nova"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:339
 msgid "Open New Message window"
 msgstr "Abrir unha xanela de Mensaxe nova"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:346
 msgid "Character _Encoding"
 msgstr "C_odificaciÃ³n de caracteres"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:363
 msgid "PGP _Encrypt"
 msgstr "C_ifrar con PGP"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:365
 msgid "Encrypt this message with PGP"
 msgstr "Cifrar esta mensaxe con PGP"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:371
 msgid "PGP _Sign"
 msgstr "A_sinar con PGP"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:373
 msgid "Sign this message with your PGP key"
 msgstr "Asinar esta mensaxe coa sÃºa chave PGP"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:379
 msgid "_Prioritize Message"
 msgstr "_Mensaxe prioritaria"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:381
 msgid "Set the message priority to high"
 msgstr "Definir a prioridade da mensaxe como alta"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:387
 msgid "Re_quest Read Receipt"
 msgstr "_Requirir confirmaciÃ³n de lectura"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:389
 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:393
+#: ../composer/e-composer-actions.c:395
 msgid "S/MIME En_crypt"
 msgstr "_Cifrar con S/MIME"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:397
 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:401
+#: ../composer/e-composer-actions.c:403
 msgid "S/MIME Sig_n"
 msgstr "Si_natura S/MIME"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:405
 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:409
+#: ../composer/e-composer-actions.c:411
 msgid "_Bcc Field"
 msgstr "Campo _Cco"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:413
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo CCO"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:419
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:421
 msgid "Toggles whether the CC field is displayed"
 msgstr "Alterna entre se se mostra ou non o campo CC"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:427
 msgid "_From Field"
 msgstr "Campo _De"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:429
 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:433
+#: ../composer/e-composer-actions.c:435
 msgid "_Reply-To Field"
 msgstr "Campo _Responder a"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:437
 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:478
+#: ../composer/e-composer-actions.c:480
 msgid "Save Draft"
 msgstr "Gardar borrador"
 
@@ -8287,15 +8055,15 @@ msgstr "Mostrar"
 msgid "Hide"
 msgstr "Ocultar"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 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:47
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8303,50 +8071,50 @@ 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:959
+#: ../composer/e-composer-header-table.c:958
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
+#: ../composer/e-composer-header-table.c:958
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:937
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:77
+#: ../modules/mail/em-mailer-prefs.c:76
 msgid "From"
 msgstr "De"
 
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:967
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:972
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:978
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:978 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "Cc"
 
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:984
 msgid "_Bcc:"
 msgstr "_Cco:"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:984 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "Cco"
 
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:989
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:993
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1002
 msgid "Si_gnature:"
 msgstr "Si_natura:"
 
@@ -8379,19 +8147,19 @@ msgid "Save draft"
 msgstr "Gardar borrador"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:150
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:188 ../mail/em-utils.c:152
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
 msgstr "_Non mostrar esta mensaxe outra vez."
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:988
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Non Ã© posÃbel asinar a mensaxe saÃnte: non hai un certificado de sinatura "
 "definido para esta conta"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:995
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8399,15 +8167,15 @@ msgstr ""
 "Non Ã© posÃbel cifrar a mensaxe saÃnte: non hai un certificado de cifrado "
 "definido para esta conta"
 
-#: ../composer/e-msg-composer.c:1379
+#: ../composer/e-msg-composer.c:1386
 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
+#: ../composer/e-msg-composer.c:1452 ../composer/e-msg-composer.c:1648
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:3310
+#: ../composer/e-msg-composer.c:3313
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -8498,9 +8266,9 @@ msgstr ""
 "nova. Recuperar a mensaxe permitiralle continuar onde a deixou."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+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 "
+"O ficheiro Â«{0}Â» non Ã© un ficheiro normal e non pode ser enviado nunha "
 "mensaxe."
 
 #: ../composer/mail-composer.error.xml.h:17
@@ -8519,8 +8287,8 @@ 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:21
-msgid "You cannot attach the file `{0}' to this message."
-msgstr "Non pode anexar o ficheiro `{0}' a esta mensaxe."
+msgid "You cannot attach the file n{0}' to this message."
+msgstr "Non pode anexar o ficheiro Â«{0}Â» a esta mensaxe."
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
@@ -8542,6 +8310,253 @@ msgstr "_Recuperar"
 msgid "_Save Draft"
 msgstr "_Gardar borrador"
 
+#: ../capplet/anjal-settings-main.c:199
+msgid "Run Anjal in a window"
+msgstr "Executar Anjar nunha xanela"
+
+#: ../capplet/anjal-settings-main.c:200
+msgid "Make Anjal the default email client"
+msgstr "Facer Anjal o cliente de correo electrÃ³nico predefinido"
+
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplet/anjal-settings-main.c:207
+msgid "ID of the socket to embed in"
+msgstr "ID do socket para incrustar"
+
+#: ../capplet/anjal-settings-main.c:208
+msgid "socket"
+msgstr "socket"
+
+#: ../capplet/anjal-settings-main.c:221
+msgid "Anjal email client"
+msgstr "Cliente de correo Anjal"
+
+#: ../capplet/settings/mail-account-view.c:56
+msgid "Please enter your full name."
+msgstr "Insira o seu nome completo."
+
+#: ../capplet/settings/mail-account-view.c:57
+msgid "Please enter your email address."
+msgstr "Insira o seu enderezo de correo electrÃ³nico:"
+
+#: ../capplet/settings/mail-account-view.c:58
+msgid "The email address you have entered is invalid."
+msgstr "O enderezo de correo electrÃ³nico inserido Ã© incorrecto."
+
+#: ../capplet/settings/mail-account-view.c:181
+msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Detalles persoais:</span>"
+
+#: ../capplet/settings/mail-account-view.c:186
+msgid "Name:"
+msgstr "Nome:"
+
+#: ../capplet/settings/mail-account-view.c:195
+msgid "Email address:"
+msgstr "Enderezo de correo:"
+
+#: ../capplet/settings/mail-account-view.c:205
+msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Detalles de recepciÃ³n:</span>"
+
+#: ../capplet/settings/mail-account-view.c:210
+#: ../capplet/settings/mail-account-view.c:258
+msgid "Server type:"
+msgstr "Tipo de servidor:"
+
+#: ../capplet/settings/mail-account-view.c:219
+#: ../capplet/settings/mail-account-view.c:267
+msgid "Server address:"
+msgstr "Endrezo do servidor:"
+
+#: ../capplet/settings/mail-account-view.c:228
+#: ../capplet/settings/mail-account-view.c:276
+msgid "Username:"
+msgstr "Nome de usuario:"
+
+#: ../capplet/settings/mail-account-view.c:237
+#: ../capplet/settings/mail-account-view.c:285
+msgid "Use encryption:"
+msgstr "Usar cifrado:"
+
+#: ../capplet/settings/mail-account-view.c:242
+#: ../capplet/settings/mail-account-view.c:290
+msgid "never"
+msgstr "nunca"
+
+#: ../capplet/settings/mail-account-view.c:253
+msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Detalles de envÃo:</span>"
+
+#: ../capplet/settings/mail-account-view.c:309
+msgid ""
+"To use the email application you'll need to setup an account. Put your email "
+"address and password in below and we'll try and work out all the settings. "
+"If we can't do it automatically you'll need your server details as well."
+msgstr ""
+"Para usar o aplicativo de correo electrÃ³nico vostede debe configurar unha "
+"conta. Insira o seu enderezo de correo e contrasinal debaixo e tentaremos "
+"configurar as preferencias. Se non Ã© posÃbel facelo de forma automatica "
+"necesitarÃ¡ os detalles do seu servidor."
+
+#: ../capplet/settings/mail-account-view.c:311
+msgid ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
+msgstr ""
+"Non foi posÃbel adiviÃ±ar as configuraciÃ³ns para configurar o seu correo "
+"electrÃ³nico automaticamente. InsÃraas embaixo, tente comezar coas que estÃ¡n "
+"inseridas embaixo pero o mÃ¡is seguro e que teÃ±a que cambialas."
+
+#: ../capplet/settings/mail-account-view.c:313
+msgid "You can specify more options to configure the account."
+msgstr "Vostede pode especificar mÃ¡is opciÃ³ns para configurar a conta."
+
+#: ../capplet/settings/mail-account-view.c:315
+msgid ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
+msgstr ""
+"Agora necesita as sÃºas configuraciÃ³ns para enviar correo. Tentouse adiviÃ±ar "
+"pero deberÃa comprobalas para asegurarse."
+
+#: ../capplet/settings/mail-account-view.c:316
+msgid "You can specify your default settings for your account."
+msgstr ""
+"Vostede pode especificar as sÃºas configuraciÃ³ns predefinidas para a sÃºa "
+"conta."
+
+#: ../capplet/settings/mail-account-view.c:317
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
+msgstr ""
+"O tempo para verificar as cousas antes de tentar conectar ao servidor e "
+"obter o seu correo electrÃ³nico"
+
+#: ../capplet/settings/mail-account-view.c:332
+#: ../mail/em-account-editor.c:2059 ../mail/em-account-editor.c:2191
+#: ../mail/mail-config.ui.h:59
+msgid "Identity"
+msgstr "Identidade"
+
+#: ../capplet/settings/mail-account-view.c:332
+msgid "Next - Receiving mail"
+msgstr "Seguinte - Recibindo o correo"
+
+#: ../capplet/settings/mail-account-view.c:333
+msgid "Receiving mail"
+msgstr "Recibindo correo"
+
+#: ../capplet/settings/mail-account-view.c:333
+#: ../capplet/settings/mail-account-view.c:334
+msgid "Next - Sending mail"
+msgstr "Seguinte - Enviando o correo"
+
+#: ../capplet/settings/mail-account-view.c:333
+msgid "Back - Identity"
+msgstr "Anterior - Identidade"
+
+#: ../capplet/settings/mail-account-view.c:333
+msgid "Next - Receiving options"
+msgstr "Seguinte - OpciÃ³ns de recepciÃ³n"
+
+#: ../capplet/settings/mail-account-view.c:334
+msgid "Receiving options"
+msgstr "OpciÃ³ns de recepciÃ³n"
+
+#: ../capplet/settings/mail-account-view.c:334
+#: ../capplet/settings/mail-account-view.c:336
+msgid "Back - Receiving mail"
+msgstr "Anterior - Recibindo o correo"
+
+#: ../capplet/settings/mail-account-view.c:336
+msgid "Sending mail"
+msgstr "Enviando correo"
+
+#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:337
+msgid "Next - Review account"
+msgstr "Seguinte - Revisando a conta"
+
+#: ../capplet/settings/mail-account-view.c:336
+msgid "Next - Defaults"
+msgstr "Seguinte - Predefinidos"
+
+#: ../capplet/settings/mail-account-view.c:336
+msgid "Back - Receiving options"
+msgstr "Anterior - OpciÃ³ns de recepciÃ³n"
+
+#: ../capplet/settings/mail-account-view.c:337
+#: ../mail/em-account-editor.c:2770 ../mail/mail-config.ui.h:32
+msgid "Defaults"
+msgstr "Predefinidos"
+
+#: ../capplet/settings/mail-account-view.c:337
+msgid "Back - Sending mail"
+msgstr "Anterior - Enviando correo"
+
+#: ../capplet/settings/mail-account-view.c:339
+msgid "Review account"
+msgstr "Revisar a conta"
+
+#: ../capplet/settings/mail-account-view.c:339
+msgid "Finish"
+msgstr "Rematar"
+
+#: ../capplet/settings/mail-account-view.c:339
+msgid "Back - Sending"
+msgstr "Anterior - Enviando"
+
+#: ../capplet/settings/mail-account-view.c:673
+#: ../capplet/settings/mail-settings-view.c:264
+msgid "Close Tab"
+msgstr "Pechar separador"
+
+#: ../capplet/settings/mail-account-view.c:683
+msgid "Account Wizard"
+msgstr "Asistente da conta"
+
+#: ../capplet/settings/mail-capplet-shell.c:208
+msgid "Evolution account assistant"
+msgstr "Asistente de contas do Evolution"
+
+#. create the local source group
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:675
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:145
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:151
+#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:162 ../mail/mail-vfolder.c:212
+#: ../mail/message-list.c:1605
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:126
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:141
+#: ../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:109
+msgid "On This Computer"
+msgstr "Neste computador"
+
+#: ../capplet/settings/mail-settings-view.c:146
+#: ../plugins/groupwise-features/share-folder.c:747
+msgid "Modify"
+msgstr "Modificar"
+
+#: ../capplet/settings/mail-settings-view.c:148
+msgid "Add a new account"
+msgstr "Engadir unha nova conta"
+
+#: ../capplet/settings/mail-settings-view.c:183
+msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
+msgstr "<span size=\"large\" weight=\"bold\">XestiÃ³n de conta</span>"
+
+#: ../capplet/settings/mail-settings-view.c:274
+msgid "Settings"
+msgstr "ConfiguraciÃ³ns"
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Calendar event notifications"
 msgstr "InformaciÃ³n do calendario"
@@ -8550,8 +8565,8 @@ msgstr "InformaciÃ³n do calendario"
 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:258
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:821
+#: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -8559,7 +8574,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Correo e calendario do Evolution"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:653
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Suite de Groupware"
 
@@ -8567,6 +8582,14 @@ msgstr "Suite de Groupware"
 msgid "Manage your email, contacts and schedule"
 msgstr "Xestionar o seu correo, contactos e calendario"
 
+#: ../data/evolution-settings.desktop.in.in.h:1
+msgid "Configure email accounts"
+msgstr "Configurar as contas de correo"
+
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "ConfiguraciÃ³n de correo electrÃ³nico"
+
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "tarxeta de enderezo"
@@ -8668,57 +8691,67 @@ msgstr "Europeo occidental"
 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
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 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
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "Simplificado"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "UcraÃno"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "Visual"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1756
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../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:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "MaÃ±Ã¡"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "Onte"
 
-#: ../e-util/e-datetime-format.c:207
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
 #, c-format
-msgid "%d days from now"
-msgstr "%d dÃas desde agora"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "Dentro de %d dÃa"
+msgstr[1] "Dentro de %d dÃas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../e-util/e-datetime-format.c:209
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
 #, c-format
-msgid "%d days ago"
-msgstr "hai %d dÃas"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Hai %d dÃa"
+msgstr[1] "Hai %d dÃas"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "Usar os locais predefinidos"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "Formato:"
 
@@ -8739,18 +8772,6 @@ msgstr "Facendo ping a %s"
 msgid "Writing \"%s\" to %s"
 msgstr "Copiando `%s' a `%s'"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "Nome do compoÃ±ente que se estÃ¡ rexistrando"
-
-#: ../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"
@@ -8773,13 +8794,13 @@ msgstr "Rexistro de mensaxes:"
 msgid "Log Level"
 msgstr "Nivel de rexistro"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2677
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensaxes"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
-#: ../shell/e-shell-window-actions.c:1430
+#: ../shell/e-shell-window-actions.c:1450
 msgid "Close this window"
 msgstr "Pechar esta xanela"
 
@@ -8803,18 +8824,7 @@ msgstr "DepuraciÃ³n"
 msgid "Error, Warnings and Debug messages"
 msgstr "Erros, avisos e mensaxes de depuraciÃ³n"
 
-#: ../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:296
-msgid "Whether the plugin is enabled"
-msgstr "Indica se o engadido estÃ¡ activado"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
 #: ../plugins/google-account-setup/google-contacts-source.c:334
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
@@ -8838,7 +8848,7 @@ msgstr ""
 msgid "Autogenerated"
 msgstr "Xerado automaticamente"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "Porque \"{1}\"."
 
@@ -8858,124 +8868,124 @@ msgstr "Quere sobrescribilo?"
 msgid "File exists \"{0}\"."
 msgstr "O ficheiro xa existe \"{0}\"."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:132
 msgid "_Overwrite"
 msgstr "S_obrescribir"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:169
 msgid "Could not open the link."
 msgstr "Non foi posÃbel abrir a ligazÃ³n."
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:219
 msgid "Could not display help for Evolution."
 msgstr "Non foi posÃbel mostrar a axuda do Evolution."
 
-#: ../e-util/gconf-bridge.c:1281
+#: ../e-util/gconf-bridge.c:1303
 #, c-format
 msgid "GConf error: %s"
 msgstr "Erro do GConf: %s"
 
-#: ../e-util/gconf-bridge.c:1292
+#: ../e-util/gconf-bridge.c:1314
 msgid "All further errors shown only on terminal."
 msgstr "Todos os erros posteriores mostraranse sÃ³ no terminal."
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
+#: ../modules/mail/em-mailer-prefs.c:77
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2305
+#: ../mail/em-format-html.c:2328 ../modules/mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../mail/em-format-html.c:2244 ../mail/em-format-html.c:2309
+#: ../mail/em-format-html.c:2331 ../modules/mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr "Cco"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
 #: ../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
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:81
+#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Asunto"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2455
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2425
+#: ../modules/mail/em-mailer-prefs.c:1137
 msgid "Mailer"
 msgstr "Aplicativo de correo"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1220
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensaxe reenviada --------"
 
-#: ../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
+#: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:82 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "Data"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:84
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Cara"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1302
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1361
 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
+#: ../em-format/em-format.c:1515 ../em-format/em-format.c:1685
 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
+#: ../em-format/em-format.c:1523
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de cifrado non compatÃbel para multipart/encrypted"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message"
 msgstr "Non foi posÃbel analizar a mensaxe PGP/MIME"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 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
+#: ../em-format/em-format.c:1709
 msgid "Unsupported signature format"
 msgstr "O formato da sinatura non Ã© compatÃbel"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1867
 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
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1856
+#: ../em-format/em-format.c:1867
 msgid "Unknown error verifying signature"
 msgstr "Produciuse un erro descoÃ±ecido ao verificar a sinatura"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message"
 msgstr "Non foi posÃbel analizar a mensaxe PGP"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 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/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -8983,7 +8993,7 @@ msgstr[0] "hai un segundo"
 msgstr[1] "hai %d segundos"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -8991,7 +9001,7 @@ msgstr[0] "dentro de 1 segundo"
 msgstr[1] "dentro de %d segundos"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -8999,7 +9009,7 @@ msgstr[0] "hai 1 minuto"
 msgstr[1] "hai %d minutos"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -9007,7 +9017,7 @@ msgstr[0] "dentro de 1 minuto"
 msgstr[1] "dentro de %d minutos"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -9015,7 +9025,7 @@ msgstr[0] "hai 1 hora"
 msgstr[1] "hai %d horas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -9023,7 +9033,7 @@ msgstr[0] "dentro de 1 hora"
 msgstr[1] "dentro de %d horas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -9031,7 +9041,7 @@ msgstr[0] "hai 1 dÃa"
 msgstr[1] "hai %d dÃas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -9039,7 +9049,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/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -9047,7 +9057,7 @@ msgstr[0] "hai 1 semana"
 msgstr[1] "hai %d semanas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -9055,7 +9065,7 @@ msgstr[0] "dentro de 1 semana"
 msgstr[1] "dentro de %d semanas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -9063,7 +9073,7 @@ msgstr[0] "hai 1 mes"
 msgstr[1] "hai %d meses"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -9071,35 +9081,35 @@ msgstr[0] "dentro de 1 mes"
 msgstr[1] "dentro de %d meses"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "hai 1 ano"
 msgstr[1] "hai %d anos"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, 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/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<prema aquÃ para seleccionar unha data>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "agora"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "Seleccione unha hora coa que comparar"
 
@@ -9152,11 +9162,11 @@ msgid "I_nclude threads"
 msgstr "I_ncluÃr fÃos"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:301
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:302
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "SaÃnte"
 
@@ -9188,7 +9198,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:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
 msgid "Missing name."
 msgstr "Falta o nome."
 
@@ -9270,7 +9280,7 @@ msgstr ""
 msgid "months"
 msgstr "Mes"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:171
 msgid "seconds"
 msgstr "segundos"
 
@@ -9287,7 +9297,7 @@ msgid "years"
 msgstr "Cabeceiras"
 
 #: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
+#: ../mail/em-format-html-display.c:1020 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
 #: ../widgets/misc/e-attachment-paned.c:153
 msgid "Attachment"
@@ -9295,35 +9305,19 @@ msgid_plural "Attachments"
 msgstr[0] "Anexo"
 msgstr[1] "Anexos"
 
-#: ../mail/e-mail-attachment-bar.c:621
+#: ../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:622
+#: ../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-browser.c:262
+msgid "(No Subject)"
+msgstr "(Sen asunto)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9370,7 +9364,7 @@ msgid "_Later"
 msgstr "_MÃ¡is tarde"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:515
+#: ../modules/mail/e-mail-shell-view-actions.c:472
 msgid "Add Label"
 msgstr "Engadir etiqueta"
 
@@ -9390,115 +9384,57 @@ msgstr ""
 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:2582
-#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1158
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "Nome"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:363
+#: ../mail/em-folder-tree-model.c:675 ../mail/em-folder-tree.c:2585
+#: ../modules/mail/e-mail-shell-view-private.c:952
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:651
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:668
 msgid "Drafts"
 msgstr "Borradores"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:661
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:678
 msgid "Outbox"
 msgstr "Caixa de saÃda"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:663
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:680
 msgid "Sent"
 msgstr "Enviado"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:654
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:671
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:570
 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
+#: ../mail/e-mail-migrate.c:147
 msgid "Migrating..."
 msgstr "Migrando..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:180
 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
+#: ../mail/e-mail-migrate.c:220
 #, 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:2933
+#: ../mail/e-mail-migrate.c:659
 msgid "Migrating Folders"
 msgstr "MigraciÃ³n de cartafoles"
 
-#: ../mail/e-mail-migrate.c:1824
-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 "
-"desde Evolution 1.x.\n"
-"\n"
-"Agarde mentres o Evolution migra os seus cartafoles..."
-
-#: ../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"
-
-#: ../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 cartafol de datos POP3 keep-on-server `%s': %s"
-
-#: ../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/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/e-mail-migrate.c:2934
+#: ../mail/e-mail-migrate.c:660
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9510,42 +9446,16 @@ msgstr ""
 "\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:2949 ../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/e-mail-migrate.c:3031
+#: ../mail/e-mail-migrate.c:756
 #, 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:3049
-#, c-format
-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."
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "Non Ã© posÃbel crear os cartafoles de correo local en Â«%sÂ»: %s"
 
 #. 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:559
+#: ../mail/e-mail-reader-utils.c:103
+#: ../modules/calendar/e-task-shell-view-actions.c:561
 msgid "Do not ask me again"
 msgstr "Non preguntar de novo."
 
@@ -9553,7 +9463,7 @@ msgstr "Non preguntar de novo."
 msgid "Copy to Folder"
 msgstr "Copiar ao cartafol"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:378
 msgid "C_opy"
 msgstr "C_opiar"
 
@@ -9561,7 +9471,7 @@ msgstr "C_opiar"
 msgid "Move to Folder"
 msgstr "Mover ao cartafol"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:378
 msgid "_Move"
 msgstr "_Mover"
 
@@ -9578,7 +9488,6 @@ msgstr[1] "Gardar mensaxe..."
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
 #: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mensaxe"
@@ -9885,8 +9794,8 @@ msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireccionar a alguÃ©n (rebotar) a mensaxe seleccionada"
 
 #: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "Responder a t_odos"
 
@@ -9904,7 +9813,7 @@ 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:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "_Responder ao remitente"
 
@@ -10064,19 +9973,19 @@ msgstr "Todas as ca_beceiras da mensaxe"
 msgid "Show messages with all email headers"
 msgstr "Mostrar as mensaxes con todas as cabeceiras de correo electrÃ³nico"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1878
 msgid "Unable to retrieve message"
 msgstr "Non foi posÃbel obter a mensaxe"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1939
+#: ../mail/mail-ops.c:1838
 #, 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:2467
+#: ../mail/e-mail-reader.c:2453
 #: ../plugins/google-account-setup/google-source.c:304
 #: ../plugins/google-account-setup/google-source.c:534
 #: ../plugins/google-account-setup/google-source.c:656
@@ -10084,33 +9993,33 @@ msgstr "Recuperando a mensaxe %s"
 msgid "Default"
 msgstr "Predefinido"
 
-#: ../mail/e-mail-reader.c:2588
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:2574
+#: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:2575
 msgid "Forward the selected message to someone"
 msgstr "Reenviar a alguÃ©n a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2633 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2619 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2623
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:2627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:2645 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2631 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "Responder"
 
@@ -10120,33 +10029,33 @@ 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:500 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:73
+#: ../modules/addressbook/ldap-config.ui.h:9
 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:504 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:121
+#: ../modules/addressbook/ldap-config.ui.h:20
 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:508 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:94
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
-#: ../mail/em-account-editor.c:595
+#: ../mail/em-account-editor.c:594
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acordo de licenza %s"
 
-#: ../mail/em-account-editor.c:602
+#: ../mail/em-account-editor.c:601
 #, c-format
 msgid ""
 "\n"
@@ -10160,34 +10069,34 @@ msgstr ""
 "e marque a caixa de verificaciÃ³n para aceptalo\n"
 
 #. 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
+#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:960
 msgid "Never"
 msgstr "Nunca"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:961
 msgid "Always"
 msgstr "Sempre"
 
-#: ../mail/em-account-editor.c:968
+#: ../mail/em-account-editor.c:962
 msgid "Ask for each message"
 msgstr "Preguntar para cada mensaxe"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1705 ../widgets/misc/e-account-tree-view.c:124
+#: ../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:2061
+#: ../mail/em-account-editor.c:2056
 msgid "Mail Configuration"
 msgstr "ConfiguraciÃ³n do correo"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2057
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10197,12 +10106,7 @@ msgstr ""
 "\n"
 "Prema en \"Adiante\" para comezar."
 
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2200
-#: ../mail/mail-config.ui.h:58
-msgid "Identity"
-msgstr "Identidade"
-
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2060
 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 "
@@ -10212,20 +10116,20 @@ msgstr ""
 "abaixo non necesitan encherse, a non ser que desexe incluÃr esta informaciÃ³n "
 "no correo que envÃe."
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2237
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2228
+#: ../mail/mail-config.ui.h:91
 msgid "Receiving Email"
 msgstr "Recibindo correo"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2063
 msgid "Please configure the following account settings."
 msgstr "Configure as seguintes opciÃ³ns de conta."
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2714
+#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2706
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2066
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10234,11 +10138,11 @@ msgstr ""
 "seguro, pregunte ao seu administrador do sistema ou provedor de acceso a "
 "Internet."
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2068
 msgid "Account Management"
 msgstr "XestiÃ³n de contas"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2069
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10246,11 +10150,11 @@ 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:2078
+#: ../mail/em-account-editor.c:2073
 msgid "Done"
 msgstr "Feito"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2074
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10265,19 +10169,15 @@ msgstr ""
 "\n"
 "Prema en \"Aplicar\" para gardar a sÃºa configuraciÃ³n."
 
-#: ../mail/em-account-editor.c:2524
+#: ../mail/em-account-editor.c:2515
 msgid "Check for _new messages every"
 msgstr "Verificar automaticamente se hai mensaxes _novas cada"
 
-#: ../mail/em-account-editor.c:2532
+#: ../mail/em-account-editor.c:2523
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:2778 ../mail/mail-config.ui.h:31
-msgid "Defaults"
-msgstr "Predefinidos"
-
-#: ../mail/em-account-editor.c:2840 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2832 ../mail/mail-config.ui.h:101
 msgid "Security"
 msgstr "Seguranza"
 
@@ -10300,25 +10200,25 @@ msgid "Evolution Account Assistant"
 msgstr "Asistente de contas do Evolution"
 
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1578
+#: ../mail/em-composer-utils.c:1570
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "A sÃºa mensaxe a %s sobre \"%s\" o %s foi lida."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1626
+#: ../mail/em-composer-utils.c:1618
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "NotificaciÃ³n de envÃo para: \"%s\""
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1942
 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:1997
+#: ../mail/em-composer-utils.c:1989
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10326,19 +10226,19 @@ msgstr ""
 "O ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} Ã¡s ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribiu:"
 
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2133
 msgid "-----Original Message-----"
 msgstr "-----Mensaxe orixinal-----"
 
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2314
 msgid "Posting destination"
 msgstr "Destino onde publicar"
 
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2315
 msgid "Choose folders to post the message to."
 msgstr "Escolla os cartafoles nos que publicar a mensaxe."
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "Seleccionar cartafol"
 
@@ -10419,6 +10319,10 @@ msgstr "Seguimento"
 msgid "Forward to"
 msgstr "Reenviar a"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Importante"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "Ã© posterior a"
@@ -10443,7 +10347,7 @@ msgstr "non estÃ¡ definida"
 msgid "is set"
 msgstr "estÃ¡ definida"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:62
 msgid "Junk"
 msgstr "Correo non desexado"
 
@@ -10492,7 +10396,7 @@ msgid "Play Sound"
 msgstr "Reproducir son"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "Ler"
 
@@ -10573,16 +10477,16 @@ msgid "Unset Status"
 msgstr "Desfacer a definiciÃ³n de estado"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "EntÃ³n"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "Engadir a_cciÃ³n"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:169
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Mensaxes non lidas:"
@@ -10590,23 +10494,23 @@ msgstr[1] "Mensaxes non lidas:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:173
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Mensaxes totais:"
 msgstr[1] "Mensaxes totais:"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:191
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Cuota de uso (%s):"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:193
 #, c-format
 msgid "Quota usage"
 msgstr "Cuota de uso"
 
-#: ../mail/em-folder-properties.c:399
+#: ../mail/em-folder-properties.c:395
 #: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Folder Properties"
 msgstr "Propiedades do cartafol"
@@ -10615,35 +10519,37 @@ msgstr "Propiedades do cartafol"
 msgid "<click here to select a folder>"
 msgstr "<prema aquÃ para seleccionar un cartafol>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "_Nome do cartafol:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:146 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:164 ../mail/em-folder-tree-model.c:166
+#: ../mail/mail-vfolder.c:1073 ../mail/mail-vfolder.c:1138
 msgid "Search Folders"
 msgstr "Cartafoles de busca"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:156
+#: ../mail/em-folder-tree-model.c:171 ../mail/em-folder-tree-model.c:173
 msgid "UNMATCHED"
 msgstr "SEN EQUIVALENCIA"
 
-#: ../mail/em-folder-tree-model.c:726 ../mail/em-folder-tree-model.c:1063
+#: ../mail/em-folder-tree-model.c:743 ../mail/em-folder-tree-model.c:1080
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:179
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:592
 msgid "Folder names cannot contain '/'"
 msgstr "Os nomes dos cartafoles non poden conter o carÃ¡cter '/'"
 
@@ -10665,74 +10571,74 @@ msgstr "Os nomes dos cartafoles non poden conter o carÃ¡cter '/'"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1083
+#: ../mail/em-folder-tree.c:1074
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1289
+#: ../mail/em-folder-tree.c:1280
 msgid "Mail Folder Tree"
 msgstr "Ã?rbore de cartafoles de correo"
 
-#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1486 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movendo o cartafol %s"
 
-#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1488 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando cartafol %s"
 
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1495 ../mail/message-list.c:2098
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1497 ../mail/message-list.c:2100
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:1515
+#: ../mail/em-folder-tree.c:1512
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Non Ã© posÃbel soltar as mensaxes no almacenamento do nivel superior"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Move Folder To"
 msgstr "_Mover o cartafol a..."
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Copy Folder To"
 msgstr "_Copiar cartafol a..."
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:500
+#: ../plugins/groupwise-features/share-folder-common.c:136
 #, c-format
-msgid "Creating folder `%s'"
-msgstr "Creando o cartafol `%s'"
+msgid "Creating folder '%s'"
+msgstr "Creando o cartafol Â«%sÂ»"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:663
 msgid "Create Folder"
 msgstr "Crear cartafol"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:664
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde crear o cartafol:"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:680
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Eliminando a subscriciÃ³n do cartafol \"%s\""
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1533
 msgid "Unsigned"
 msgstr "Non asinado"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10740,11 +10646,11 @@ msgstr ""
 "Esta mensaxe non estÃ¡ asinada. Non hai garantÃa de que a mensaxe sexa "
 "autÃ©ntica."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1534
 msgid "Valid signature"
 msgstr "Sinatura vÃ¡lida"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10752,11 +10658,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:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1535
 msgid "Invalid signature"
 msgstr "Sinatura non vÃ¡lida"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10764,11 +10670,11 @@ msgstr ""
 "A sinatura desta mensaxe non se pode verificar, puido ser alterada en "
 "trÃ¡nsito."
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1536
 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:106
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10776,11 +10682,11 @@ msgstr ""
 "Esta mensaxe estÃ¡ asinada cunha sinatura vÃ¡lida, mais non foi posÃbel "
 "verificar o remitente da mensaxe."
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1537
 msgid "Signature exists, but need public key"
 msgstr "A sinatura existe, mais precisa unha chave pÃºblica"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -10788,11 +10694,11 @@ msgstr ""
 "Esta mensaxe estÃ¡ asinada cunha sinatura, mais non existe unha chave pÃºblica "
 "correspondente."
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1543
 msgid "Unencrypted"
 msgstr "Non cifrada"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -10800,11 +10706,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:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1544
 msgid "Encrypted, weak"
 msgstr "Cifrada; dÃ©bil"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 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 "
@@ -10814,11 +10720,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:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1545
 msgid "Encrypted"
 msgstr "Cifrada"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -10826,11 +10732,11 @@ msgstr ""
 "Esta mensaxe estÃ¡ cifrada. SerÃa difÃcil para un intruso ver o contido desta "
 "mensaxe."
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1546
 msgid "Encrypted, strong"
 msgstr "Cifrada; forte"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 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 "
@@ -10839,15 +10745,15 @@ 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:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Ver o certificado"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "Este certificado non Ã© visÃbel"
 
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10856,28 +10762,28 @@ msgstr ""
 "procesamento demora demasiado. Pode visualizalo sen formato ou ben cun "
 "editor de texto externo."
 
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:726
 msgid "Completed on"
 msgstr "Terminado o"
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:734
 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:750
+#: ../mail/em-format-html-display.c:738
 msgid "by"
 msgstr "por"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html-display.c:992
 msgid "View _Unformatted"
 msgstr "Ver sen _formato"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:950
 msgid "Hide _Unformatted"
 msgstr "Ocultar sen _formato"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1012
 msgid "O_pen With"
 msgstr "A_brir con"
 
@@ -10886,18 +10792,18 @@ msgstr "A_brir con"
 msgid "Page %d of %d"
 msgstr "PÃ¡xina %d de %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:147
 msgid "Formatting message"
 msgstr "Formatando a mensaxe"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:338
 msgid "Formatting Message..."
 msgstr "Formatando a mensaxe..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1380 ../mail/em-format-html.c:1389
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "Recuperando `%s'"
+msgid "Retrieving '%s'"
+msgstr "Obtendo Â«%sÂ»"
 
 #: ../mail/em-format-html.c:1854
 msgid "Unknown external-body part."
@@ -10935,39 +10841,49 @@ msgstr "Punteiro aos datos externos descoÃ±ecidos (tipo \"%s\")"
 #. 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:2628
+#: ../mail/em-format-html.c:2598
 #, 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-subscribe-editor.c:586
+#: ../mail/em-subscribe-editor.c:583
 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:619
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "Subscrito"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Cartafol"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:837
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Non se seleccionou un servidor"
 
-#: ../mail/em-utils.c:311
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, c-format
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "EstÃ¡ seguro de que quere abrir %d mensaxe ao mesmo tempo?"
+msgstr[1] "EstÃ¡ seguro de que quere abrir %d mensaxes ao mesmo tempo?"
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "Filtros de mensaxe"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:815
+#: ../mail/em-utils.c:852
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensaxes de %s"
@@ -10976,7 +10892,7 @@ msgstr "Mensaxes de %s"
 msgid "Search _Folders"
 msgstr "Carta_foles de busca"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:521
 msgid "Add Folder"
 msgstr "Cartafol"
 
@@ -11017,50 +10933,46 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Largura da xanela \"Enviar e recibir correo\""
 
 #: ../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:11
 msgid "Always request read receipt"
 msgstr "Requirir sempre confirmaciÃ³n de lectura"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "RecoÃ±ecemento automÃ¡tico de emoticonas"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "RecoÃ±ecemento automÃ¡tico da ligazÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "Verificar se o correo entrante Ã© correo non desexado"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "Cor de realce de citas"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "Cor de realce de citas."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "Altura predefinida da xanela do editor"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "Largura predefinida da xanela do editor"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "Cartafol para cargar/anexar do editor"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 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:22
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11068,7 +10980,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:23
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11076,13 +10988,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:24
+#: ../mail/evolution-mail.schemas.in.h:23
 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:25
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11090,63 +11002,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:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "Conxunto de caracteres predefinido para escribir mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "Conxunto de caracteres predefinido para escribir mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "Conxunto de caracteres predefinido para mostrar mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "Conxunto de caracteres predefinido para mostrar mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "Estilo de reenvÃo predefinido"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "Altura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "Altura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "Altura predefinida do diÃ¡logo de subscriciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "Largura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "Estilo de resposta predefinido"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "Valor predefinido para o estado expandido do fÃo"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "Largura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "Largura predefinida da xanela do editor."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "Largura predefinida do diÃ¡logo de subscriciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11154,12 +11066,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:41
+#: ../mail/evolution-mail.schemas.in.h:40
 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:42
+#: ../mail/evolution-mail.schemas.in.h:41
 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 "
@@ -11172,13 +11084,13 @@ msgstr ""
 "axendas de enderezos remotas (LDAP, por exemplo) estÃ¡n marcadas para o "
 "completado automÃ¡tico."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 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:44
+#: ../mail/evolution-mail.schemas.in.h:43
 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 "
@@ -11188,7 +11100,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:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11196,20 +11108,24 @@ 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:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "Cartafol onde cargar/anexar os ficheiros no editor."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "Cartafol onde gardar os ficheiros enviados por correo."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 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:48
+msgid "Display only message texts not exceeding certain size"
+msgstr "SÃ³ mostrar as mensaxes de texto que non excedan certo tamaÃ±o"
+
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
 msgstr "Non foi posÃbel gardar o ficheiro de sinatura."
@@ -11286,15 +11202,18 @@ msgstr ""
 "previsualizaciÃ³n da mensaxe, na lista de mensaxes e nos cartafoles."
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
 msgstr ""
-"Active isto para renderizar a parte da mensaxe de texto de tamaÃ±o limitado."
+"Activar a mostra de sÃ³ as mensaxes que non excedan o tamaÃ±o definido pola "
+"chave 'message_text_part_limit'."
 
 #: ../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:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:46
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Codificar os nomes de ficheiro como o Outlook ou o Gmail"
 
@@ -11440,11 +11359,11 @@ msgstr ""
 "dos resultados da busca."
 
 #: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
+msgid "Last time Empty Junk was run"
 msgstr "Ã?ltima vez que se baleirou o correo non desexado"
 
 #: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
+msgid "Last time Empty Trash was run"
 msgstr "Ã?ltima vez que se baleirou o lixo"
 
 #: ../mail/evolution-mail.schemas.in.h:85
@@ -11559,65 +11478,69 @@ msgstr "Marcar as citas textuais na \"PrevisualizaciÃ³n\" da mensaxe"
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar as citas textuais na \"PrevisualizaciÃ³n\" da mensaxe."
 
-# (pofilter) gconf: do not translate gconf attribute: "source"
 #: ../mail/evolution-mail.schemas.in.h:109
+msgid "Message text limit for display"
+msgstr "LÃmite do texto do mensaxe para mostralo"
+
+# (pofilter) gconf: do not translate gconf attribute: "source"
+#: ../mail/evolution-mail.schemas.in.h:110
 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:110
+#: ../mail/evolution-mail.schemas.in.h:111
 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:111
+#: ../mail/evolution-mail.schemas.in.h:112
 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:112
+#: ../mail/evolution-mail.schemas.in.h:113
 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:113
+#: ../mail/evolution-mail.schemas.in.h:114
 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:114
+#: ../mail/evolution-mail.schemas.in.h:115
 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:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt on empty subject"
 msgstr "Preguntar cando o asunto estÃ¡ baleiro"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 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:117
+#: ../mail/evolution-mail.schemas.in.h:118
 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:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when deleting messages in search folder"
 msgstr "Preguntar cando se eliminen mensaxes nun cartafol de busca"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user expunges"
 msgstr "Preguntar cando o usuario compacta"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cando o usuario sÃ³ encha o campo Cco"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 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:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11625,65 +11548,65 @@ msgstr ""
 "Preguntar ao enviar mensaxes en HTML a destinatarios que non desexen "
 "recibilas."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 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:124
+#: ../mail/evolution-mail.schemas.in.h:125
 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:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt while marking multiple messages"
 msgstr "Preguntar cando se marquen varias mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put personalized signatures at the top of replies"
 msgstr "PoÃ±er sinaturas personalizadas no inicio das respostas"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Put the cursor at the bottom of replies"
 msgstr "PoÃ±er o cursor ao fondo da resposta"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 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:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Recognize links in text and replace them."
 msgstr "RecoÃ±ecer ligazÃ³ns no texto e substituÃlas."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Run junk test on incoming mail."
 msgstr "Realizar a proba de correo non desexado no correo entrante."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Save directory"
 msgstr "Cartafol onde gardar"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 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:133
+#: ../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:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Send HTML mail by default."
 msgstr "Enviar correo en HTML por omisiÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 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:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Server synchronization interval"
 msgstr "Intervalo de sincronizaciÃ³n do servidor"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -11691,67 +11614,67 @@ 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
+#: ../mail/evolution-mail.schemas.in.h:139
 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:139
+#: ../mail/evolution-mail.schemas.in.h:140
 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:140
+#: ../mail/evolution-mail.schemas.in.h:141
 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:141
+#: ../mail/evolution-mail.schemas.in.h:142
 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:142
+#: ../mail/evolution-mail.schemas.in.h:143
 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:143
+#: ../mail/evolution-mail.schemas.in.h:144
 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:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show Animations"
 msgstr "Mostrar animaciÃ³ns"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Show all message headers"
 msgstr "Contraer todos os fÃos de mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 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
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show animated images as animations."
 msgstr "Mostrar as imaxes animadas como animaciÃ³ns."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 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:149
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar as mensaxes eliminadas na lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show image animations"
 msgstr "Mostrar as animaciÃ³ns de imaxe "
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show original \"Date\" header value."
 msgstr "Mostrar o valor da cabeceira \"Date\" orixinal"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show photo of the sender"
 msgstr "Mostrar a foto do remitente"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11759,7 +11682,7 @@ msgstr ""
 "Mostrar o campo \"Bcc\" ao enviar unha mensaxe de correo. Isto pÃ³dese "
 "configurar desde o menÃº Ver cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11767,7 +11690,7 @@ msgstr ""
 "Mostrar o campo \"Cc\" ao enviar unha mensaxe de correo. Isto pÃ³dese "
 "configurar desde o menÃº Ver cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11775,7 +11698,7 @@ msgstr ""
 "Mostrar o campo \"De\" ao enviar a unha rolda de correo. Isto pÃ³dese "
 "configurar desde o menÃº Ver cando se selecciona unha conta de novas."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11783,7 +11706,7 @@ msgstr ""
 "Mostrar o campo \"De\" ao enviar unha mensaxe de correo. Isto pÃ³dese "
 "configurar desde o menÃº Ver cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11791,7 +11714,7 @@ msgstr ""
 "Mostrar o campo \"Respostar a\" ao enviar a unha rolda de correo. Isto "
 "pÃ³dese configurar desde o menÃº VEr cando se selecciona unha conta de novas."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11799,14 +11722,14 @@ msgstr ""
 "Mostrar o campo \"Respostar a\" ao enviar unha mensaxe de correo. Isto "
 "pÃ³dese configurar desde o menÃº Ver cando se selecciona unha conta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 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:160
+#: ../mail/evolution-mail.schemas.in.h:161
 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 "
@@ -11816,50 +11739,51 @@ msgstr ""
 "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
+#: ../mail/evolution-mail.schemas.in.h:162
 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:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell check inline"
 msgstr "VerificaciÃ³n ortogrÃ¡fica en liÃ±a"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking color"
 msgstr "Cor da verificaciÃ³n ortogrÃ¡fica"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Spell checking languages"
 msgstr "Idiomas da verificaciÃ³n ortogrÃ¡fica"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default height"
 msgstr "Altura predefinida do diÃ¡logo de subscriciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default width"
 msgstr "Largura predefinida do diÃ¡logo de subscriciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Terminal font"
 msgstr "Tipo de letra do terminal"
 
-#: ../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:169
 msgid "The default plugin for Junk hook"
 msgstr "O engadido predefinido para a asociaciÃ³n de correo non desexado"
 
 #: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
-"A Ãºltima vez que se baleirou o correo non desexado, en dÃas desde a Ã©poca."
+"A Ãºltima vez que se baleirou o correo non desexado, en dÃas desde o 1 de "
+"xaneiro de 1970 (Epoch)."
 
 #: ../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 desde a Ã©poca."
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr ""
+"A Ãºltima vez que se baleirou o Lixo, en dÃas desde o 1 de xaneiro de 1970 "
+"(Epoch)."
 
 #: ../mail/evolution-mail.schemas.in.h:172
 msgid ""
@@ -11891,11 +11815,13 @@ msgstr ""
 
 #: ../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."
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
-"Isto decide o tamaÃ±o mÃ¡ximo da parte de texto que pode ser formatada no "
-"Evolution. O predefinido Ã© 4MB/4096 KB e estÃ¡ especificado en termos de KB."
+"Isto decide o tamaÃ±o mÃ¡ximo da parte de texto que se pode formatar no "
+"Evolution, estÃ¡ especificado en termos de KB. O predefinido Ã© 4096 (4MB). "
+"Este valor Ãºsase sÃ³ cando a chave 'force_message_limit' estÃ¡ activada."
 
 #: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
@@ -12073,532 +11999,551 @@ msgstr "Largura do panel de lista de mensaxes"
 msgid "Width of the message-list pane."
 msgstr "Largura do panel de lista de mensaxes."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "Importando datos Elm"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:372
 #: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "Correo"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:365
 msgid "Evolution Elm importer"
 msgstr "Importador do Elm do Evolution"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:366
 msgid "Import mail from Elm."
 msgstr "Importar correo desde o Elm."
 
-#: ../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:114
+msgid "_Destination folder:"
+msgstr "Cartafol de _destino:"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder to import into"
 msgstr "Seleccionar un cartafol para o que importar"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:218
+#: ../mail/importers/evolution-mbox-importer.c:262
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Caixa de correo Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:263
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de cartafoles no formato caixa de correo de Berkeley"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "Importando caixa de correo"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../mail/importers/mail-importer.c:148
+#: ../plugins/pst-import/pst-importer.c:453
+#: ../plugins/pst-import/pst-importer.c:559
 #, c-format
-msgid "Importing `%s'"
-msgstr "Importando `%s'"
+msgid "Importing '%s'"
+msgstr "Importando Â«%sÂ»"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:291
 #, c-format
 msgid "Scanning %s"
 msgstr "Examinando %s"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:219
 msgid "Importing Pine data"
 msgstr "Importando datos do Pine"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:377
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:418
 msgid "Evolution Pine importer"
 msgstr "Importador do Pine do Evolution"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:419
 msgid "Import mail from Pine."
 msgstr "Importar correo do Pine."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Enviar a %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "Correo de %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "O asunto Ã© %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "Engadir unha regra de filtraxe"
 
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(Nota: Ã© preciso reiniciar o aplicativo)"
 
-#: ../mail/mail-config.ui.h:2
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:3
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>OpciÃ³n para responder por encima</b> (Non se recomenda)"
 
-#: ../mail/mail-config.ui.h:3
+#: ../mail/mail-config.ui.h:4
 msgid "Account Information"
 msgstr "Sen informaciÃ³n"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "Engadir sinatura _nova..."
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Asinar sem_pre as mensaxes saÃntes cando se use esta conta"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 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.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Enviar sempre _copia de carbÃ³n (Cc) a:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Enviar sempre copia de carbÃ³n _oculta (Cco) a:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Confia_r sempre nas chaves do meu anel de chaves ao cifrar"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Cifrar sempre para un _mesmo ao enviar correo cifrado"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "Requirir sempre confirmaciÃ³n de lec_tura"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "AutenticaciÃ³n"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "Inserir imaxes de _emoticonas automaticamente"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "Conxunto de ca_racteres:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "_Verificar os tipos compatÃbeis"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr ""
 "Verificar as cabeceiras personalizada_s para detectar correo non desexado"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check incoming _messages for junk"
 msgstr "Verificar as _mensaxes entrantes para detectar correo non desexado"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check spelling while I _type"
 msgstr "Verificar a orto_grafÃa mentres se escribe"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Verifica se o correo entrante Ã© correo non desexado"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Cle_ar"
 msgstr "Limp_ar"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "Limpa_r"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "Cor para as palabras escritas _incorrectamente:"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Composing Messages"
 msgstr "Escribir unha mensaxe"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:27 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "ConfiguraciÃ³n"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "Confirmar a_o compactar un cartafol"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgid "Default Behavior"
 msgstr "Prioridade predefinida:"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:31
 msgid "Default character e_ncoding:"
 msgstr "CodificaciÃ³_n de caracteres predefinida:"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Delete Mail"
 msgstr "Eliminar"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Delete junk messages on e_xit"
 msgstr "Eliminar os correos non desexados ao saÃ_r"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Asinar dixitalmente as mensaxes saÃnt_es (por omisiÃ³n)"
 
-#: ../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"
+msgid "Displayed Message Headers"
+msgstr "Cabeceiras mostradas do mensaxe"
 
 #: ../mail/mail-config.ui.h:38
+msgid "Do not display messages when text si_ze exceeds"
+msgstr "Non mostrar mensaxes se o tama_Ã±o do texto excede"
+
+#: ../mail/mail-config.ui.h:39
 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.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Do not quote"
 msgstr "Non eliminar"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Drafts _Folder:"
 msgstr "Carta_fol de borradores:"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Email _Address:"
 msgstr "_Enderezo de correo:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Empty trash folders on e_xit"
 msgstr "Baleirar os cartafoles de lixo ao _saÃr"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Magic S_pacebar"
 msgstr "Activar a barra de espa_zos mÃ¡xica"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:45
 msgid "Enable Sea_rch Folders"
 msgstr "Activar cartafoles de _busca"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encry_ption certificate:"
 msgstr "Certificado de ci_frado:"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "Encrypt out_going messages (by default)"
 msgstr "Cifrar as mensaxes saÃn_tes (por omisiÃ³n)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Fi_xed-width:"
 msgstr "Largura fi_xa:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Fix_ed width Font:"
 msgstr "Tipo de letra de largura f_ixa:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Font Properties"
 msgstr "Propiedades do tipo de letra"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:52
 msgid "Format messages in _HTML"
 msgstr "Formato das mensaxes en _HTML"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Full Nam_e:"
 msgstr "Nom_e completo:"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "HTML Messages"
 msgstr "Mensaxes HTML"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
 msgid "H_TTP Proxy:"
 msgstr "Proxy H_TTP:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:57
 msgid "Headers"
 msgstr "Cabeceiras"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:58
 msgid "Highlight _quotations with"
 msgstr "Realzar as _citas con"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:60
 msgid "Inline"
 msgstr "En liÃ±a"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:61
 msgid "Inline (Outlook style)"
 msgstr "En liÃ±a (estilo Outlook)"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:63
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Etiquetas"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "TÃ¡boa de idiomas"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "_Cargar imaxes"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "TÃ¡boa de cabeceiras de correo"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "LocalizaciÃ³n da caixa de correo"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "Mensaxes"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:70
 msgid "Message Fonts"
 msgstr "A mensaxe contÃ©n"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:71
 msgid "Message Receipts"
 msgstr "Retirada de mensaxe"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:72
 msgid "No _Proxy for:"
 msgstr "Sen pro_xy para:"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:74
 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.ui.h:74
+#: ../mail/mail-config.ui.h:75
 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.ui.h:75
+#: ../mail/mail-config.ui.h:76
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Datos persoais"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:78
 msgid "Or_ganization:"
 msgstr "Organi_zaciÃ³n:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:79
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da _Chave PGP/GPG:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "Pass_word:"
 msgstr "Con_trasinal:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 msgid "Port:"
 msgstr "Porto:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:83
 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.ui.h:83
+#: ../mail/mail-config.ui.h:84
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "<span weight=\"bold\">Privacidade bastante boa (PGP/GPG)</span>"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:86
 msgid "Printed Fonts"
 msgstr "Imprimir notas"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:87
 msgid "Proxy Settings"
 msgstr "ConfiguraciÃ³n de correo non desexado"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:88
 msgid "Quoted"
 msgstr "_Citada"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:89
 msgid "Re_member password"
 msgstr "Le_mbrar contrasinal"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:90
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:92
 msgid "Remember _password"
 msgstr "Lembrar _contrasinal"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:93
 msgid "Required Information"
 msgstr "InformaciÃ³n do servidor"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
 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
+#: ../mail/mail-config.ui.h:96
 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.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "S_eleccionar..."
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "En_viar confirmaciÃ³ns de mensaxes:"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "Tipo de letra es_tÃ¡ndar:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME seguro (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:102
 msgid "Select Drafts Folder"
 msgstr "Seleccionar cartafol"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font"
 msgstr "Seleccione o tipo de letra de largura fixa para HTML"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr "Seleccione o tipo de letra de largura fixa en HTML para imprimir"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font"
 msgstr "Seleccione o tipo de letra de largura variÃ¡bel en HTML"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:106
 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.ui.h:106
+#: ../mail/mail-config.ui.h:107
 msgid "Select Sent Folder"
 msgstr "Seleccionar cartafol"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:108
 msgid "Sender Photograph"
 msgstr "<b>FotografÃa do remitente</b>"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:109
 msgid "Sending Mail"
 msgstr "Enviando correo"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:110
 msgid "Sent _Messages Folder:"
 msgstr "Cartafol de _mensaxes enviadas:"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:111
 msgid "Sent and Draft Messages"
 msgstr "Mensaxes enviadas"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:112
 msgid "Ser_ver requires authentication"
 msgstr "O ser_vidor require autenticaciÃ³n"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:113
 msgid "Server Configuration"
 msgstr "InformaciÃ³n do servidor"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:114
 msgid "Server _Type:"
 msgstr "_Tipo de servidor:"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_natures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:116
 msgid "Sig_ning certificate:"
 msgstr "Certificado de si_natura:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:117
 msgid "Signat_ure:"
 msgstr "Sinat_ura:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:118
 msgid "Signatures"
 msgstr "Sinaturas"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:119
 msgid "Spell Checking"
 msgstr "VerificaciÃ³n ortogrÃ¡fica"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:120
 msgid "Start _typing at the bottom on replying"
 msgstr "Comezar a escri_bir ao final da resposta"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:122
 msgid "T_ype:"
 msgstr "T_ipo:"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12606,7 +12551,7 @@ msgstr ""
 "Esta lista de idiomas reflicte unicamente os idiomas para os cales hai "
 "instalado un dicionario."
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:124
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12615,7 +12560,7 @@ 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.ui.h:126
+#: ../mail/mail-config.ui.h:127
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12623,244 +12568,242 @@ msgstr ""
 "Teclee o nome polo que quere identificar a esta conta.\n"
 "Por exemplo: \"Traballo\" ou \"Persoal\""
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:129
 msgid "Us_ername:"
 msgstr "Nome de _usuario:"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:130
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticaciÃ³n"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
+#: ../mail/mail-config.ui.h:131 ../plugins/caldav/caldav-source.c:222
 #: ../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.ui.h:131
+#: ../mail/mail-config.ui.h:132
 msgid "V_ariable-width:"
 msgstr "Largura v_ariÃ¡bel:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:133
 msgid "_Add Signature"
 msgstr "_Engadir sinatura"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:134
 msgid "_Always load images from the Internet"
 msgstr "Cargar _sempre as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:135
 msgid "_Authentication Type"
 msgstr "Tipo de _autenticaciÃ³n"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:136
 msgid "_Default junk plugin:"
 msgstr "engadido por _omisiÃ³n de correo non desexado:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:137
 msgid "_Direct connection to the Internet"
 msgstr "ConexiÃ³n _directa a Internet"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:138
 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.ui.h:138
+#: ../mail/mail-config.ui.h:139
 msgid "_Forward style:"
 msgstr "Estilo de _reenvÃo:"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:140
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Manter a sinatura sobre a mensaxe orixinal ao responder"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:141
 msgid "_Languages"
 msgstr "Idioma"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:142
 msgid "_Load images in messages from contacts"
 msgstr "Ca_rgar as imaxes nas mensaxes dos contactos"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:143
 msgid "_Lookup in local address book only"
 msgstr "_Buscar sÃ³ nas axendas de enderezos locais"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:144
 msgid "_Make this my default account"
 msgstr "_Facer desta a miÃ±a conta predefinida"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:145
 msgid "_Manual proxy configuration:"
 msgstr "ConfiguraciÃ³n _manual do proxy:"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:146
 msgid "_Mark messages as read after"
 msgstr "_Marcar as mensaxes como lidas despois de"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:148
 msgid "_Never load images from the Internet"
 msgstr "_Nunca cargar as imaxes desde Internet"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:149
 msgid "_Path:"
 msgstr "_CamiÃ±o:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:150
 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.ui.h:150
+#: ../mail/mail-config.ui.h:151
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Preguntar cando se envÃen mensaxes cun asunto baleiro"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:152
 msgid "_Reply style:"
 msgstr "Estilo da _resposta:"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:153
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:154
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _seguro:"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:156 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Servidor:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:158
 msgid "_Show image animations"
 msgstr "_Mostrar animaciÃ³ns de imaxes"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:159
 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.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:161
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Reducir as cabeceiras Para/Cc/Cco como "
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:162
 msgid "_Use Secure Connection:"
 msgstr "_Usar unha conexiÃ³n segura:"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:163
 msgid "_Use system defaults"
 msgstr "_Usar as configuraciÃ³ns predefinidas do sistema"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:164
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar os mesmos tipos de letra que noutros aplicativos"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "am"
 
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:167
 msgid "addresses"
 msgstr "enderezos"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:168 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "por"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:169
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:170
 msgid "description"
 msgstr "descriciÃ³n"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "Todos os cartafoles remotos activados"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "Todos os cartafoles locais e remotos activados"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "Todos os cartafoles locais"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "Chamar"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "Ter_minado"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Digital Signature"
 msgstr "Editar a sinatura"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Do Not Forward"
 msgstr "Non reenviar"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Folder Subscriptions"
 msgstr "SubscriciÃ³ns de cartafoles"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "Seguimento"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "Para a sÃºa informaciÃ³n"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Reenviar"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "Acordo de licenza"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "Non Ã© necesaria unha resposta"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "Revisar"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:20
 msgid "S_erver:"
 msgstr "S_ervidor:"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Search Folder Sources"
 msgstr "Orixe do cartafol de busca"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Security Information"
 msgstr "InformaciÃ³n de seguranza"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Specific folders"
 msgstr "Cartafoles especÃficos"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:24
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12868,170 +12811,170 @@ msgstr ""
 "As mensaxes que seleccionou para o seguimento lÃstanse abaixo.\n"
 "Seleccione unha acciÃ³n de seguimento desde o menÃº \"Marcar\"."
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Accept License"
 msgstr "_Aceptar a licenza"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Due By:"
 msgstr "_Vence o:"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Flag:"
 msgstr "_Marca:"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Tick this to accept the license agreement"
 msgstr "Ma_rque isto para aceptar o acordo de licenza"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:891
 #, c-format
 msgid "Pinging %s"
 msgstr "Facendo ping a %s"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "Filtrando as mensaxes seleccionadas"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "Recibindo correo"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:574
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Produciuse un fallo ao aplicar os filtros ao correo saÃnte: %s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:586 ../mail/mail-ops.c:613
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "Produciuse un fallo ao anexar a %s: %s\n"
-"anexando ao cartafol local `Enviados' no seu lugar."
+"No seu lugar anexaranse ao cartafol local Â«EnviadosÂ»."
 
-#: ../mail/mail-ops.c:641
+#: ../mail/mail-ops.c:630
 #, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Produciuse un fallo ao anexar ao cartafol local `Enviados': %s"
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "Produciuse un fallo ao anexar ao cartafol local Â«EnviadosÂ»: %s"
 
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:741 ../mail/mail-ops.c:822
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:751
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:778
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Produciuse un fallo ao enviar %d de %d mensaxes"
 
-#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:780 ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:782 ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "Terminado."
 
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:894
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Gardando a mensaxe no cartafol %s"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:971
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Movendo as mensaxes a %s"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:971
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copiando as mensaxes a %s"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1080
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1188
 msgid "Forwarded messages"
 msgstr "Mensaxes reenviadas"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1229
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Abrindo cartafol %s"
 
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1295
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "Obtendo a informaciÃ³n de cuota do cartafol %s"
 
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1367
 #, c-format
 msgid "Opening store '%s'"
 msgstr "Abrindo almacenamento %s"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1438
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Eliminando o cartafol %s"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1556
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Almacenando o cartafol '%s'"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1619
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando e almacenando a conta '%s'"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1620
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando a conta '%s'"
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1674
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Actualizando o cartafol %s"
 
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1714
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Compactando o cartafol %s"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1759
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Baleirando o lixo en '%s'"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1760
 msgid "Local Folders"
 msgstr "Cartafoles locais"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:1956
 #, 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:2056
+#: ../mail/mail-ops.c:2045
 #, 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:2136
+#: ../mail/mail-ops.c:2126
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13040,11 +12983,11 @@ msgstr ""
 "Produciuse un erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2198
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2216 ../mail/mail-ops.c:2224
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13053,35 +12996,35 @@ msgstr ""
 "Non Ã© posÃbel crear o ficheiro de saÃda: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
+#: ../mail/mail-ops.c:2239
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non Ã© posÃbel escribir os datos: %s"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2384
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Desconectando de %s"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2384
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Conectando novamente con %s"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2480
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando a conta '%s' para o modo sen conexiÃ³n"
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2566
 msgid "Checking Service"
 msgstr "Verificando o servizo"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "Cancelando..."
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:427
 msgid "Send & Receive Mail"
 msgstr "Enviar e recibir correo"
 
@@ -13089,111 +13032,140 @@ msgstr "Enviar e recibir correo"
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:554
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
 msgid "Waiting..."
 msgstr "En espera..."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:874
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando o correo novo"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:217
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduza a frase de paso para %s"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:219
 msgid "Enter Passphrase"
 msgstr "Introduza a frase de paso"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:222
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza o contrasinal para %s"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:224
 msgid "Enter Password"
 msgstr "Introduza o contrasinal"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:266
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operaciÃ³n."
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:660
 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-session.c:669
+#: ../mail/mail-session.c:666
 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:123
+#: ../mail/mail-tools.c:119
 #, c-format
-msgid "Could not create spool directory `%s': %s"
-msgstr "Non foi posÃbel crear o cartafol spool `%s': %s"
+msgid "Could not create spool directory '%s': %s"
+msgstr "Non foi posÃbel crear o cartafol spool Â«%sÂ»: %s"
 
-#: ../mail/mail-tools.c:153
+#: ../mail/mail-tools.c:149
 #, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
+msgid "Trying to movemail a non-mbox source '%s'"
 msgstr ""
-"Tentando facer un movemail dunha orixe que non Ã© unha caixa de correo `%s'"
+"Tentando mover o correo desde unha orixe que non Ã© unha caixa de correo Â«%sÂ»"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe reenviada - %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:257
 msgid "Forwarded message"
 msgstr "Mensaxe reenviada"
 
-#: ../mail/mail-tools.c:301
+#: ../mail/mail-tools.c:297
 #, c-format
-msgid "Invalid folder: `%s'"
-msgstr "Cartafol non vÃ¡lido: `%s'"
+msgid "Invalid folder: '%s'"
+msgstr "Cartafol non vÃ¡lido: Â«%sÂ»"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Configurando o cartafol de busca: %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:229
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Actualizando os cartafoles de busca para '%s: %s'"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:236
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Actualizando os cartafoles de busca para '%s'"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:679
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-vfolder.c:1191
 msgid "Edit Search Folder"
 msgstr "Editar cartafol de busca"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1296
 msgid "New Search Folder"
 msgstr "Cartafol de busca novo"
 
 #: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "Produciuse un fallo na comprobaciÃ³n de correo lixo"
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "Produciuse un fallo ao informar de que Ã© correo non desexado"
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "Produciuse un fallo ao informar de que non Ã© non desexado"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Xa existe un cartafol co nome \"{0}\". Use un nome diferente."
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Xa existe un cartafol co nome \"{1}\". Use un nome diferente."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13205,7 +13177,7 @@ msgstr ""
 "Pode escoller entre ignorar este cartafol, sobrescribir ou anexar os seus "
 "contidos ou saÃr."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
@@ -13213,13 +13185,13 @@ msgstr ""
 "Foi solicitada unha confirmaciÃ³n de lectura para \"{1}\". QuÃ©relle enviar a "
 "confirmaciÃ³n de lectura a {0}?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr "Xa existe unha sinatura co nome \"{0}\". Use un nome diferente."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13227,26 +13199,22 @@ msgstr ""
 "Engadir unha liÃ±a de asunto significativa Ã¡s mensaxes darÃ¡ aos seus "
 "destinatarios unha idea sobre o contido do correo."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "EstÃ¡ seguro de que quere eliminar esta conta e todos os seus proxies?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to delete this account?"
 msgstr "EstÃ¡ seguro de que quere eliminar esta conta?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "EstÃ¡ seguro de que quere desactivar esta conta e eliminar todos os seus "
 "proxies?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "EstÃ¡ seguro de que quere abrir {0} mensaxes ao mesmo tempo?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13254,7 +13222,7 @@ msgstr ""
 "EstÃ¡ seguro de que quere eliminar permanentemente todas as mensaxes "
 "eliminadas en todos os cartafoles?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -13262,87 +13230,79 @@ msgstr ""
 "EstÃ¡ seguro de que quere eliminar permanentemente todas as mensaxes "
 "eliminadas do cartafol \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 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
+#: ../mail/mail.error.xml.h:18
 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
+#: ../mail/mail.error.xml.h:19
 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
+#: ../mail/mail.error.xml.h:20
 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
+#: ../mail/mail.error.xml.h:21
 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:20
-msgid "Because \"{0}\"."
-msgstr "Por causa de \"{0}\"."
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "Por causa de \"{2}\"."
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "Sinatura en branco"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Non Ã© posÃbel engadir o Cartafol de busca \"{0}\"."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Non Ã© posÃbel copiar o cartafol \"{0}\" en \"{1}\"."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "Non Ã© posÃbel crear o cartafol \"{0}\"."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "Non Ã© posÃbel crear o cartafol de gardado temporal."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Non Ã© posÃbel crear o cartafol de gardado porque \"{1}\""
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Non Ã© posÃbel eliminar o cartafol \"{0}\"."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Non Ã© posÃbel eliminar o cartafol de sistema \"{0}\"."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 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:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Non Ã© posÃbel mover o cartafol \"{0}\" a \"{1}\"."
 
-#: ../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
+msgid "Cannot open source \"{1}\"."
+msgstr "Non Ã© posÃbel abrir a orixe Â«{1}Â»"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "Non Ã© posÃbel abrir a orixe \"{2}\"."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "Non Ã© posÃbel abrir o destino \"{2}\"."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 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."
@@ -13351,35 +13311,31 @@ msgstr ""
 "instalaciÃ³n. Non serÃ¡ capaz de usar este provedor atÃ© que acepte a sÃºa "
 "licenza."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Non Ã© posÃbel renomear \"{0}\" como \"{1}\"."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 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:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "Non Ã© posÃbel gardar as modificaciÃ³ns na conta."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Non Ã© posÃbel gardar no cartafol \"{0}\"."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "Non Ã© posÃbel gardar no ficheiro \"{0}\"."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Non Ã© posÃbel estabelecer o script de sinatura \"{0}\"."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "Produciuse un fallo na verificaciÃ³n de correo non desexado"
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13388,27 +13344,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:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Non foi posÃbel gardar o ficheiro de sinatura."
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Quere eliminar as mensaxes no Cartafol de busca \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:45
 msgid "Do not d_elete"
 msgstr "Non _eliminar"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "Non eliminar"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "Non desactivar"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -13416,60 +13372,63 @@ msgstr ""
 "Quere sincronizar localmente os cartafoles que estÃ¡n marcados para o uso sen "
 "conexiÃ³n?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want to mark all messages as read?"
 msgstr "Quere marcar todas as mensaxes como lidas?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "Quere gardar as modificaciÃ³ns?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "Introduza o contrasinal."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "Produciuse un erro ao cargar as definiciÃ³ns dos filtros."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "Produciuse un erro ao efectuar a operaciÃ³n."
 
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:57
 msgid "Error while {0}."
 msgstr "Produciuse un erro ao {0}."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "O ficheiro existe mais non Ã© posÃbel sobrescribilo."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "O ficheiro existe mais non Ã© un ficheiro normal."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 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:60
+#: ../mail/mail.error.xml.h:61
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
-"Se elimina o cartafol eliminarase permanentemente todo o seu contido e o dos "
-"seus subcartafoles."
+"Se elimina o cartafol todo o seu contido e o dos seus subcartafoles "
+"eliminarase permanentemente."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Se elimina o cartafol eliminarase permanentemente todo o seu contido."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Se procede, as contas proxy eliminaranse permanentemente."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13477,11 +13436,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:65
+#: ../mail/mail.error.xml.h:66
 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:66
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13489,23 +13448,23 @@ msgstr ""
 "Se sae, estas mensaxes non se enviarÃ¡n atÃ© que o Evolution sexa iniciado de "
 "novo."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "AutenticaciÃ³n non vÃ¡lida"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Produciuse un fallo na eliminaciÃ³n de correo"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automaticamente."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 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 "
@@ -13517,27 +13476,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:72
+#: ../mail/mail.error.xml.h:73
 msgid "Missing folder."
 msgstr "Falta o cartafol."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "No sources selected."
 msgstr "Non se seleccionou ningunha orixe."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 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:76
+#: ../mail/mail.error.xml.h:77
 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:77
+#: ../mail/mail.error.xml.h:78
 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:78
+#: ../mail/mail.error.xml.h:79
 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."
@@ -13545,7 +13504,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:79
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13555,67 +13514,59 @@ msgstr ""
 "HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Please provide an unique name to identify this signature."
 msgstr "Introduza un nome Ãºnico para identificar esta sinatura."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Please wait."
 msgstr "Agarde."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Produciuse un problema ao migrar o cartafol de correo antigo \"{0}\"."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 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:85
+#: ../mail/mail.error.xml.h:86
 msgid "Read receipt requested."
 msgstr "Solicitouse unha confirmaciÃ³n de lectura."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 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:87
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\"?"
 msgstr "Confirma o borrado do cartafol \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "Produciuse un fallo ao informar de correo non desexado"
-
 #: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "Produciuse un fallo ao informe do correo que non Ã© non desexado"
-
-#: ../mail/mail.error.xml.h:90
 msgid "Search Folders automatically updated."
 msgstr "Os cartafoles de busca actualizÃ¡ronse automaticamente."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid "Send Receipt"
 msgstr "Enviar notificaciÃ³n de recepciÃ³n"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:91
 msgid "Signature Already Exists"
 msgstr "A sinatura xa existe"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize"
 msgstr "Sincronizar"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Sincronizar os cartafoles localmente para o uso sen conexiÃ³n?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13623,7 +13574,7 @@ msgstr ""
 "O Evolution precisa os cartafoles de sistema para funcionar correctamente e "
 "non Ã© posÃbel renomear, mover nin eliminar."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13640,35 +13591,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:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"Os seguintes cartafoles de busca:\n"
-"{0}\n"
-"usan o cartafol que se eliminou agora:\n"
-"    \"{1}\"\n"
-"e foron actualizados."
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"As seguintes regras de filtraxe:\n"
-"{0}\n"
-"usan o cartafol que se eliminou agora:\n"
-"    \"{1}\"\n"
-"e foron actualizadas."
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13677,7 +13600,7 @@ msgstr ""
 "electrÃ³nico correcto:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13686,11 +13609,11 @@ msgstr ""
 "electrÃ³nico correcto:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:102
 msgid "The script file must exist and be executable."
 msgstr "O ficheiro de script debe existir e ser executÃ¡bel."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13699,7 +13622,7 @@ msgstr ""
 "vaia ao editor de cartafoles de busca para engadilo explicitamente, se Ã© "
 "necesario."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -13707,14 +13630,14 @@ msgstr ""
 "Esta mensaxe non pode ser enviada porque a conta que escolleu para enviala "
 "non estÃ¡ activada"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Esta mensaxe non pode ser enviada porque non se especificou ningÃºn "
 "destinatario"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13722,11 +13645,11 @@ msgstr ""
 "Este servidor non Ã© compatÃbel con este tipo de autenticaciÃ³n e quizais non "
 "permita ningÃºn tipo de autenticaciÃ³n."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:108
 msgid "This signature has been changed, but has not been saved."
 msgstr "Modificouse esta sinatura mais non foi gardada."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -13734,11 +13657,11 @@ msgstr ""
 "Isto marcarÃ¡ todas as mensaxes como lidas no cartafol seleccionado e nos "
 "seus subcartafoles."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:110
 msgid "Unable to connect to the GroupWise server."
 msgstr "Non foi posÃbel conectar co servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13746,19 +13669,19 @@ msgstr ""
 "Non Ã© posÃbel abrir o cartafol de borradores nesta conta. Quere usar no seu "
 "lugar o cartafol de borradores do sistema?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to read license file."
 msgstr "Non Ã© posÃbel ler o ficheiro da licenza."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:113
 msgid "Use _Default"
 msgstr "Usar o pre_determinado"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:114
 msgid "Use default drafts folder?"
 msgstr "Quere usar o cartafol de borradores predefinidos?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13768,31 +13691,31 @@ msgstr ""
 "mensaxes reais dun dos seus cartafoles locais ou remotos.\n"
 "EstÃ¡ seguro de que quere facer isto?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:117
 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:129
+#: ../mail/mail.error.xml.h:118
 msgid "You have not filled in all of the required information."
 msgstr "Non encheu toda a informaciÃ³n requirida."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:119
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Ten mensaxes non enviadas. AÃnda asÃ quere saÃr?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:120
 msgid "You may not create two accounts with the same name."
 msgstr "Non pode crear dÃºas contas co mesmo nome."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:121
 msgid "You must name this Search Folder."
 msgstr "Debe dar un nome a este cartafol de busca."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:122
 msgid "You must specify a folder."
 msgstr "Debe especificar un cartafol."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13802,119 +13725,115 @@ msgstr ""
 "FÃ¡gao seleccionando os cartafoles individualmente, ou seleccionando todos os "
 "cartafoles locais e todos os cartafoles remotos ou ambos."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:125
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr ""
 "Produciuse un fallo no seu inicio de sesiÃ³n no servidor \"{0}\" como \"{0}\"."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:126
 msgid "_Append"
 msgstr "_Engadir"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:127
 msgid "_Discard changes"
 msgstr "_Rexeitar as modificaciÃ³ns"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:128
 msgid "_Do not Synchronize"
 msgstr "_Non sincronizar"
 
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:862
+#: ../mail/mail.error.xml.h:129
+#: ../modules/mail/e-mail-shell-view-actions.c:821
 msgid "_Empty Trash"
 msgstr "_Baleirar o lixo"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:130
 msgid "_Expunge"
 msgstr "_Compactar"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:131
 msgid "_Open Messages"
 msgstr "_Abrir mensaxes"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1110
 msgid "Unseen"
 msgstr "Non vista"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1111
 msgid "Seen"
 msgstr "Vista"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1112
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1113
 msgid "Forwarded"
 msgstr "Reenviada"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1114
 msgid "Multiple Unseen Messages"
 msgstr "MÃºltiples mensaxes non vistas"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1115
 msgid "Multiple Messages"
 msgstr "MÃºltiples mensaxes"
 
-#: ../mail/message-list.c:1131
+#: ../mail/message-list.c:1119
 msgid "Lowest"
 msgstr "A mÃ¡is baixa"
 
-#: ../mail/message-list.c:1132
+#: ../mail/message-list.c:1120
 msgid "Lower"
 msgstr "Inferior"
 
-#: ../mail/message-list.c:1136
+#: ../mail/message-list.c:1124
 msgid "Higher"
 msgstr "Superior"
 
-#: ../mail/message-list.c:1137
+#: ../mail/message-list.c:1125
 msgid "Highest"
 msgstr "A mÃ¡is alta"
 
-#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1735 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1742 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Hoxe Ã¡s %l:%M %p"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1751
 msgid "Yesterday %l:%M %p"
 msgstr "Onte Ã¡s %l:%M %p"
 
 # (pofilter) variables: do not translate: %a, %l, %p
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1763
 msgid "%a %l:%M %p"
 msgstr "O %A Ã¡s %k:%M"
 
 # (pofilter) variables: do not translate: %b, %l, %p
-#: ../mail/message-list.c:1783
+#: ../mail/message-list.c:1771
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B Ã¡s %k:%M"
 
 # (pofilter) variables: do not translate: %b
-#: ../mail/message-list.c:1785
+#: ../mail/message-list.c:1773
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2518
 msgid "Select all visible messages"
 msgstr "Seleccionar todas as mensaxes visÃbeis"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:722
-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:4399 ../mail/message-list.c:4895
+#: ../mail/message-list.c:4199 ../mail/message-list.c:4595
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
-#: ../mail/message-list.c:4726
+#: ../mail/message-list.c:4432
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13922,15 +13841,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:4728
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"SÃ³ hai mensaxes ocultas neste cartafol. Use Ver -> Mostrar mensaxes ocultas "
-"para velas."
-
-#: ../mail/message-list.c:4730
+#: ../mail/message-list.c:4434
 msgid "There are no messages in this folder."
 msgstr "Non hai mensaxes neste cartafol."
 
@@ -13968,27 +13879,27 @@ msgid "Subject - Trimmed"
 msgstr "Asunto - Recortado"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Body contains"
 msgstr "O corpo contÃ©n"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Message contains"
 msgstr "A mensaxe contÃ©n"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Recipients contain"
 msgstr "Os destinatarios conteÃ±en"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Sender contains"
 msgstr "O remitente contÃ©n"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "Subject contains"
 msgstr "O asunto contÃ©n"
 
@@ -14022,17 +13933,17 @@ msgstr ""
 "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:602
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "U_sar no calendario Cumpleanos e aniversarios"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 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
+#: ../modules/addressbook/addressbook-config.c:746
 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 "
@@ -14042,7 +13953,7 @@ msgstr ""
 "Proporcionouse unha lista de portos estÃ¡ndar. Pregunte ao seu administrador "
 "do sistema que porto deberÃa especificar."
 
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:820
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -14052,7 +13963,7 @@ msgstr ""
 "definir isto como \"Enderezo de correo\" require o acceso anÃ³nimo ao "
 "servidor LDAP."
 
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:895
 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 "
@@ -14064,29 +13975,29 @@ msgstr ""
 "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
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "InformaciÃ³n do servidor"
 
-#: ../modules/addressbook/addressbook-config.c:996
+#: ../modules/addressbook/addressbook-config.c:1016
 #: ../smime/gui/smime-ui.ui.h:14
 msgid "Details"
 msgstr "Detalles"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "Buscando"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "Propiedades da axenda de enderezos"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "Nova axenda de enderezos"
 
@@ -14177,8 +14088,10 @@ msgstr ""
 msgid "Whether to show the preview pane."
 msgstr "Indica se se mostra o panel de previsualizaciÃ³n."
 
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
+#: ../modules/mail/em-mailer-prefs.c:1158
+msgid "_Table column:"
 msgstr "Columna da tÃ¡boa:"
 
 #: ../modules/addressbook/autocompletion-config.c:162
@@ -14191,7 +14104,7 @@ 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
+#: ../modules/addressbook/e-book-shell-migrate.c:144
 msgid "On LDAP Servers"
 msgstr "En servidores LDAP"
 
@@ -14201,7 +14114,7 @@ msgid "_Contact"
 msgstr "_Contacto"
 
 #: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "Crear un contacto novo"
 
@@ -14211,7 +14124,7 @@ msgid "Contact _List"
 msgstr "_Lista de contactos"
 
 #: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "Crear unha lista de contactos nova"
 
@@ -14221,7 +14134,7 @@ msgid "Address _Book"
 msgstr "_Axenda de enderezos"
 
 #: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "Crear unha axenda de enderezos nova"
 
@@ -14229,337 +14142,232 @@ msgstr "Crear unha axenda de enderezos nova"
 #: ../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
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 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:689
-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:690
-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:761
-#: ../modules/calendar/e-memo-shell-sidebar.c:687
-#: ../modules/calendar/e-task-shell-sidebar.c:687
-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
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
 msgid "Save as vCard"
 msgstr "Gardar como vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Co_py All Contacts To..."
 msgstr "Co_piar todos os contactos a..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
 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
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "D_elete Address Book"
 msgstr "E_liminar a axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
 msgid "Delete the selected address book"
 msgstr "Eliminar o cartafol seleccionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_ver todos os contactos a..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 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
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "_New Address Book"
 msgstr "_Nova axenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Address _Book Properties"
 msgstr "Propiedades da a_xenda de enderezos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 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:1300
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 #: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../modules/mail/e-mail-shell-view-actions.c:905
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "Rename the selected address book"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "S_ave Address Book as vCard"
 msgstr "G_ardar axenda de enderezos como VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 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
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 msgid "Stop loading"
 msgstr "Deter a carga"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "_Copy Contact To..."
 msgstr "_Copiar contacto a..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 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
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "_Delete Contact"
 msgstr "E_liminar contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 msgid "_Find in Contact..."
 msgstr "_Buscar no contacto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 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
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "_Forward Contact..."
 msgstr "_Reenviar contacto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "Send selected contacts to another person"
 msgstr "Enviar os contactos seleccionados a outra persoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "_Move Contact To..."
 msgstr "_Mover contacto a..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 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
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "_New Contact..."
 msgstr "Contacto _novo..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "New Contact _List..."
 msgstr "_Lista de contactos nova..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "_Open Contact"
 msgstr "_Contacto"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "View the current contact"
 msgstr "Ver o contacto actual"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "_Send Message to Contact..."
 msgstr "_Enviar mensaxe ao contacto..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 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:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "_Actions"
 msgstr "_AcciÃ³ns"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
 #: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
 msgid "_Preview"
 msgstr "_PrevisualizaciÃ³n"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 #: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "_Delete"
 msgstr "E_liminar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "_Save as vCard..."
 msgstr "_Gardar como vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Contact _Preview"
 msgstr "_PrevisualizaciÃ³n de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Show contact preview window"
 msgstr "Mostrar a xanela de previsualizaciÃ³n de contactos"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 #: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/calendar/e-task-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "_Classic View"
 msgstr "VisualizaciÃ³n _clÃ¡sica"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
 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/addressbook/e-book-shell-view-actions.c:870
 #: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1192
+#: ../modules/calendar/e-task-shell-view-actions.c:889
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "_Vertical View"
 msgstr "VisualizaciÃ³n _vertical"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 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:1595
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/calendar/e-task-shell-view-actions.c:906
 msgid "Any Category"
 msgstr "Calquera categorÃa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
 #: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/calendar/e-task-shell-view-actions.c:941
 msgid "Unmatched"
 msgstr "Sen equivalencia"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
 #: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
-#: ../shell/e-shell-content.c:516
+#: ../modules/calendar/e-task-shell-view-actions.c:951
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../shell/e-shell-content.c:441
 msgid "Advanced Search"
 msgstr "Busca avanzada"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "Print all shown contacts"
 msgstr "Imprimir os contactos seleccionados"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Preview the contacts to be printed"
 msgstr "Previsualiza os contactos que se van imprimir"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 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
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "Save selected contacts as a vCard"
 msgstr "Gardar os contactos seleccionados como unha VCard"
 
@@ -14603,57 +14411,47 @@ msgstr "InformaciÃ³n de contacto"
 msgid "Contact information for %s"
 msgstr "InformaciÃ³n de contacto de %s"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 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"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "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
+#: ../modules/addressbook/ldap-config.ui.h:7
 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
+#: ../modules/addressbook/ldap-config.ui.h:8
 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
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "Conectado"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "Filtro de busca"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "_Base de busca:"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "_Filtro de busca:"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -14663,54 +14461,54 @@ msgstr ""
 "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
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "Do"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "Bases de busca compatÃbeis"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr ""
 "Anonimamente\n"
 "Empregar enderezo de correo\n"
 "Empregar nome distintivo (DN)"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "_Enderezo de correo:"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "LÃmite de _descarga:"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "_Localizar bases de busca posÃbeis"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "MÃ©todo de _inicio de sesiÃ³n:"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "Ã?mbito da bu_sca:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "_Tempo de espera:"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "_Usar unha conexiÃ³n segura:"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "tarxetas"
 
@@ -14736,11 +14534,11 @@ 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-cal-shell-migrate.c:176
 #: ../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
+#: ../modules/calendar/e-task-shell-migrate.c:143
 msgid "On The Web"
 msgstr "Na Web"
 
@@ -14750,7 +14548,7 @@ msgid "Weather"
 msgstr "O tempo"
 
 #: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "Datas de nacementos e aniversarios"
 
@@ -14760,7 +14558,7 @@ msgid "_Appointment"
 msgstr "Cit_a"
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Create a new appointment"
 msgstr "Crear unha cita nova"
 
@@ -14788,48 +14586,18 @@ msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Create a new calendar"
 msgstr "Crear un calendario novo"
 
 #: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../plugins/itip-formatter/itip-formatter.c:2651
 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:167
-#: ../modules/calendar/e-memo-shell-sidebar.c:162
-#: ../modules/calendar/e-task-shell-sidebar.c:162
+#: ../modules/calendar/e-cal-shell-sidebar.c:168
+#: ../modules/calendar/e-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -14838,36 +14606,16 @@ msgstr ""
 "Erro en %s:\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:226
+#: ../modules/calendar/e-cal-shell-sidebar.c:227
 msgid "Loading calendars"
 msgstr "Cargando calendario"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:615
+#: ../modules/calendar/e-cal-shell-sidebar.c:617
 msgid "Calendar Selector"
 msgstr "Selector de orixe do calendario"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:741
-msgid "Date Navigator Widget"
-msgstr "Widget do navegador de datas"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:742
-msgid "This widget displays a miniature calendar"
-msgstr "Este widget mostra unha calendario en miniatura"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:751
-msgid "Default Calendar Client"
-msgstr "Cliente de correo predefinido"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:752
-msgid "Default client for calendar operations"
-msgstr "O cliente predefinido para as operaciÃ³ns no calendario"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:762
-msgid "This widget displays groups of calendars"
-msgstr "Este widget mostra grupos de calendarios"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:950
+#: ../modules/calendar/e-cal-shell-sidebar.c:952
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrir calendario en %s"
@@ -14911,244 +14659,244 @@ msgstr "Enviado"
 #: ../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:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-task-shell-view-actions.c:612
 msgid "Save as iCalendar"
 msgstr "Seleccione un calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
 #: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "D_elete Calendar"
 msgstr "_Eliminar o calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Delete the selected calendar"
 msgstr "Eliminar o calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 msgid "Go Back"
 msgstr "AtrÃ¡s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Go Forward"
 msgstr "Adiante"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "Seleccionar _hoxe"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
 msgid "Select today"
 msgstr "Seleccionar hoxe"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
 msgid "Select _Date"
 msgstr "Seleccionar _data"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Select a specific date"
 msgstr "Seleccionar unha data especÃfica"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
 msgid "_New Calendar"
 msgstr "Calendario _novo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Purg_e"
 msgstr "D_epurar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 msgid "Purge old appointments and meetings"
 msgstr "Depurar as reuniÃ³ns e as citas antigas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 #: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Re_fresh"
 msgstr "Ac_tualizar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 msgid "Refresh the selected calendar"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Rename the selected calendar"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "Show _Only This Calendar"
 msgstr "M_ostrar sÃ³ este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar a un calendario..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "_Delegate Meeting..."
 msgstr "_Delegar cita..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_Delete Appointment"
 msgstr "_Eliminar esta cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Delete selected appointments"
 msgstr "Eliminar a cita seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "Delete This _Occurrence"
 msgstr "Eliminar esta _apariciÃ³n"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete this occurrence"
 msgstr "Eliminar esta apariciÃ³n"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete All Occ_urrences"
 msgstr "Eliminar _todas as apariciÃ³ns"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete all occurrences"
 msgstr "Eliminar todas as apariciÃ³ns"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "New All Day _Event..."
 msgstr "Novo _actividade de dÃa completo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 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:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 #: ../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:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:693
 msgid "_Forward as iCalendar..."
 msgstr "Remi_tir como iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
 msgid "New _Meeting..."
 msgstr "_ReuniÃ³n nova"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "Create a new meeting"
 msgstr "Crear unha solicitude de cita nova"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver ao calendario..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "New _Appointment..."
 msgstr "_Cita nova..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta apariciÃ³n _movÃbel"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "_Open Appointment"
 msgstr "_Abrir cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "View the current appointment"
 msgstr "Ver a cita actual"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 #: ../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:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "_Programar cita..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Converts an appointment to a meeting"
 msgstr "Depurar as reuniÃ³ns e as citas antigas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Conv_ert to Appointment..."
 msgstr "_Cita nova..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Converts a meeting to an appointment"
 msgstr "%s ao finalizar a cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+msgid "Quit"
+msgstr "SaÃr"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
 msgid "Day"
 msgstr "DÃa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "Show one day"
 msgstr "Mostrar un dÃa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1584
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "Show as list"
 msgstr "Mostrar como unha lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
 msgid "Month"
 msgstr "Mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Show one month"
 msgstr "Mostrar un mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
 msgid "Week"
 msgstr "Semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Show one week"
 msgstr "Mostrar unha semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1607
 msgid "Show one work week"
 msgstr "Mostrar unha semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Next 7 Days' Appointments"
 msgstr "Citas dos prÃ³ximos sete dÃas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 #: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-task-shell-view-actions.c:965
 msgid "Description contains"
 msgstr "A descriciÃ³n contÃ©n"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 #: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-task-shell-view-actions.c:972
 msgid "Summary contains"
 msgstr "O resumo contÃ©n"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Print this calendar"
 msgstr "Imprimir este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
 msgid "Preview the calendar to be printed"
 msgstr "Previsualiza o calendario que se vai imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Go To"
 msgstr "Ir a"
 
@@ -15183,7 +14931,7 @@ 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:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-task-shell-view-actions.c:777
 msgid "Open _Web Page"
 msgstr "Abrir pÃ¡xina _web"
 
@@ -15197,22 +14945,22 @@ 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
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:609
+#: ../modules/calendar/e-task-shell-view-actions.c:610
 msgid "task"
 msgstr "Tarefa"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:672
 msgid "_Assign Task"
 msgstr "_Asignar Tarefa"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:749
 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:750
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Mark selected tasks as complete"
 msgstr "Marcar as tarefas seleccionadas como terminadas"
 
@@ -15221,39 +14969,39 @@ 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:757
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 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:762
+#: ../modules/calendar/e-task-shell-view-actions.c:763
 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:764
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 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:769
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "_Open Task"
 msgstr "_Abrir tarefa"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 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:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 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:997
+#: ../modules/calendar/e-task-shell-view-actions.c:998
 msgid "Print the selected task"
 msgstr "Ver a tarefa seleccionada"
 
@@ -15281,36 +15029,16 @@ msgstr "Lista de notas"
 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:221
+#: ../modules/calendar/e-memo-shell-sidebar.c:222
 msgid "Loading memos"
 msgstr "Cargando notas"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:569
+#: ../modules/calendar/e-memo-shell-sidebar.c:571
 msgid "Memo List Selector"
 msgstr "Selector de orixe de notas"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:677
-msgid "Default Memo Client"
-msgstr "Cliente de recordatorios predefinido"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:678
-msgid "Default client for memo operations"
-msgstr "Cliente predefinido para as operaciÃ³ns nas citas"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:688
-msgid "This widget displays groups of memo lists"
-msgstr "Este widget mostra os grupos de listas de recordatorios"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:868
+#: ../modules/calendar/e-memo-shell-sidebar.c:870
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Abrindo notas en %s"
@@ -15421,58 +15149,20 @@ msgid "Tas_k List"
 msgstr "Lista de tarefas"
 
 #: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 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:221
+#: ../modules/calendar/e-task-shell-sidebar.c:222
 msgid "Loading tasks"
 msgstr "Cargando tarefas"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:569
+#: ../modules/calendar/e-task-shell-sidebar.c:571
 msgid "Task List Selector"
 msgstr "Selector de orixe de tarefas"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:677
-msgid "Default Task Client"
-msgstr "Cliente de tarefas predefinido"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:678
-msgid "Default client for task operations"
-msgstr "Cliente predefinido para a operaciÃ³n na tarefa"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:688
-msgid "This widget displays groups of task lists"
-msgstr "Este widget mostra os grupos de listas de tarefas"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:868
+#: ../modules/calendar/e-task-shell-sidebar.c:870
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas en %s"
@@ -15482,7 +15172,7 @@ msgstr "Abrindo tarefas en %s"
 msgid "Print Tasks"
 msgstr "Imprimir tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:554
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15494,95 +15184,95 @@ msgstr ""
 "\n"
 "EstÃ¡ seguro de que quere eliminar estas tarefas?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:679
 msgid "_Delete Task"
 msgstr "E_liminar"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:686
 msgid "_Find in Task..."
 msgstr "_Buscar na tarefa..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "Search for text in the displayed task"
 msgstr "Buscar texto no corpo da tarefa mostrada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:700
 msgid "Copy..."
 msgstr "_Copiar..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:707
 msgid "D_elete Task List"
 msgstr "_Eliminar a lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Delete the selected task list"
 msgstr "Eliminar a lista de tarefas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:714
 msgid "_New Task List"
 msgstr "Lista de tarefas _nova"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:730
 msgid "Refresh the selected task list"
 msgstr "Eliminar as tarefas seleccionadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Rename the selected task list"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Show _Only This Task List"
 msgstr "M_ostrar sÃ³ esta lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:756
 msgid "Mar_k as Incomplete"
 msgstr "_Marcar como non terminada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Delete completed tasks"
 msgstr "Eliminar as tarefas terminadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:861
 msgid "Task _Preview"
 msgstr "_Previsualizar tarefa"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:863
 msgid "Show task preview pane"
 msgstr "Mostrar o panel de previsualizaciÃ³n"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:884
 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:890
+#: ../modules/calendar/e-task-shell-view-actions.c:891
 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:898
+#: ../modules/calendar/e-task-shell-view-actions.c:899
 msgid "Active Tasks"
 msgstr "Tarefas activas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:913
 msgid "Completed Tasks"
 msgstr "Tarefas terminadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:920
 msgid "Next 7 Days' Tasks"
 msgstr "Tarefas dos prÃ³ximos sete dÃas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:927
 msgid "Overdue Tasks"
 msgstr "Tarefas atrasadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:934
 msgid "Tasks with Attachments"
 msgstr "Tarefas con anexos"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:984
 msgid "Print the list of tasks"
 msgstr "Imprimir a lista de tarefas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:991
 msgid "Preview the list of tasks to be printed"
 msgstr "Previsualiza a lista de tarefas para imprimir"
 
@@ -15607,406 +15297,373 @@ msgstr "Eliminar a tarefa"
 
 # (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
+#: ../modules/mail/e-mail-attachment-handler.c:333
 #, 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
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:164
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensaxe de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:166
 msgid "Compose a new mail message"
 msgstr "Compor unha mensaxe de correo nova"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:174
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Carta_fol de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:176
 msgid "Create a new mail folder"
 msgstr "Crear un cartafol novo de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgid "Mail Accounts"
 msgstr "Contas de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:203
 msgid "Mail Preferences"
 msgstr "Preferencias de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:211
 msgid "Composer Preferences"
 msgstr "Preferencias do editor"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:219
 msgid "Network Preferences"
 msgstr "Preferencias de rede"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Group by Threads"
-msgstr "Agr_upar por fÃos"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-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-actions.c:814
 #: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
 msgstr "Desactivar conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:816
 msgid "Disable this account"
 msgstr "Desactivar conta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:823
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:828
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:835
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:837
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Descargar as mensaxes para as contas e cartafoles marcados para o modo sen "
 "conexiÃ³n"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:842
 msgid "Fl_ush Outbox"
 msgstr "Lim_par a caixa de saÃda"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:849
 msgid "_Copy Folder To..."
 msgstr "_Copiar cartafol a..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:851
 msgid "Copy the selected folder into another folder"
 msgstr "Copiar o cartafol seleccionado noutro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:858
 msgid "Permanently remove this folder"
 msgstr "Eliminar permanentemente este cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:863
 msgid "E_xpunge"
 msgstr "Com_pactar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:865
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:870
 msgid "Mar_k All Messages as Read"
 msgstr "Ma_rcar todas as mensaxes como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:872
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:877
 msgid "_Move Folder To..."
 msgstr "_Mover o cartafol a..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:879
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:884
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:886
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:893
 msgid "Change the properties of this folder"
 msgstr "Modificar as propiedades deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:900
 msgid "Refresh the folder"
 msgstr "Actualizar o cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:907
 msgid "Change the name of this folder"
 msgstr "Modificar o nome deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:912
 msgid "Select Message _Thread"
 msgstr "Seleccionar o _fÃo da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:914
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:919
 msgid "Select Message S_ubthread"
 msgstr "Seleccionar o fÃo sec_undario da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:962
+#: ../modules/mail/e-mail-shell-view-actions.c:921
 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
+#: ../modules/mail/e-mail-shell-view-actions.c:926
 msgid "_Unsubscribe"
 msgstr "Eliminar s_ubscriciÃ³n"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:969
+#: ../modules/mail/e-mail-shell-view-actions.c:928
 msgid "Unsubscribe from the selected folder"
 msgstr "Renomear o cartafol seleccionado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../modules/mail/e-mail-shell-view-actions.c:933
 msgid "Empty _Trash"
 msgstr "Baleirar o _lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:935
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr ""
 "Eliminar permanentemente todas as mensaxes eliminadas en todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:940
 msgid "_New Label"
 msgstr "Etiqueta _nova"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:949
 msgid "N_one"
 msgstr "NingÃºn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
-msgid "Hide _Read Messages"
-msgstr "Ocultar as mensaxes _lidas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
-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:1004
-msgid "Hide S_elected Messages"
-msgstr "Ocultar as mensaxes s_eleccionadas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
-msgid "Temporarily hide the selected messages"
-msgstr "Ocultar temporalmente as mensaxes seleccionadas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
-msgid "Show Hidde_n Messages"
-msgstr "Mostrar as mensaxes o_cultas"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
-msgid "Show messages that have been temporarily hidden"
-msgstr "Mostrar as mensaxes ocultas temporalmente"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:972
 msgid "Cancel the current mail operation"
 msgstr "Cancelar a operaciÃ³n de correo actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:977
 msgid "Collapse All _Threads"
 msgstr "Contraer todos os _fÃos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1041
+#: ../modules/mail/e-mail-shell-view-actions.c:979
 msgid "Collapse all message threads"
 msgstr "Contraer todos os fÃos de mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:984
 msgid "E_xpand All Threads"
 msgstr "E_xpandir todos os fÃos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
+#: ../modules/mail/e-mail-shell-view-actions.c:986
 msgid "Expand all message threads"
 msgstr "Expandir todos os fÃos de mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:991
 msgid "_Message Filters"
 msgstr "Filtros de _mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
+#: ../modules/mail/e-mail-shell-view-actions.c:993
 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:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:998
 msgid "Search F_olders"
 msgstr "Cartaf_oles de busca"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../modules/mail/e-mail-shell-view-actions.c:1000
 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:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1005
 msgid "_Subscriptions..."
 msgstr "_SubscriciÃ³ns..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:1007
 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:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:1014
 msgid "F_older"
 msgstr "Cartaf_ol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1083
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
 msgid "_Label"
 msgstr "_Etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
 msgid "_New Folder..."
 msgstr "Cartafol _novo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
-msgid "Hide _Deleted Messages"
-msgstr "Ocultar as mensaxes elimina_das"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
-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:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 msgid "Show Message _Preview"
 msgstr "Mostrar _previsualizaciÃ³n da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 msgid "Show message preview pane"
 msgstr "Mostrar a xanela de previsualizaciÃ³n da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
+msgid "Show _Deleted Messages"
+msgstr "Mostrar as mensaxes _eliminadas"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
+msgid "Show deleted messages with a line through them"
+msgstr "Mostrar as mensaxes eliminadas riscÃ¡ndoas."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
 msgid "_Group By Threads"
 msgstr "Agr_upar por fÃos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
 msgid "Threaded message list"
 msgstr "Lista de mensaxes por fÃos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 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:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 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:1202
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
 msgid "All Messages"
 msgstr "Todas as mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1146
 msgid "Important Messages"
 msgstr "Mensaxes importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "Last 5 Days' Messages"
 msgstr "Mensaxes dos Ãºltimos 5 dÃas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1160
 msgid "Messages Not Junk"
 msgstr "Mensaxes que non son lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
 msgid "Messages with Attachments"
 msgstr "Mensaxes con anexos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1174
 msgid "No Label"
 msgstr "Sen etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
 msgid "Read Messages"
 msgstr "Mensaxes lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
 msgid "Recent Messages"
 msgstr "Mensaxes recentes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
 msgid "Unread Messages"
 msgstr "Mensaxes non lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Subject or Addresses contain"
 msgstr "O asunto ou os enderezos conteÃ±en"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "All Accounts"
 msgstr "Todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
 msgid "Current Account"
 msgstr "Conta actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "Current Folder"
 msgstr "Cartafol actual"
 
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:880
 #, 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:902
+#: ../modules/mail/e-mail-shell-view-private.c:891
 #, 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:908
-#: ../modules/mail/e-mail-shell-view-private.c:915
+#: ../modules/mail/e-mail-shell-view-private.c:897
+#: ../modules/mail/e-mail-shell-view-private.c:904
 #, 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:921
+#: ../modules/mail/e-mail-shell-view-private.c:910
 #, 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:927
+#: ../modules/mail/e-mail-shell-view-private.c:916
 #, 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:933
+#: ../modules/mail/e-mail-shell-view-private.c:922
 #, 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:945
+#: ../modules/mail/e-mail-shell-view-private.c:934
 #, 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:948
+#: ../modules/mail/e-mail-shell-view-private.c:937
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16025,77 +15682,77 @@ msgstr "Buscar na conta"
 msgid "Proxy _Logout"
 msgstr "_Terminar a sesiÃ³n proxy"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-composer-prefs.c:472
+#: ../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"
+
+#: ../modules/mail/em-composer-prefs.c:476
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:95
 msgid "Every time"
 msgstr "Cada vez"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:96
 msgid "Once per day"
 msgstr "Unha vez ao dÃa"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:97
 msgid "Once per week"
 msgstr "Unha vez Ã¡ semana"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:98
 msgid "Once per month"
 msgstr "Unha vez ao mes"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:223
 msgid "Add Custom Junk Header"
 msgstr "Engadir unha cabeceira personalizada para o correo non desexado"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:231
 msgid "Header Name:"
 msgstr "Nome da cabeceira:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:232
 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
+#: ../modules/mail/em-mailer-prefs.c:332
 msgid "Header"
 msgstr "Cabeceira"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:336
 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
+#: ../modules/mail/em-mailer-prefs.c:729 ../modules/mail/em-mailer-prefs.c:800
 #, 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
+#: ../modules/mail/em-mailer-prefs.c:737 ../modules/mail/em-mailer-prefs.c:809
 #, 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
+#: ../modules/mail/em-mailer-prefs.c:773
 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
+#: ../modules/mail/em-mailer-prefs.c:1160
 msgid "_Date header:"
 msgstr "Data da cabeceira:"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1161
 msgid "Show _original header value"
 msgstr "Mostrar tamaÃ±o _orixinal"
 
@@ -16131,16 +15788,8 @@ msgstr ""
 "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
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"Lista de pistas do engadido de aviso de anexos para buscar no corpo dunha "
-"mensaxe."
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:509
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "Palabras chave"
 
@@ -16225,8 +15874,8 @@ 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..."
+msgid "_Backup Evolution Settings..."
+msgstr "_Respaldar axustes de Evolutionâ?¦"
 
 #: ../plugins/backup-restore/backup-restore.c:355
 msgid "Backup Evolution data and settings to an archive file"
@@ -16234,8 +15883,8 @@ 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..."
+msgid "R_estore Evolution Settings..."
+msgstr "R_estaurar axustes de Evolutionâ?¦"
 
 #: ../plugins/backup-restore/backup-restore.c:362
 msgid "Restore Evolution data and settings from an archive file"
@@ -16319,33 +15968,33 @@ msgid "Restoring from the folder %s"
 msgstr "Restaurando desde o cartafol %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "Copia de seguranza do Evolution"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "RestauraciÃ³n do Evolution"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "Facendo unha copia de seguranza dos datos do Evolution"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:495
 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:491
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "Restaurando os datos do Evolution"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Agarde mentres o Evolution restaura os seus datos."
 
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:516
 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 "
@@ -16415,39 +16064,39 @@ msgstr ""
 "Evolution se reinicie automaticamente despois da restauraciÃ³n, active o "
 "botÃ³n de estado."
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contactos automÃ¡ticos"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 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:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "Seleccione a axenda de enderezos para contactos automÃ¡ticos"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "Contactos de mensaxerÃa instantÃ¡nea"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
+#: ../plugins/bbdb/bbdb.c:745
+msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
-"Sincronizar a informaciÃ³n de contacto e as imaxes desde a lista de amigos do "
-"Pidgin"
+"_Sincronizar a informaciÃ³n e as imaxes de contactos desde a lista de amigos "
+"do Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 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:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar coa lista de _amigos agora"
 
@@ -16469,34 +16118,34 @@ msgstr ""
 "correo electrÃ³nico ao responder as mensaxes. TamÃ©n enche a informaciÃ³n de "
 "contacto IM desde a sÃºa lista de amigos."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:153
 #, 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
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Produciuse un erro ao iniciar %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, 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:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, 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:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:210
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr ""
 "Produciuse un fallo na canalizaciÃ³n co Bogofilter; o cÃ³digo de erro Ã©: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:394
 msgid "Convert message text to _Unicode"
 msgstr "Converter o texto da mensaxe a _Unicode"
 
@@ -16524,17 +16173,17 @@ msgstr "OpciÃ³ns do Bogofilter"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Filtra os correos non desexados usando o Bogofilter."
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 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
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr "Non Ã© posÃbel encontrar o URL fornecido."
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16543,69 +16192,69 @@ msgstr ""
 "O servidor devolveu datos non esperados.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #: ../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
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
 msgstr "Produciuse un fallo ao actualizar delegados:"
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "Finaliza"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 msgid "User's calendars"
 msgstr "Calendario novo"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 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:626
+#: ../plugins/caldav/caldav-browse-server.c:667
 #: ../plugins/caldav/caldav-browse-server.c:1272
 msgid "Searching for user's calendars..."
 msgstr "Buscando os contactos..."
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
 msgstr "Non Ã© posÃbel localizar ningÃºn calendario"
 
-#: ../plugins/caldav/caldav-browse-server.c:794
+#: ../plugins/caldav/caldav-browse-server.c:793
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "Produciuse un fallo no intento anterior: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:796
+#: ../plugins/caldav/caldav-browse-server.c:795
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "Produciuse un fallo no intento anterior co cÃ³digo %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:799
+#: ../plugins/caldav/caldav-browse-server.c:798
 #, 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
+#: ../plugins/caldav/caldav-browse-server.c:855
 #, 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
+#: ../plugins/caldav/caldav-browse-server.c:1090
 msgid "Searching folder content..."
 msgstr "Buscando nos contidos do cartafol..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1133
 msgid "List of available calendars:"
 msgstr "Calendarios locais"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1170
 msgid "Supports"
 msgstr "Compatibilidade con Hula"
 
@@ -16627,24 +16276,24 @@ msgstr "Explorar por un calendario CalDAV"
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:215
+#: ../plugins/caldav/caldav-source.c:216
 #: ../plugins/calendar-http/calendar-http.c:92
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:219
+#: ../plugins/caldav/caldav-source.c:220
 #: ../plugins/google-account-setup/google-contacts-source.c:305
 msgid "Use _SSL"
 msgstr "Usar _SSL"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:229
 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/caldav/caldav-source.c:241
+#: ../plugins/calendar-file/calendar-file.c:182
 #: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
+#: ../plugins/calendar-weather/calendar-weather.c:395
 #: ../plugins/google-account-setup/google-contacts-source.c:323
 #: ../plugins/google-account-setup/google-source.c:627
 msgid "Re_fresh:"
@@ -16658,31 +16307,31 @@ msgstr "Engade a compatibilidade de CalDAV con Evolution."
 msgid "CalDAV Support"
 msgstr "Compatibilidade de CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:116
 msgid "_Customize options"
 msgstr "Personalizar as op_ciÃ³ns"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:135
 msgid "File _name:"
 msgstr "Nome do f_icheiro:"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:139
 msgid "Choose calendar file"
 msgstr "Escoller ficheiro de calendario"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:187
 msgid "On open"
 msgstr "Ao abrir"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:188
 msgid "On file change"
 msgstr "Cambio de ficheiro"
 
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:189
 msgid "Periodically"
 msgstr "Periodicamente"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:204
 msgid "Force read _only"
 msgstr "Forzar s_Ã³ lectura"
 
@@ -16746,26 +16395,26 @@ msgstr "Tempo: noite despexada"
 msgid "Weather: Thunderstorms"
 msgstr "Tempo: treboadas"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "Seleccione unha localizaciÃ³n"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "_Unidades:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "MÃ©trico (CentÃgrados, cm etc.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Non mÃ©trico (Fahrenheit, polgadas etc.)"
 
@@ -16890,12 +16539,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "Cabeceira p_ersonalizada"
 
 #. 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.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:896
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16905,12 +16554,12 @@ msgstr ""
 "Nome dos valores da chave para unha Cabeceira personalizada separados por \";"
 "\"."
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:950
 msgid "Key"
 msgstr "Chave"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:961
+#: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "Valores"
 
@@ -16933,7 +16582,7 @@ 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:119
+#: ../plugins/external-editor/external-editor.c:118
 msgid "Automatically launch when a new mail is edited"
 msgstr "Lanzar automaticamente cando se edite un novo correo"
 
@@ -16945,11 +16594,11 @@ msgstr "Editor externo predefinido"
 msgid "The default command that must be used as the editor."
 msgstr "A orde predefinida que se debe usar como o editor."
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:107
 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
+#: ../plugins/external-editor/external-editor.c:108
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16957,8 +16606,8 @@ 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
+#: ../plugins/external-editor/external-editor.c:374
+#: ../plugins/external-editor/external-editor.c:376
 msgid "Compose in External Editor"
 msgstr "CompoÃ±er no editor externo"
 
@@ -17095,8 +16744,8 @@ msgstr ""
 "%s"
 
 #: ../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
+#: ../plugins/mail-to-task/mail-to-task.c:718
+#: ../plugins/mail-to-task/mail-to-task.c:934
 msgid "Unknown error."
 msgstr "Erro descoÃ±ecido."
 
@@ -17116,7 +16765,7 @@ msgstr "Engadir calendario de Google a Evolution."
 msgid "Google Calendars"
 msgstr "Calendarios de Google"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "Lista de verificaciÃ³n"
 
@@ -17148,12 +16797,12 @@ msgstr "Aceptar provisionalmente"
 msgid "Rese_nd Meeting..."
 msgstr "Ree_nviar cita..."
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Create folder"
 msgstr "Crear cartafol"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17178,19 +16827,19 @@ msgstr ""
 "Prema en 'adiante' para instalar o cartafol compartido\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:231
 msgid "Install the shared folder"
 msgstr "Instalar o cartafol compartido"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:235
 msgid "Shared Folder Installation"
 msgstr "InstalaciÃ³n de cartafol compartido"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "ConfiguraciÃ³n de correo non desexado"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "ConfiguraciÃ³n de correo non desexado"
@@ -17226,7 +16875,7 @@ msgstr "E_liminar"
 msgid "Message Retract"
 msgstr "Retirada de mensaxe"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../plugins/groupwise-features/mail-retract.c:90
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
@@ -17234,7 +16883,7 @@ 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:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "Mensaxe anulada con Ã©xito"
 
@@ -17442,44 +17091,50 @@ msgstr "<b>Nome da conta</b>"
 msgid "Proxy Login"
 msgstr "Iniciar sesiÃ³n no proxy"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, 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.c:692
+#: ../plugins/groupwise-features/proxy.c:690
 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:698
+#: ../plugins/groupwise-features/proxy.c:696
 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/proxy.c:931
+#. 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:701
+msgctxt "GW"
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../plugins/groupwise-features/proxy.c:929
 #: ../plugins/groupwise-features/share-folder.c:701
 msgid "Add User"
 msgstr "Engadir usuario"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "OpciÃ³ns de envÃo avanzadas"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder-common.c:313
 #: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:314
 msgid "Enter the users and set permissions"
 msgstr "Introduza os usuarios e defina os permisos"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:412
 msgid "Sharing"
 msgstr "Compartir"
 
@@ -17491,67 +17146,55 @@ msgstr "NotificaciÃ³n personalizada"
 msgid "Add   "
 msgstr "Engadir   "
 
-#: ../plugins/groupwise-features/share-folder.c:747
-msgid "Modify"
-msgstr "Modificar"
-
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "Estado da mensaxe"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "De:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "Data de creaciÃ³n:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "Entregada: "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "Aberta: "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "Aceptada: "
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "Eliminada: "
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "Rexeitada: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "Terminada: "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "Sen entregar: "
 
-#: ../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."
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "Compatibilidade con Hula"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "vCards en liÃ±a"
@@ -17560,12 +17203,12 @@ msgstr "vCards en liÃ±a"
 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.c:325
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Cabeceiras personalizadas"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:338
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "Cabeceiras IMAP"
@@ -17612,142 +17255,142 @@ msgstr "Axuste os detalles das sÃºas contas IMAP."
 msgid "IMAP Features"
 msgstr "CaracterÃsticas IMAP"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#: ../plugins/itip-formatter/itip-formatter.c:475
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Produciuse un fallo ao cargar o calendario '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:641
 #, 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:688
+#: ../plugins/itip-formatter/itip-formatter.c:677
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Localizouse a cita no calendario '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Unable to find any calendars"
 msgstr "Non Ã© posÃbel localizar ningÃºn calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:783
 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:798
+#: ../plugins/itip-formatter/itip-formatter.c:787
 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:802
+#: ../plugins/itip-formatter/itip-formatter.c:791
 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:873
+#: ../plugins/itip-formatter/itip-formatter.c:862
 msgid "Opening the calendar. Please wait.."
 msgstr "Abrindo o calendario. Agarde..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:865
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando unha versiÃ³n existente desta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1046
 msgid "Unable to parse item"
 msgstr "Non Ã© posÃbel analizar o elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, 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:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1145
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado ao calendario '%s' como aceptado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1149
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado ao calendario '%s' como provisional"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1154
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado ao calendario '%s' como rexeitado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1159
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado ao calendario '%s' como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "O organizador eliminou o delegado %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1260
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviouse unha notificaciÃ³n de cancelaciÃ³n ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1262
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Non foi posÃbel enviar unha notificaciÃ³n de cancelaciÃ³n ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1373
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Non foi posÃbel actualizar o estado de participaciÃ³n debido a que o estado "
 "non Ã© vÃ¡lido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1402
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Non Ã© posÃbel actualizar o participante. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1406
 msgid "Attendee status updated"
 msgstr "Estado de participaciÃ³n actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1432
 msgid "Meeting information sent"
 msgstr "InformaciÃ³n da cita enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1435
 msgid "Task information sent"
 msgstr "InformaciÃ³n da tarefa enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1438
 msgid "Memo information sent"
 msgstr "InformaciÃ³n da nota enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 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:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1450
 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:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1453
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Non Ã© posÃbel enviar informaciÃ³n da nota: a nota non existe"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "calendar.ics"
 msgstr "Calendarios"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1523
 msgid "Save Calendar"
 msgstr "Calendario novo"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1576
 #: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid "The calendar attached is not valid"
 msgstr "O calendario anexo non Ã© vÃ¡lido"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 #: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17755,15 +17398,15 @@ msgstr ""
 "A mensaxe di que contÃ©n un calendario mais o calendario non Ã© un iCalendar "
 "vÃ¡lido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1628
+#: ../plugins/itip-formatter/itip-formatter.c:1656
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 msgid "The item in the calendar is not valid"
 msgstr "O elemento no calendario non Ã© vÃ¡lido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1629
+#: ../plugins/itip-formatter/itip-formatter.c:1657
+#: ../plugins/itip-formatter/itip-formatter.c:1763
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17771,11 +17414,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:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1670
 msgid "The calendar attached contains multiple items"
 msgstr "O calendario anexo contÃ©n mÃºltiples elementos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1671
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17783,216 +17426,216 @@ msgstr ""
 "Para procesar todos estes elementos, deberÃa gardarse o ficheiro e "
 "importarse o calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2436
 msgid "This meeting recurs"
 msgstr "Esta cita repÃtese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2439
 msgid "This task recurs"
 msgstr "Esta tarefa repÃtese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2442
 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:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2676
 msgid "_Delete message after acting"
 msgstr "E_liminar a mensaxe despois de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2686
+#: ../plugins/itip-formatter/itip-formatter.c:2719
 msgid "Conflict Search"
 msgstr "Buscar conflito"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2701
 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:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Hoxe Ã¡s %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 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:213
+#: ../plugins/itip-formatter/itip-view.c:209
 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:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "MaÃ±Ã¡ Ã¡s %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 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:237
+#: ../plugins/itip-formatter/itip-view.c:233
 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:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "MaÃ±Ã¡ Ã¡s %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, 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:265
+#: ../plugins/itip-formatter/itip-view.c:261
 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:269
+#: ../plugins/itip-formatter/itip-view.c:265
 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:274
+#: ../plugins/itip-formatter/itip-view.c:270
 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:278
+#: ../plugins/itip-formatter/itip-view.c:274
 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:287
+#: ../plugins/itip-formatter/itip-view.c:283
 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:293
+#: ../plugins/itip-formatter/itip-view.c:289
 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:297
+#: ../plugins/itip-formatter/itip-view.c:293
 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:302
+#: ../plugins/itip-formatter/itip-view.c:298
 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:306
+#: ../plugins/itip-formatter/itip-view.c:302
 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:312
+#: ../plugins/itip-formatter/itip-view.c:308
 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:317
+#: ../plugins/itip-formatter/itip-view.c:313
 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:321
+#: ../plugins/itip-formatter/itip-view.c:317
 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:326
+#: ../plugins/itip-formatter/itip-view.c:322
 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:330
+#: ../plugins/itip-formatter/itip-view.c:326
 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:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:526
 #, 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:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:528
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Recibido de parte de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:358
 #, 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:364
+#: ../plugins/itip-formatter/itip-view.c:360
 #, 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:369
+#: ../plugins/itip-formatter/itip-view.c:365
 #, 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:372
+#: ../plugins/itip-formatter/itip-view.c:368
 #, 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:374
+#: ../plugins/itip-formatter/itip-view.c:370
 #, 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:380
+#: ../plugins/itip-formatter/itip-view.c:376
 #, 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:382
+#: ../plugins/itip-formatter/itip-view.c:378
 #, 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:386
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18001,90 +17644,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:388
+#: ../plugins/itip-formatter/itip-view.c:384
 #, 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:392
+#: ../plugins/itip-formatter/itip-view.c:388
 #, 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:394
+#: ../plugins/itip-formatter/itip-view.c:390
 #, 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:398
+#: ../plugins/itip-formatter/itip-view.c:394
 #, 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:400
+#: ../plugins/itip-formatter/itip-view.c:396
 #, 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:404
+#: ../plugins/itip-formatter/itip-view.c:400
 #, 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:406
+#: ../plugins/itip-formatter/itip-view.c:402
 #, 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:410
+#: ../plugins/itip-formatter/itip-view.c:406
 #, 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:412
+#: ../plugins/itip-formatter/itip-view.c:408
 #, 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:450
+#: ../plugins/itip-formatter/itip-view.c:446
 #, 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:452
+#: ../plugins/itip-formatter/itip-view.c:448
 #, 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:457
+#: ../plugins/itip-formatter/itip-view.c:453
 #, 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:460
+#: ../plugins/itip-formatter/itip-view.c:456
 #, 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:462
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> asignoulle unha tarefa:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, 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:470
+#: ../plugins/itip-formatter/itip-view.c:466
 #, 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:474
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18093,7 +17736,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:476
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18101,7 +17744,7 @@ msgid ""
 msgstr ""
 "<b>%s</b> quere recibir a Ãºltima informaciÃ³n para a seguinte tarefa asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
@@ -18109,22 +17752,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:482
+#: ../plugins/itip-formatter/itip-view.c:478
 #, 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:486
+#: ../plugins/itip-formatter/itip-view.c:482
 #, 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:488
+#: ../plugins/itip-formatter/itip-view.c:484
 #, 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:492
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
@@ -18132,165 +17775,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:494
+#: ../plugins/itip-formatter/itip-view.c:490
 #, 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:498
+#: ../plugins/itip-formatter/itip-view.c:494
 #, 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:500
+#: ../plugins/itip-formatter/itip-view.c:496
 #, 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:537
+#: ../plugins/itip-formatter/itip-view.c:533
 #, 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:539
+#: ../plugins/itip-formatter/itip-view.c:535
 #, 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:544
+#: ../plugins/itip-formatter/itip-view.c:540
 #, 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:546
+#: ../plugins/itip-formatter/itip-view.c:542
 #, 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:550
+#: ../plugins/itip-formatter/itip-view.c:546
 #, 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:552
+#: ../plugins/itip-formatter/itip-view.c:548
 #, 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
+#: ../plugins/itip-formatter/itip-view.c:672
 msgid "All day:"
 msgstr "Todo o dÃa:"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:682
 msgid "Start day:"
 msgstr "Data de _comezo:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:682
+#: ../plugins/itip-formatter/itip-view.c:1037
 msgid "Start time:"
 msgstr "Hora de comezo:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:694
 msgid "End day:"
 msgstr "%d dÃa"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:694
+#: ../plugins/itip-formatter/itip-view.c:1048
 msgid "End time:"
 msgstr "Hora de finalizaciÃ³n:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:827
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
+#: ../plugins/itip-formatter/itip-view.c:833
 #: ../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
+#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:865
 msgid "_Decline"
 msgstr "_Rexeitar"
 
-#: ../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
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:867
 msgid "_Accept"
 msgstr "_Aceptar"
 
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:837
 msgid "_Decline all"
 msgstr "_Rexeitar todo"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:838
 msgid "_Tentative all"
 msgstr "Facer _provisional todo"
 
-#: ../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
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Tentative"
 msgstr "_Provisional"
 
-#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:839
 msgid "_Accept all"
 msgstr "_Aceptar todo"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Send Information"
 msgstr "_Enviar informaciÃ³n"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Update Attendee Status"
 msgstr "Act_ualizar o estado do participante"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Update"
 msgstr "Act_ualizar"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1068
+#: ../plugins/itip-formatter/itip-view.c:1122
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1107
 msgid "Send _reply to sender"
 msgstr "_Responder ao remitente"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1137
 msgid "Send _updates to attendees"
 msgstr "Mandar as act_ualizaciÃ³ns aos participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1146
 msgid "_Apply to all instances"
 msgstr "_Aplicar en todos os casos"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1155
 msgid "Show time as _free"
 msgstr "Mostrar a hora como _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1158
 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:1172
+#: ../plugins/itip-formatter/itip-view.c:1164
 msgid "_Inherit reminder"
 msgstr "_Herdar o aviso"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1907
 msgid "_Tasks:"
 msgstr "_Tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1909
 msgid "_Memos:"
 msgstr "_Notas:"
 
@@ -18404,16 +18047,16 @@ msgstr "Se a icona se deberÃa volver intermitente ou non."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Se notificar as mensaxes sÃ³ na caixa de entrada ou non."
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:343
 msgid "Evolution's Mail Notification"
 msgstr "NotificaciÃ³n de correo do Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:365
 msgid "Mail Notification Properties"
 msgstr "Propiedades da notificaciÃ³n de correo"
 
 #. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:496
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18429,68 +18072,68 @@ msgstr[1] ""
 "en %s."
 
 #. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:507
 #, 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
+#: ../plugins/mail-notification/mail-notification.c:519
 #, c-format
 msgid "Subject: %s"
 msgstr "Asunto: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:528
 #, 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:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:551
 msgid "New email"
 msgstr "Novo correo"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:605
 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:632
+#: ../plugins/mail-notification/mail-notification.c:633
 msgid "B_link icon in notification area"
 msgstr "Volver _intermitente a icona da Ã¡rea de notificaciÃ³n"
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:643
 msgid "Popup _message together with the icon"
 msgstr "Facer emerxer a _mensaxe xunto coa icona"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:828
 msgid "_Play sound when new messages arrive"
 msgstr "_Reproducir un son cando cheguen mensaxes novas"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:857
 msgid "_Beep"
 msgstr "_Ton de aviso"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:870
 msgid "Use sound _theme"
 msgstr "Usar _tema de sons"
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:889
 msgid "Play _file:"
 msgstr "Reproducir un ficheiro de _son"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:900
 msgid "Select sound file"
 msgstr "Seleccionar un ficheiro de son"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:958
 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
+#: ../plugins/mail-notification/mail-notification.c:967
 msgid "Generate a _D-Bus message"
 msgstr "Xerar unha mensaxe _D-Bus"
 
@@ -18503,12 +18146,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Reproducir un son cando cheguen mensaxes novas."
 
 #. 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
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, 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
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18517,7 +18160,7 @@ msgstr ""
 "O calendario seleccionado contÃ©n xa unha actividade '%s'. Quere editar a  "
 "actividade vella?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18526,7 +18169,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:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18535,7 +18178,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:519
+#: ../plugins/mail-to-task/mail-to-task.c:512
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18543,7 +18186,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:522
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18551,7 +18194,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:525
+#: ../plugins/mail-to-task/mail-to-task.c:518
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18559,7 +18202,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:543
+#: ../plugins/mail-to-task/mail-to-task.c:536
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18573,7 +18216,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:549
+#: ../plugins/mail-to-task/mail-to-task.c:542
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18587,7 +18230,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:555
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18601,25 +18244,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:614
+#: ../plugins/mail-to-task/mail-to-task.c:607
 msgid "[No Summary]"
 msgstr "[Sen resumo]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:618
 msgid "Invalid object returned from a server"
 msgstr "O obxecto devolto polo servidor non Ã© vÃ¡lido"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:689
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Produciuse un erro no proceso: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:718
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Non Ã© posÃbel abrir o calendario. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:725
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18627,7 +18270,7 @@ msgstr ""
 "A orixe seleccionada Ã© sÃ³ de lectura, polo que non Ã© posÃbel crear eventos "
 "nela. Seleccione outra orixe."
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:728
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18635,7 +18278,7 @@ msgstr ""
 "A orixe seleccionada Ã© sÃ³ de lectura, polo que non Ã© posÃbel crear tarefas "
 "nela. Seleccione outra orixe."
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:731
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18643,40 +18286,40 @@ msgstr ""
 "A orixe seleccionada Ã© sÃ³ de lectura, polo que non Ã© posÃbel crear notas "
 "nela. Seleccione outra orixe."
 
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:934
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Non Ã© posÃbel obter a lista orixe. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1053
 msgid "Create an _Event"
 msgstr "Cr_ear unha actividade"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1055
 msgid "Create a new event from the selected message"
 msgstr "Crear unha actividade nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1060
 msgid "Create a Mem_o"
 msgstr "Crear unha n_ota"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 msgid "Create a new memo from the selected message"
 msgstr "Crear unha nota nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1067
 msgid "Create a _Task"
 msgstr "Crear unha _tarefa"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 msgid "Create a new task from the selected message"
 msgstr "Crear unha tarefa nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 msgid "Create a _Meeting"
 msgstr "Crear unha _cita"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1079
 msgid "Create a new meeting from the selected message"
 msgstr "Crear unha cita nova a partir da mensaxe seleccionada"
 
@@ -18684,56 +18327,56 @@ msgstr "Crear unha cita nova a partir da mensaxe seleccionada"
 msgid "Convert a mail message to a task."
 msgstr "Converte unha mensaxe nunha tarefa."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:279
 msgid "Get List _Archive"
 msgstr "Obter _arquivo da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:281
 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
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
 msgid "Get List _Usage Information"
 msgstr "Obter informaciÃ³n do _uso da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
 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/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Contact List _Owner"
 msgstr "Pr_opietario da lista de contactos"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 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/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "_Post Message to List"
 msgstr "_Publicar unha mensaxe na lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 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
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "_Subscribe to List"
 msgstr "_Subscribirse Ã¡ lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 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
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "_Unsubscribe from List"
 msgstr "E_liminar subscriciÃ³n da lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 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
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "Mailing _List"
 msgstr "_Lista de correo"
 
@@ -18829,11 +18472,11 @@ msgstr "_Editar a mensaxe"
 msgid "_Send message"
 msgstr "_Enviar a mensaxe"
 
-#: ../plugins/mark-all-read/mark-all-read.c:42
+#: ../plugins/mark-all-read/mark-all-read.c:41
 msgid "Also mark messages in subfolders?"
 msgstr "Quere marcar tamÃ©n as mensaxes nos subcartafoles?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:44
+#: ../plugins/mark-all-read/mark-all-read.c:43
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18909,19 +18552,19 @@ 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:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "Mostrar HTML se estÃ¡ presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 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
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "Mostrar HTML se estÃ¡ presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -18929,21 +18572,21 @@ 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
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "Mostrar sÃ³ PLANO"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 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
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Mostra a parte HTML _suprimida como anexos"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
@@ -18967,31 +18610,35 @@ 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
+#: ../plugins/pst-import/pst-importer.c:296
 msgid "_Mail"
 msgstr "_Correo"
 
+#: ../plugins/pst-import/pst-importer.c:308
+msgid "Destination folder:"
+msgstr "Cartafol de destino:"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:314
 msgid "_Address Book"
 msgstr "_Axenda de enderezos"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:321
 msgid "A_ppointments"
 msgstr "Ci_tas"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:327 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tarefas"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:333
 msgid "_Journal entries"
 msgstr "Entradas de _diario"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:348
 msgid "Importing Outlook data"
 msgstr "ImportaciÃ³n de datos do Outlook"
 
@@ -19154,57 +18801,57 @@ msgstr ""
 "Non foi posÃbel publicar o calendario: A infraestrutura Calendar xa non "
 "existe"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "New Location"
 msgstr "LocalizaciÃ³n nova"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "Edit Location"
 msgstr "Editar localizaciÃ³n"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:120
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "Non se encontrou o SpamAssassin; cÃ³digo: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Produciuse un fallo ao crear a canalizaciÃ³n: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:175
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Erro despois de facer fork: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:230
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "O proceso fillo SpamAssassin non responde; matÃ¡ndoo..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Interrompeuse a espera polo proceso fillo SpamAssassin; terminando..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr ""
 "Produciuse un fallo na canalizaciÃ³n co SpamAssassin; cÃ³digo de erro: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:504
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "O SpamAssassin non estÃ¡ dispoÃ±Ãbel."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:924
 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:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:932
 msgid "I_nclude remote tests"
 msgstr "I_ncluÃr probas remotas"
 
@@ -19349,47 +18996,47 @@ 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:87
+#: ../plugins/startup-wizard/startup-wizard.c:110
 msgid "Evolution Setup Assistant"
 msgstr "Asistente de configuraciÃ³n do Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:92
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Welcome"
 msgstr "Benvido/a"
 
-#: ../plugins/startup-wizard/startup-wizard.c:97
+#: ../plugins/startup-wizard/startup-wizard.c:118
 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"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"Benvido/a ao Evolution. As seguintes pantallas permitiranlle ao Evolution "
+"Benvido/a a Evolution. As seguintes pantallas permitiranlle a Evolution "
 "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:135
+#: ../plugins/startup-wizard/startup-wizard.c:153
 #: ../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:150
+#: ../plugins/startup-wizard/startup-wizard.c:168
 #: ../widgets/misc/e-import-assistant.c:542
 #, c-format
 msgid "From %s:"
 msgstr "De: %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:167
+#: ../plugins/startup-wizard/startup-wizard.c:185
 msgid "Importing files"
 msgstr "ImportaciÃ³n de ficheiros"
 
-#: ../plugins/startup-wizard/startup-wizard.c:230
+#: ../plugins/startup-wizard/startup-wizard.c:251
 msgid "Importing data."
 msgstr "Importando datos."
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
+#: ../plugins/startup-wizard/startup-wizard.c:257
 msgid "Please wait"
 msgstr "Espere"
 
@@ -19422,15 +19069,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "engadido de modelo baseado en borradores"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:613
 msgid "No Title"
 msgstr "Sen tÃtulo"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:684
 msgid "Save as _Template"
 msgstr "Gardar como _modelo"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:686
 msgid "Save as Template"
 msgstr "Gardar como modelo"
 
@@ -19450,29 +19097,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:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:157
+#: ../plugins/vcard-inline/vcard-inline.c:242
 msgid "Show Full vCard"
 msgstr "Mostrar vCard completa"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:160
 msgid "Show Compact vCard"
 msgstr "Mostrar vCard compacta"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:221
 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:233
+#: ../plugins/vcard-inline/vcard-inline.c:230
 #, 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:254
+#: ../plugins/vcard-inline/vcard-inline.c:251
 msgid "Save in Address Book"
 msgstr "Gardar na axenda de enderezos"
 
@@ -19533,33 +19180,41 @@ msgid "Default window width"
 msgstr "Largura predefinida da xanela"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "Enable express mode"
+msgstr "Activar o modo express"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 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:11
+#: ../shell/apps_evolution_shell.schemas.in.h:12
+msgid "Flag that enables a much simplified user interface."
+msgstr "Bandeira que activa unha interface de usuario moito mÃ¡is simplificada."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy host name"
 msgstr "Nome do host proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy password"
 msgstr "Contrasinal do proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "HTTP proxy port"
 msgstr "Porto do proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "HTTP proxy username"
 msgstr "Nome de usuario para o proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 "ID ou alias do compoÃ±ente que se mostrarÃ¡ de forma predefinida ao iniciar."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username is retrieved from the \"/apps/evolution/shell/network_config/"
@@ -19571,19 +19226,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:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial attachment view"
 msgstr "VisiÃ³n inicial do anexo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid "Initial file chooser folder"
 msgstr "Cartafol inicial do seleccionador de ficheiro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Cartafol inicial para os diÃ¡logos GtkFileChooser."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
@@ -19591,47 +19246,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:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
 msgstr "Ã?ltima versiÃ³n da configuraciÃ³n actualizada"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 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:23
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Non-proxy hosts"
 msgstr "Hosts que non usan proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 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:25
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Proxy configuration mode"
 msgstr "Modo de configuraciÃ³n do proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "SOCKS proxy host name"
 msgstr "Nome do host do proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "SOCKS proxy port"
 msgstr "Porto do proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Secure HTTP proxy host name"
 msgstr "Nome do host do proxy HTTP seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Secure HTTP proxy port"
 msgstr "Porto do proxy HTTP seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19643,23 +19298,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:31
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Sidebar is visible"
 msgstr "A barra lateral Ã© visÃbel"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Skip development warning dialog"
 msgstr "Saltar o diÃ¡logo de aviso de desenvolvemento"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:322
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:305
 msgid "Start in offline mode"
 msgstr "Iniciar en modo sen conexiÃ³n"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "Statusbar is visible"
 msgstr "A barra de estado Ã© visÃbel"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19667,27 +19322,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:36
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 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
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 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
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default height for the main window, in pixels."
 msgstr "Altura predefinida da xanela principal, en pÃxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid "The default width for the main window, in pixels."
 msgstr "A largura predefinida da xanela principal, en pÃxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The default width for the sidebar, in pixels."
 msgstr "A largura predefinida para a barra lateral, en pÃxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19695,19 +19350,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:42
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 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:43
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 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:44
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 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:45
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -19715,7 +19370,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:46
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -19723,7 +19378,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:47
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -19731,7 +19386,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:48
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19741,7 +19396,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:49
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 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 "
@@ -19754,618 +19409,427 @@ 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:50
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Toolbar is visible"
 msgstr "A barra de ferramentas Ã© visÃbel"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "URL that provides proxy configuration values."
 msgstr "O URL que proporciona os valores de configuraciÃ³n de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Use HTTP proxy"
 msgstr "Usar proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 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:54
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 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:55
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 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:56
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the sidebar should be visible."
 msgstr "Se a barra lateral deberÃa ser visÃbel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 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:58
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 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:59
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 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:60
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 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:61
+#: ../shell/apps_evolution_shell.schemas.in.h:63
 msgid "Window button style"
 msgstr "Estilo dos botÃ³ns de xanela"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:62
+#: ../shell/apps_evolution_shell.schemas.in.h:64
 msgid "Window buttons are visible"
 msgstr "Os botÃ³ns da xanela son visÃbeis"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:502 ../shell/e-shell-content.c:503
 msgid "Searches"
 msgstr "Buscas"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:545
 msgid "Save Search"
 msgstr "Gardar a busca"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
 #. 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
+#: ../shell/e-shell-searchbar.c:918
 msgid "Sho_w:"
 msgstr "Mos_trar: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:949
 msgid "Sear_ch:"
 msgstr "Busca_r: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1010
 msgid "i_n"
 msgstr " e_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
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../shell/e-shell-utils.c:222
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "Ficheiros iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:243
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "Todos os ficheiros"
 
-#: ../shell/e-shell-view.c:674
-msgid "Switcher Action"
-msgstr "Cambiar a %s"
-
-#: ../shell/e-shell-view.c:675
-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:690
-msgid "Page Number"
-msgstr "NÃºmero de serie"
-
-#: ../shell/e-shell-view.c:691
-msgid "The notebook page number of the shell view"
-msgstr ""
-"O nÃºmero de pÃ¡xina do libro de notas da visualizaciÃ³n de terminal de ordes"
-
-#: ../shell/e-shell-view.c:707
-msgid "Search Rule"
-msgstr "Filtro de busca"
-
-#: ../shell/e-shell-view.c:708
-msgid "Criteria for the current search results"
-msgstr "Criterio para os resultados da bÃºsqueda actual"
-
-#: ../shell/e-shell-view.c:723
-msgid "The EShellBackend for this shell view"
-msgstr "O EShellBackend para esta visualizacion de terminal de ordes"
-
-#: ../shell/e-shell-view.c:738
-msgid "Shell Content Widget"
-msgstr "Widget de contido de intÃ©rprete de ordes"
-
-#: ../shell/e-shell-view.c:739
-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-view.c:755
-msgid "Shell Sidebar Widget"
-msgstr "Largura predefinida da barra lateral"
-
-#: ../shell/e-shell-view.c:756
-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"
-
-#: ../shell/e-shell-view.c:771
-msgid "Shell Taskbar Widget"
-msgstr "Widget da barra de ferramentas da terminal de ordes"
-
-#: ../shell/e-shell-view.c:772
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr ""
-"O widget da barra de ferramentas aparece na parte inferior da xanela da "
-"terminal de ordes"
-
-#: ../shell/e-shell-view.c:787
-msgid "Shell Window"
-msgstr "_Xanela nova"
-
-#: ../shell/e-shell-view.c:788
-msgid "The window to which the shell view belongs"
-msgstr "A xanela Ã¡ que pertence a visualizaciÃ³n da terminal de ordes"
-
-#: ../shell/e-shell-view.c:804
-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:819
-msgid "The title of the shell view"
-msgstr "O tÃtulo da visualizaciÃ³n da terminal de sesiÃ³n"
-
-#: ../shell/e-shell-view.c:833
-msgid "Current View ID"
-msgstr "_VisualizaciÃ³n actual"
-
-#: ../shell/e-shell-view.c:834
-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-actions.c:644
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr ""
 "Fran Dieguez <frandieguez ubuntu com>, 2009, 2010:\n"
 "AntÃ³n MÃ©ixome <meixome certima net>, 2009, 2010;"
 
-#: ../shell/e-shell-window-actions.c:655
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "Sitio web do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1223
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Bug Buddy is not installed."
 msgstr "O Bug buddy non estÃ¡ instalado."
 
-#: ../shell/e-shell-window-actions.c:1225
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Bug Buddy could not be run."
 msgstr "Non foi posÃbel executar o Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:1327
+#: ../shell/e-shell-window-actions.c:1347
 msgid "GNOME Pilot is not installed."
 msgstr "O Bug buddy non estÃ¡ instalado."
 
-#: ../shell/e-shell-window-actions.c:1329
+#: ../shell/e-shell-window-actions.c:1349
 msgid "GNOME Pilot could not be run."
 msgstr "Non foi posÃbel executar o Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:1423
+#: ../shell/e-shell-window-actions.c:1443
 msgid "Show information about Evolution"
 msgstr "Mostrar informaciÃ³n sobre o Evolution"
 
-#: ../shell/e-shell-window-actions.c:1428
+#: ../shell/e-shell-window-actions.c:1448
 msgid "_Close Window"
 msgstr "_Pechar xanela"
 
-#: ../shell/e-shell-window-actions.c:1435
+#: ../shell/e-shell-window-actions.c:1455
 msgid "_Contents"
 msgstr "Ci_tas"
 
-#: ../shell/e-shell-window-actions.c:1437
+#: ../shell/e-shell-window-actions.c:1457
 msgid "Open the Evolution User Guide"
 msgstr "Abrir o cartafol doutro usuario"
 
-#: ../shell/e-shell-window-actions.c:1463
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Evolution _FAQ"
 msgstr "_FAQ do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:1485
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Abrir a pÃ¡xina web das Preguntas frecuentes (FAQ)"
 
-#: ../shell/e-shell-window-actions.c:1470
+#: ../shell/e-shell-window-actions.c:1490
 msgid "_Forget Passwords"
 msgstr "_Esquecer os contrasinais"
 
-#: ../shell/e-shell-window-actions.c:1472
+#: ../shell/e-shell-window-actions.c:1492
 msgid "Forget all remembered passwords"
 msgstr "EstÃ¡ seguro de que quere esquecer todos os contrasinais memorizados?"
 
-#: ../shell/e-shell-window-actions.c:1477
+#: ../shell/e-shell-window-actions.c:1497
 msgid "I_mport..."
 msgstr "I_mportar..."
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1499
 msgid "Import data from other programs"
 msgstr "Importar datos doutros programas"
 
-#: ../shell/e-shell-window-actions.c:1484
+#: ../shell/e-shell-window-actions.c:1504
 msgid "New _Window"
 msgstr "_Xanela nova"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1506
 msgid "Create a new window displaying this view"
 msgstr "Crear unha xanela nova ao mostrar este cartafol"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1520
 msgid "Configure Evolution"
 msgstr "ConfiguraciÃ³n"
 
-#: ../shell/e-shell-window-actions.c:1505
+#: ../shell/e-shell-window-actions.c:1525
 msgid "_Quick Reference"
 msgstr "_Referencia rÃ¡pida"
 
-#: ../shell/e-shell-window-actions.c:1507
+#: ../shell/e-shell-window-actions.c:1527
 msgid "Show Evolution's shortcut keys"
 msgstr "Modificar a configuraciÃ³n do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1534
 msgid "Exit the program"
 msgstr "SaÃr do programa"
 
-#: ../shell/e-shell-window-actions.c:1519
+#: ../shell/e-shell-window-actions.c:1539
 msgid "_Advanced Search..."
 msgstr "Busca _avanzada..."
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1541
 msgid "Construct a more advanced search"
 msgstr "ConstrÃºe unha bÃºsqueda mÃ¡is avanzada"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1548
 msgid "Clear the current search parameters"
 msgstr "Limpar bÃºsqueda"
 
-#: ../shell/e-shell-window-actions.c:1533
+#: ../shell/e-shell-window-actions.c:1553
 msgid "_Edit Saved Searches..."
 msgstr "_Editar as buscas gardadas..."
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1555
 msgid "Manage your saved searches"
 msgstr "Xestionar o seu correo, contactos e calendario"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1562
 msgid "Click here to change the search type"
 msgstr "Prema aquÃ para cambiar o tipo de busca"
 
-#: ../shell/e-shell-window-actions.c:1547
+#: ../shell/e-shell-window-actions.c:1567
 msgid "_Find Now"
 msgstr "_Buscar agora"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1569
 msgid "Execute the current search parameters"
 msgstr "Cancelar a operaciÃ³n de correo actual"
 
-#: ../shell/e-shell-window-actions.c:1554
+#: ../shell/e-shell-window-actions.c:1574
 msgid "_Save Search..."
 msgstr "_Gardar a busca..."
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1576
 msgid "Save the current search parameters"
 msgstr "Gardar o ficheiro actual"
 
-#: ../shell/e-shell-window-actions.c:1568
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Send / _Receive"
 msgstr "Enviar/_Recibir"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1590
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar elementos da fila e obter elementos novos"
 
-#: ../shell/e-shell-window-actions.c:1575
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Submit _Bug Report..."
 msgstr "Enviar un _informe de erro"
 
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1597
 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
+#: ../shell/e-shell-window-actions.c:1602
 msgid "GNOME Pilot _Synchronization..."
 msgstr "_SincronizaciÃ³n con GNOME Pilot..."
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1604
 msgid "Set up GNOME Pilot configuration"
 msgstr "Definir a configuraciÃ³n do GNOME Pilot"
 
-#: ../shell/e-shell-window-actions.c:1589
+#: ../shell/e-shell-window-actions.c:1609
 msgid "_Work Offline"
 msgstr "_Traballar sen conexiÃ³n"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1611
 msgid "Put Evolution into offline mode"
 msgstr "Iniciar en modo sen conexiÃ³n"
 
-#: ../shell/e-shell-window-actions.c:1596
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Work Online"
 msgstr "_Traballar con conexiÃ³n"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1618
 msgid "Put Evolution into online mode"
 msgstr "Iniciar en modo con conexiÃ³n"
 
-#: ../shell/e-shell-window-actions.c:1626
+#: ../shell/e-shell-window-actions.c:1646
 msgid "Lay_out"
 msgstr "Disp_osiciÃ³n"
 
-#: ../shell/e-shell-window-actions.c:1633
+#: ../shell/e-shell-window-actions.c:1653
 msgid "_New"
 msgstr "_Novo"
 
-#: ../shell/e-shell-window-actions.c:1640
+#: ../shell/e-shell-window-actions.c:1660
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../shell/e-shell-window-actions.c:1647
+#: ../shell/e-shell-window-actions.c:1667
 msgid "_Switcher Appearance"
 msgstr "Aparencia do _selector"
 
-#: ../shell/e-shell-window-actions.c:1661
+#: ../shell/e-shell-window-actions.c:1681
 msgid "_Window"
 msgstr "_Xanela"
 
-#: ../shell/e-shell-window-actions.c:1690
+#: ../shell/e-shell-window-actions.c:1710
 msgid "Show Side _Bar"
 msgstr "Mostrar _barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1692
+#: ../shell/e-shell-window-actions.c:1712
 msgid "Show the side bar"
 msgstr "Mostrar _barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1698
+#: ../shell/e-shell-window-actions.c:1718
 msgid "Show _Buttons"
 msgstr "Mostrar animaciÃ³ns"
 
-#: ../shell/e-shell-window-actions.c:1700
+#: ../shell/e-shell-window-actions.c:1720
 msgid "Show the switcher buttons"
 msgstr "Mostrar o fuso horario secundario"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1726
 msgid "Show _Status Bar"
 msgstr "Mostrar _barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Show the status bar"
 msgstr "Mostrar _barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1734
 msgid "Show _Tool Bar"
 msgstr "Mostrar barra de _ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1736
 msgid "Show the tool bar"
 msgstr "Mostrar barra de _ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1738
+#: ../shell/e-shell-window-actions.c:1758
 msgid "_Icons Only"
 msgstr "SÃ³ _iconas"
 
-#: ../shell/e-shell-window-actions.c:1740
+#: ../shell/e-shell-window-actions.c:1760
 msgid "Display window buttons with icons only"
 msgstr "Mostrar os botÃ³ns da xanela sÃ³ con iconas"
 
-#: ../shell/e-shell-window-actions.c:1745
+#: ../shell/e-shell-window-actions.c:1765
 msgid "_Text Only"
 msgstr "SÃ³ _texto"
 
-#: ../shell/e-shell-window-actions.c:1747
+#: ../shell/e-shell-window-actions.c:1767
 msgid "Display window buttons with text only"
 msgstr "Mostrar os botÃ³ns da xanela sÃ³ con texto"
 
-#: ../shell/e-shell-window-actions.c:1752
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Icons _and Text"
 msgstr "Iconas _e texto"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1774
 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
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Tool_bar Style"
 msgstr "Estilo da _barra de ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1781
 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"
 
-#: ../shell/e-shell-window-actions.c:1769
+#: ../shell/e-shell-window-actions.c:1789
 msgid "Define Views..."
 msgstr "Definir visualizaciÃ³ns..."
 
-#: ../shell/e-shell-window-actions.c:1771
+#: ../shell/e-shell-window-actions.c:1791
 msgid "Create or edit views"
 msgstr "Crear ou editar visualizaciÃ³ns"
 
-#: ../shell/e-shell-window-actions.c:1776
+#: ../shell/e-shell-window-actions.c:1796
 msgid "Save Custom View..."
 msgstr "Gardar visualizaciÃ³n personalizada..."
 
-#: ../shell/e-shell-window-actions.c:1778
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Save current custom view"
 msgstr "Gardar a visualizaciÃ³n personalizada actual"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1805
 msgid "C_urrent View"
 msgstr "VisualizaciÃ³n act_ual"
 
-#: ../shell/e-shell-window-actions.c:1795
+#: ../shell/e-shell-window-actions.c:1815
 msgid "Custom View"
 msgstr "VisualizaciÃ³n personalizada"
 
-#: ../shell/e-shell-window-actions.c:1797
+#: ../shell/e-shell-window-actions.c:1817
 msgid "Current view is a customized view"
 msgstr "A visualizaciÃ³n actual Ã© unha visualizaciÃ³n personalizada"
 
-#: ../shell/e-shell-window-actions.c:1807
+#: ../shell/e-shell-window-actions.c:1827
 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
+#: ../shell/e-shell-window-actions.c:2204
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell-window-actions.c:2332
+#: ../shell/e-shell-window-actions.c:2417
 msgid "Execute these search parameters"
 msgstr "Executar estes parÃ¡metros de bÃºsqueda"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:555
+#: ../shell/e-shell-window-private.c:573
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:382
 msgid "New"
 msgstr "Novo"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "VisualizaciÃ³n da terminal de ordes activa"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "Nome da visualizaciÃ³n nova:"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "O EFocusTracker da xanela da terminal de ordes"
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:761
-msgid "Geometry"
-msgstr "XeometrÃa"
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:762
-msgid "Initial window geometry string"
-msgstr "A cadea da xeometrÃa inicial da xanela"
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "Activar _cursor"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "Indica se o engadido estÃ¡ activado"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "A barra lateral Ã© visÃbel"
-
-#: ../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/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/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "A barra de estado Ã© visÃbel"
-
-#: ../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/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/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "Xestor"
-
-#: ../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:210
+#: ../shell/e-shell.c:218
 msgid "Preparing to go offline..."
 msgstr "Preparando a conta '%s' para o modo sen conexiÃ³n"
 
-#: ../shell/e-shell.c:260
+#: ../shell/e-shell.c:268
 msgid "Preparing to go online..."
 msgstr "Preparando a conta '%s' para o modo sen conexiÃ³n"
 
-#: ../shell/e-shell.c:328
+#: ../shell/e-shell.c:336
 msgid "Preparing to quit..."
 msgstr "PreparÃ¡ndose para saÃr..."
 
-#: ../shell/e-shell.c:777
-msgid "Module Directory"
-msgstr "Cartafol onde gardar"
-
-#: ../shell/e-shell.c:778
-msgid "The directory from which to load EModules"
-msgstr "O cartafol desde o cal ler EModules"
-
-#: ../shell/e-shell.c:793
-msgid "Network Available"
-msgstr "TLS non dispoÃ±Ãbel"
-
-#: ../shell/e-shell.c:794
-msgid "Whether the network is available"
-msgstr "Indica se o engadido estÃ¡ activado"
-
-#: ../shell/e-shell.c:809 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "Conectado"
-
-#: ../shell/e-shell.c:810
-msgid "Whether the shell is online"
-msgstr "Indica se o engadido estÃ¡ activado"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:167
+#: ../shell/main.c:164
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20402,7 +19866,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:191
+#: ../shell/main.c:188
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20410,57 +19874,57 @@ msgstr ""
 "Grazas\n"
 "O equipo do Evolution\n"
 
-#: ../shell/main.c:198
+#: ../shell/main.c:195
 msgid "Do not tell me again"
 msgstr "Non preguntarme de novo"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:301
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar o Evolution activando o compoÃ±ente especificado"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:303
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar a xeometrÃa fornecida Ã¡ xanela principal"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:307
 msgid "Start in online mode"
 msgstr "Iniciar en modo con conexiÃ³n"
 
-#: ../shell/main.c:327
+#: ../shell/main.c:309
+msgid "Start in \"express\" mode"
+msgstr "Iniciar en modo \"express\""
+
+#: ../shell/main.c:312
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar o peche de todos os compoÃ±entes do Evolution"
 
-#: ../shell/main.c:331
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Forza a remigraciÃ³n desde o Evolution 1.4"
-
-#: ../shell/main.c:334
+#: ../shell/main.c:315
 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:336
+#: ../shell/main.c:317
 msgid "Disable loading of any plugins."
 msgstr "Desactivar a carga de calquera engadido."
 
-#: ../shell/main.c:338
+#: ../shell/main.c:319
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar o panel de previsualizaciÃ³n de correo, contactos e tarefas."
 
-#: ../shell/main.c:342
+#: ../shell/main.c:323
 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
+#: ../shell/main.c:325
 msgid "Request a running Evolution process to quit"
 msgstr "Reiniciando o Evolution"
 
-#: ../shell/main.c:494
+#: ../shell/main.c:440
 msgid "- The Evolution PIM and Email Client"
 msgstr "- O cliente de correo e PIM do Evolution"
 
-#: ../shell/main.c:520
+#: ../shell/main.c:466
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20474,99 +19938,44 @@ 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 "Continue"
-msgstr "Continuar"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "Non Ã© posÃbel actualizar directamente desde a versiÃ³n {0}"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "Quere eliminar os datos antigos da versiÃ³n {0}?"
+msgid "Continue Anyway"
+msgstr "Continuar de todas formas"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+"Evolution xa non admite a actualizaciÃ³n directamente desde a versiÃ³n {0}. "
+"PorÃ©n, como soluciÃ³n pode intentar actualizar primeiro a Evolution 2 e "
+"despois a Evolution 3."
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 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:6
-msgid "Insufficient disk space for upgrade."
-msgstr "Espazo en disco insuficiente para a actualizaciÃ³n."
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "EstÃ¡ seguro de que quere eliminar os datos antigos?"
+msgid "Quit Now"
+msgstr "SaÃr agora"
 
 #: ../shell/shell.error.xml.h:8
-msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be "
-"permanently removed.\n"
-"\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
-"\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
-msgstr ""
-"Todo o contido do cartafol &quot;evolution&quot; vaise eliminar "
-"permanentemente.\n"
-"\n"
-"SuxÃreselle que verifique manualmente que todos os datos do seu correo, "
-"contactos, e calendarios estÃ¡n presentes, e que esta versiÃ³n do Evolution "
-"funciona correctamente antes de eliminar os datos antigos.\n"
-"\n"
-"Unha vez eliminados, non poderÃ¡ desactualizarse Ã¡ versiÃ³n anterior do "
-"Evolution sen intervenciÃ³n manual.\n"
-
-#: ../shell/shell.error.xml.h:14
-msgid ""
-"The previous version of Evolution stored its data in a different location.\n"
-"\n"
-"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to keep "
-"this data, then you may manually remove the contents of &quot;"
-"evolution&quot; at your convenience.\n"
-msgstr ""
-"As versiÃ³ns anteriores do Evolution gardan os seus datos nunha localizaciÃ³n "
-"diferente.\n"
-"\n"
-"Se escolle eliminar estes datos, todos os contidos do cartafol &quot;"
-"evolution&quot; serÃ¡n eliminados permanentemente. Se escolle gardar estes "
-"datos, entÃ³n poderÃ¡ eliminar os contidos de &quot;evolution&quot; cando o "
-"vexa conveniente.\n"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "Produciuse un fallo ao actualizar desde a versiÃ³n anterior: {0}"
 
-#: ../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"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
-msgstr ""
-"A actualizaciÃ³n dos seus datos e configuraciÃ³n requirirÃ¡ atÃ© {0} de espazo "
-"no disco, mais sÃ³ ten {1} dispoÃ±Ãbeis.\n"
-"\n"
-"NecesitarÃ¡ facer mÃ¡is espazo dispoÃ±Ãbel no seu cartafol persoal antes de que "
-"poida continuar."
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "_Esquecer"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "_Conservar os datos"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "_Avisarme mÃ¡is tarde"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
@@ -20660,7 +20069,7 @@ msgstr "OpciÃ³ns de xestiÃ³n de sesiÃ³n:"
 msgid "Show session management options"
 msgstr "Mostrar as animaciÃ³ns de imaxe "
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20739,19 +20148,19 @@ msgstr "Enderezo de correo electrÃ³nico"
 msgid "All CA certificate files"
 msgstr "Todos os ficheiros CA de certificaciÃ³n de correo"
 
-#: ../smime/gui/certificate-manager.c:1050
+#: ../smime/gui/certificate-manager.c:1052
 msgid "Certificates"
 msgstr "Certificados"
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualizador de certificados: %s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-msgid "Enter the password for `%s'"
-msgstr "Introduza o seu contrasinal para `%s'"
+msgid "Enter the password for '%s'"
+msgstr "Introduza o seu contrasinal para Â«%sÂ»"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
@@ -20781,7 +20190,7 @@ msgstr ""
 "Emitido por:\n"
 "  Asunto: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Seleccione o certificado"
 
@@ -20795,11 +20204,11 @@ msgstr "Autoridades"
 
 #: ../smime/gui/smime-ui.ui.h:3
 msgid "Backup"
-msgstr "Facer unha copia de seguranza"
+msgstr ""
 
 #: ../smime/gui/smime-ui.ui.h:4
 msgid "Backup All"
-msgstr "Facer unha copia de seguranza para todo"
+msgstr ""
 
 #: ../smime/gui/smime-ui.ui.h:5
 msgid ""
@@ -20809,7 +20218,7 @@ 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.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "Certificado"
 
@@ -20931,7 +20340,7 @@ msgstr "Confiar nesta AC para identificar desenvolvedores de software."
 
 #: ../smime/gui/smime-ui.ui.h:39
 msgid "Trust this CA to identify web sites."
-msgstr "Confiar nesta AC para identificar sitios web."
+msgstr "Confiar nesta CA para identificar sitios web."
 
 #: ../smime/gui/smime-ui.ui.h:40
 msgid "Validity"
@@ -21107,28 +20516,34 @@ msgstr "Non crÃtico"
 msgid "Extensions"
 msgstr "ExtensiÃ³ns"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1036
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmo de sinatura do certificado"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Emisor"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1155
 msgid "Issuer Unique ID"
 msgstr "ID Ãºnico do emisor"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr "ID Ãºnico do asunto"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1220
 msgid "Certificate Signature Value"
 msgstr "Valor da sinatura do certificado"
 
@@ -21217,11 +20632,11 @@ 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: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
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
 msgstr "UTC"
 
@@ -21251,19 +20666,14 @@ msgstr ""
 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:327
+#: ../widgets/menus/gal-define-views-dialog.c:339
 #: ../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:335
-#: ../widgets/menus/gal-define-views-dialog.c:337
+#: ../widgets/menus/gal-define-views-dialog.c:347
+#: ../widgets/menus/gal-define-views-dialog.c:349
 msgid "Define Views"
 msgstr "Definir visualizaciÃ³ns"
 
@@ -21276,11 +20686,7 @@ msgstr "Definir visualizaciÃ³ns para \"%s\""
 msgid "Table"
 msgstr "TÃ¡boa"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "Instancia"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Gardar visualizaciÃ³n actual"
 
@@ -21292,11 +20698,7 @@ msgstr "_Crear visualizaciÃ³n nova"
 msgid "_Replace existing view"
 msgstr "_SubstituÃr visualizaciÃ³n existente"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "FactorÃa"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "Definir visualizaciÃ³ns novas"
 
@@ -21324,14 +20726,6 @@ msgstr "Nome da conta"
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "_AcciÃ³ns"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "Un GtkRadioAction"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Propiedades de anexos"
@@ -21349,11 +20743,11 @@ msgstr "Tipo MIME:"
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suxerir mostrar o anexo automaticamente"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "Non foi posÃbel definir como fondo"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "Definir como _fondo"
 
@@ -21386,13 +20780,10 @@ msgid "Hide Attachment _Bar"
 msgstr "Ocultar a _barra de anexos"
 
 #: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:636
 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:538
 msgid "Add Attachment"
 msgstr "Engadir anexo"
@@ -21409,7 +20800,7 @@ msgstr[1] "Gardar anexos"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
@@ -21444,59 +20835,59 @@ msgstr "Abrir os anexos en %s"
 #. * 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
+#: ../widgets/misc/e-attachment.c:994
 msgid "Attached message"
 msgstr "Mensaxe anexa"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2615
 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:2629
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2623
 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
+#: ../widgets/misc/e-attachment.c:1914
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Non foi posÃbel cargar '%s'"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1917
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Non foi posÃbel cargar o anexo"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2193
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Non foi posÃbel abrir '%s'"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2196
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Non foi posÃbel abrir o anexo"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2631
 msgid "Attachment contents not loaded"
 msgstr "Os contidos dos anexos non foron cargados"
 
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2707
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Non foi posÃbel gardar '%s'"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2710
 #, 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:363
+#: ../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:1249
+#: ../widgets/misc/e-calendar-item.c:1254
 msgid "%B %Y"
 msgstr "%B de %Y"
 
@@ -21504,65 +20895,6 @@ msgstr "%B de %Y"
 msgid "Month Calendar"
 msgstr "Calendario mensual"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "Encher con cor"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "Encher con cor GDK"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "Encher con liÃ±a de puntos"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../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:2884
-msgid "Minimum width"
-msgstr "Largura mÃnima"
-
-#: ../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:2885
-msgid "Minimum Width"
-msgstr "Largura mÃnima"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "Espazamento"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "CodificaciÃ³n de caracteres"
@@ -21575,48 +20907,48 @@ msgstr "Introduza o conxunto de caracteres que se vai usar"
 msgid "Other..."
 msgstr "Outro..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "Data e hora"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "Entrada de texto para introducir a data"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "Prema este botÃ³n para mostrar un calendario"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Caixa de combinaciÃ³n despregÃ¡bel para seleccionar a hora"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "Ago_ra"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "_Hoxe"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 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:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
 msgctxt "date"
 msgid "None"
 msgstr "NingÃºn"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1809
 msgid "Invalid Date Value"
 msgstr "O valor da data non Ã© vÃ¡lido"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1853
 msgid "Invalid Time Value"
 msgstr "O valor da hora non Ã© vÃ¡lido"
 
@@ -21714,11 +21046,11 @@ msgstr ""
 msgid "Import Data"
 msgstr "Importante"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "Mapa do mundo"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:626
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21745,42 +21077,6 @@ msgstr ""
 "O Evolution estÃ¡ actualmente desconectado.\n"
 "Prema neste botÃ³n para traballar conectado."
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "O estado do botÃ³n Ã© conectado"
-
-#: ../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:"
@@ -21802,68 +21098,46 @@ msgstr "Preferencias do Evolution"
 msgid "Matches: %d"
 msgstr "Equivalencias: %d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../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:566
+#: ../widgets/misc/e-search-bar.c:562
 msgid "Fin_d:"
 msgstr "_Buscar:"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:574
 msgid "Clear the search"
 msgstr "Limpar bÃºsqueda"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../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:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Next"
 msgstr "_Seguinte"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:619
 msgid "Find the next occurrence of the phrase"
 msgstr "Buscar a seguinte apariciÃ³n na frase"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:629
 msgid "Mat_ch case"
 msgstr "_Coincidir maiÃºsculas e minÃºsculas"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../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"
 
-#: ../widgets/misc/e-search-bar.c:683
+#: ../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
-msgid "Cursor Row"
-msgstr "Fila de cursor"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "Columna de cursor"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "Clasificador"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "Modo de selecciÃ³n"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "Modo do cursor"
-
 #: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "Ao e_liminar:"
@@ -21938,43 +21212,46 @@ msgstr "Ao co_mpletar:"
 msgid "When decli_ned:"
 msgstr "Ao _rexeitar:"
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "Wi_thin"
 msgstr "Den_tro"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
-msgstr "_Despois:"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+msgid "_After"
+msgstr "_Despois"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "_Toda a informaciÃ³n"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Classification:"
 msgstr "_ClasificaciÃ³n:"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "_Atrasar a entrega da mensaxe"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "_Entregada"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "_Definir a data de vencemento"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
-msgstr "_AtÃ©:"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "_Until"
+msgstr "_AtÃ©"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "_Cando sexa conveniente"
 
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "_Ao abrir:"
 
@@ -22030,41 +21307,41 @@ msgstr "O ficheiro de script debe existir e ser executÃ¡bel."
 msgid "Click here to go to URL"
 msgstr "Prema aquÃ para ir ao URL"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:359
 msgid "_Copy Link Location"
 msgstr "_Copiar a localizaciÃ³n da ligazÃ³n"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:361
 msgid "Copy the link to the clipboard"
 msgstr "Copia obxectos no portapapeis."
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:369
 msgid "_Open Link in Browser"
 msgstr "_Abrir ligazÃ³n no navegador"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:371
 msgid "Open the link in a web browser"
 msgstr "_Abrir ligazÃ³n no navegador"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:379
 msgid "_Copy Email Address"
 msgstr "Copiar enderezo de _correo"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1063
 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
+#: ../widgets/misc/e-web-view.c:840 ../widgets/misc/e-web-view.c:842
+#: ../widgets/misc/e-web-view.c:844
 #, c-format
 msgid "Click to call %s"
 msgstr "Prema para chamar %s"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:846
 msgid "Click to hide/unhide addresses"
 msgstr "Prema para ocultar ou mostrar os enderezos"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:848
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
@@ -22083,7 +21360,7 @@ msgstr "Calendario: desde %s atÃ© %s"
 msgid "evolution calendar item"
 msgstr "elemento de calendario do Evolution"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "lista emerxente"
 
@@ -22101,7 +21378,7 @@ msgstr "NingÃºn"
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A data ten que ser introducida no formato: %s"
@@ -22110,48 +21387,12 @@ msgstr "A data ten que ser introducida no formato: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "A porcentaxe ten que ser un valor entre 0 e 100, incluÃdos"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "Columna seleccionada"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "Columna enfocada"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "Columna non seleccionada"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "Riscar columna"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "SubliÃ±ar columna"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "Columna en negra"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "Cor da columna"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "Cor de fondo da columna"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 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:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(Ascendente)"
@@ -22168,12 +21409,12 @@ msgstr "Sen ordenar"
 msgid "No grouping"
 msgstr "Sen agrupar"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Mostrar os campos"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "Campos dispoÃ±Ãbeis"
 
@@ -22182,7 +21423,7 @@ msgid "A_vailable Fields:"
 msgstr "Campos _dispoÃ±Ãbeis:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -22195,7 +21436,7 @@ msgid "Clear _All"
 msgstr "Limp_ar todo"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Descending"
 msgstr "Descendente"
 
@@ -22255,7 +21496,7 @@ msgstr "_Mostrar estes campos por orde:"
 msgid "_Sort..."
 msgstr "_Ordenar..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
 msgstr "Engadir unha c_olumna..."
 
@@ -22267,248 +21508,112 @@ 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:342
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
 #, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
+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:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, 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: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:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "Alternar as cores das filas"
-
-#: ../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:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "Debuxar a grade horizontal"
-
-#: ../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:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "Debuxar a grade vertical"
-
-#: ../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:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "Debuxar o foco"
-
-#: ../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:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "Modo de cursor"
-
-#: ../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:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "Modelo de selecciÃ³n"
-
-#: ../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:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "LÃmite de lonxitude"
-
-#: ../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:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "Altura uniforme da fila"
-
-#: ../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:1487
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Customize Current View"
 msgstr "Personalizar a visualizaciÃ³n actual"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1562
 msgid "Sort _Ascending"
 msgstr "Orde _ascendente"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1565
 msgid "Sort _Descending"
 msgstr "Orde _descendente"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1568
 msgid "_Unsort"
 msgstr "Sen ord_enar"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1571
 msgid "Group By This _Field"
 msgstr "Agrupar por este ca_mpo"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1574
 msgid "Group By _Box"
 msgstr "Agrupar por cai_xa"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1578
 msgid "Remove This _Column"
 msgstr "Eliminar esta _columna"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1581
 msgid "Add a C_olumn..."
 msgstr "Engadir unha c_olumna..."
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "A_lignment"
 msgstr "A_liÃ±amento"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "B_est Fit"
 msgstr "Axuste Ã³pt_imo"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1591
 msgid "Format Column_s..."
 msgstr "Formatar columna_s..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Custo_mize Current View..."
 msgstr "Perso_nalizar a visualizaciÃ³n actual..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1654
 msgid "_Sort By"
 msgstr "O_rdenar por"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1672
 msgid "_Custom"
 msgstr "_Personalizado"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "Cabeceira da tÃ¡boa"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "Modelo da tÃ¡boa"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "Fila do cursor"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "Ordenar a informaciÃ³n"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "Buscar sempre"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "Premer para engadir"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr "Debuxar a grade vertical"
-
-#: ../widgets/table/e-table.c:3375
-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:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "Adaptador de tÃ¡boa Etree"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "Aparencia retro"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "Debuxar liÃ±as e expansores +/-."
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "TamaÃ±o do expansor"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "TamaÃ±o da frecha do expansor"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "emerxente"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 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
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 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
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 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
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 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
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "contrae a fila no ETree que contÃ©n esta cela"
 
@@ -22524,116 +21629,1010 @@ msgstr "premer"
 msgid "sort"
 msgstr "ordenar"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2474
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "MÃ©todos de entrada"
 
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "Procesador de eventos"
+#, fuzzy
+#~| msgid "Accept"
+#~ msgid "A_ccept"
+#~ msgstr "Aceptar"
+
+#~ msgid "{0}"
+#~ msgstr "{0}"
+
+#~ msgid "{1}"
+#~ msgstr "{1}"
+
+#~ msgid "Web Log:"
+#~ msgstr "Rexistro _web:"
+
+#~ msgid "_Web Log:"
+#~ msgstr "Rexistro _web:"
+
+#~ msgid "Editable"
+#~ msgstr "EditÃ¡bel"
+
+#~ msgid "Source Book"
+#~ msgstr "Axenda de enderezos de orixe"
+
+#~ msgid "Target Book"
+#~ msgstr "Axenda de enderezos de destino"
+
+#~ msgid "Is New Contact"
+#~ msgstr "Ã? un contacto novo"
+
+#~ msgid "Writable Fields"
+#~ msgstr "Campos que se poden escribir"
+
+#~ msgid "Required Fields"
+#~ msgstr "Campos requiridos"
+
+#~ msgid "Changed"
+#~ msgstr "Modificado"
+
+#~ msgid "Shell"
+#~ msgstr "Terminal"
+
+#~ msgid "The EShell singleton"
+#~ msgstr "O singleton de EShell"
+
+#~ msgid "Book"
+#~ msgstr "Axenda de enderezos"
+
+#~ msgid "Is New List"
+#~ msgstr "Ã? unha lista nova"
+
+#~ msgid "Query"
+#~ msgstr "Consulta"
+
+#~ msgid "Model"
+#~ msgstr "Modelo"
+
+#~ msgid "Shell View"
+#~ msgstr "VisualizaciÃ³n de terminal"
+
+#~ msgid "Source"
+#~ msgstr "Orixe"
+
+#~ msgid "Width"
+#~ msgstr "Largura"
+
+#~ msgid "Height"
+#~ msgstr "Altura"
+
+#~ msgid "Has Focus"
+#~ msgstr "Ten foco"
+
+#~ msgid "Field"
+#~ msgstr "Campo"
+
+#~ msgid "Field Name"
+#~ msgstr "Nome do campo"
+
+#~ msgid "Text Model"
+#~ msgstr "Modelo de texto"
+
+#~ msgid "Max field name length"
+#~ msgstr "Lonxitude mÃ¡xima do campo"
+
+#~ msgid "Column Width"
+#~ msgstr "Largura da columna"
+
+#~ msgid "Adapter"
+#~ msgstr "Adaptador"
+
+#~ msgid "Selected"
+#~ msgstr "Seleccionado"
+
+#~ msgid "Has Cursor"
+#~ msgstr "PosÃºe cursor"
+
+#~ msgid "Calendar repository is offline."
+#~ msgstr "O repositorio de calendarios estÃ¡ desconectado."
+
+#~ msgid "Error on '{0}'"
+#~ msgstr "Erro en '{0}'"
+
+#~ msgid "No response from the server."
+#~ msgstr "Non hai resposta do servidor."
+
+#~ msgid "Unable to load the calendar"
+#~ msgstr "Non Ã© posÃbel cargar o calendario"
+
+#~ msgid "{0}."
+#~ msgstr "{0}."
+
+#~ msgid "Check this to use system timezone in Evolution."
+#~ msgstr "Active isto para empregar o fuso horario do sistema en Evolution."
+
+#~ msgid "Attendee_s..."
+#~ msgstr "Participante_s..."
+
+#~ msgid "Default Client"
+#~ msgstr "Cliente predefinido"
+
+#~ msgid "Shell Settings"
+#~ msgstr "ConfiguraciÃ³n do Exchange"
+
+#~ msgid "Application-wide settings"
+#~ msgstr "ConfiguraciÃ³n do completado automÃ¡tico"
+
+#~ msgid "A_ttendees..."
+#~ msgstr "Par_ticipantes..."
+
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "_Select Today"
+#~ msgstr "_Seleccionar hoxe"
+
+#~| msgid "New _Task"
+#~ msgid "New Tab"
+#~ msgstr "Novo _separador"
+
+#~ msgid "Name of the logger"
+#~ msgstr "Nome do compoÃ±ente que se estÃ¡ rexistrando"
+
+#~ msgid "Filename"
+#~ msgstr "Nome do f_icheiro:"
+
+#~ msgid "The filename of the module"
+#~ msgstr "Modificar o nome deste cartafol"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "Indica se o engadido estÃ¡ activado"
+
+#~ msgid "Focus Tracker"
+#~ msgstr "Enfocar o tracker"
+
+#~ msgid "Shell Module"
+#~ msgstr "Modo de selecciÃ³n"
+
+#~ msgid "The mail shell backend"
+#~ msgstr "A infraestrutura da terminal de mail"
+
+#~ msgid "Show Deleted"
+#~ msgstr "Eliminada"
+
+#~ msgid "To Do"
+#~ msgstr "Tarefas pendentes"
+
+#~ msgid "Later"
+#~ msgstr "MÃ¡is tarde"
+
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "Non Ã© posÃbel crear un cartafol novo: `%s': %s"
+
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "Non Ã© posÃbel copiar o cartafol `%s' en `%s': %s"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr "Non Ã© posÃbel examinar as caixas de correo existentes en `%s': %s"
+
+#~ 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 desde Evolution 1.x.\n"
+#~ "\n"
+#~ "Agarde mentres o Evolution migra os seus cartafoles..."
+
+#~ 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"
+
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr ""
+#~ "Non Ã© posÃbel crear o cartafol de datos POP3 keep-on-server `%s': %s"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "Non Ã© posÃbel copiar os datos POP3 keep-on-server `%s': %s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr ""
+#~ "Produciuse un fallo ao crear o almacenamento de correo local `%s': %s"
+
+#~ 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."
+
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr ""
+#~ "Permite que o Evolution mostre unha parte de texto de tamaÃ±o limitado"
+
+#~ 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."
+
+#~ msgid "Text message part limit"
+#~ msgstr "LÃmite da parte de texto da mensaxe"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Because \"{0}\"."
+#~ msgstr "Por causa de \"{0}\"."
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "Por causa de \"{2}\"."
+
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "Os seguintes cartafoles de busca:\n"
+#~ "{0}\n"
+#~ "usan o cartafol que se eliminou agora:\n"
+#~ "    \"{1}\"\n"
+#~ "e foron actualizados."
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "As seguintes regras de filtraxe:\n"
+#~ "{0}\n"
+#~ "usan o cartafol que se eliminou agora:\n"
+#~ "    \"{1}\"\n"
+#~ "e foron actualizadas."
+
+#~ msgid "Shell Backend"
+#~ msgstr "Infraestrutura shell"
+
+#~ msgid ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+#~ msgstr ""
+#~ "SÃ³ hai mensaxes ocultas neste cartafol. Use Ver -> Mostrar mensaxes "
+#~ "ocultas para velas."
+
+#~ msgid "Table column:"
+#~ msgstr "Columna da tÃ¡boa:"
+
+#~ msgid "Source List"
+#~ msgstr "Orixe"
+
+#~ msgid "The registry of address books"
+#~ msgstr "Non foi posÃbel obter unha lista de axendas de enderezos"
+
+#~ msgid "Current View"
+#~ msgstr "_VisualizaciÃ³n actual"
+
+#~ msgid "The currently selected address book view"
+#~ msgstr "A visualizaciÃ³n de axenda de enderezo seleccionada actualmente"
+
+#~ msgid "Previewed Contact"
+#~ msgstr "Contacto novo"
+
+#~ msgid "The contact being shown in the preview pane"
+#~ msgstr "Indica se se mostra o panel de previsualizaciÃ³n."
+
+#~ msgid "Preview is Visible"
+#~ msgstr "A barra lateral Ã© visÃbel"
+
+#~ msgid "Whether the preview pane is visible"
+#~ msgstr "Indica se se mostra o panel de previsualizaciÃ³n."
+
+#~ msgid "LDAP Servers"
+#~ msgstr "Servidores LDAP"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "ConfiguraciÃ³n do completado automÃ¡tico"
+
+#~ 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..."
+
+#~ 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..."
+
+#~ 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..."
+
+#~ 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..."
+
+#~ msgid "Source Selector Widget"
+#~ msgstr "Selector de orixe de notas"
+
+#~ msgid "This widget displays groups of address books"
+#~ msgstr "Non foi posÃbel obter unha lista de axendas de enderezos"
+
+#~ msgid "Save as vCard..."
+#~ msgstr "Gardar como vCard..."
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "The registry of calendars"
+#~ msgstr "Calendario primario"
+
+#~ 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..."
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr ""
+#~ "Non Ã© posÃbel migrar a configuraciÃ³n antiga desde evolution/config.xmldb"
+
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "Non foi posÃbel migrar o calendario `%s'"
+
+#~ msgid "Date Navigator Widget"
+#~ msgstr "Widget do navegador de datas"
+
+#~ msgid "This widget displays a miniature calendar"
+#~ msgstr "Este widget mostra unha calendario en miniatura"
+
+#~ msgid "Default Calendar Client"
+#~ msgstr "Cliente de correo predefinido"
+
+#~ msgid "Default client for calendar operations"
+#~ msgstr "O cliente predefinido para as operaciÃ³ns no calendario"
+
+#~ msgid "This widget displays groups of calendars"
+#~ msgstr "Este widget mostra grupos de calendarios"
+
+#~ msgid "The registry of memo lists"
+#~ msgstr "Lista de notas primaria"
+
+#~ msgid "The memo table model"
+#~ msgstr "Modelo da tÃ¡boa"
+
+#~ msgid "Default Memo Client"
+#~ msgstr "Cliente de recordatorios predefinido"
+
+#~ msgid "Default client for memo operations"
+#~ msgstr "Cliente predefinido para as operaciÃ³ns nas citas"
+
+#~ msgid "This widget displays groups of memo lists"
+#~ msgstr "Este widget mostra os grupos de listas de recordatorios"
+
+#~ msgid "The registry of task lists"
+#~ msgstr "Lista de tarefas primaria"
+
+#~ msgid "The task table model"
+#~ msgstr "Modelo da tÃ¡boa"
+
+#~ 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..."
+
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "Non foi posÃbel migrar as tarefas `%s'"
+
+#~ msgid "Default Task Client"
+#~ msgstr "Cliente de tarefas predefinido"
+
+#~ msgid "Default client for task operations"
+#~ msgstr "Cliente predefinido para a operaciÃ³n na tarefa"
+
+#~ msgid "This widget displays groups of task lists"
+#~ msgstr "Este widget mostra os grupos de listas de tarefas"
+
+#~ msgid "Group by Threads"
+#~ msgstr "Agr_upar por fÃos"
+
+#~ msgid "Whether to group messages by threads"
+#~ msgstr "Indica se as mensaxes se agrupan por fÃos"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "Ocultar as mensaxes _lidas"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "Ocultar temporalmente todas as mensaxes lidas"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "Ocultar as mensaxes s_eleccionadas"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "Ocultar temporalmente as mensaxes seleccionadas"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "Mostrar as mensaxes o_cultas"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "Mostrar as mensaxes ocultas temporalmente"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "Ocultar as mensaxes elimina_das"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr "Ocultar as mensaxes eliminadas en vez de mostralas riscadas"
+
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr ""
+#~ "Lista de pistas do engadido de aviso de anexos para buscar no corpo dunha "
+#~ "mensaxe."
+
+#~ msgid "Add Hula support to Evolution."
+#~ msgstr "Engade a compatibilidade de Hula con Evolution."
+
+#~ msgid "Hula Support"
+#~ msgstr "Compatibilidade con Hula"
+
+#~ msgid "%ld KB"
+#~ msgstr "%ld KB"
+
+#~ msgid "Toolbar Style"
+#~ msgstr "Estilo da _barra de ferramentas"
+
+#~ msgid "The switcher's toolbar style"
+#~ msgstr "O estilo da barra de ferramentas do alternador"
+
+#~ msgid "Toolbar Visible"
+#~ msgstr "A barra de ferramentas Ã© visÃbel"
+
+#~ msgid "Whether the switcher is visible"
+#~ msgstr "Se a barra lateral deberÃa ser visÃbel."
+
+#~ msgid "Switcher Action"
+#~ msgstr "Cambiar a %s"
+
+#~ msgid "The switcher action for this shell view"
+#~ msgstr "A acciÃ³n do alternador para esta visualizaciÃ³n de terminal de ordes"
+
+#~ msgid "Page Number"
+#~ msgstr "NÃºmero de serie"
+
+#~ msgid "The notebook page number of the shell view"
+#~ msgstr ""
+#~ "O nÃºmero de pÃ¡xina do libro de notas da visualizaciÃ³n de terminal de ordes"
+
+#~ msgid "Search Rule"
+#~ msgstr "Filtro de busca"
+
+#~ msgid "Criteria for the current search results"
+#~ msgstr "Criterio para os resultados da bÃºsqueda actual"
+
+#~ msgid "The EShellBackend for this shell view"
+#~ msgstr "O EShellBackend para esta visualizacion de terminal de ordes"
+
+#~ msgid "Shell Content Widget"
+#~ msgstr "Widget de contido de intÃ©rprete de ordes"
+
+#~ 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"
+
+#~ msgid "Shell Sidebar Widget"
+#~ msgstr "Largura predefinida da barra lateral"
+
+#~ 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"
+
+#~ msgid "Shell Taskbar Widget"
+#~ msgstr "Widget da barra de ferramentas da terminal de ordes"
+
+#~ msgid "The taskbar widget appears at the bottom of a shell window"
+#~ msgstr ""
+#~ "O widget da barra de ferramentas aparece na parte inferior da xanela da "
+#~ "terminal de ordes"
+
+#~ msgid "Shell Window"
+#~ msgstr "_Xanela nova"
+
+#~ msgid "The window to which the shell view belongs"
+#~ msgstr "A xanela Ã¡ que pertence a visualizaciÃ³n da terminal de ordes"
+
+#~ msgid "The key file holding widget state data"
+#~ msgstr "O ficheiro chave que contÃ©n os datos de estado do wiget"
+
+#~ msgid "The title of the shell view"
+#~ msgstr "O tÃtulo da visualizaciÃ³n da terminal de sesiÃ³n"
+
+#~ msgid "Current View ID"
+#~ msgstr "_VisualizaciÃ³n actual"
+
+#~ msgid "The current GAL view ID"
+#~ msgstr "Gardar a visualizaciÃ³n personalizada actual"
+
+#~ msgid "Active Shell View"
+#~ msgstr "VisualizaciÃ³n da terminal de ordes activa"
+
+#~ msgid "Name of the active shell view"
+#~ msgstr "Nome da visualizaciÃ³n nova:"
+
+#~ msgid "The shell window's EFocusTracker"
+#~ msgstr "O EFocusTracker da xanela da terminal de ordes"
+
+#~ msgid "Geometry"
+#~ msgstr "XeometrÃa"
+
+#~ msgid "Initial window geometry string"
+#~ msgstr "A cadea da xeometrÃa inicial da xanela"
+
+#~ msgid "Safe Mode"
+#~ msgstr "Activar _cursor"
+
+#~ msgid "Whether the shell window is in safe mode"
+#~ msgstr "Indica se o engadido estÃ¡ activado"
+
+#~ msgid "Sidebar Visible"
+#~ msgstr "A barra lateral Ã© visÃbel"
+
+#~ msgid "Whether the shell window's side bar is visible"
+#~ msgstr "Se os botÃ³ns da xanela deberÃan ser visÃbeis."
+
+#~ msgid "Switcher Visible"
+#~ msgstr "A barra lateral Ã© visÃbel"
+
+#~ msgid "Whether the shell window's switcher buttons are visible"
+#~ msgstr "Se os botÃ³ns da xanela deberÃan ser visÃbeis."
+
+#~ msgid "Taskbar Visible"
+#~ msgstr "A barra de estado Ã© visÃbel"
+
+#~ msgid "Whether the shell window's task bar is visible"
+#~ msgstr "Se a barra de estado deberÃa ser visÃbel."
+
+#~ msgid "Whether the shell window's tool bar is visible"
+#~ msgstr "Se os botÃ³ns da xanela deberÃan ser visÃbeis."
+
+#~ msgid "UI Manager"
+#~ msgstr "Xestor"
+
+#~ msgid "The shell window's GtkUIManager"
+#~ msgstr "O GtkUIManager da xanela da terminal de ordes"
+
+#~ msgid "Module Directory"
+#~ msgstr "Cartafol onde gardar"
+
+#~ msgid "The directory from which to load EModules"
+#~ msgstr "O cartafol desde o cal ler EModules"
+
+#~ msgid "Network Available"
+#~ msgstr "TLS non dispoÃ±Ãbel"
+
+#~ msgid "Whether the network is available"
+#~ msgstr "Indica se o engadido estÃ¡ activado"
+
+#~ msgid "Online"
+#~ msgstr "Conectado"
+
+#~ msgid "Whether the shell is online"
+#~ msgstr "Indica se o engadido estÃ¡ activado"
+
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "Forza a remigraciÃ³n desde o Evolution 1.4"
+
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "Espazo en disco insuficiente para a actualizaciÃ³n."
+
+#~ msgid "Really delete old data?"
+#~ msgstr "EstÃ¡ seguro de que quere eliminar os datos antigos?"
+
+#~ msgid ""
+#~ "The entire contents of the &quot;evolution&quot; directory are about to "
+#~ "be permanently removed.\n"
+#~ "\n"
+#~ "It is suggested you manually verify that all of your mail, contact, and "
+#~ "calendar data is present, and that this version of Evolution operates "
+#~ "correctly before deleting this old data.\n"
+#~ "\n"
+#~ "Once deleted, you cannot downgrade to the previous version of Evolution "
+#~ "without manual intervention.\n"
+#~ msgstr ""
+#~ "Todo o contido do cartafol &quot;evolution&quot; vaise eliminar "
+#~ "permanentemente.\n"
+#~ "\n"
+#~ "SuxÃreselle que verifique manualmente que todos os datos do seu correo, "
+#~ "contactos, e calendarios estÃ¡n presentes, e que esta versiÃ³n do Evolution "
+#~ "funciona correctamente antes de eliminar os datos antigos.\n"
+#~ "\n"
+#~ "Unha vez eliminados, non poderÃ¡ desactualizarse Ã¡ versiÃ³n anterior do "
+#~ "Evolution sen intervenciÃ³n manual.\n"
+
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+#~ msgstr ""
+#~ "As versiÃ³ns anteriores do Evolution gardan os seus datos nunha "
+#~ "localizaciÃ³n diferente.\n"
+#~ "\n"
+#~ "Se escolle eliminar estes datos, todos os contidos do cartafol &quot;"
+#~ "evolution&quot; serÃ¡n eliminados permanentemente. Se escolle gardar estes "
+#~ "datos, entÃ³n poderÃ¡ eliminar os contidos de &quot;evolution&quot; cando o "
+#~ "vexa conveniente.\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, "
+#~ "but you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "A actualizaciÃ³n dos seus datos e configuraciÃ³n requirirÃ¡ atÃ© {0} de "
+#~ "espazo no disco, mais sÃ³ ten {1} dispoÃ±Ãbeis.\n"
+#~ "\n"
+#~ "NecesitarÃ¡ facer mÃ¡is espazo dispoÃ±Ãbel no seu cartafol persoal antes de "
+#~ "que poida continuar."
+
+#~ msgid "_Keep Data"
+#~ msgstr "_Conservar os datos"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "_Avisarme mÃ¡is tarde"
+
+#~ msgid "Collection"
+#~ msgstr "ColecciÃ³n"
+
+#~ msgid "Instance"
+#~ msgstr "Instancia"
+
+#~ msgid "Factory"
+#~ msgstr "FactorÃa"
+
+#~ msgid "Action"
+#~ msgstr "_AcciÃ³ns"
+
+#~ msgid "A GtkRadioAction"
+#~ msgstr "Un GtkRadioAction"
+
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "Mostrar a _barra de anexos"
+
+#~ msgid "Fill color"
+#~ msgstr "Encher con cor"
+
+#~ msgid "GDK fill color"
+#~ msgstr "Encher con cor GDK"
+
+#~ msgid "Fill stipple"
+#~ msgstr "Encher con liÃ±a de puntos"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "Largura mÃnima"
+
+#~ msgid "Minimum Width"
+#~ msgstr "Largura mÃnima"
+
+#~ msgid "Spacing"
+#~ msgstr "Espazamento"
+
+#~ msgid "The button state is online"
+#~ msgstr "O estado do botÃ³n Ã© conectado"
+
+#~ msgid "Horizontal Position"
+#~ msgstr "PosiciÃ³n horizontal do panel"
+
+#~ msgid "Pane position when oriented horizontally"
+#~ msgstr "PosiciÃ³n do panel ao orientalo horizontalmente"
+
+#~ msgid "Vertical Position"
+#~ msgstr "PosiciÃ³n vertical do panel"
+
+#~ msgid "Pane position when oriented vertically"
+#~ msgstr "PosiciÃ³n do panel ao orientalo verticalmente"
+
+#~ msgid "Proportion"
+#~ msgstr "_Propiedades"
+
+#~ msgid "Proportion of the 2nd pane size"
+#~ msgstr "ProporciÃ³n do tamaÃ±o do segundo panel"
+
+#~ msgid "Fixed Resize"
+#~ msgstr "_Redimensionar"
+
+#~ msgid "Keep the 2nd pane fixed during resize"
+#~ msgstr "Manter o segundo panel fixo durante o redimensionado"
+
+#~ msgid "Cursor Row"
+#~ msgstr "Fila de cursor"
+
+#~ msgid "Cursor Column"
+#~ msgstr "Columna de cursor"
+
+#~ msgid "Sorter"
+#~ msgstr "Clasificador"
+
+#~ msgid "Selection Mode"
+#~ msgstr "Modo de selecciÃ³n"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "Modo do cursor"
+
+#~ msgid "Selected Column"
+#~ msgstr "Columna seleccionada"
+
+#~ msgid "Focused Column"
+#~ msgstr "Columna enfocada"
+
+#~ msgid "Unselected Column"
+#~ msgstr "Columna non seleccionada"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "Riscar columna"
+
+#~ msgid "Underline Column"
+#~ msgstr "SubliÃ±ar columna"
+
+#~ msgid "Bold Column"
+#~ msgstr "Columna en negra"
+
+#~ msgid "Color Column"
+#~ msgstr "Cor da columna"
+
+#~ msgid "BG Color Column"
+#~ msgstr "Cor de fondo da columna"
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Alternating Row Colors"
+#~ msgstr "Alternar as cores das filas"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "Debuxar a grade horizontal"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "Debuxar a grade vertical"
+
+#~ msgid "Draw focus"
+#~ msgstr "Debuxar o foco"
+
+#~ msgid "Cursor mode"
+#~ msgstr "Modo de cursor"
+
+#~ msgid "Selection model"
+#~ msgstr "Modelo de selecciÃ³n"
+
+#~ msgid "Length Threshold"
+#~ msgstr "LÃmite de lonxitude"
+
+#~ msgid "Uniform row height"
+#~ msgstr "Altura uniforme da fila"
+
+#~ msgid "Frozen"
+#~ msgstr "Conxelado"
+
+#~ msgid "Table header"
+#~ msgstr "Cabeceira da tÃ¡boa"
+
+#~ msgid "Table model"
+#~ msgstr "Modelo da tÃ¡boa"
+
+#~ msgid "Cursor row"
+#~ msgstr "Fila do cursor"
+
+#~ msgid "Sort Info"
+#~ msgstr "Ordenar a informaciÃ³n"
+
+#~ msgid "Always search"
+#~ msgstr "Buscar sempre"
+
+#~ msgid "Use click to add"
+#~ msgstr "Premer para engadir"
+
+#~ msgid "Vertical Row Spacing"
+#~ msgstr "Debuxar a grade vertical"
+
+#~ 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"
+
+#~ msgid "ETree table adapter"
+#~ msgstr "Adaptador de tÃ¡boa Etree"
+
+#~ msgid "Retro Look"
+#~ msgstr "Aparencia retro"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "Debuxar liÃ±as e expansores +/-."
+
+#~ msgid "Expander Size"
+#~ msgstr "TamaÃ±o do expansor"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "TamaÃ±o da frecha do expansor"
+
+#~ msgid "popup"
+#~ msgstr "emerxente"
+
+#~ msgid "edit"
+#~ msgstr "editar"
+
+#~ msgid "toggle"
+#~ msgstr "alternar o estado"
+
+#~ msgid "expand"
+#~ msgstr "expandir"
+
+#~ msgid "collapse"
+#~ msgstr "contraer"
 
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "Texto"
+#~ msgid "Event Processor"
+#~ msgstr "Procesador de eventos"
 
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "Negra"
+#~ msgid "Text"
+#~ msgstr "Texto"
 
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "Riscado"
+#~ msgid "Bold"
+#~ msgstr "Negra"
 
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "Ã?ncora"
+#~ msgid "Strikeout"
+#~ msgstr "Riscado"
 
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "AliÃ±amento"
+#~ msgid "Anchor"
+#~ msgstr "Ã?ncora"
 
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "Largura do clip"
+#~ msgid "Justification"
+#~ msgstr "AliÃ±amento"
 
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "Altura do clip"
+#~ msgid "Clip Width"
+#~ msgstr "Largura do clip"
 
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "Clip"
+#~ msgid "Clip Height"
+#~ msgstr "Altura do clip"
 
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "Encher o rectÃ¡ngulo do clip"
+#~ msgid "Clip"
+#~ msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "Desprazamento X"
+#~ msgid "Fill clip rectangle"
+#~ msgstr "Encher o rectÃ¡ngulo do clip"
 
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "Desprazamento Y"
+#~ msgid "X Offset"
+#~ msgstr "Desprazamento X"
 
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "Largura do texto"
+#~ msgid "Y Offset"
+#~ msgstr "Desprazamento Y"
 
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "Altura do texto"
+#~ msgid "Text width"
+#~ msgstr "Largura do texto"
 
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "Usar a elipse"
+#~ msgid "Text height"
+#~ msgstr "Altura do texto"
 
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "Elipse"
+#~ msgid "Use ellipsis"
+#~ msgstr "Usar a elipse"
 
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "Axuste de liÃ±a"
+#~ msgid "Ellipsis"
+#~ msgstr "Elipse"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "Caracteres de quebra"
+#~ msgid "Line wrap"
+#~ msgstr "Axuste de liÃ±a"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "MÃ¡ximo de liÃ±as"
+#~ msgid "Break characters"
+#~ msgstr "Caracteres de quebra"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "Debuxar os bordos"
+#~ msgid "Max lines"
+#~ msgstr "MÃ¡ximo de liÃ±as"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "Permitir liÃ±as novas"
+#~ msgid "Draw borders"
+#~ msgstr "Debuxar os bordos"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "Debuxar o fondo"
+#~ msgid "Allow newlines"
+#~ msgstr "Permitir liÃ±as novas"
 
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "Debuxar o botÃ³n"
+#~ msgid "Draw background"
+#~ msgstr "Debuxar o fondo"
 
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "PosiciÃ³n do cursor"
+#~ msgid "Draw button"
+#~ msgstr "Debuxar o botÃ³n"
 
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "Contexto MI"
+#~ msgid "Cursor position"
+#~ msgstr "PosiciÃ³n do cursor"
 
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "Tirador emerxente"
+#~ msgid "IM Context"
+#~ msgstr "Contexto MI"
 
+#~ msgid "Handle Popup"
+#~ msgstr "Tirador emerxente"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]