Do this everywhere, also fixup CLEANFILES

Do this everywhere, also fixup CLEANFILES 2001-04-14 Michael Meeks <michael@ximian.com> * Makefile.am (dist-hook): remove built sources from dist. svn path=/trunk/; revision=9309
author: Michael Meeks <michael@ximian.com> 2001-04-14 16:02:59 +0800
committer: Michael Meeks <michael@src.gnome.org> 2001-04-14 16:02:59 +0800
commit: 04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2 (patch)
tree: b5e5eb3fca54a50b8643bfdf7125fef9b272e6dd /po/gl.po
parent: a5e6e0b5f3e06eee5726edfe276c5d3c65bb155c (diff)
download: gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar
gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.gz
gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.bz2
gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.lz
gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.xz
gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.zst
gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.zip
1 files changed, 2390 insertions, 1714 deletions
diff --git a/po/gl.po b/po/gl.po
index aae4a510ce..3e7f49d087 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-03-15 11:05+0100\n"
+"POT-Creation-Date: 2001-04-14 08:51-0400\n"
 "PO-Revision-Date: 2000-08-26 00:59+0200\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3209
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3211
 msgid ""
 "\n"
 "Name: "
@@ -30,7 +30,7 @@ msgstr ""
 "\n"
 "Nome: "
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3212
 msgid ""
 "\n"
 "  Prefix:     "
@@ -38,25 +38,25 @@ msgstr ""
 "\n"
 "  Prefixo:    "
 
-#: addressbook/backend/ebook/e-card.c:3057
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3058
+#: addressbook/backend/ebook/e-card.c:3214
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3059
+#: addressbook/backend/ebook/e-card.c:3215
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3060
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "  Suffix:     "
@@ -64,7 +64,7 @@ msgstr ""
 "\n"
 "  Sufixo:     "
 
-#: addressbook/backend/ebook/e-card.c:3074
+#: addressbook/backend/ebook/e-card.c:3230
 msgid ""
 "\n"
 "Birth Date: "
@@ -72,7 +72,7 @@ msgstr ""
 "\n"
 "Data de Nacemento: "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3241
 msgid ""
 "\n"
 "Address:"
@@ -80,7 +80,7 @@ msgstr ""
 "\n"
 "Enderezo:"
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3243
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -88,13 +88,13 @@ msgstr ""
 "\n"
 "  Apdo. de Correos: "
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3244
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3245
 msgid ""
 "\n"
 "  Street:      "
@@ -102,7 +102,7 @@ msgstr ""
 "\n"
 "  Rúa:         "
 
-#: addressbook/backend/ebook/e-card.c:3090
+#: addressbook/backend/ebook/e-card.c:3246
 msgid ""
 "\n"
 "  City:        "
@@ -110,7 +110,7 @@ msgstr ""
 "\n"
 "  Cidade:      "
 
-#: addressbook/backend/ebook/e-card.c:3091
+#: addressbook/backend/ebook/e-card.c:3247
 msgid ""
 "\n"
 "  Region:      "
@@ -118,7 +118,7 @@ msgstr ""
 "\n"
 "  Rexión:      "
 
-#: addressbook/backend/ebook/e-card.c:3092
+#: addressbook/backend/ebook/e-card.c:3248
 msgid ""
 "\n"
 "  Postal Code: "
@@ -126,7 +126,7 @@ msgstr ""
 "\n"
 "  Código Postal: "
 
-#: addressbook/backend/ebook/e-card.c:3093
+#: addressbook/backend/ebook/e-card.c:3249
 msgid ""
 "\n"
 "  Country:     "
@@ -134,13 +134,13 @@ msgstr ""
 "\n"
 "  País:        "
 
-#: addressbook/backend/ebook/e-card.c:3106
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3118
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "Telephones:\n"
@@ -148,7 +148,7 @@ msgstr ""
 "\n"
 "Teléfonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3121
+#: addressbook/backend/ebook/e-card.c:3277
 msgid ""
 "\n"
 "Telephone:"
@@ -156,7 +156,7 @@ msgstr ""
 "\n"
 "Teléfono:"
 
-#: addressbook/backend/ebook/e-card.c:3145
+#: addressbook/backend/ebook/e-card.c:3301
 msgid ""
 "\n"
 "E-mail:\n"
@@ -164,7 +164,7 @@ msgstr ""
 "\n"
 "Correo Electrónico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3148
+#: addressbook/backend/ebook/e-card.c:3304
 msgid ""
 "\n"
 "E-mail:"
@@ -172,13 +172,13 @@ msgstr ""
 "\n"
 "Correo Electrónico:"
 
-#: addressbook/backend/ebook/e-card.c:3167
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3173
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "Time Zone: "
@@ -186,25 +186,25 @@ msgstr ""
 "\n"
 "Zona Horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3185
+#: addressbook/backend/ebook/e-card.c:3341
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3354
 msgid ""
 "\n"
 "  Name:  "
@@ -212,31 +212,31 @@ msgstr ""
 "\n"
 "  Nome:  "
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3355
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3201
+#: addressbook/backend/ebook/e-card.c:3357
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3206
+#: addressbook/backend/ebook/e-card.c:3362
 msgid ""
 "\n"
 "Categories: "
@@ -244,7 +244,7 @@ msgstr ""
 "\n"
 "Categorías: "
 
-#: addressbook/backend/ebook/e-card.c:3207
+#: addressbook/backend/ebook/e-card.c:3363
 msgid ""
 "\n"
 "Comment: "
@@ -262,13 +262,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3220
+#: addressbook/backend/ebook/e-card.c:3376
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3223
+#: addressbook/backend/ebook/e-card.c:3379
 msgid ""
 "\n"
 "Public Key: "
@@ -284,15 +284,15 @@ msgstr ""
 msgid "Imports GnomeCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:39
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:33
+#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/gui/component/addressbook-factory.c:43
 #: calendar/conduits/calendar/calendar-conduit.c:1151
 #: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
+#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
@@ -304,20 +304,20 @@ msgstr "Non foi posible cargar o cursor\n"
 msgid "EBook not loaded\n"
 msgstr "EBook non cargado\n"
 
-#: addressbook/conduit/address-conduit.c:651
+#: addressbook/conduit/address-conduit.c:654
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Non foi posible iniciar o servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:652
+#: addressbook/conduit/address-conduit.c:655
 #: calendar/conduits/calendar/calendar-conduit.c:732
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Non foi posible iniciar wombat"
 
-#: addressbook/conduit/address-conduit.c:684
 #: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:690
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -325,7 +325,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
 #: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "Add"
 msgstr "Engadir"
 
@@ -366,7 +366,6 @@ msgstr "Arquivar Como:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:10
 #: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:27
 msgid "General"
 msgstr "Xeral"
 
@@ -383,7 +382,7 @@ msgid "Phone Types"
 msgstr "Tipos de Teléfono"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "Primary Email"
 msgstr "Correo Electrónico Principal"
 
@@ -396,7 +395,7 @@ msgid "Web page address:"
 msgstr "Enderezo da páxina Web:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:74
 msgid "_Add"
 msgstr "_Engadir"
 
@@ -421,8 +420,8 @@ msgid "_Company:"
 msgstr "_Compañía:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
+#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:91 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -474,129 +473,125 @@ msgstr "_Este é o enderezo da lista de correo"
 msgid "Delete Contact?"
 msgstr "¿Borrar Contacto?"
 
-#: addressbook/contact-editor/e-contact-editor.c:590
+#: addressbook/contact-editor/e-contact-editor.c:603
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "Elemento(s) pertencentes a estas categorías:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/widgets/e-addressbook-view.c:676
 msgid "Assistant"
 msgstr "Asistente"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1297
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1310
 msgid "Business"
 msgstr "Traballo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/contact-editor/e-contact-editor.c:1244
 msgid "Business 2"
 msgstr "Traballo 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Business Fax"
 msgstr "Fax do Traballo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "Car"
 msgstr "Automóbil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1248
 msgid "Company"
 msgstr "Compañía"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
-#: addressbook/contact-editor/e-contact-editor.c:1298
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1311
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/contact-editor/e-contact-editor.c:1250
 msgid "Home 2"
 msgstr "Particular 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Home Fax"
 msgstr "Fax Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/contact-editor/e-contact-editor.c:1253
 msgid "Mobile"
 msgstr "Móbil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/contact-editor/e-contact-editor.c:1299
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
+#: addressbook/contact-editor/e-contact-editor.c:1254
+#: addressbook/contact-editor/e-contact-editor.c:1312
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:662
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Pager"
 msgstr "Localizador (Pager)"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1257
 msgid "Primary"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/gui/widgets/e-addressbook-view.c:664
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/widgets/e-addressbook-view.c:665
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:1260
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
-#: addressbook/gui/widgets/e-addressbook-view.c:593
+#: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:668
 msgid "Email 2"
 msgstr "Correo Electrónico 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/gui/widgets/e-addressbook-view.c:594
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/gui/widgets/e-addressbook-view.c:669
 msgid "Email 3"
 msgstr "Correo Electrónico 3"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:214
+#: addressbook/contact-editor/e-contact-quick-add.c:223
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:216
+#: addressbook/contact-editor/e-contact-quick-add.c:225
 #, fuzzy
 msgid "Edit Full"
 msgstr "Editar Filtros"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:253
+#: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/widgets/e-addressbook-view.c:643
 #, fuzzy
 msgid "Full Name"
 msgstr "Nome Completo:"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:259
+#: addressbook/contact-editor/e-contact-quick-add.c:268
 #, fuzzy
 msgid "E-mail"
 msgstr "Correo Electrónico 2"
@@ -716,25 +711,25 @@ msgstr "_Sufixo:"
 msgid "_Title:"
 msgstr "_Tratamento:"
 
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:241
 msgid "As _Minicards"
 msgstr "Como _Minitarxetas"
 
-#: addressbook/gui/component/addressbook.c:243
+#: addressbook/gui/component/addressbook.c:247
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Como unha _Táboa"
 
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:399
 #, fuzzy, c-format
 msgid "Enter password for %s"
 msgstr "Introduza o contrasinal NNTP para %s@%s"
 
-#: addressbook/gui/component/addressbook.c:440
+#: addressbook/gui/component/addressbook.c:427
 msgid "Unable to open addressbook"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook.c:445
+#: addressbook/gui/component/addressbook.c:432
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -746,187 +741,187 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:568
+#: addressbook/gui/component/addressbook.c:555
 #, fuzzy
 msgid "Show All"
 msgstr "Ver Todos"
 
-#: addressbook/gui/component/addressbook.c:570
+#: addressbook/gui/component/addressbook.c:557
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:587
 #, fuzzy
 msgid "Any field contains"
 msgstr "O corpo contén"
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:588
 #, fuzzy
 msgid "Name contains"
 msgstr "contén"
 
-#: addressbook/gui/component/addressbook.c:602
+#: addressbook/gui/component/addressbook.c:589
 #, fuzzy
 msgid "Email contains"
 msgstr "contén"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:732
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que amosará o navegador de carpetas"
 
-#: addressbook/gui/component/addressbook-storage.c:95
+#: addressbook/gui/component/addressbook-storage.c:99
 #, fuzzy
 msgid "Other Contacts"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/addressbook-config.c:143
+#: addressbook/gui/component/addressbook-config.c:148
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Servidor LDAP:"
 
-#: addressbook/gui/component/addressbook-config.c:145
+#: addressbook/gui/component/addressbook-config.c:150
 #, fuzzy
 msgid "File"
 msgstr "_Ficheiro"
 
-#: addressbook/gui/component/addressbook-config.c:148
+#: addressbook/gui/component/addressbook-config.c:153
 #, fuzzy
 msgid "Unknown addressbook type"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook-config.c:158
+#: addressbook/gui/component/addressbook-config.c:163
 msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:261
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:145
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
 msgid "Password"
 msgstr "Contrasinal"
 
-#: addressbook/gui/component/addressbook-config.c:162
+#: addressbook/gui/component/addressbook-config.c:167
 msgid "SASL"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:165
+#: addressbook/gui/component/addressbook-config.c:170
 #, fuzzy
 msgid "Unknown auth type"
 msgstr "Erro descoñecido"
 
-#: addressbook/gui/component/addressbook-config.c:174
+#: addressbook/gui/component/addressbook-config.c:179
 #, fuzzy
 msgid "Base"
 msgstr "Pegar"
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:178
+#: addressbook/gui/component/addressbook-config.c:183
 #, fuzzy
 msgid "Subtree"
 msgstr "Subscribir"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-config.c:186
 msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:348
+#: addressbook/gui/component/addressbook-config.c:353
 msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:349
+#: addressbook/gui/component/addressbook-config.c:354
 msgid "FIXME Bind DN Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:351
+#: addressbook/gui/component/addressbook-config.c:356
+#: mail/mail-config.glade.h:50
 msgid "Remember this password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:401
+#: addressbook/gui/component/addressbook-config.c:406
 #: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Host:"
 msgstr "Horas"
 
-#: addressbook/gui/component/addressbook-config.c:402
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "FIXME Host help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:404
+#: addressbook/gui/component/addressbook-config.c:409
 #, fuzzy
 msgid "Port:"
 msgstr "Prioridade:"
 
-#: addressbook/gui/component/addressbook-config.c:405
+#: addressbook/gui/component/addressbook-config.c:410
 msgid "FIXME Port help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/component/addressbook-config.c:414
 msgid "Root DN:"
 msgstr "DN Raíz:"
 
-#: addressbook/gui/component/addressbook-config.c:410
+#: addressbook/gui/component/addressbook-config.c:415
 msgid "FIXME Root DN help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:430
+#: addressbook/gui/component/addressbook-config.c:435
 #, fuzzy
 msgid "Search Scope:"
 msgstr "Buscar"
 
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:8
+#: addressbook/gui/component/addressbook-config.c:489
 msgid "Authentication:"
 msgstr "Autenticación:"
 
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
+#: addressbook/gui/component/addressbook-config.c:507
+#: mail/mail-config.glade.h:44
 msgid "Path:"
 msgstr "Camiño:"
 
-#: addressbook/gui/component/addressbook-config.c:503
+#: addressbook/gui/component/addressbook-config.c:508
 msgid "FIXME Path Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:508
+#: addressbook/gui/component/addressbook-config.c:513
 #, fuzzy
 msgid "Create path if it doesn't exist."
 msgstr "O ficheiro non existe."
 
-#: addressbook/gui/component/addressbook-config.c:642
+#: addressbook/gui/component/addressbook-config.c:647
 #, fuzzy
 msgid "Edit Addressbook"
 msgstr "Gardar no libro de enderezos"
 
-#: addressbook/gui/component/addressbook-config.c:644
+#: addressbook/gui/component/addressbook-config.c:649
 #, fuzzy
 msgid "Add Addressbook"
 msgstr "Gardar no libro de enderezos"
 
-#: addressbook/gui/component/addressbook-config.c:660
+#: addressbook/gui/component/addressbook-config.c:665
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:41
+#: addressbook/gui/component/addressbook-config.c:671
+#: mail/mail-config.glade.h:35
 msgid "Name:"
 msgstr "Nome:"
 
-#: addressbook/gui/component/addressbook-config.c:667
+#: addressbook/gui/component/addressbook-config.c:672
 msgid "FIXME Name help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:669
+#: addressbook/gui/component/addressbook-config.c:674
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3
 msgid "Description:"
 msgstr "Descrición:"
 
-#: addressbook/gui/component/addressbook-config.c:670
+#: addressbook/gui/component/addressbook-config.c:675
 msgid "FIXME Description help text here"
 msgstr ""
 
@@ -936,23 +931,24 @@ msgid "Addressbook Sources"
 msgstr "Engadir Fonte"
 
 #: addressbook/gui/component/addressbook-config.glade.h:3
+#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/gui/widgets/e-minicard.c:673
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
-#: mail/mail-config.glade.h:20 mail/mail-view.c:150
+#: filter/libfilter-i18n.h:8 mail/folder-browser.c:597
+#: mail/mail-config.glade.h:19 mail/mail-view.c:156
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Eliminar"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
 #: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:23
 msgid "Edit"
 msgstr "Editar"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:578
 #, fuzzy
 msgid "Name"
 msgstr "Nome:"
@@ -962,51 +958,74 @@ msgstr "Nome:"
 msgid "URI"
 msgstr "URL:"
 
-#: addressbook/gui/component/e-address-widget.c:259
-#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#: addressbook/gui/component/e-address-widget.c:365
+#, fuzzy
+msgid "Disable Queries"
+msgstr "Categorías Dispoñibles:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:210
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:269
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "_Novo Contacto"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for displaying an address."
+msgid "A Bonobo control for an address popup."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A sample Bonobo control which displays an addressbook."
+msgid "A Bonobo control for displaying an address."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 #, fuzzy
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 "Utilidade de configuración para o conducto de libro de enderezos de "
 "evolution.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #, fuzzy
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Conducto de Libro de Enderezos de Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 #, fuzzy
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the Addressbook's address popup"
+msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 #, fuzzy
 msgid "Factory for the Evolution addressbook component."
 msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 #, fuzzy
 msgid "Factory for the sample Addressbook control"
 msgstr "Prema aquí para o libro de enderezos"
@@ -1020,21 +1039,18 @@ msgstr "Conducto de Libro de Enderezos de Evolution"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:121
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+#: addressbook/gui/component/select-names/e-select-names-popup.c:131
+#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
 msgid "Remove"
 msgstr "Quitar"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#: addressbook/gui/component/select-names/e-select-names-popup.c:146
 #, fuzzy
 msgid "Remove All"
 msgstr "Quitar"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
-msgid "Edit Contact Info"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Buscar..."
@@ -1054,7 +1070,7 @@ msgstr "Seleccionar un nome da Lista:"
 msgid "Select name from:"
 msgstr "Seleccionar un nome da Lista:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
 msgid "Search"
 msgstr "Buscar"
 
@@ -1166,83 +1182,182 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:481
-#: addressbook/gui/widgets/e-minicard.c:435
+#: addressbook/gui/widgets/e-addressbook-view.c:513
+#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/gui/widgets/e-minicard.c:466
+#: addressbook/gui/widgets/e-minicard.c:668
 msgid "Save as VCard"
 msgstr "Gardar como VCard"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-minicard.c:669
+msgid "Send contact to other"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-minicard.c:670
+#, fuzzy
+msgid "Send message to contact"
+msgstr "Enviar unha mensaxe sen asunto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
+#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
+#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:50
+#: ui/evolution-tasks.xml.h:4
+msgid "Print"
+msgstr "Imprimir"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-minicard.c:672
+#, fuzzy
+msgid "Print Envelope"
+msgstr "_Configuración da Impresión..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:641
 #, fuzzy
 msgid "* Click here to add a contact *"
 msgstr "<prema aquí para seleccionar unha data>"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/gui/widgets/e-addressbook-view.c:642
+#, fuzzy
+msgid "File As"
+msgstr "Arquivar Como:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:644
 #, fuzzy
 msgid "Email"
 msgstr "Correo Electrónico 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:645
+#, fuzzy
+msgid "Primary Phone"
+msgstr "Correo Electrónico Principal"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:646
+#, fuzzy
+msgid "Assistant Phone"
+msgstr "Asistente"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:647
+#, fuzzy
+msgid "Business Phone"
+msgstr "Traballo 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:648
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:649
+#, fuzzy
+msgid "Company Phone"
+msgstr "Compañía"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:650
+#, fuzzy
+msgid "Home Phone"
+msgstr "Particular 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:651
 msgid "Organization"
 msgstr "Organización"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:595
+#: addressbook/gui/widgets/e-addressbook-view.c:652
+#, fuzzy
+msgid "Business Address"
+msgstr "Traballo 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:653
+#, fuzzy
+msgid "Home Address"
+msgstr "Enderezo"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:654
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "Móbil"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:658
+#, fuzzy
+msgid "Business Phone 2"
+msgstr "Traballo 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:659
+#, fuzzy
+msgid "Home Phone 2"
+msgstr "Particular 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:661
+#, fuzzy
+msgid "Other Phone"
+msgstr "_Novo Contacto"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:666
+msgid "TTY"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:667
+#, fuzzy
+msgid "Other Address"
+msgstr "Enderezo"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:670
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:596
+#: addressbook/gui/widgets/e-addressbook-view.c:671
 #, fuzzy
 msgid "Department"
 msgstr "_Departamento:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:597
+#: addressbook/gui/widgets/e-addressbook-view.c:672
 #, fuzzy
 msgid "Office"
 msgstr "_Oficina:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:673
 #, fuzzy
 msgid "Title"
 msgstr "_Tratamento:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:674
 #, fuzzy
 msgid "Profession"
 msgstr "_Profesión:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:600
+#: addressbook/gui/widgets/e-addressbook-view.c:675
 #, fuzzy
 msgid "Manager"
 msgstr "Localizador (Pager)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 #, fuzzy
 msgid "Nickname"
 msgstr "_Sobrenome:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-view.c:678
 #, fuzzy
 msgid "Spouse"
 msgstr "_Cónxuxe:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: addressbook/gui/widgets/e-addressbook-view.c:679
 #, fuzzy
 msgid "Note"
 msgstr "No_tas:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:606
-#, fuzzy
-msgid "Click here to add a contact"
-msgstr "<prema aquí para seleccionar unha data>"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-minicard-control.c:282
 msgid "Save in addressbook"
 msgstr "Gardar no libro de enderezos"
 
-#: addressbook/gui/widgets/e-minicard-view.c:141
+#: addressbook/gui/widgets/e-minicard-view.c:166
 msgid ""
 "\n"
 "\n"
@@ -1256,7 +1371,7 @@ msgstr ""
 "\n"
 "Faga dobre clic aquí para crear un novo Contacto."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 msgid "Card View"
 msgstr ""
 
@@ -1444,126 +1559,127 @@ msgstr ""
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:233
+#: calendar/gui/calendar-commands.c:266
 msgid "File not found"
 msgstr "Ficheiro non atopado"
 
-#: calendar/gui/calendar-commands.c:257
+#: calendar/gui/calendar-commands.c:290
 msgid "Open calendar"
 msgstr "Abrir axenda"
 
-#: calendar/gui/calendar-commands.c:299
+#: calendar/gui/calendar-commands.c:332
 msgid "Save calendar"
 msgstr "Gardar axenda"
 
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:468
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
-#: calendar/gui/e-calendar-table.c:329
+#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
+#: calendar/gui/e-calendar-table.c:330
 msgid "Public"
 msgstr "Público"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
+#: calendar/gui/e-calendar-table.c:331
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
+#: calendar/gui/e-calendar-table.c:332
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
-#: calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1592
+#: calendar/gui/event-editor.c:1619
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
 msgid "High"
 msgstr "Alta"
 
-#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
-#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
+#: calendar/gui/calendar-model.c:1569
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
 msgid "Low"
 msgstr "Baixa"
 
-#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
+#: calendar/gui/e-calendar-table.c:406
 msgid "Transparent"
 msgstr "Transparente"
 
-#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
+#: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:426
 msgid "Not Started"
 msgstr "Non Iniciada"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:427
 msgid "In Progress"
 msgstr "En Progreso"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:428
 #, fuzzy
 msgid "Completed"
 msgstr "% Comp_leta:"
 
-#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
+#: camel/camel-service.c:586
 #, fuzzy
 msgid "Cancelled"
 msgstr "Cancelar"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:285
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:805
+#: calendar/gui/calendar-model.c:799
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1574,24 +1690,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:885
+#: calendar/gui/calendar-model.c:879
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
-#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
-#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
-#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
-#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
-#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
-#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
+#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
+#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
+#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
+#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1129
+#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
+#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:967
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1601,39 +1716,39 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1013
+#: calendar/gui/calendar-model.c:1007
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "A porcentaxe ten que ser un valor entre 0 e 100, inclusive"
 
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1048
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/calendar-model.c:1061
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:355
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1108
+#: calendar/gui/calendar-model.c:1102
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1598
+#: calendar/gui/calendar-model.c:1571
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1600
+#: calendar/gui/calendar-model.c:1573
 #, fuzzy
 msgid "Assigned"
 msgstr "Asignar Puntuación"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 #, fuzzy
 msgid "No"
 msgstr "Agora"
@@ -1706,25 +1821,25 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:73
+#: calendar/gui/alarm-notify/notify-main.c:77
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "Non foi posible crear o directorio temporal: %s"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+#: calendar/gui/dialogs/alarm-notify-dialog.c:189
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarma o %A, %d de %b de %Y, %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
+#: calendar/gui/dialogs/alarm-notify-dialog.c:196
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "Notificación da súa cita o %A, %d de %b de %Y, %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
+#: calendar/gui/dialogs/alarm-notify-dialog.c:207
 msgid "No summary available."
 msgstr ""
 
@@ -1817,7 +1932,7 @@ msgid "Display options"
 msgstr "_Visualizar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:162
 msgid "Due Date"
 msgstr ""
 
@@ -1838,7 +1953,7 @@ msgid "Fri"
 msgstr "Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
 msgid "Friday"
 msgstr "Venres"
 
@@ -1868,7 +1983,7 @@ msgid "Mon"
 msgstr "Lun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
 msgid "Monday"
 msgstr "Luns"
 
@@ -1881,11 +1996,12 @@ msgid "Overdue Items:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: mail/mail-config.glade.h:45
 msgid "Pick a color"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:165
 msgid "Priority"
 msgstr "Prioridade"
 
@@ -1905,7 +2021,7 @@ msgid "Sat"
 msgstr "Sáb"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:482
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -1932,7 +2048,7 @@ msgid "Sun"
 msgstr "Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:483
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -1946,7 +2062,7 @@ msgid "Thu"
 msgstr "Xov"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
 msgid "Thursday"
 msgstr "Xoves"
 
@@ -1968,7 +2084,7 @@ msgid "Tue"
 msgstr "Mar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -1981,7 +2097,7 @@ msgid "Wed"
 msgstr "Mér"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
 msgid "Wednesday"
 msgstr "Mércores"
 
@@ -1995,46 +2111,46 @@ msgid "minutes before they occur."
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:78
 msgid "seconds."
 msgstr "segundos."
 
-#: calendar/gui/dialogs/delete-comp.c:68
+#: calendar/gui/dialogs/delete-comp.c:70
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 "¿Está seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:73
 #, fuzzy
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 "¿Está seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:77
+#: calendar/gui/dialogs/delete-comp.c:79
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 "¿Está seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:82
 #, fuzzy
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 "¿Está seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:86
+#: calendar/gui/dialogs/delete-comp.c:88
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 "¿Está seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:89
+#: calendar/gui/dialogs/delete-comp.c:91
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
@@ -2051,7 +2167,7 @@ msgid "% Comp_lete:"
 msgstr "% Comp_leta:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:158
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Clasificación"
@@ -2124,318 +2240,331 @@ msgstr "_Prioridade:"
 msgid "_Status:"
 msgstr "_Estado:"
 
-#: calendar/gui/dialogs/task-editor.c:689
+#: calendar/gui/dialogs/task-editor.c:697
 msgid "Edit Task"
 msgstr "Editar Tarefa"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
+#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
 msgid "No summary"
 msgstr "Sen resume"
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
+#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
+#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:157
 #, fuzzy
 msgid "Categories"
 msgstr "categorías"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:159
 #, fuzzy
 msgid "Completion Date"
 msgstr "Completada"
 
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:160
 #, fuzzy
 msgid "End Date"
 msgstr "Hora de _finalización:"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:161
 #, fuzzy
 msgid "Start Date"
 msgstr "Data de _Inicio:"
 
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:163
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:164
 #, fuzzy
 msgid "Percent complete"
 msgstr "Marcar a tarefa como completa"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:166
 #, fuzzy
 msgid "Summary"
 msgstr "_Resume"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:167
 #, fuzzy
 msgid "Transparency"
 msgstr "Transparente"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:168
 #, fuzzy
 msgid "URL"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/e-calendar-table.c:169
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.c:169
+#: calendar/gui/e-calendar-table.c:170
 #, fuzzy
 msgid "Click here to add a task"
 msgstr "Prema aquí para o libro de enderezos"
 
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:374
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:375
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:376
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:377
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:378
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:379
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:380
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:381
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:382
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:383
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:384
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:550
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark Complete"
 msgstr "Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:551
+#: calendar/gui/e-calendar-table.c:552
 msgid "Mark the task complete"
 msgstr "Marcar a tarefa como completa"
 
-#: calendar/gui/e-calendar-table.c:556
+#: calendar/gui/e-calendar-table.c:557
 #, fuzzy
 msgid "Edit this task..."
 msgstr "Editar esta cita..."
 
-#: calendar/gui/e-calendar-table.c:557
+#: calendar/gui/e-calendar-table.c:558
 #, fuzzy
 msgid "Edit the task"
 msgstr "Editar Tarefa"
 
-#: calendar/gui/e-calendar-table.c:559
+#: calendar/gui/e-calendar-table.c:560
 #: ui/evolution-task-editor-dialog.xml.h:19
 #, fuzzy
 msgid "Delete this task"
 msgstr "Borrar a tarefa"
 
-#: calendar/gui/e-calendar-table.c:560
+#: calendar/gui/e-calendar-table.c:561
 msgid "Delete the task"
 msgstr "Borrar a tarefa"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
-#: calendar/gui/e-week-view-main-item.c:321
+#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
+#: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1288
-#: calendar/gui/e-week-view-main-item.c:330
+#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
+#: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d de %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
-#: calendar/gui/e-week-view-main-item.c:344
+#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-week-view-main-item.c:348
 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:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:613
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:617
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
-#: calendar/gui/print.c:612
+#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
+#: calendar/gui/print.c:616
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
-#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
+#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "New Appointment..."
+msgid "New Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
-#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
+#, fuzzy
+msgid "New All Day Event"
+msgstr "Evento de día _completo"
+
+#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
+#, fuzzy
+msgid "Go to Today"
+msgstr "Ir a hoxe"
+
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#, fuzzy
+msgid "Go to Date..."
+msgstr "Ir á data"
+
+#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
+#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
 #: ui/evolution-message-composer.xml.h:10
 #, fuzzy
 msgid "Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete this Appointment"
 msgstr "Borrar esta cita"
 
-#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
 #: ui/evolution-event-editor.xml.h:45
 #, fuzzy
 msgid "Schedule Meeting"
 msgstr "FIXME: Programar Reunión"
 
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
 #, fuzzy
 msgid "Make this Occurrence Movable"
 msgstr "Gardar o ficheiro actual"
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Borrar este elemento"
 
-#: calendar/gui/e-day-view.c:3047
+#: calendar/gui/e-day-view.c:3179
 #, fuzzy
 msgid "Delete all Occurrences"
 msgstr "Borrar un contacto"
 
-#: calendar/gui/e-itip-control.c:153
+#: calendar/gui/e-itip-control.c:161
 #, fuzzy
 msgid "I couldn't update your calendar file!\n"
 msgstr "Non foi posible crear un calendario en `%s'"
 
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
+#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
 #, fuzzy
 msgid "Component successfully updated."
 msgstr "Ficheiros de Evolution instalados con éxito."
 
-#: calendar/gui/e-itip-control.c:165
+#: calendar/gui/e-itip-control.c:173
 msgid "There was an error loading the calendar file."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:189
+#: calendar/gui/e-itip-control.c:197
 msgid "I couldn't open your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
+#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
 msgid "I couldn't load your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:462
+#: calendar/gui/e-itip-control.c:470
 #, fuzzy
 msgid "I couldn't read your calendar file!\n"
 msgstr "Non foi posible crear un calendario en `%s'"
 
-#: calendar/gui/e-itip-control.c:475
+#: calendar/gui/e-itip-control.c:483
 msgid "This is a reply from someone who was uninvited!"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:491
+#: calendar/gui/e-itip-control.c:499
 #, fuzzy
 msgid "I couldn't update your calendar store."
 msgstr "Non foi posible crear un calendario en `%s'"
 
-#: calendar/gui/e-itip-control.c:532
+#: calendar/gui/e-itip-control.c:540
 msgid "I couldn't delete the calendar component!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:542
+#: calendar/gui/e-itip-control.c:550
 #, fuzzy
 msgid "Component successfully deleted."
 msgstr "Ficheiros de Evolution instalados con éxito."
 
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:694
 #, fuzzy
 msgid "I don't recognize this type of calendar component."
 msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:780
 #, fuzzy
 msgid "Add to Calendar"
 msgstr "Axenda"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:814
 #, fuzzy
-msgid "Accept"
+msgid " Accept "
 msgstr "Contas"
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:815
 #, fuzzy
-msgid "Decline"
+msgid " Decline "
 msgstr "Eliminar"
 
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
+#: calendar/gui/e-itip-control.c:816
+msgid " Tentative "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:852
+#: calendar/gui/e-itip-control.c:860
 #, fuzzy
 msgid "Update Calendar"
 msgstr "_Abrir axenda"
 
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:883
 #, fuzzy
 msgid "Cancel Meeting"
 msgstr "FIXME: Programar Reunión"
@@ -2454,7 +2583,7 @@ msgstr ""
 msgid "Calendar Message"
 msgstr "Axenda"
 
-#: calendar/gui/e-itip-control.glade.h:5
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
 #, fuzzy
 msgid "Date:"
 msgstr "Pegar"
@@ -2469,9 +2598,10 @@ msgstr "Imprimir axenda"
 msgid "Organizer:"
 msgstr "Organización:"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
-msgid "Sender"
-msgstr "Autor"
+#: calendar/gui/e-itip-control.glade.h:10
+#, fuzzy
+msgid "Server Message:"
+msgstr "Mover Mensaxe"
 
 #: calendar/gui/e-itip-control.glade.h:11
 #, fuzzy
@@ -2564,30 +2694,30 @@ msgid ""
 "Time"
 msgstr "FIXME: Programar Reunión"
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
-#: mail/message-list.c:1171
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
+#: mail/message-list.c:1052
 #, fuzzy
 msgid "Status"
 msgstr "_Estado:"
 
-#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
-#: calendar/gui/e-tasks.c:501
+#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
+#: calendar/gui/e-tasks.c:502
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:154
+#: calendar/gui/e-tasks.c:155
 #, fuzzy
 msgid "Category:"
 msgstr ""
 "\n"
 "Categorías: "
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:298
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Non foi posible cargar a axenda en `%s'"
 
-#: calendar/gui/e-tasks.c:309
+#: calendar/gui/e-tasks.c:310
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "O método requirido para cargar `%s' non está soportado"
@@ -2595,11 +2725,16 @@ msgstr "O método requirido para cargar `%s' non está soportado"
 #. 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:338
+#: calendar/gui/e-week-view-main-item.c:342
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: calendar/gui/e-week-view.c:3255
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+#, fuzzy
+msgid "New Appointment..."
+msgstr "Nova cita..."
+
+#: calendar/gui/e-week-view.c:3314
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Fontes"
@@ -2642,7 +2777,7 @@ msgid "No recurrence"
 msgstr "Fontes"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1577
+#: calendar/gui/event-editor.c:1579
 msgid "Play a sound"
 msgstr ""
 
@@ -2667,24 +2802,24 @@ msgid "Reminder"
 msgstr "Autor"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1586
+#: calendar/gui/event-editor.c:1588
 #, fuzzy
 msgid "Run a program"
 msgstr "_Executar programa:"
 
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1583
+#: calendar/gui/event-editor.c:1585
 #, fuzzy
 msgid "Send an email"
 msgstr "Recibindo correo de %s"
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
 #, fuzzy
 msgid "Settings..."
 msgstr "_Configuración"
 
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1580
+#: calendar/gui/event-editor.c:1582
 #, fuzzy
 msgid "Show a dialog"
 msgstr "Amosar un día"
@@ -2706,12 +2841,11 @@ msgstr "Hora de _comezo:"
 msgid "_Starting date:"
 msgstr "Data de _comezo:"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
 msgid "after"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
 msgid "before"
 msgstr ""
 
@@ -2738,7 +2872,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr "horas"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
 #, fuzzy
 msgid "minute(s)"
 msgstr "minutos"
@@ -2765,109 +2899,109 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: calendar/gui/event-editor.c:371
+#: calendar/gui/event-editor.c:373
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/event-editor.c:449
+#: calendar/gui/event-editor.c:451
 msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
 msgid "day"
 msgstr "día"
 
-#: calendar/gui/event-editor.c:601
+#: calendar/gui/event-editor.c:603
 #, fuzzy
 msgid "on the"
 msgstr "mes"
 
-#: calendar/gui/event-editor.c:608
+#: calendar/gui/event-editor.c:610
 #, fuzzy
 msgid "th"
 msgstr "4"
 
-#: calendar/gui/event-editor.c:754
+#: calendar/gui/event-editor.c:756
 #, fuzzy
 msgid "occurrences"
 msgstr "Fontes"
 
-#: calendar/gui/event-editor.c:871
+#: calendar/gui/event-editor.c:873
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1532
+#: calendar/gui/event-editor.c:1534
 #, fuzzy, c-format
 msgid " %d days"
 msgstr "días"
 
-#: calendar/gui/event-editor.c:1534
+#: calendar/gui/event-editor.c:1536
 #, fuzzy
 msgid " 1 day"
 msgstr "Amosar un día"
 
-#: calendar/gui/event-editor.c:1537
+#: calendar/gui/event-editor.c:1539
 #, fuzzy, c-format
 msgid " %d weeks"
 msgstr "semanas"
 
-#: calendar/gui/event-editor.c:1539
+#: calendar/gui/event-editor.c:1541
 #, fuzzy
 msgid " 1 week"
 msgstr "Amosar unha semana"
 
-#: calendar/gui/event-editor.c:1542
+#: calendar/gui/event-editor.c:1544
 #, fuzzy, c-format
 msgid " %d hours"
 msgstr "horas"
 
-#: calendar/gui/event-editor.c:1544
+#: calendar/gui/event-editor.c:1546
 #, fuzzy
 msgid " 1 hour"
 msgstr "hora"
 
-#: calendar/gui/event-editor.c:1547
+#: calendar/gui/event-editor.c:1549
 #, fuzzy, c-format
 msgid " %d minutes"
 msgstr "minutos"
 
-#: calendar/gui/event-editor.c:1549
+#: calendar/gui/event-editor.c:1551
 #, fuzzy
 msgid " 1 minute"
 msgstr "10 minutos"
 
-#: calendar/gui/event-editor.c:1552
+#: calendar/gui/event-editor.c:1554
 #, fuzzy, c-format
 msgid " %d seconds"
 msgstr " segundos"
 
-#: calendar/gui/event-editor.c:1554
+#: calendar/gui/event-editor.c:1556
 #, fuzzy
 msgid " 1 second"
 msgstr " segundos"
 
-#: calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1603
 #, fuzzy
 msgid " before start of appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/event-editor.c:1603
+#: calendar/gui/event-editor.c:1605
 #, fuzzy
 msgid " after start of appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/event-editor.c:1611
+#: calendar/gui/event-editor.c:1613
 #, fuzzy
 msgid " before end of appointment"
 msgstr "Borrar esta cita"
 
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/event-editor.c:1615
 #, fuzzy
 msgid " after end of appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
-#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
+#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
+#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
@@ -2909,14 +3043,14 @@ msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
 msgid "Factory for the sample Calendar control"
 msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
 
-#: calendar/gui/gnome-cal.c:695
+#: calendar/gui/gnome-cal.c:700
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 "Non é posible abrir a carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/gnome-cal.c:706
+#: calendar/gui/gnome-cal.c:711
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O método requirido para cargar `%s' non está soportado"
@@ -2991,202 +3125,202 @@ msgstr "outubro"
 msgid "September"
 msgstr "setembro"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:306
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Th"
 msgstr "Xo"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Sa"
 msgstr "Sa"
 
-#: calendar/gui/print.c:944
+#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tarefas"
 
 #. Day
-#: calendar/gui/print.c:1074
+#: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
 msgstr "Día actual (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1089
+#: calendar/gui/print.c:1093
 msgid "%a %d %Y"
 msgstr "%a %d de %Y"
 
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1104
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Semana actual (%s - %s)"
 
 # Isto está mal, o %a é o nome de semana
 #. Month
-#: calendar/gui/print.c:1108
+#: calendar/gui/print.c:1112
 msgid "Current month (%b %Y)"
 msgstr "Mes actual (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1115
+#: calendar/gui/print.c:1119
 msgid "Current year (%Y)"
 msgstr "Ano actual (%Y)"
 
-#: calendar/gui/print.c:1152
+#: calendar/gui/print.c:1156
 msgid "Print Calendar"
 msgstr "Imprimir axenda"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:32
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1342
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
+#: ui/evolution-mail.xml.h:52
 msgid "Print Preview"
 msgstr "Previsualizar da Impresión"
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/tasks-control.c:108
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "O URI que amosará a axenda"
@@ -3219,26 +3353,105 @@ msgid ""
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
+#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 msgid "SMTWTFS"
 msgstr "DLMMXVS"
 
-#: camel/camel-filter-driver.c:790
+#: camel/camel-cipher-context.c:169
+#, fuzzy
+msgid "Signing is not supported by this cipher"
+msgstr "O tipo especificado non está soportado neste almacenamento"
+
+#: camel/camel-cipher-context.c:207
+#, fuzzy
+msgid "Clearsigning is not supported by this cipher"
+msgstr "O tipo especificado non está soportado neste almacenamento"
+
+#: camel/camel-cipher-context.c:245
+#, fuzzy
+msgid "Verifying is not supported by this cipher"
+msgstr "O tipo especificado non está soportado neste almacenamento"
+
+#: camel/camel-cipher-context.c:286
+#, fuzzy
+msgid "Encryption is not supported by this cipher"
+msgstr "O tipo especificado non está soportado neste almacenamento"
+
+#: camel/camel-cipher-context.c:326
+#, fuzzy
+msgid "Decryption is not supported by this cipher"
+msgstr "O tipo especificado non está soportado neste almacenamento"
+
+#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#, fuzzy
+msgid "Syncing folders"
+msgstr "Sincronizando \"%s\""
+
+#: camel/camel-filter-driver.c:643
+#, fuzzy
+msgid "Unable to open spool folder"
+msgstr "Non se pode abrir o libro de enderezos"
+
+#: camel/camel-filter-driver.c:652
+#, fuzzy
+msgid "Unable to process spool folder"
+msgstr ""
+"Non foi posible crear a carpeta `%s':\n"
+"%s"
+
+#: camel/camel-filter-driver.c:666
+#, fuzzy
+msgid "Getting message %d (%d%%)"
+msgstr "Escribindo a mensaxe %d de %d"
+
+#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#, fuzzy, c-format
+msgid "Failed message %d"
+msgstr "_Mensaxe"
+
+#: camel/camel-filter-driver.c:671
+#, fuzzy
+msgid "Cannot open message"
+msgstr ""
+"Non é posible obter a mensaxe: %s\n"
+"  %s"
+
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#, fuzzy
+msgid "Syncing folder"
+msgstr "Sincronizando \"%s\""
+
+#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
+#, fuzzy
+msgid "Complete"
+msgstr "% Comp_leta:"
+
+#: camel/camel-filter-driver.c:748
+#, fuzzy, c-format
+msgid "Getting message %d of %d"
+msgstr "Escribindo a mensaxe %d de %d"
+
+#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#, fuzzy, c-format
+msgid "Failed at message %d of %d"
+msgstr "Escribindo a mensaxe %d de %d"
+
+#: camel/camel-filter-driver.c:866
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: camel/camel-filter-driver.c:795
+#: camel/camel-filter-driver.c:871
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: camel/camel-folder-search.c:323
+#: camel/camel-folder-search.c:328
 #, fuzzy, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3247,7 +3460,7 @@ msgstr ""
 "Erro na expresión regular '%s':\n"
 "%s"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:338
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3256,155 +3469,226 @@ msgstr ""
 "Erro na expresión regular '%s':\n"
 "%s"
 
-#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
+#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:554
+#: camel/camel-folder-search.c:559
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
+#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
+#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
+#: camel/camel-movemail.c:185
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Non foi posible crear o ficheiro de bloqueo para %s: %s"
 
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151 camel/camel-movemail.c:219
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:199
+#: camel/camel-lock.c:201
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:253
+#: camel/camel-lock.c:255
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:99
+#: camel/camel-movemail.c:101
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:148
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Non foi posible abrir o ficheiro de correo %s: %s"
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Non foi posible abrir o ficheiro de correo temporal %s: %s"
 
-#: camel/camel-movemail.c:197
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:243
+#: camel/camel-movemail.c:245
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Erro lendo o ficheiro de correo: %s"
 
-#: camel/camel-movemail.c:254
+#: camel/camel-movemail.c:256
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Erro escribindo o ficheiro temporal de correo: %s"
 
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:274
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Erro ó almacenar o correo no ficheiro temporal %s: %s"
 
-#: camel/camel-movemail.c:304
+#: camel/camel-movemail.c:306
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Non foi posible crear unha canalización: %s"
 
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:318
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Non foi posible facer fork: %s"
 
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:356
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "O programa movemail fallou: %s"
 
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:357
 msgid "(Unknown error)"
 msgstr "(Erro descoñecido)"
 
-#: camel/camel-provider.c:137
+#: camel/camel-movemail.c:587
+#, fuzzy, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "Erro escribindo o ficheiro temporal de correo: %s"
+
+#: camel/camel-pgp-context.c:186
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Introduza o seu contrasinal de PGP/GPG."
+
+#: camel/camel-pgp-context.c:189
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Introduza o seu contrasinal de PGP/GPG."
+
+#: camel/camel-pgp-context.c:509
+msgid "No plaintext to sign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
+#: camel/camel-pgp-context.c:1021 camel/camel-pgp-context.c:1235
+msgid "No password provided."
+msgstr "Non se indicou un contrasinal."
+
+#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
+#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1028
+#: camel/camel-pgp-context.c:1242
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Non foi posible crear unha canalización co GPG/PGP: %s"
+
+#: camel/camel-pgp-context.c:681
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:871
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:888
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Non foi posible crear unha canalización: %s"
+
+#: camel/camel-pgp-context.c:1011
+msgid "No plaintext to encrypt."
+msgstr ""
+
+#: camel/camel-pgp-context.c:1037
+msgid "No recipients specified"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1227
+msgid "No ciphertext to decrypt."
+msgstr ""
+
+#: camel/camel-provider.c:131
+#, c-format
+msgid "Could not load %s: Module loading not supported on this system."
+msgstr ""
+
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Non foi posible cargar %s: %s"
 
-#: camel/camel-provider.c:145
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:181
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:185
+#: camel/camel-remote-store.c:190
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:232
+#: camel/camel-remote-store.c:240
 #, fuzzy
 msgid "Connection cancelled"
 msgstr "Cancelada"
 
-#: camel/camel-remote-store.c:235
-#: camel/providers/smtp/camel-smtp-transport.c:244
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:261
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Non foi posible conectarse a %s (porto %d): %s"
 
-#: camel/camel-remote-store.c:236
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(máquina descoñecida)"
 
-#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
-#: camel/camel-remote-store.c:448
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
+#: camel/camel-remote-store.c:458
+#: camel/providers/imap/camel-imap-command.c:264
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Abrir axenda"
 
-#: camel/camel-remote-store.c:453
+#: camel/camel-remote-store.c:464
 #, fuzzy
 msgid "Server unexpectedly disconnected"
 msgstr "O servidor rexeitou o nome de usuario"
 
-#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#: camel/camel-sasl-anonymous.c:33
+msgid "Anonymous"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:35
+#, fuzzy
+msgid "This option will connect to the server using an anonymous login."
+msgstr ""
+"Esta opción conectarase ó servidor IMAP usando un contrasinal sen cifrar."
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autenticación"
 
-#: camel/camel-sasl-anonymous.c:106
+#: camel/camel-sasl-anonymous.c:119
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-anonymous.c:118
+#: camel/camel-sasl-anonymous.c:131
 #, fuzzy, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -3413,7 +3697,7 @@ msgstr ""
 "Erro cargando a información do filtro:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:130
+#: camel/camel-sasl-anonymous.c:143
 #, fuzzy, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -3422,11 +3706,11 @@ msgstr ""
 "Erro cargando a información do filtro:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+#: camel/camel-sasl-cram-md5.c:35
 msgid "CRAM-MD5"
 msgstr ""
 
-#: camel/camel-sasl-cram-md5.c:34
+#: camel/camel-sasl-cram-md5.c:37
 #, fuzzy
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
@@ -3434,11 +3718,11 @@ msgid ""
 msgstr ""
 "Esta opción conectarase ó servidor IMAP usando autenticación Kerberos 4."
 
-#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+#: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:39
+#: camel/camel-sasl-digest-md5.c:45
 #, fuzzy
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
@@ -3446,109 +3730,113 @@ msgid ""
 msgstr ""
 "Esta opción conectarase ó servidor IMAP usando un contrasinal sen cifrar."
 
-#: camel/camel-sasl-digest-md5.c:761
+#: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:770
+#: camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge invalid\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:776
+#: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:798
+#: camel/camel-sasl-digest-md5.c:847
 msgid "Server response did not contain authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:816
+#: camel/camel-sasl-digest-md5.c:865
 msgid "Server response contained incomplete authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:826
+#: camel/camel-sasl-digest-md5.c:875
 msgid "Server response does not match\n"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:38
+#: camel/camel-sasl-kerberos4.c:40
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-kerberos4.c:42
 #, fuzzy
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "Esta opción conectarase ó servidor IMAP usando autenticación Kerberos 4."
 
-#: camel/camel-sasl-kerberos4.c:158
+#: camel/camel-sasl-kerberos4.c:161
 #, fuzzy, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr "Non foi posible crear unha canalización: %s"
 
-#: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:381
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:417
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Resposta non agardada do servidor IMAP: %s"
 
-#: camel/camel-sasl-plain.c:29
-msgid "PLAIN"
-msgstr ""
-
-#: camel/camel-sasl-plain.c:31
+#: camel/camel-sasl-plain.c:34
 #, fuzzy
-msgid ""
-"This option will connect to the server using a the PLAIN SASL mechanism if "
-"the server supports it."
+msgid "This option will connect to the server using a simple password."
 msgstr ""
 "Esta opción conectarase ó servidor IMAP usando un contrasinal sen cifrar."
 
-#: camel/camel-search-private.c:105
+#: camel/camel-search-private.c:110
 #, fuzzy, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Erro escribindo á caixa de correo temporal: %s"
 
-#: camel/camel-service.c:142
+#: camel/camel-service.c:152
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "O URL '%s' necesita unha parte co nome do usuario"
 
-#: camel/camel-service.c:151
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "O URL '%s' necesita unha parte co nome de máquina"
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:168
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte co camiño"
 
-#: camel/camel-service.c:512
+#: camel/camel-service.c:554
+#, fuzzy, c-format
+msgid "Resolving: %s"
+msgstr "Probando \"%s\""
+
+#: camel/camel-service.c:581
+#, c-format
+msgid "Failure in name lookup: %s"
+msgstr ""
+
+#: camel/camel-service.c:606
 #, c-format
-msgid "No such host %s."
+msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:515
+#: camel/camel-service.c:608
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
+msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:54
+#: camel/camel-session.c:57
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:59
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:322
+#: camel/camel-session.c:274 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Non hai ningún fornecedor dispoñible para o protocolo `%s'"
 
-#: camel/camel-session.c:417
+#: camel/camel-session.c:462
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3558,121 +3846,149 @@ msgstr ""
 "%s"
 
 #. Fill in the new fields
-#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
-#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
+#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
 #, fuzzy
 msgid "Trash"
 msgstr "Tarefa"
 
-#: camel/camel-url.c:77
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "O URL `%s' non contén ningún protocolo"
-
-#: camel/camel-url.c:92
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "O URL `%s' contén un protocolo non válido"
+#: camel/camel-url.c:289
+#, fuzzy, c-format
+msgid "Could not parse URL `%s'"
+msgstr ""
+"Non foi posible abrir o ficheiro `%s':\n"
+"%s"
 
-#: camel/camel-url.c:152
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "O número de porto no URL `%s' non é numérico"
+#: camel/camel-vee-folder.c:451
+#, fuzzy, c-format
+msgid "No such message %s in %s"
+msgstr "Re-enviar esta mensaxe"
 
-#: camel/camel-vee-folder.c:960
+#: camel/camel-vee-folder.c:545
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "Re-enviar esta mensaxe"
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:209
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta non agardada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:217
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
+#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:272
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:433
+#: camel/providers/imap/camel-imap-command.c:456
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:469
+#: camel/providers/imap/camel-imap-command.c:490
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:172
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:329
+#: camel/providers/imap/camel-imap-folder.c:351
 #, fuzzy
 msgid "Scanning IMAP folder"
 msgstr "Examinando as carpetas en \"%s\""
 
-#: camel/providers/imap/camel-imap-folder.c:837
-#: camel/providers/imap/camel-imap-folder.c:999
+#: camel/providers/imap/camel-imap-folder.c:986
+#: camel/providers/imap/camel-imap-folder.c:1197
+#, fuzzy
+msgid "This message is not currently available"
+msgstr ""
+"Esta mensaxe non ten asunto.\n"
+"¿Enviar realmente?"
+
+#: camel/providers/imap/camel-imap-folder.c:1016
+#: camel/providers/imap/camel-imap-folder.c:1231
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Checking for new mail"
+msgstr "Crear un novo contacto"
 
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Check for new messages in all folders"
+msgstr "Marcando mensaxes na carpeta \"%s\""
+
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+msgid "Folders"
+msgstr "Carpetas"
+
+#: camel/providers/imap/camel-imap-provider.c:50
+#, fuzzy
+msgid "Show only subscribed folders"
+msgstr "Abrindo as mensaxes da carpeta \"%s\""
+
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:54
 #, fuzzy
-msgid "Secure IMAPv4"
+msgid "Namespace"
+msgstr "Nome:"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Apply filters to new messages in INBOX on this server"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:63
+msgid "IMAPv4"
 msgstr "IMAPv4"
 
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "For reading and storing mail on IMAP servers over an SSL connection."
+#: camel/providers/imap/camel-imap-provider.c:65
+msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:263
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Esta opción conectarase ó servidor IMAP usando un contrasinal sen cifrar."
 
-#: camel/providers/imap/camel-imap-store.c:415
+#: camel/providers/imap/camel-imap-store.c:440
 #, fuzzy, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "Non foi posible conectarse ó servidor POP.\n"
 "Non se soporta o mecanismo de autenticación solicitado."
 
-#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap/camel-imap-store.c:450
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autenticación"
 
-#: camel/providers/imap/camel-imap-store.c:454
+#: camel/providers/imap/camel-imap-store.c:475
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIntroduza o contrasinal IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:469
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:403
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:498
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: camel/providers/imap/camel-imap-store.c:518
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3683,90 +3999,99 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:772
+#: camel/providers/imap/camel-imap-store.c:865
+#, fuzzy, c-format
+msgid "%s is not a selectable folder"
+msgstr "Ver carpeta seleccionada"
+
+#: camel/providers/imap/camel-imap-store.c:879
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Non foi posible crear o directorio %s: %s"
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/imap/camel-imap-store.c:1382
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:39
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "`%s' non é un directorio."
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:40
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:49
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:50
 msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:58
+#: camel/providers/local/camel-local-provider.c:59
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:128
+#: camel/providers/local/camel-local-store.c:129
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:135
+#: camel/providers/local/camel-local-store.c:136
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "`%s' non é un ficheiro regular."
 
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:144
+#: camel/providers/local/camel-local-store.c:160
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Non é posible facer un fork a %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:175
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:241
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Non foi posible renomear a carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:283
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Non foi posible borrar a carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:293
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Non foi posible borrar a carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
+#: camel/providers/local/camel-maildir-folder.c:150
+#: camel/providers/local/camel-maildir-folder.c:158
+#: camel/providers/local/camel-maildir-folder.c:169
 #, fuzzy, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Non é posible engadir a mensaxe á carpeta mh: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:197
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:217
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-mh-folder.c:194
+#: camel/providers/local/camel-mh-folder.c:202
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3775,20 +4100,20 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:197
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
 #, fuzzy
 msgid "No such message"
 msgstr "Re-enviar esta mensaxe"
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:203
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
+#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -3797,15 +4122,15 @@ msgstr ""
 "Non é posible abrir a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
+#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "A carpeta `%s' non existe."
 
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3814,36 +4139,41 @@ msgstr ""
 "Non foi posible crear a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:120
+#: camel/providers/local/camel-maildir-store.c:122
 #, fuzzy, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' non é un directorio."
 
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
+#: camel/providers/local/camel-maildir-store.c:151
+#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Non foi posible borrar a carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:150
+#: camel/providers/local/camel-maildir-store.c:152
 #, fuzzy
 msgid "not a maildir directory"
 msgstr "`%s' non é un directorio."
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:152
+#, fuzzy, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "Non é posible facer un fork a %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:203
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Non é posible abrir a caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Non é posible engadir a mensaxe á carpeta mh: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:335
+#: camel/providers/local/camel-mbox-folder.c:367
+#: camel/providers/local/camel-mbox-folder.c:380
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3852,15 +4182,15 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:368
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:381
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:92
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -3869,7 +4199,7 @@ msgstr ""
 "Non foi posible abrir o ficheiro `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -3878,14 +4208,14 @@ msgstr ""
 "Non foi posible crear o ficheiro `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' non é un ficheiro regular."
 
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3894,117 +4224,117 @@ msgstr ""
 "Non foi posible borrar a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:151
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "A carpeta `%s' non está baleira. Non borrada."
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:240
+#: camel/providers/local/camel-mbox-summary.c:248
 #, fuzzy
 msgid "Summarising folder"
 msgstr "Sincronizando \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:245
+#: camel/providers/local/camel-mbox-summary.c:253
 #, fuzzy, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 "Non é posible abrir a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:287
+#: camel/providers/local/camel-mbox-summary.c:295
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:362
+#: camel/providers/local/camel-mbox-summary.c:370
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Non é posible facer un fork a %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
+#: camel/providers/local/camel-mbox-summary.c:501
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Sincronizando \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:506
+#: camel/providers/local/camel-mbox-summary.c:707
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 "Non é posible abrir a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:523
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Non é posible abrir a caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
 #: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:556
 #: camel/providers/local/camel-mbox-summary.c:745
+#: camel/providers/local/camel-mbox-summary.c:753
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:591
+#: camel/providers/local/camel-mbox-summary.c:599
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erro escribindo á caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:608
+#: camel/providers/local/camel-mbox-summary.c:616
 #, fuzzy, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Erro escribindo á caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
+#: camel/providers/local/camel-mbox-summary.c:634
+#: camel/providers/local/camel-mbox-summary.c:803
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Non foi posible pechar a carpeta orixe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:643
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Non foi posible pechar a carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:646
+#: camel/providers/local/camel-mbox-summary.c:654
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posible renomear a carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:870
+#: camel/providers/local/camel-mbox-summary.c:878
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro descoñecido: %s"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:149
+#: camel/providers/local/camel-mh-folder.c:157
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Non é posible engadir a mensaxe á carpeta mh: %s"
 
-#: camel/providers/local/camel-mh-store.c:108
+#: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' non é un directorio."
 
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Introduza o contrasinal NNTP para %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:62
+#: camel/providers/nntp/camel-nntp-auth.c:66
 msgid "Server rejected username"
 msgstr "O servidor rexeitou o nome de usuario"
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:72
 msgid "Failed to send username to server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:81
 msgid "Server rejected username/password"
 msgstr "O servidor rexeitou o nome de usuario/contrasinal"
 
@@ -4028,11 +4358,11 @@ msgstr ""
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
@@ -4059,35 +4389,50 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:145
+#: camel/providers/pop3/camel-pop3-folder.c:149
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:188
+#: camel/providers/pop3/camel-pop3-folder.c:192
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:282
+#: camel/providers/pop3/camel-pop3-folder.c:285
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:286
+#: camel/providers/pop3/camel-pop3-folder.c:289
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:304
+#: camel/providers/pop3/camel-pop3-folder.c:307
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
+#, fuzzy
+msgid "Message storage"
+msgstr "Corpo da Mensaxe"
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+#, fuzzy
+msgid "Leave messages on server"
+msgstr "Non borrar as mensaxes do servidor"
+
+#: camel/providers/pop3/camel-pop3-provider.c:41
+#, fuzzy, c-format
+msgid "Delete after %s day(s)"
+msgstr "Borrar a tarefa"
+
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-provider.c:50
 msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
@@ -4096,22 +4441,7 @@ msgstr ""
 "recibir correo de certos provedores de correo web, e de sistemas de email "
 "propietarios."
 
-#: camel/providers/pop3/camel-pop3-provider.c:54
-msgid "Secure POP"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:56
-#, fuzzy
-msgid ""
-"For connecting to POP servers over an SSL connection. The POP protocol can "
-"also be used to retrieve mail from certain web mail providers and "
-"proprietary email systems."
-msgstr ""
-"Para conectarse a servidores POP. O protocolo POP tamén se pode usar para "
-"recibir correo de certos provedores de correo web, e de sistemas de email "
-"propietarios."
-
-#: camel/providers/pop3/camel-pop3-store.c:147
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4119,7 +4449,7 @@ msgstr ""
 "Esta opción conectarase ó servidor POP usando un contrasinal sen cifrar. "
 "Esta é a única opción que soportan moitos servidores POP."
 
-#: camel/providers/pop3/camel-pop3-store.c:157
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4129,28 +4459,28 @@ msgstr ""
 "través do protocolo APOP. Pode que isto non funcione para tódolos usuarios, "
 "mesmo naqueles que indican que o soportan."
 
-#: camel/providers/pop3/camel-pop3-store.c:169
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Isto conectarase ó servidor POP e usará Kerberos 4 para autenticarse con el."
 
-#: camel/providers/pop3/camel-pop3-store.c:214
+#: camel/providers/pop3/camel-pop3-store.c:207
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Non foi posible autenticarse co servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:331
+#: camel/providers/pop3/camel-pop3-store.c:319
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Non foi posible conectarse ó servidor POP en %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:378
+#: camel/providers/pop3/camel-pop3-store.c:358
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sIntroduza o contrasinal POP3 para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:377
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4159,12 +4489,12 @@ msgstr ""
 "Non foi posible conectarse ó servidor POP.\n"
 "Erro enviando o nome de usuario: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:400
-#: camel/providers/pop3/camel-pop3-store.c:437
+#: camel/providers/pop3/camel-pop3-store.c:380
+#: camel/providers/pop3/camel-pop3-store.c:417
 msgid "(Unknown)"
 msgstr "(Descoñecido)"
 
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:407
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4172,7 +4502,7 @@ msgstr ""
 "Non foi posible conectarse ó servidor POP.\n"
 "Non se soporta o mecanismo de autenticación solicitado."
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:415
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4181,372 +4511,369 @@ msgstr ""
 "Non foi posible conectarse ó servidor POP.\n"
 "Erro enviando o contrasinal: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Non existe a carpeta `%s'."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:57
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 "Para entregar o correo pasándollo ó programa \"sendmail\" no sistema local."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Non foi posible crear unha canalización para o sendmail: %s: correo non "
 "enviado"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Non foi posible facer fork para o sendmail: %s: correo non enviado"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#: camel/providers/sendmail/camel-sendmail-transport.c:150
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Non foi posible enviar a mensaxe: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "o sendmail saíu co sinal %s: correo non enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Non foi posible executar %s: correo non enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#: camel/providers/sendmail/camel-sendmail-transport.c:175
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "o sendmail saíu con estado %d: correo non enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
 #, fuzzy
 msgid "Could not find 'From' address in message"
 msgstr "Non foi posible enviar a mensaxe: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:245
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:249
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correo a través do programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:36
+#: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:53
-msgid "Secure SMTP"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-provider.c:55
-msgid ""
-"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
-"connection.\n"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:175
 #, fuzzy
 msgid "Help message"
 msgstr "Editar Mensaxe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:177
 #, fuzzy
 msgid "Service ready"
 msgstr "Agochar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:207
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Non se indicou un contrasinal."
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:211
 #, fuzzy
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "Non foi posible conectarse ó servidor POP.\n"
 "Non se soporta o mecanismo de autenticación solicitado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:213
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autenticación"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:215
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autenticación"
 
-#: camel/providers/smtp/camel-smtp-transport.c:286
+#: camel/providers/smtp/camel-smtp-transport.c:305
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:348
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
+msgstr ""
+"Non foi posible conectarse ó servidor POP.\n"
+"Non se soporta o mecanismo de autenticación solicitado."
+
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIntroduza o contrasinal IMAP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:466
-#, fuzzy
-msgid "No authentication required"
-msgstr "Autenticación"
-
-#: camel/providers/smtp/camel-smtp-transport.c:468
-#, fuzzy
+#: camel/providers/smtp/camel-smtp-transport.c:411
+#, fuzzy, c-format
 msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
 msgstr ""
-"Esta opción conectarase ó servidor POP usando un contrasinal sen cifrar. "
-"Esta é a única opción que soportan moitos servidores POP."
+"Non foi posible autenticarse co servidor IMAP.\n"
+"%s\n"
+"\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:511
+#: camel/providers/smtp/camel-smtp-transport.c:527
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:529
 #, fuzzy, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correo a través do programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:554
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:561
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:559
+#: camel/providers/smtp/camel-smtp-transport.c:575
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
-#: camel/providers/smtp/camel-smtp-transport.c:719
+#: camel/providers/smtp/camel-smtp-transport.c:721
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:736
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Non foi posible executar %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:777
+#: camel/providers/smtp/camel-smtp-transport.c:798
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta non agardada do servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:824
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:821
+#: camel/providers/smtp/camel-smtp-transport.c:843
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:846
+#: camel/providers/smtp/camel-smtp-transport.c:868
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "Non foi posible crear unha canalización para o sendmail: %s: correo non "
 "enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:865
+#: camel/providers/smtp/camel-smtp-transport.c:887
 #, fuzzy, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Non foi posible executar %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:896
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Non foi posible executar %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:915
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, fuzzy, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Non foi posible facer fork para o sendmail: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:930
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:952
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "o sendmail saíu co sinal %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:967
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:1013
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1010
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Erro descoñecido: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1033
+#: camel/providers/smtp/camel-smtp-transport.c:1055
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1052
+#: camel/providers/smtp/camel-smtp-transport.c:1074
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:95
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:97
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:112
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:413
+#: composer/e-msg-composer-attachment-bar.c:421
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Incluír un ficheiro"
 
-#: composer/e-msg-composer-attachment-bar.c:461
+#: composer/e-msg-composer-attachment-bar.c:469
 msgid "Remove selected items from the attachment list"
 msgstr "Quitar os elementos seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Add attachment..."
 msgstr "Engadir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:501
 msgid "Attach a file to the message"
 msgstr "Incluír un ficheiro como anexo na mensaxe"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
-#: ui/evolution-mail.xml.h:1
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
 #, fuzzy
 msgid "Attachment"
 msgstr "anexo"
@@ -4573,52 +4900,52 @@ msgstr "Tipo MIME:"
 msgid "Send as:"
 msgstr "Autor"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:321
 msgid "Click here for the address book"
 msgstr "Prema aquí para o libro de enderezos"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:377
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:381
+#: composer/e-msg-composer-hdrs.c:388
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduza os enderezos que recibirán unha copia da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:392
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4626,7 +4953,7 @@ msgstr ""
 "Introduza os enderezos que recibirán unha copia da mensaxe sen apareceren na "
 "lista de destinatarios."
 
-#: composer/e-msg-composer.c:518
+#: composer/e-msg-composer.c:528
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4635,26 +4962,32 @@ msgstr ""
 "Non foi posible abrir o ficheiro de sinatura %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:706
+#: composer/e-msg-composer.c:716
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: composer/e-msg-composer.c:717
+#: composer/e-msg-composer.c:727
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:737
+#: composer/e-msg-composer.c:747
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
+#: composer/e-msg-composer.c:819
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+
+#: composer/e-msg-composer.c:877 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:206
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:824
+#: composer/e-msg-composer.c:883
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4664,27 +4997,27 @@ msgstr ""
 "\n"
 "¿Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:849
+#: composer/e-msg-composer.c:908
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:975
+#: composer/e-msg-composer.c:1034
 msgid "That file does not exist."
 msgstr "O ficheiro non existe."
 
-#: composer/e-msg-composer.c:985
+#: composer/e-msg-composer.c:1044
 msgid "That is not a regular file."
 msgstr "Non é un ficheiro normal."
 
-#: composer/e-msg-composer.c:995
+#: composer/e-msg-composer.c:1054
 msgid "That file exists but is not readable."
 msgstr "O ficheiro existe pero non se pode ler."
 
-#: composer/e-msg-composer.c:1005
+#: composer/e-msg-composer.c:1064
 msgid "That file appeared accesible but open(2) failed."
 msgstr "O ficheiro parecía accesible pero a chamada a open(2) fallou."
 
-#: composer/e-msg-composer.c:1027
+#: composer/e-msg-composer.c:1086
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4692,25 +5025,25 @@ msgstr ""
 "O ficheiro é moi longo (máis de 100K).\n"
 "¿Está seguro de querer inserilo?"
 
-#: composer/e-msg-composer.c:1048
+#: composer/e-msg-composer.c:1107
 msgid "An error occurred while reading the file."
 msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
+#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
 msgid "Compose a message"
 msgstr "Compoñer unha mensaxe"
 
-#: composer/e-msg-composer.c:1765
+#: composer/e-msg-composer.c:1829
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:352
+#: composer/evolution-composer.c:355
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:367
+#: composer/evolution-composer.c:370
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
@@ -4730,55 +5063,81 @@ msgid "calendar information"
 msgstr "Sen Información"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
+#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:267
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
+#: e-util/e-time-utils.c:269
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:272
+#: e-util/e-time-utils.c:274
 #, fuzzy
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:283
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
+#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. strftime format of a time in 24-hour format.
+#: e-util/e-time-utils.c:315
+#, fuzzy
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S%n"
+
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
+#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
+#. strftime format of a time in 12-hour format.
+#: e-util/e-time-utils.c:323
+#, fuzzy
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p%n"
+
 #: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
 msgid "Evolution component for the executive summary."
 msgstr ""
@@ -4858,7 +5217,7 @@ msgstr "Ir ó elemento seguinte"
 msgid "Configure %s"
 msgstr "_Configurar Carpeta"
 
-#: executive-summary/component/e-summary.c:918
+#: executive-summary/component/e-summary.c:924
 #, fuzzy, c-format
 msgid ""
 "Cannot open the HTML file:\n"
@@ -4867,14 +5226,14 @@ msgstr ""
 "Non foi posible abrir o ficheiro %s:\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:932
+#: executive-summary/component/e-summary.c:938
 #, fuzzy, c-format
 msgid ""
 "Error reading data:\n"
 "%s"
 msgstr "Erro lendo o ficheiro de correo: %s"
 
-#: executive-summary/component/e-summary.c:950
+#: executive-summary/component/e-summary.c:956
 msgid "File does not have a place for the services.\n"
 msgstr ""
 
@@ -4886,7 +5245,7 @@ msgstr ""
 msgid "Background:"
 msgstr ""
 
-#: executive-summary/component/main.c:60
+#: executive-summary/component/main.c:62
 msgid ""
 "Executive summary component could not initialize Bonobo.\n"
 "If there was a warning message about the RootPOA, it probably means\n"
@@ -4920,101 +5279,101 @@ msgstr ""
 msgid "Test service"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
+#: widgets/misc/e-messagebox.c:166
 #, fuzzy
 msgid "Error"
 msgstr "Sen erro"
 
-#: executive-summary/test-service/rdf-summary.c:765
+#: executive-summary/test-service/rdf-summary.c:768
 msgid "Update automatically"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:775
+#: executive-summary/test-service/rdf-summary.c:778
 msgid "Update now"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:785
+#: executive-summary/test-service/rdf-summary.c:788
 msgid "Update every "
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
+#: executive-summary/test-service/rdf-summary.c:796
+#: filter/filter-datespec.c:83
 msgid "minutes"
 msgstr "minutos"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "year"
 msgstr "ano"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "years"
 msgstr "anos"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "month"
 msgstr "mes"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "months"
 msgstr "meses"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "week"
 msgstr "semana"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "weeks"
 msgstr "semanas"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:81
 msgid "days"
 msgstr "días"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hour"
 msgstr "hora"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hours"
 msgstr "horas"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:83
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "second"
 msgstr "segundo"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "seconds"
 msgstr "segundos"
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:199
 msgid "Oops. You have forgotten to choose a date."
 msgstr "Oops. Esqueceu escoller unha data."
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:201
 msgid "Oops. You have chosen an invalid date."
 msgstr "Oops. Escolleu unha data non válida."
 
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:275
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:282
+#: filter/filter-datespec.c:298
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:322
+#: filter/filter-datespec.c:338
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5022,67 +5381,64 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "the current time"
 msgstr "a hora actual"
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "a time you specify"
 msgstr "unha hora que especifique"
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:374
 msgid "a time relative to the current time"
 msgstr "unha relativa ó momento actual"
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:432
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
 msgid "now"
 msgstr "agora"
 
-#: filter/filter-datespec.c:690
+#: filter/filter-datespec.c:706
 msgid "<click here to select a date>"
 msgstr "<prema aquí para seleccionar unha data>"
 
-#: filter/filter-editor.c:126 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "Reglas de Filtrado"
 
 #. and now for the action area
-#: filter/filter-filter.c:424
+#: filter/filter-filter.c:453
 msgid "Then"
 msgstr "Entón"
 
-#: filter/filter-filter.c:437
+#: filter/filter-filter.c:467
 msgid "Add action"
 msgstr "Engadir acción"
 
-#: filter/filter-filter.c:443
-msgid "Remove action"
-msgstr "Eliminar acción"
-
-#: filter/filter-folder.c:143
+#: filter/filter-folder.c:147
 msgid ""
 "Oops, you forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
+#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
+#: mail/mail-account-gui.c:682
 msgid "Select Folder"
 msgstr "Seleccionar Carpeta"
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:247
 msgid "Enter folder URI"
 msgstr "Introduza o URI da carpeta"
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:293
 msgid "<click here to select a folder>"
 msgstr "<prema aquí para seleccionar unha carpeta>"
 
-#: filter/filter-input.c:189
+#: filter/filter-input.c:194
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5091,58 +5447,38 @@ msgstr ""
 "Erro na expresión regular '%s':\n"
 "%s"
 
-#: filter/filter-part.c:467
+#: filter/filter-part.c:475
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:597
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Nome da regra: "
 
-#: filter/filter-rule.c:601
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "Sen_título"
 
-#: filter/filter-rule.c:617
+#: filter/filter-rule.c:646
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:634
+#: filter/filter-rule.c:664
 msgid "Execute actions"
 msgstr "Executar accións"
 
-#: filter/filter-rule.c:638
+#: filter/filter-rule.c:668
 msgid "if all criteria are met"
 msgstr "se se cumpren tódolos criterios"
 
-#: filter/filter-rule.c:643
+#: filter/filter-rule.c:673
 msgid "if any criteria are met"
 msgstr "se se cumpre algún criterio"
 
-#: filter/filter-rule.c:654
+#: filter/filter-rule.c:684
 msgid "Add criterion"
 msgstr "Engadir criterio"
 
-#: filter/filter-rule.c:660
-msgid "Remove criterion"
-msgstr "Eliminar criterio"
-
-#: filter/filter-system-flag.c:67
-#, fuzzy
-msgid "Replied to"
-msgstr "Responder a Todos"
-
-#. { N_("Deleted"), "Deleted" },
-#. { N_("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr ""
-
-#: filter/filter-system-flag.c:71
-#, fuzzy
-msgid "Read"
-msgstr "Refacer"
-
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Editar Filtros"
@@ -5166,7 +5502,7 @@ msgstr ""
 "Entrante\n"
 "Saínte\n"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Carpetas Virtuais"
 
@@ -5193,288 +5529,327 @@ msgstr ""
 msgid "with all local folders"
 msgstr "Crear unha nova carpeta"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Asignar Cor"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Asignar Puntuación"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 #, fuzzy
 msgid "Attachments"
 msgstr "anexo"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contén"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Copiar á Carpeta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Data de recepción"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Data de envío"
 
-#: filter/libfilter-i18n.h:12
-msgid "does not contain"
-msgstr "non contén"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not end with"
-msgstr "non termina en"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not exist"
-msgstr "non existe"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:16
-msgid "does not start with"
-msgstr "non empeza por"
+#: filter/libfilter-i18n.h:9
+#, fuzzy
+msgid "Deleted"
+msgstr "Eliminar"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:10
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "non existe"
 
-#: filter/libfilter-i18n.h:18
-msgid "ends with"
-msgstr "termina en"
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Draft"
+msgstr "Pegar"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Exist"
 msgstr "_Saír"
 
-#: filter/libfilter-i18n.h:20
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Expresión"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Forward to Address"
 msgstr "Reenviar ó Enderezo"
 
-#: filter/libfilter-i18n.h:23
-msgid "is"
-msgstr "é"
-
-#: filter/libfilter-i18n.h:24
-msgid "is greater than"
-msgstr "é maior que"
-
-#: filter/libfilter-i18n.h:25
-msgid "is less than"
-msgstr "é menor que"
+#: filter/libfilter-i18n.h:15
+msgid "Important"
+msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "is not"
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "Is Not"
 msgstr "non é"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Is"
+msgstr "Se"
+
+#: filter/libfilter-i18n.h:18
 #, fuzzy
 msgid "Mailing list"
 msgstr "lista de correo %s"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:19
 msgid "Message Body"
 msgstr "Corpo da Mensaxe"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:20
 #, fuzzy
 msgid "Message Header"
 msgstr "Corpo da Mensaxe"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:21
 msgid "Message was received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:22
 msgid "Message was sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:23
 msgid "Move to Folder"
 msgstr "Mover para a Carpeta"
 
-#: filter/libfilter-i18n.h:33
-msgid "on or after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
-msgid "on or before"
-msgstr ""
+#: filter/libfilter-i18n.h:24
+#, fuzzy
+msgid "Read"
+msgstr "Refacer"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:25
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:26
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1171
+#: filter/libfilter-i18n.h:27
+#, fuzzy
+msgid "Replied to"
+msgstr "Responder a Todos"
+
+#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
+#: mail/message-list.c:1052
 msgid "Score"
 msgstr "Puntuación"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:29
+msgid "Sender"
+msgstr "Autor"
+
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "Set Status"
 msgstr "_Estado:"
 
-#: filter/libfilter-i18n.h:40
-msgid "sounds like"
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "Source Account"
+msgstr "Contas"
+
+#: filter/libfilter-i18n.h:32
+msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
-msgid "Source"
+#: filter/libfilter-i18n.h:34
+msgid "Stop Processing"
 msgstr ""
 
+#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
+msgid "Subject"
+msgstr "Asunto"
+
+#: filter/libfilter-i18n.h:38
+msgid "contains"
+msgstr "contén"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not contain"
+msgstr "non contén"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not end with"
+msgstr "non termina en"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not exist"
+msgstr "non existe"
+
 #: filter/libfilter-i18n.h:42
-msgid "Specific header"
+msgid "does not sound like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
-msgid "starts with"
-msgstr ""
+msgid "does not start with"
+msgstr "non empeza por"
+
+#: filter/libfilter-i18n.h:44
+msgid "ends with"
+msgstr "termina en"
 
 #: filter/libfilter-i18n.h:45
-msgid "Stop Processing"
-msgstr ""
+msgid "exists"
+msgstr "existe"
 
-#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
-msgid "Subject"
-msgstr "Asunto"
+#: filter/libfilter-i18n.h:46
+msgid "is greater than"
+msgstr "é maior que"
 
 #: filter/libfilter-i18n.h:47
+msgid "is less than"
+msgstr "é menor que"
+
+#: filter/libfilter-i18n.h:48
+msgid "is not"
+msgstr "non é"
+
+#: filter/libfilter-i18n.h:49
+msgid "is"
+msgstr "é"
+
+#: filter/libfilter-i18n.h:50
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:51
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:52
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:53
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:54
 msgid "was after"
 msgstr "foi posterior a"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:55
 msgid "was before"
 msgstr "foi anterior a"
 
-#: filter/score-editor.c:126
+#: filter/score-editor.c:130
 #, fuzzy
 msgid "Score Rules"
 msgstr "Puntuación"
 
-#: mail/component-factory.c:306
+#: mail/component-factory.c:329
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compoñente de correo de Evolution."
 
-#: mail/component-factory.c:379
+#: mail/component-factory.c:402
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:237
+#: mail/folder-browser-factory.c:209
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades"
 
-#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:219
+#: mail/folder-browser.c:225
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "Seleccionar Carpeta"
 
-#: mail/folder-browser.c:509
+#: mail/folder-browser.c:533
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:512
+#: mail/folder-browser.c:536
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:515
+#: mail/folder-browser.c:539
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:518 mail/folder-browser.c:702
+#: mail/folder-browser.c:542 mail/folder-browser.c:733
 msgid "VFolder on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:524
+#: mail/folder-browser.c:548
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:527
+#: mail/folder-browser.c:551
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:530
+#: mail/folder-browser.c:554
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:533 mail/folder-browser.c:701
+#: mail/folder-browser.c:557 mail/folder-browser.c:732
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:544
+#: mail/folder-browser.c:568
+#, fuzzy
+msgid "Resend"
+msgstr "segundo"
+
+#: mail/folder-browser.c:570
 #, fuzzy
 msgid "Save As..."
 msgstr "Gardar _Como..."
 
-#: mail/folder-browser.c:546 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Imprimir"
-
-#: mail/folder-browser.c:551
+#: mail/folder-browser.c:577
 msgid "Reply to Sender"
 msgstr "Responder ó Autor"
 
-#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
+#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
-#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
+#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
 msgid "Forward"
 msgstr "Re-enviar"
 
-#: mail/folder-browser.c:557
+#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
 #, fuzzy
 msgid "Forward inline"
 msgstr "Ir para diante no tempo"
 
-#: mail/folder-browser.c:560
+#: mail/folder-browser.c:586
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:562
+#: mail/folder-browser.c:588
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:567
+#: mail/folder-browser.c:593
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Mover para a Carpeta"
 
-#: mail/folder-browser.c:569
+#: mail/folder-browser.c:595
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Copiar á Carpeta"
 
-#: mail/folder-browser.c:573
+#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
 #, fuzzy
 msgid "Undelete"
 msgstr "Eliminar"
@@ -5483,20 +5858,20 @@ msgstr "Eliminar"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:583
+#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
 msgid "Apply Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:587
+#: mail/folder-browser.c:613
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:735
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:705
+#: mail/folder-browser.c:736
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr ""
@@ -5576,19 +5951,28 @@ msgstr ""
 msgid "mh"
 msgstr "h"
 
-#: mail/mail-accounts.c:116
+#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
 #, fuzzy
 msgid " (default)"
 msgstr "Eliminar"
 
-#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#: mail/mail-accounts.c:197
+#, fuzzy
+msgid "Disable"
+msgstr "Desactivar."
+
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+msgid "Enable"
+msgstr ""
+
+#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 "¿Está seguro de que quere\n"
 "borrar este contacto?"
 
-#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
@@ -5596,52 +5980,46 @@ msgstr ""
 "borrar este contacto?"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:423
+#: mail/mail-accounts.c:536
 #, fuzzy
 msgid "Evolution Account Manager"
 msgstr "Xestión e Contas"
 
-#: mail/mail-account-editor.c:307
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
+#: mail/mail-account-editor.c:105
+msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:706
+#: mail/mail-account-editor.c:173
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Instalación de Evolution"
 
-#: mail/mail-account-editor.c:727
-msgid "Unspecified"
-msgstr ""
-
-#: mail/mail-autofilter.c:71
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Enviar por correo a %s"
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, c-format
 msgid "Subject is %s"
 msgstr "O asunto é %s"
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr "Enviar dende %s"
 
-#: mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
 msgid "Add Filter Rule"
 msgstr "Engadir Regra de Filtrado"
 
-#: mail/mail-callbacks.c:85
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5649,7 +6027,7 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5657,17 +6035,17 @@ msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: mail/mail-callbacks.c:150
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:202
 msgid "You have not set a mail transport method"
 msgstr "Non definiu ningún método de envío de correo"
 
-#: mail/mail-callbacks.c:227
+#: mail/mail-callbacks.c:235
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5675,36 +6053,36 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "¿Enviar realmente?"
 
-#: mail/mail-callbacks.c:294
+#: mail/mail-callbacks.c:308
+msgid "You must specify recipients in order to send this message."
+msgstr "Ten que especificar destinatarios para poder enviar esta mensaxe."
+
+#: mail/mail-callbacks.c:351
 #, fuzzy
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: mail/mail-callbacks.c:316
-msgid "You must specify recipients in order to send this message."
-msgstr "Ten que especificar destinatarios para poder enviar esta mensaxe."
-
-#: mail/mail-callbacks.c:579
+#: mail/mail-callbacks.c:591
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:761
+#: mail/mail-callbacks.c:773
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-callbacks.c:864
+#: mail/mail-callbacks.c:876
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:866
+#: mail/mail-callbacks.c:878
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1007
+#: mail/mail-callbacks.c:1019
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5712,11 +6090,20 @@ msgstr ""
 "Só pode editar mensaxes gardados\n"
 "na carpeta de Borrador."
 
-#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1056
+#, fuzzy
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+"Só pode editar mensaxes gardados\n"
+"na carpeta de Borrador."
+
+#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
 msgid "Overwrite file?"
 msgstr "¿Sobrescribir ficheiro?"
 
-#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5724,17 +6111,17 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "¿Sobrescribilo?"
 
-#: mail/mail-callbacks.c:1088
+#: mail/mail-callbacks.c:1137
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Gardar como..."
 
-#: mail/mail-callbacks.c:1090
+#: mail/mail-callbacks.c:1139
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Gardar como..."
 
-#: mail/mail-callbacks.c:1204
+#: mail/mail-callbacks.c:1253
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5743,50 +6130,61 @@ msgstr ""
 "Erro cargando a información do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1349
 msgid "Printing of message failed"
 msgstr "A impresión da mensaxe fallou"
 
+#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#, fuzzy
+msgid "Connecting to server..."
+msgstr "Non foi posible conectarse ó servidor POP en %s."
+
 #: mail/mail-config.glade.h:1
 #, fuzzy
+msgid " Check for supported types "
+msgstr "Detectar tipos soportados..."
+
+#: mail/mail-config.glade.h:2
+#, fuzzy
+msgid " color"
+msgstr "Cores"
+
+#: mail/mail-config.glade.h:3
+#, fuzzy
 msgid "Account"
 msgstr "Contas"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 msgid "Account Information"
 msgstr "Información de Contas"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "Account Management"
 msgstr "Xestión e Contas"
 
-#: mail/mail-config.glade.h:5
-msgid "Advanced"
-msgstr ""
-
 #: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "Accounts"
+msgstr "Contas"
+
+#: mail/mail-config.glade.h:8
 msgid "Authentication"
 msgstr "Autenticación"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 #, fuzzy
-msgid "Authentication Type:"
+msgid "Authentication Type: "
 msgstr "Autenticación:"
 
-#: mail/mail-config.glade.h:9
-msgid "Automatically check mail every"
+#: mail/mail-config.glade.h:10
+msgid "Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
-#, fuzzy
-msgid "Check settings"
-msgstr "Probar Configuración"
-
 #: mail/mail-config.glade.h:12
 #, fuzzy
 msgid ""
@@ -5800,220 +6198,186 @@ msgstr ""
 "A configuración do correo electrónico está completa.\n"
 "Prema \"Finalizar\" para gardar a nova configuración"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "De_fault"
 msgstr "Eliminar"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Done"
 msgstr "mes"
 
-#: mail/mail-config.glade.h:23
-msgid "Email Address:"
-msgstr "Enderezo de Email:"
+#: mail/mail-config.glade.h:21
+#, fuzzy
+msgid "Drafts"
+msgstr "Pegar"
 
-#: mail/mail-config.glade.h:24
-msgid "Email address:"
-msgstr "Enderezo de email:"
+#: mail/mail-config.glade.h:22
+#, fuzzy
+msgid "Drafts folder:"
+msgstr "Creando unha nova carpeta"
 
-#: mail/mail-config.glade.h:25
-msgid "Evolution Mail Configuration"
-msgstr "Configuración de Correo do Evolution"
+#: mail/mail-config.glade.h:24
+msgid "Email Address:"
+msgstr "Enderezo de Email:"
 
 #: mail/mail-config.glade.h:26
 msgid "Full Name:"
 msgstr "Nome Completo:"
 
+#: mail/mail-config.glade.h:27
+msgid "Highlight citations with "
+msgstr ""
+
 #: mail/mail-config.glade.h:29
 #, fuzzy
-msgid "Hostname:"
-msgstr "Nome de usuario:"
+msgid "IMAPv4 "
+msgstr "IMAPv4"
 
 #: mail/mail-config.glade.h:30
-msgid "IMAP"
-msgstr "IMAP"
-
-#: mail/mail-config.glade.h:31
 msgid "Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:32
-msgid "Include this account when receiving mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:33
-#, fuzzy
-msgid "Keep mail on server"
-msgstr "Non borrar as mensaxes do servidor"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 #, fuzzy
-msgid "Kerberos"
+msgid "Kerberos "
 msgstr "Kerberos 4"
 
-#: mail/mail-config.glade.h:35
-msgid "Mail"
-msgstr "Correo"
-
-#: mail/mail-config.glade.h:36
-#, fuzzy
-msgid "Mail Account"
-msgstr "Contas"
-
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:32
 msgid "Mail Configuration"
 msgstr "Configuración do Correo"
 
-#: mail/mail-config.glade.h:38
-msgid "Mail Configuration Druid"
-msgstr "Axudante da Configuración do Correo"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid "Mark messages as \"Read\" after:"
 msgstr "Marcar mensaxe como lida [ms]: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:36
 msgid "News"
 msgstr "Novas"
 
-#: mail/mail-config.glade.h:44
-msgid "Optional"
-msgstr "Opcional"
+#: mail/mail-config.glade.h:38
+#, fuzzy
+msgid "Optional Information"
+msgstr "Sen Información"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:39
 msgid "Organization:"
 msgstr "Organización:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:41
 msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
-msgid "Password:"
-msgstr "Contrasinal:"
-
-#: mail/mail-config.glade.h:50
-msgid "Plain Text"
-msgstr ""
+#: mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Qmail maildir "
+msgstr "Correo Electrónico 2"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:48
 #, fuzzy
-msgid "Remember my password"
-msgstr "Gardar como VCard"
+msgid "Receiving Mail"
+msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:49
 #, fuzzy
-msgid "Reply address:"
-msgstr "Enderezo de email:"
+msgid "Receiving Options"
+msgstr "Data de recepción"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Required Information"
+msgstr "Sen Información"
+
+#: mail/mail-config.glade.h:53
+msgid "Select PGP binary"
+msgstr ""
 
 #: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "Required"
-msgstr "Persoas _Requiridas"
+msgid "Send mail in HTML format by default."
+msgstr "Enviar mensaxes en formato HTML"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Save password"
-msgstr "Gardar como VCard"
+msgid "Sending Email"
+msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:57
-msgid "Select PGP binary"
-msgstr ""
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Enviando Correo"
 
 #: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Select signature file"
-msgstr "Ficheiro de sinatura:"
+msgid "Sent"
+msgstr "Autor"
 
 #: mail/mail-config.glade.h:59
 #, fuzzy
-msgid "Send mail in HTML format by default."
-msgstr "Enviar mensaxes en formato HTML"
+msgid "Sent and Draft Messages"
+msgstr "Axenda"
 
 #: mail/mail-config.glade.h:60
 #, fuzzy
-msgid "Sending Email"
-msgstr "Enviando Correo"
+msgid "Sent messages folder:"
+msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:61
 msgid "Server Configuration"
 msgstr "Configuración do Servidor"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:62
 msgid "Server Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 #, fuzzy
 msgid "Server requires authentication"
 msgstr "O servidor SMTP require autenticación"
 
-#: mail/mail-config.glade.h:65
-#, fuzzy
-msgid "Server type:"
-msgstr "Tipo de Servidor: "
-
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Signature file:"
 msgstr "Ficheiro de sinatura:"
 
-#: mail/mail-config.glade.h:67
-#, fuzzy
-msgid "Signature:"
-msgstr "Ficheiro de sinatura:"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:65
 msgid "Sources"
 msgstr "Fontes"
 
-#: mail/mail-config.glade.h:70
-#, fuzzy
-msgid "This server requires a secure connection (SSL)"
-msgstr "O servidor SMTP require autenticación"
-
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:66
 #, fuzzy
-msgid "Transport"
-msgstr "Transparente"
+msgid "Special Folders"
+msgstr "Carpetas Virtuais"
 
-#: mail/mail-config.glade.h:72
-#, fuzzy
-msgid "Transport Authentication"
-msgstr "Autenticación"
+#: mail/mail-config.glade.h:67
+msgid "Standard Unix mbox"
+msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Type"
 msgstr "Tipo:"
 
-#: mail/mail-config.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:69
 #, fuzzy
-msgid "User Information"
-msgstr "Sen Información"
+msgid "Use secure connection (SSL)"
+msgstr "O servidor SMTP require autenticación"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:70
 msgid "Username:"
 msgstr "Nome de usuario:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
@@ -6021,186 +6385,211 @@ msgid ""
 "Click \"Next\" to begin. "
 msgstr "¡Benvido ó axudante da Configuración de Correo do Evolution!"
 
-#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
 #: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
 msgid "_Edit"
 msgstr "_Editar"
 
-#: mail/mail-config.glade.h:83
-#, fuzzy
-msgid "minutes."
-msgstr "minutos"
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
 
-#: mail/mail-config-druid.c:421
-#, c-format
+#: mail/mail-config-druid.c:101
 msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:515
-#, fuzzy
-msgid "Namespace:"
-msgstr "Nome:"
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
 
-#: mail/mail-config-druid.c:708
-#, c-format
+#: mail/mail-config-druid.c:107
 msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:1215
+#: mail/mail-config-druid.c:445
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-display.c:189
+#: mail/mail-display.c:194
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:229
+#: mail/mail-display.c:234
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Non foi posible crear o directorio temporal: %s"
 
-#: mail/mail-display.c:290
+#: mail/mail-display.c:295
 msgid "Save to Disk..."
 msgstr "Gardar ó Disco..."
 
-#: mail/mail-display.c:292
+#: mail/mail-display.c:297
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:294
+#: mail/mail-display.c:299
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:323
+#: mail/mail-display.c:334
 msgid "External Viewer"
 msgstr "Visualizador Externo"
 
-#: mail/mail-display.c:346
+#: mail/mail-display.c:357
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:361
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-format.c:506
+#: mail/mail-display.c:1102
+#, fuzzy
+msgid "Open link in browser"
+msgstr "Abrir nunha Nova Fiestra"
+
+#: mail/mail-display.c:1104
+#, fuzzy
+msgid "Save as (FIXME)"
+msgstr "_Tarefa (FIXME)"
+
+#: mail/mail-display.c:1106
+#, fuzzy
+msgid "Copy location (FIXME)"
+msgstr "_Contacto (FIXME)"
+
+#: mail/mail-format.c:518
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:704
+#: mail/mail-format.c:560
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+
+#: mail/mail-format.c:742
 #, fuzzy
 msgid "Loading message content"
 msgstr "Reenviando mensaxes \"%s\""
 
-#: mail/mail-format.c:993
+#: mail/mail-format.c:1046
 msgid "Encrypted message not displayed"
 msgstr "Mensaxe cifrada non visualizada"
 
-#: mail/mail-format.c:999
+#: mail/mail-format.c:1052
 msgid "Encrypted message"
 msgstr "Mensaxe cifrada"
 
-#: mail/mail-format.c:1000
+#: mail/mail-format.c:1053
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1069 mail/mail-format.c:1456
+#: mail/mail-format.c:1137 mail/mail-format.c:1526
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1077 mail/mail-format.c:1464
+#: mail/mail-format.c:1145 mail/mail-format.c:1534
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1677
+#: mail/mail-format.c:1747
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1689
+#: mail/mail-format.c:1759
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1693
+#: mail/mail-format.c:1763
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1727
+#: mail/mail-format.c:1797
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1732
+#: mail/mail-format.c:1802
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:335
+#: mail/mail-local.c:337
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Non existe a carpeta `%s'."
 
-#: mail/mail-local.c:508
+#: mail/mail-local.c:509
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "Abrir en %s..."
 
-#: mail/mail-local.c:786
+#: mail/mail-local.c:787
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando a carpeta \"%s\" ó formato \"%s\""
 
-#: mail/mail-local.c:790
+#: mail/mail-local.c:791
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Cambiar carpeta \"%s\" ó formato \"%s\""
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:815
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Configurar Carpeta"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:843
+#: mail/mail-local.c:844
 msgid "Closing current folder"
 msgstr "Pechando a carpeta actual"
 
-#: mail/mail-local.c:875
+#: mail/mail-local.c:876
 msgid "Renaming old folder and opening"
 msgstr "Renomeando a carpeta antiga e abrindo"
 
-#: mail/mail-local.c:893
+#: mail/mail-local.c:894
 msgid "Creating new folder"
 msgstr "Creando unha nova carpeta"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:908
 msgid "Copying messages"
 msgstr "Copiando as mensaxes"
 
-#: mail/mail-local.c:928
+#: mail/mail-local.c:925
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:967
+#: mail/mail-local.c:964
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:177
+#: mail/mail-mt.c:190
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6209,7 +6598,7 @@ msgstr ""
 "Erro na expresión regular '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:179
+#: mail/mail-mt.c:192
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6218,408 +6607,388 @@ msgstr ""
 "Erro cargando a información do filtro:\n"
 "%s"
 
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
+#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
 #, fuzzy
 msgid "Working"
 msgstr "Movendo"
 
-#: mail/mail-mt.c:666 mail/session.c:91
+#: mail/mail-mt.c:679 mail/session.c:98
 msgid "Do you accept?"
 msgstr ""
 
-#: mail/mail-mt.c:860
+#: mail/mail-mt.c:873
 #, fuzzy
 msgid "Evolution progress"
 msgstr "Evolution"
 
-#: mail/mail-ops.c:516
+#: mail/mail-ops.c:587
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:518
+#: mail/mail-ops.c:589
 #, fuzzy
 msgid "Sending message"
 msgstr "Borrar esta mensaxe"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:704
+#, fuzzy, c-format
+msgid "Sending message %d of %d"
+msgstr "Escribindo a mensaxe %d de %d"
+
+#: mail/mail-ops.c:723
+#, fuzzy, c-format
+msgid "Failed on message %d of %d"
+msgstr "Marcando a mensaxe %d de %d"
+
+#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#, fuzzy
+msgid "Complete."
+msgstr "% Comp_leta:"
+
+#: mail/mail-ops.c:811
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes"
 
-#: mail/mail-ops.c:842
+#: mail/mail-ops.c:900
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:903
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:856
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s mensaxe %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:978
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1085
+#: mail/mail-ops.c:1139
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
+#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1193
+#: mail/mail-ops.c:1247
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1380
+#: mail/mail-ops.c:1434
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1429
+#: mail/mail-ops.c:1483
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/mail-ops.c:1496
+#: mail/mail-ops.c:1550
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1560
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Recibindo a mensaxe número %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1580
+#: mail/mail-ops.c:1634
 #, fuzzy
 msgid "Saving messages"
 msgstr "Copiando as mensaxes"
 
-#: mail/mail-ops.c:1659
+#: mail/mail-ops.c:1713
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
 
-#: mail/mail-ops.c:1672
+#: mail/mail-ops.c:1726
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Recibindo a mensaxe %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1686
+#: mail/mail-ops.c:1740
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: mail/mail-ops.c:1760
+#: mail/mail-ops.c:1814
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1829
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1857
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-search-dialogue.c:107
+#: mail/mail-search-dialogue.c:113
 #, fuzzy
 msgid "_Search"
 msgstr "Buscar"
 
-#: mail/mail-send-recv.c:136
+#: mail/mail-send-recv.c:138
 #, fuzzy
 msgid "Cancelling ..."
 msgstr "Cancelar"
 
-#: mail/mail-send-recv.c:231
+#: mail/mail-send-recv.c:233
 #, fuzzy
 msgid "Send & Receive mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-send-recv.c:234
+#: mail/mail-send-recv.c:236
 #, fuzzy
 msgid "Receiving"
 msgstr "Data de recepción"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:285
 msgid "Updating ..."
 msgstr ""
 
-#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
 msgid "Waiting ..."
 msgstr ""
 
-#: mail/mail-send-recv.c:304
+#: mail/mail-send-recv.c:306
 #, fuzzy
 msgid "Sending"
 msgstr "Enviando \"%s\""
 
-#: mail/mail-send-recv.c:469
+#: mail/mail-send-recv.c:471
 #, fuzzy
 msgid "Cancelled."
 msgstr "Cancelar"
 
-#: mail/mail-send-recv.c:473
-#, fuzzy
-msgid "Complete."
-msgstr "% Comp_leta:"
-
-#: mail/mail-summary.c:111
+#: mail/mail-summary.c:109
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-tools.c:138
+#: mail/mail-tools.c:141
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
 
-#: mail/mail-tools.c:185
+#: mail/mail-tools.c:188
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (mensaxe reenviada)"
 
-#: mail/mail-tools.c:195
+#: mail/mail-tools.c:198
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (sen asunto)"
 
-#: mail/mail-tools.c:212
+#: mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-tools.c:214
+#: mail/mail-tools.c:217
 msgid "Forwarded message (no subject)"
 msgstr "Mensaxe reenviada (sen asunto)"
 
-#: mail/mail-tools.c:411
+#: mail/mail-tools.c:414
 #, c-format
 msgid ""
 "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
 "%s<br><b>Subject:</b> %s<br>"
 msgstr ""
 
-#: mail/mail-vfolder.c:248
+#: mail/mail-vfolder.c:249
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:427
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
 msgid "Reply to the sender of this message"
 msgstr "Responder ó autor desta mensaxe"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
 msgid "Reply to all recipients of this message"
 msgstr "Responder a tódolos destinatarios desta mensaxe"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
 msgid "Forward this message"
 msgstr "Re-enviar esta mensaxe"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
+#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
 msgid "Print the selected message"
 msgstr "Imprimir a mensaxe seleccionada"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Borrar esta mensaxe"
 
-#: mail/message-list.c:618
+#: mail/message-list.c:648
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:621
+#: mail/message-list.c:649
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:624
+#: mail/message-list.c:650
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:627
+#: mail/message-list.c:651
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "Non foi posible enviar a mensaxe: %s"
 
-#: mail/message-list.c:630
+#: mail/message-list.c:652
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Editar Mensaxe"
 
-#: mail/message-list.c:952
-#, c-format
-msgid "[ %s ]"
-msgstr ""
+#: mail/message-list.c:656
+#, fuzzy
+msgid "Lowest"
+msgstr "Baixa"
 
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:964 mail/message-list.c:980
-#, c-format
-msgid "%s, et al."
-msgstr ""
+#: mail/message-list.c:657
+#, fuzzy
+msgid "Lower"
+msgstr "Baixa"
 
-#: mail/message-list.c:967 mail/message-list.c:983
+#: mail/message-list.c:661
 #, fuzzy
-msgid "<unknown>"
-msgstr "Descoñecido"
+msgid "Higher"
+msgstr "Alta"
+
+#: mail/message-list.c:662
+#, fuzzy
+msgid "Highest"
+msgstr "Alta"
 
-#: mail/message-list.c:1035
+#: mail/message-list.c:912
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1042
+#: mail/message-list.c:919
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1051
+#: mail/message-list.c:928
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1063
+#: mail/message-list.c:940
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1071
+#: mail/message-list.c:948
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1073
+#: mail/message-list.c:950
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d de %Y"
 
-#: mail/message-list.c:1171
+#: mail/message-list.c:1052
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "From"
 msgstr "De:"
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "Date"
 msgstr "Pegar"
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "Received"
 msgstr "Data de recepción"
 
-#: mail/message-list.c:1173
+#: mail/message-list.c:1054
 #, fuzzy
 msgid "To"
 msgstr "A:"
 
-#: mail/message-list.c:1173
+#: mail/message-list.c:1054
 #, fuzzy
 msgid "Size"
 msgstr "Tamaño:"
 
-#: mail/openpgp-utils.c:89
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Introduza o seu contrasinal de PGP/GPG."
-
-#: mail/openpgp-utils.c:92
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Introduza o seu contrasinal de PGP/GPG."
-
-#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
-#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
-msgid "No GPG/PGP program available."
-msgstr "O programa GPG/PGP non está dispoñible."
-
-#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
-#: mail/openpgp-utils.c:920
-msgid "No password provided."
-msgstr "Non se indicou un contrasinal."
-
-#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
-#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Non foi posible crear unha canalización co GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:588
-msgid "No recipients specified"
-msgstr ""
-
-#: mail/openpgp-utils.c:1088
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Non foi posible crear unha canalización: %s"
-
-#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
 #, fuzzy
 msgid "Folder"
 msgstr "Carpetas"
 
-#: mail/subscribe-dialog.c:65
+#: mail/subscribe-dialog.c:77
 #, fuzzy
 msgid "Store"
 msgstr "Puntuación"
 
-#: mail/subscribe-dialog.c:147
+#: mail/subscribe-dialog.c:138
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:177
+#: mail/subscribe-dialog.c:168
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:280
+#: mail/subscribe-dialog.c:271
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:273
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
+#. Construct the app
+#: mail/subscribe-dialog.c:873
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Descrición:"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #, fuzzy
 msgid "Folder name:"
@@ -6635,9 +7004,18 @@ msgstr "Carpetas"
 msgid "Specify where to create the folder:"
 msgstr "Non hai espacio dabondo para crear a carpeta"
 
+#: shell/importer/importer.c:87
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/importer/importer.c:157
+#: shell/importer/importer.c:182
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6645,76 +7023,72 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/importer/importer.c:175 shell/importer/importer.c:202
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/importer/importer.c:309
+#: shell/importer/importer.c:341
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr "Non hai novo correo en %s."
 
-#: shell/importer/importer.c:319
+#: shell/importer/importer.c:351
 #, fuzzy
 msgid "Importing"
 msgstr "Movendo"
 
-#: shell/importer/importer.c:327
+#: shell/importer/importer.c:359
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/importer/importer.c:342
+#: shell/importer/importer.c:372
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "Erro cargando o ficheiro: %s"
+
+#: shell/importer/importer.c:387
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: shell/importer/importer.c:357
+#: shell/importer/importer.c:402
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/importer/importer.c:428
+#: shell/importer/importer.c:473
 msgid "Automatic"
 msgstr ""
 
-#: shell/importer/importer.c:478
+#: shell/importer/importer.c:523
 #, fuzzy
 msgid "Filename:"
 msgstr "Nome de ficheiro:"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
 #, fuzzy
 msgid "Select a file"
 msgstr "Ficheiro de sinatura:"
 
-#: shell/importer/importer.c:493
+#: shell/importer/importer.c:538
 #, fuzzy
 msgid "File type:"
 msgstr "Nome de ficheiro:"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
 msgid "Import"
 msgstr ""
 
-#: shell/importer/importer.c:609
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -6736,11 +7110,11 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: shell/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr "Instalación de Evolution"
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:122
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6748,30 +7122,30 @@ msgstr ""
 "Esta nova versión do Evolution necesita instalar ficheiros\n"
 "adicionais no seu directorio persoal do Evolution"
 
-#: shell/e-setup.c:117
+#: shell/e-setup.c:123
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Prema \"Aceptar\" para instalar os ficheiros, ou \"Cancelar\" para saír."
 
-#: shell/e-setup.c:157
+#: shell/e-setup.c:163
 msgid "Could not update files correctly"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
+#: shell/e-setup.c:166 shell/e-setup.c:234
 msgid "Evolution files successfully installed."
 msgstr "Ficheiros de Evolution instalados con éxito."
 
-#: shell/e-setup.c:189
+#: shell/e-setup.c:195
 #, fuzzy
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Semella que é a primeira vez que executa Evolution."
 
-#: shell/e-setup.c:190
+#: shell/e-setup.c:196
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Prema \"Aceptar\" para instalar os ficheiros de usuario de Evolution en"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:215
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6782,7 +7156,7 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:224
+#: shell/e-setup.c:230
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -6791,7 +7165,7 @@ msgstr ""
 "Non se poden copiar os ficheiros a\n"
 "`%s'."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:255
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6802,7 +7176,7 @@ msgstr ""
 "Móvao para poder instalar os ficheiros de\n"
 "usuario de Evolution."
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:267
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6813,7 +7187,7 @@ msgstr ""
 "directorio de Evolution. Móvao para poder\n"
 "instalar os ficheiros de usuario de Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:96
+#: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -6822,11 +7196,11 @@ msgstr ""
 "Non se pode crear a carpeta indicada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:153
+#: shell/e-shell-folder-creation-dialog.c:156
 msgid "The specified folder name is not valid."
 msgstr "O nome de carpeta indicado non é válido."
 
-#: shell/e-shell-folder-creation-dialog.c:245
+#: shell/e-shell-folder-creation-dialog.c:248
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear unha nova carpeta"
 
@@ -6838,28 +7212,28 @@ msgstr ""
 "O tipo da carpeta seleccionada non é válido para\n"
 "a operación solicitada."
 
-#: shell/e-shell-folder-selection-dialog.c:318
+#: shell/e-shell-folder-selection-dialog.c:319
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
 msgid "(Untitled)"
 msgstr "(Sen_título)"
 
-#: shell/e-shell-view-menu.c:159
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy non foi atopado no seu $PATH."
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:179
 msgid "Bug buddy could not be run."
 msgstr "Non se puido executar Bug buddy."
 
-#: shell/e-shell-view-menu.c:194
+#: shell/e-shell-view-menu.c:208
 #, fuzzy
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:196
+#: shell/e-shell-view-menu.c:210
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6869,34 +7243,30 @@ msgstr ""
 "en grupo para xestión de correo, axenda e contactos\n"
 "dentro do ambiente de escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:360
+#: shell/e-shell-view-menu.c:374
 msgid "Go to folder..."
 msgstr "Ir á carpeta..."
 
-#: shell/e-shell-view.c:143
+#: shell/e-shell-view.c:148
 msgid "(No folder displayed)"
 msgstr "(Ningunha carpeta visualizada)"
 
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Carpetas"
-
-#: shell/e-shell-view.c:1124
+#: shell/e-shell-view.c:1134
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1126
+#: shell/e-shell-view.c:1136
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:372
+#: shell/e-shell.c:378
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Non se pode activar o almacenamento local -- %s"
 
-#: shell/e-shell.c:1242
+#: shell/e-shell.c:1248
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6905,15 +7275,15 @@ msgstr ""
 "Ooops!  A vista de `%s' morreu inesperadamente.  :-(\n"
 "Isto significa probablemente que o compoñente %s se estragou."
 
-#: shell/e-shortcuts-view.c:123
+#: shell/e-shortcuts-view.c:134
 msgid "Create new shortcut group"
 msgstr "Crear novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:137
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:260
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -6922,75 +7292,75 @@ msgstr ""
 "¿Realmente desexa eliminar o grupo\n"
 "`%s' da barra de atallos?"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:265
 msgid "Don't remove"
 msgstr "Non eliminar"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:276
 msgid "_Small Icons"
 msgstr "Iconas _Pequenas"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:277
 msgid "Show the shortcuts as small icons"
 msgstr "Amosar os atallos como iconas pequenas"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:279
 msgid "_Large Icons"
 msgstr "Iconas _Grandes"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:280
 msgid "Show the shortcuts as large icons"
 msgstr "Amosar os atallos como iconas grandes"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:291
 msgid "_New Group..."
 msgstr "_Novo Grupo..."
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:292
 msgid "Create a new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:294
 msgid "_Remove This Group..."
 msgstr "_Eliminar este Grupo..."
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:295
 msgid "Remove this shortcut group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:300
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Amosar a Barra de _Atallos"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:301
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Amosar a Barra de _Atallos"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate"
 msgstr "Activar"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate this shortcut"
 msgstr "Activar este atallo"
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:388
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
-#: shell/e-shortcuts.c:375
+#: shell/e-shortcuts.c:379
 msgid "Error saving shortcuts."
 msgstr "Erro gardando atallos."
 
-#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
 msgid "_View"
 msgstr "_Vista"
 
-#: shell/e-storage-set-view.c:468
+#: shell/e-storage-set-view.c:649
 msgid "View the selected folder"
 msgstr "Ver carpeta seleccionada"
 
@@ -6998,47 +7368,47 @@ msgstr "Ver carpeta seleccionada"
 msgid "(No name)"
 msgstr "(Sen nome)"
 
-#: shell/e-storage.c:429
+#: shell/e-storage.c:459
 msgid "No error"
 msgstr "Sen erro"
 
-#: shell/e-storage.c:431
+#: shell/e-storage.c:461
 msgid "Generic error"
 msgstr "Erro xenérico"
 
-#: shell/e-storage.c:433
+#: shell/e-storage.c:463
 msgid "A folder with the same name already exists"
 msgstr "Xa existe unha carpeta co mesmo nome"
 
-#: shell/e-storage.c:435
+#: shell/e-storage.c:465
 msgid "The specified folder type is not valid"
 msgstr "O tipo da carpeta especificada non é válido"
 
-#: shell/e-storage.c:437
+#: shell/e-storage.c:467
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:439
+#: shell/e-storage.c:469
 msgid "Not enough space to create the folder"
 msgstr "Non hai espacio dabondo para crear a carpeta"
 
-#: shell/e-storage.c:441
+#: shell/e-storage.c:471
 msgid "The specified folder was not found"
 msgstr "Non se atopou a carpeta especificada"
 
-#: shell/e-storage.c:443
+#: shell/e-storage.c:473
 msgid "Function not implemented in this storage"
 msgstr "Función non implementada neste almacenamento"
 
-#: shell/e-storage.c:445
+#: shell/e-storage.c:475
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: shell/e-storage.c:447
+#: shell/e-storage.c:477
 msgid "Operation not supported"
 msgstr "Operación non soportada"
 
-#: shell/e-storage.c:449
+#: shell/e-storage.c:479
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado non está soportado neste almacenamento"
 
@@ -7047,7 +7417,7 @@ msgstr "O tipo especificado non está soportado neste almacenamento"
 msgid "The Evolution shell."
 msgstr "Non se pode inicializar a shell de Evolution."
 
-#: shell/main.c:73
+#: shell/main.c:83
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -7068,7 +7438,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:98
+#: shell/main.c:108
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7076,15 +7446,19 @@ msgstr ""
 "Graciñas\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:129
+#: shell/main.c:139
 msgid "Cannot initialize the Evolution shell."
 msgstr "Non se pode inicializar a shell de Evolution."
 
-#: shell/main.c:175
-msgid "Disable."
-msgstr "Desactivar."
+#: shell/main.c:185
+msgid "Disable splash screen"
+msgstr ""
 
-#: shell/main.c:195
+#: shell/main.c:186
+msgid "Send the debugging output of all components to a file."
+msgstr ""
+
+#: shell/main.c:219
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Non se pode inicializar o sistema de compoñentes de Bonobo"
 
@@ -7110,8 +7484,7 @@ msgstr "Buscar un contacto"
 msgid "New contact"
 msgstr "Ver tódolos contactos"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
 msgid "Previews the message to be printed"
 msgstr "Previsualiza a mensaxe que se vai imprimir"
 
@@ -7119,7 +7492,7 @@ msgstr "Previsualiza a mensaxe que se vai imprimir"
 msgid "Print contacts"
 msgstr "Imprimir contactos"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
 msgid "Stop"
 msgstr "Parar"
 
@@ -7145,7 +7518,7 @@ msgstr "Engadir Fonte"
 msgid "_Contact"
 msgstr "_Contactos..."
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
 #: ui/evolution-contact-editor.xml.h:15
 #, fuzzy
 msgid "_Print..."
@@ -7155,9 +7528,9 @@ msgstr "Imprimir..."
 msgid "_Search for contacts"
 msgstr "_Buscar contactos"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:110
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
 msgid "_Tools"
 msgstr "_Ferramentas"
 
@@ -7171,128 +7544,168 @@ msgid "Alter preferences"
 msgstr "Preferencias da Axenda"
 
 #: ui/evolution-calendar.xml.h:4
+#, fuzzy
+msgid "Create a new all day Event"
+msgstr "Crear unha nova axenda"
+
+#: ui/evolution-calendar.xml.h:5
 msgid "Create a new appointment"
 msgstr "Crear unha nova cita"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Create a new calendar"
 msgstr "Crear unha nova axenda"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Day"
 msgstr "Día"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Go To"
 msgstr "Ir para"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Go back in time"
 msgstr "Ir para atrás no tempo"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go forward in time"
 msgstr "Ir para diante no tempo"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
+#, fuzzy
+msgid "Go to _Date"
+msgstr "Ir á data"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Go to _Today"
+msgstr "Ir a hoxe"
+
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to a specific date"
 msgstr "Ir para a data especificada"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:14
 #, fuzzy
 msgid "Go to present time"
 msgstr "Ir ó elemento seguinte"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
-msgid "New Appointment"
-msgstr "Nova cita..."
+msgid "New _Event"
+msgstr "Nova A_xenda"
 
-#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
 #: ui/evolution-task-editor-dialog.xml.h:32
 #, fuzzy
 msgid "Next"
 msgstr "Seguinte"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Open Calendar"
 msgstr "_Abrir axenda"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Prev"
 msgstr "Previsualización:"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Previews the calendar to be printed"
+msgstr "Previsualiza a mensaxe que se vai imprimir"
+
+#: ui/evolution-calendar.xml.h:25
 #, fuzzy
 msgid "Print calendar"
 msgstr "Imprimir axenda"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Print this Calendar"
 msgstr "Imprimir esta axenda"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
 #, fuzzy
 msgid "Save As"
 msgstr "Gardar _Como"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
 msgid "Save calendar as something else"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show 1 day"
 msgstr "Amosar un día"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show 1 month"
 msgstr "Amosar un mes"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show 1 week"
 msgstr "Amosar unha semana"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Amosar a semana laboral"
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
-#: widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
+#: widgets/misc/e-dateedit.c:422
 msgid "Today"
 msgstr "Hoxe"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "W_ork Week"
+msgstr "semana"
+
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Semana"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
 #, fuzzy
 msgid "_Appointment"
 msgstr "Citas:"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
+#: ui/evolution-calendar.xml.h:38
+#, fuzzy
+msgid "_Day"
+msgstr "Día"
+
+#: ui/evolution-calendar.xml.h:39
+#, fuzzy
+msgid "_Month"
+msgstr "Mes"
+
+#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:41
 msgid "_Open Calendar"
 msgstr "_Abrir axenda"
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
 #: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
+#: ui/evolution-calendar.xml.h:45
+#, fuzzy
+msgid "_Week"
+msgstr "Semana"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Borrar este elemento"
@@ -7317,7 +7730,7 @@ msgid "Print this item"
 msgstr "Imprimir este elemento"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Imprimir..."
 
@@ -7351,7 +7764,7 @@ msgstr "Enviar unha mensaxe sen asunto"
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
 #: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
 msgid "_File"
 msgstr "_Ficheiro"
 
@@ -7408,7 +7821,7 @@ msgstr "Pechar esta cita"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "Copiar á Carpeta"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Copiar"
@@ -7504,7 +7917,7 @@ msgid "Print Setup"
 msgstr "Configuración da Impresión"
 
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Gardar"
 
@@ -7527,7 +7940,8 @@ msgstr "FIXME: _Programar Reunión"
 msgid "Schedule some sort of a meeting"
 msgstr "FIXME: Programar Reunión"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:68
+#: ui/evolution-task-editor-dialog.xml.h:57
 #, fuzzy
 msgid "Select All"
 msgstr "Seleccionar _Todo"
@@ -7551,12 +7965,12 @@ msgid "_About..."
 msgstr "_Acerca de..."
 
 #: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
 msgid "_Close"
 msgstr "_Pechar"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_Contact (FIXME)"
 msgstr "_Contacto (FIXME)"
 
@@ -7570,7 +7984,7 @@ msgid "_Debug"
 msgstr "_Depuración"
 
 #: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
 msgid "_Help"
 msgstr "A_xuda"
 
@@ -7613,7 +8027,7 @@ msgstr "_Pegar"
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
 #: ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "_Propiedades..."
@@ -7624,7 +8038,7 @@ msgid "_Select All"
 msgstr "Seleccionar _Todo"
 
 #: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:41
 msgid "_Task (FIXME)"
 msgstr "_Tarefa (FIXME)"
 
@@ -7657,262 +8071,401 @@ msgid "New Mail"
 msgstr "Recibir Correo"
 
 #: ui/evolution-mail.xml.h:2
+msgid "Apply any new filters to the mail in this box"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:3
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:4
 msgid "Compose"
 msgstr "Redactar"
 
-#: ui/evolution-mail.xml.h:3
+#: ui/evolution-mail.xml.h:5
 msgid "Compose a new message"
 msgstr "Redactar unha nova mensaxe"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Configure Folder..."
+msgstr "Mover para a Carpeta"
+
+#: ui/evolution-mail.xml.h:8
 msgid "Copy message to a new folder"
 msgstr "Copiar a mensaxe nunha nova carpeta"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail.xml.h:9
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Copiar a mensaxe nunha nova carpeta"
+
+#: ui/evolution-mail.xml.h:10
 #, fuzzy
 msgid "Create _Virtual Folder From Message"
 msgstr "Carpetas Virtuais"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Delete the selected messages"
+msgstr "Imprimir a mensaxe seleccionada"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Display all of the message headers"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail.xml.h:15
 #, fuzzy
-msgid "Empty Trash"
+msgid "Edit Message"
+msgstr "_Editar Mensaxe"
+
+#: ui/evolution-mail.xml.h:16
+#, fuzzy
+msgid "Edit the current message"
+msgstr "a hora actual"
+
+#: ui/evolution-mail.xml.h:17
+#, fuzzy
+msgid "Empty _Trash"
 msgstr "Días baleiros:"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:18
+msgid "Expunge"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:19
 #, fuzzy
 msgid "Filter on Se_nder"
 msgstr "Responder ó Autor"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:20
 #, fuzzy
 msgid "Filter on _Recipients"
 msgstr "Destinatarios"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:21
 #, fuzzy
 msgid "Filter on _Subject"
 msgstr "Asunto"
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:22
+msgid "Finaly remove all mails tagged for deletion"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:23
 msgid "Forget _Passwords"
 msgstr "Esquecer _Contrasinais"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:25
 #, fuzzy
 msgid "Forward As"
 msgstr "Re-enviar"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:27
+msgid "Forward the selected mail to someone"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:29
+msgid "Forward this message in-line with your mail, so you can edit it"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:30
 #, fuzzy
-msgid "Full Headers"
+msgid "Full _Headers"
 msgstr "Nome Completo:"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:31
+#, fuzzy
+msgid "Hide Deleted Messages"
+msgstr "Borrar Mensaxe"
+
+#: ui/evolution-mail.xml.h:32
 #, fuzzy
 msgid "Hide S_elected Messages"
 msgstr "Imprimir a mensaxe seleccionada"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:33
 #, fuzzy
 msgid "Hide _Deleted Messages"
 msgstr "Borrar Mensaxe"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:34
 #, fuzzy
 msgid "Hide _Read messages"
 msgstr "Mensaxe reenviada - %s"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Inline"
-msgstr ""
+#: ui/evolution-mail.xml.h:35
+#, fuzzy
+msgid "Invert Selection"
+msgstr "_Inverter Selección"
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:36
 #, fuzzy
 msgid "Manage _Subscriptions..."
 msgstr "Descrición:"
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:37
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:38
 #, fuzzy
 msgid "Mark All as R_ead"
 msgstr "Marcar como _Lida"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:39
+#, fuzzy
+msgid "Mark As Read"
+msgstr "Marcar como _Lida"
+
+#: ui/evolution-mail.xml.h:40
+#, fuzzy
+msgid "Mark As U_nread"
+msgstr "Marcar como _non Lida"
+
+#: ui/evolution-mail.xml.h:41
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Marcar como _non Lida"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:42
 #, fuzzy
-msgid "Message _Display"
-msgstr "Corpo da Mensaxe"
+msgid "Mark the selected messages as having been read"
+msgstr "Imprimir a mensaxe seleccionada"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:43
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:44
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:45
 msgid "Move message to a new folder"
 msgstr "Mover mensaxe a unha nova carpeta"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:46
+#, fuzzy
+msgid "Move selected messages to another folder"
+msgstr "Mover mensaxe a unha nova carpeta"
+
+#: ui/evolution-mail.xml.h:47
+msgid "Open in New Window"
+msgstr "Abrir nunha Nova Fiestra"
+
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Open the current message in a new window"
+msgstr "Enviar mensaxes en formato HTML"
+
+#: ui/evolution-mail.xml.h:53
+msgid "Print Preview of message..."
+msgstr "Previsualización da Impresión da mensaxe..."
+
+#: ui/evolution-mail.xml.h:54
 msgid "Print message to the printer"
 msgstr "Imprimir mensaxe na impresora"
 
-#: ui/evolution-mail.xml.h:36
-#, fuzzy
-msgid "Quoted"
-msgstr "No_tas:"
+#: ui/evolution-mail.xml.h:55
+msgid "Print message..."
+msgstr "Imprimir mensaxe..."
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:58
 msgid "Redirect (FIXME: implement me)"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:61
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:62
+#, fuzzy
+msgid "Reply to all"
+msgstr "Responder a Todos"
+
+#: ui/evolution-mail.xml.h:64
+#, fuzzy
+msgid "Reply to sender"
+msgstr "Responder ó Autor"
+
+#: ui/evolution-mail.xml.h:66
 #, fuzzy
 msgid "S_ource"
 msgstr "Fontes"
 
-#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "Save the message into a new file"
+msgstr "Mover mensaxe a unha nova carpeta"
+
+#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Seleccionar _Todo"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:70
 #, fuzzy
 msgid "Select _Thread"
 msgstr "Seleccionar _Todo"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Send and Receive"
+#: ui/evolution-mail.xml.h:71
+#, fuzzy
+msgid "Send / Receive"
+msgstr "Enviando Correo"
+
+#: ui/evolution-mail.xml.h:72
+msgid "Send a reply to the person who sent you this mail"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:73
+msgid "Send a single mail in reply to all the selected mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:74
+#, fuzzy
+msgid ""
+"Send queued mail\n"
+"    and retrieve new mail"
+msgstr "Enviar o correo na cola e recibir o correo novo"
+
+#: ui/evolution-mail.xml.h:76
 msgid "Send queued mail and retrieve new mail"
 msgstr "Enviar o correo na cola e recibir o correo novo"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:77
 #, fuzzy
 msgid "Show _All"
 msgstr "Ver Todos"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:79
 #, fuzzy
 msgid "Threaded Message list"
 msgstr "Mensaxe reenviada - %s"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:80
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "Imprimir a mensaxe seleccionada"
+
+#: ui/evolution-mail.xml.h:82
 #, fuzzy
 msgid "VFolder on Se_nder"
 msgstr "Responder ó Autor"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:83
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "Destinatarios"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:84
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Asunto"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:85
 msgid "View Raw Message Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:86
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "Carpetas Virtuais"
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Actions"
-msgstr "_Accións"
-
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:87
 msgid "_Apply Filters"
 msgstr "_Aplicar Filtros"
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:88
 #, fuzzy
-msgid "_Compose"
-msgstr "Redactar"
+msgid "_Attachment"
+msgstr "anexo"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:89
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Copiar á Carpeta"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:90
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:92
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:93
 #, fuzzy
 msgid "_Filters..."
 msgstr "_Filtros de Correo..."
 
-#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:95
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:96
+#, fuzzy
+msgid "_Inline"
+msgstr "Í_ndice"
+
+#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Inverter Selección"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:98
 #, fuzzy
 msgid "_Mail Message"
 msgstr "FIXME: Enviar _Mensaxe"
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:99
 #, fuzzy
 msgid "_Mail Settings..."
 msgstr "_Configuración"
 
-#: ui/evolution-mail.xml.h:69
-#, fuzzy
-msgid "_Message Hiding"
-msgstr "_Mensaxe"
-
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail.xml.h:100
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "_Mover para a Carpeta"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail.xml.h:101
 #, fuzzy
 msgid "_Open Selected Items"
 msgstr "Abrir a tarefa"
 
-#: ui/evolution-mail.xml.h:74
-msgid "_Send and Receive"
-msgstr ""
+#: ui/evolution-mail.xml.h:103
+#, fuzzy
+msgid "_Quoted"
+msgstr "No_tas:"
+
+#: ui/evolution-mail.xml.h:104
+#, fuzzy
+msgid "_Reply"
+msgstr "Responder"
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail.xml.h:105
+#, fuzzy
+msgid "_Resend Messages"
+msgstr "_Editar Mensaxe"
+
+#: ui/evolution-mail.xml.h:107
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Gardar como..."
+
+#: ui/evolution-mail.xml.h:108
+#, fuzzy
+msgid "_Send / Receive"
+msgstr "Enviando Correo"
+
+#: ui/evolution-mail.xml.h:109
 msgid "_Threaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:111
 #, fuzzy
 msgid "_Undelete"
 msgstr "_Borrar"
@@ -8186,7 +8739,7 @@ msgstr "Desfacer"
 msgid "Undo the last action"
 msgstr "Desfacer a última acción"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
 msgid "_Appointment (FIXME)"
 msgstr "_Cita (FIXME)"
 
@@ -8324,123 +8877,135 @@ msgstr "Movendo"
 msgid "_About Evolution..."
 msgstr "_Acerca do Evolution..."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:25
+msgid "_Actions"
+msgstr "_Accións"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Carpeta"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:33
 msgid "_Go to Folder..."
 msgstr "_Ir para a Carpeta..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Import file..."
 msgstr "_Propiedades..."
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:36
 msgid "_Index"
 msgstr "Í_ndice"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:37
 #, fuzzy
 msgid "_Mail message"
 msgstr "_Mensaxe"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_New Folder"
 msgstr "Nova VFolder"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Amosar a Barra de _Atallos"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+msgid "Tentative"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Ocupado"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "Fóra da Oficina"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Sen Información"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
 msgid "_Invite Others..."
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
 msgid "_Options"
 msgstr "_Opcións"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
 msgid "Show _Only Working Hours"
 msgstr "Amosar _Só as Horas de Traballo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
 msgid "_All People and Resources"
 msgstr "_Tódalas Persoas e Recursos"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
 msgid "All _People and One Resource"
 msgstr "Tódalas _Persoas e Un Recurso"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
 msgid "_Required People"
 msgstr "Persoas _Requiridas"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
 msgid "Required People and _One Resource"
 msgstr "Persoas Requiridas e _Un Recurso"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
 msgid "Meeting _start time:"
 msgstr "Hora do _inicio da reunión:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
 msgid "Meeting _end time:"
 msgstr "Hora do _final da reunión:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
 msgid "All Attendees"
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:171
+#: widgets/menus/gal-view-menus.c:177
 #, fuzzy
 msgid "_Current View"
 msgstr "a hora actual"
 
+#: widgets/menus/gal-view-menus.c:196
+msgid "Define Views"
+msgstr ""
+
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: widgets/misc/e-calendar-item.c:421
@@ -8452,97 +9017,112 @@ msgstr "LMMXVSD"
 msgid "%B %Y"
 msgstr "%B de %Y"
 
-#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
 msgid "Now"
 msgstr "Agora"
 
-#: widgets/misc/e-cell-date-edit.c:239
+#: widgets/misc/e-cell-date-edit.c:242
 msgid "OK"
 msgstr ""
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#.
-#: widgets/misc/e-cell-date-edit.c:460
-#, fuzzy
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S%n"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#.
-#: widgets/misc/e-cell-date-edit.c:469
-#, fuzzy
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p%n"
-
-#. FIXME: Better message needed.
-#: widgets/misc/e-cell-date-edit.c:736
-msgid "The time is invalid"
+#: widgets/misc/e-cell-date-edit.c:723
+#, fuzzy, c-format
+msgid "The time must be in the format: %s"
 msgstr ""
+"A data ten que ser introducida no formato: \n"
+"\n"
+"%s"
 
 #: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:160
+#: widgets/misc/e-filter-bar.c:166
 #, fuzzy
 msgid "Save Search"
 msgstr "Buscar"
 
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:237
 msgid "Advanced Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:311
+#: widgets/misc/e-filter-bar.c:317
 msgid "Advanced ..."
 msgstr ""
 
-#: widgets/misc/e-messagebox.c:141
+#: widgets/misc/e-messagebox.c:152
 #, fuzzy
 msgid "Information"
 msgstr "Sen Información"
 
-#: widgets/misc/e-messagebox.c:148
+#: widgets/misc/e-messagebox.c:159
 #, fuzzy
 msgid "Warning"
 msgstr "Movendo"
 
-#: widgets/misc/e-messagebox.c:162
+#: widgets/misc/e-messagebox.c:173
 #, fuzzy
 msgid "Question"
 msgstr "Descrición:"
 
-#: widgets/misc/e-messagebox.c:169
+#: widgets/misc/e-messagebox.c:180
 #, fuzzy
 msgid "Message"
 msgstr "_Mensaxe"
 
 #. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
+#: widgets/misc/e-messagebox.c:224
 #, fuzzy
 msgid "Don't show this message again."
 msgstr "Borrar esta mensaxe"
 
-#: widgets/misc/e-search-bar.c:140
+#: widgets/misc/e-search-bar.c:148
 #, fuzzy
 msgid "Sear_ch"
 msgstr "Buscar"
 
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Adress Cards"
+msgstr "Enderezo"
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "Compañía"
+
+#: views/addressbook/galview.xml.h:3
+#, fuzzy
+msgid "Phone List"
+msgstr "Tipos de Teléfono"
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "Autor"
+
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "_Estado:"
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "Asunto"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "_Mensaxe"
+
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With Category"
+msgstr ""
+"\n"
+"Categorías: "
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
 msgid "The Personal Addressbook Server"
@@ -8552,28 +9132,179 @@ msgstr "Engadir Fonte"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:153
+#: wombat/wombat.c:173
 #, fuzzy
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: wombat/wombat.c:165
+#: wombat/wombat.c:185
 #, fuzzy
 msgid "init_corba(): could not initialize GNOME"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: wombat/wombat.c:178
+#: wombat/wombat.c:198
 #, fuzzy
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
 #, fuzzy
-#~ msgid "Copyright (C) 2000, Helix Code, Inc."
-#~ msgstr "Copyright 1999, 2000 Helix Code, Inc."
+#~ msgid "Click here to add a contact"
+#~ msgstr "<prema aquí para seleccionar unha data>"
+
+#, fuzzy
+#~ msgid ""
+#~ "This option will connect to the server using a the PLAIN SASL mechanism if "
+#~ "the server supports it."
+#~ msgstr ""
+#~ "Esta opción conectarase ó servidor IMAP usando un contrasinal sen cifrar."
+
+#~ msgid "URL string `%s' contains no protocol"
+#~ msgstr "O URL `%s' non contén ningún protocolo"
+
+#~ msgid "URL string `%s' contains an invalid protocol"
+#~ msgstr "O URL `%s' contén un protocolo non válido"
+
+#~ msgid "Port number in URL `%s' is non-numeric"
+#~ msgstr "O número de porto no URL `%s' non é numérico"
+
+#, fuzzy
+#~ msgid "Secure IMAPv4"
+#~ msgstr "IMAPv4"
+
+#, fuzzy
+#~ msgid ""
+#~ "For connecting to POP servers over an SSL connection. The POP protocol can "
+#~ "also be used to retrieve mail from certain web mail providers and "
+#~ "proprietary email systems."
+#~ msgstr ""
+#~ "Para conectarse a servidores POP. O protocolo POP tamén se pode usar para "
+#~ "recibir correo de certos provedores de correo web, e de sistemas de email "
+#~ "propietarios."
+
+#, fuzzy
+#~ msgid "No authentication required"
+#~ msgstr "Autenticación"
+
+#, fuzzy
+#~ msgid ""
+#~ "This option will connect to the SMTP server without using any kind of "
+#~ "authentication. This should be fine for connecting to most SMTP servers."
+#~ msgstr ""
+#~ "Esta opción conectarase ó servidor POP usando un contrasinal sen cifrar. "
+#~ "Esta é a única opción que soportan moitos servidores POP."
+
+#~ msgid "Remove action"
+#~ msgstr "Eliminar acción"
+
+#~ msgid "Remove criterion"
+#~ msgstr "Eliminar criterio"
+
+#, fuzzy
+#~ msgid "Check settings"
+#~ msgstr "Probar Configuración"
+
+#~ msgid "Email address:"
+#~ msgstr "Enderezo de email:"
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Configuración de Correo do Evolution"
+
+#, fuzzy
+#~ msgid "Hostname:"
+#~ msgstr "Nome de usuario:"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#, fuzzy
+#~ msgid "Keep mail on server"
+#~ msgstr "Non borrar as mensaxes do servidor"
+
+#, fuzzy
+#~ msgid "Kerberos"
+#~ msgstr "Kerberos 4"
+
+#~ msgid "Mail"
+#~ msgstr "Correo"
+
+#, fuzzy
+#~ msgid "Mail Account"
+#~ msgstr "Contas"
+
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Axudante da Configuración do Correo"
+
+#~ msgid "Optional"
+#~ msgstr "Opcional"
+
+#~ msgid "Password:"
+#~ msgstr "Contrasinal:"
+
+#, fuzzy
+#~ msgid "Remember my password"
+#~ msgstr "Gardar como VCard"
+
+#, fuzzy
+#~ msgid "Reply address:"
+#~ msgstr "Enderezo de email:"
+
+#, fuzzy
+#~ msgid "Required"
+#~ msgstr "Persoas _Requiridas"
+
+#, fuzzy
+#~ msgid "Save password"
+#~ msgstr "Gardar como VCard"
+
+#, fuzzy
+#~ msgid "Select signature file"
+#~ msgstr "Ficheiro de sinatura:"
+
+#, fuzzy
+#~ msgid "Server type:"
+#~ msgstr "Tipo de Servidor: "
+
+#, fuzzy
+#~ msgid "Signature:"
+#~ msgstr "Ficheiro de sinatura:"
 
 #, fuzzy
-#~ msgid "Connect to server"
-#~ msgstr "Non foi posible conectarse ó servidor POP en %s."
+#~ msgid "Transport"
+#~ msgstr "Transparente"
+
+#, fuzzy
+#~ msgid "Transport Authentication"
+#~ msgstr "Autenticación"
+
+#, fuzzy
+#~ msgid "minutes."
+#~ msgstr "minutos"
+
+#~ msgid "%s message %d of %d (uid \"%s\")"
+#~ msgstr "%s mensaxe %d de %d (uid \"%s\")"
+
+#, fuzzy
+#~ msgid "<unknown>"
+#~ msgstr "Descoñecido"
+
+#~ msgid "No GPG/PGP program available."
+#~ msgstr "O programa GPG/PGP non está dispoñible."
+
+#, fuzzy
+#~ msgid "Message _Display"
+#~ msgstr "Corpo da Mensaxe"
+
+#, fuzzy
+#~ msgid "_Compose"
+#~ msgstr "Redactar"
+
+#, fuzzy
+#~ msgid "_Message Hiding"
+#~ msgstr "_Mensaxe"
+
+#, fuzzy
+#~ msgid "Copyright (C) 2000, Helix Code, Inc."
+#~ msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
 #~ msgid "New"
 #~ msgstr "Novo"
@@ -8743,14 +9474,6 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgid "Registering local folder"
 #~ msgstr "Creando unha nova carpeta"
 
-#, fuzzy
-#~ msgid ""
-#~ "Unable to register folder '%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Non foi posible crear a carpeta `%s':\n"
-#~ "%s"
-
 #~ msgid "Fetching email from %s"
 #~ msgstr "Recibindo correo de %s"
 
@@ -8792,9 +9515,6 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgid "Retrieving message %d of %d"
 #~ msgstr "Recibindo a mensaxe %d de %d"
 
-#~ msgid "Writing message %d of %d"
-#~ msgstr "Escribindo a mensaxe %d de %d"
-
 #~ msgid "Saving changes to %s"
 #~ msgstr "Gardando as modificacións de %s"
 
@@ -8806,10 +9526,6 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ "%s"
 
 #, fuzzy
-#~ msgid "Unsubscribe from folder \"%s\""
-#~ msgstr "Abrindo as mensaxes da carpeta \"%s\""
-
-#, fuzzy
 #~ msgid "FIXME: _Appointment"
 #~ msgstr "FIXME: _Nova Cita"
 
@@ -9049,12 +9765,6 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgid "Server:"
 #~ msgstr "Servidor:"
 
-#~ msgid "Detect supported types..."
-#~ msgstr "Detectar tipos soportados..."
-
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Non borrar as mensaxes do servidor"
-
 #~ msgid "Mail source type:"
 #~ msgstr "Tipo de fonte de correo:"
 
@@ -9079,9 +9789,6 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgid "Edit News Server"
 #~ msgstr "Editar Servidor de News"
 
-#~ msgid "Testing \"%s\""
-#~ msgstr "Probando \"%s\""
-
 #~ msgid "The connection was successful!"
 #~ msgstr "¡A conexión foi correcta!"
 
@@ -9147,12 +9854,6 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgid "_Undo"
 #~ msgstr "_Desfacer"
 
-#~ msgid "Print Preview of message..."
-#~ msgstr "Previsualización da Impresión da mensaxe..."
-
-#~ msgid "Print message..."
-#~ msgstr "Imprimir mensaxe..."
-
 #~ msgid "Reply to _Sender"
 #~ msgstr "Responder ó _Autor"
 
@@ -9160,9 +9861,6 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgid "Show _All messages"
 #~ msgstr "Ver Todos"
 
-#~ msgid "_Edit Message"
-#~ msgstr "_Editar Mensaxe"
-
 #~ msgid "_Mail Configuration..."
 #~ msgstr "Configuración do _Correo..."
 
@@ -9173,19 +9871,12 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgstr "_Imprimir Mensaxe"
 
 #, fuzzy
-#~ msgid "_Save Message As..."
-#~ msgstr "Gardar como..."
-
-#, fuzzy
 #~ msgid "_Source"
 #~ msgstr "Fontes"
 
 #~ msgid "Show the _Folder Bar"
 #~ msgstr "Amosar a Barra de _Carpetas"
 
-#~ msgid "Available Categories:"
-#~ msgstr "Categorías Dispoñibles:"
-
 #~ msgid "External Directories"
 #~ msgstr "Directorios Externos"
 
@@ -9302,15 +9993,9 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgid "Send a message without a subject"
 #~ msgstr "Enviar unha mensaxe sen asunto"
 
-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "Marcando mensaxes na carpeta \"%s\""
-
 #~ msgid "Mark messages in folder \"%s\""
 #~ msgstr "Marcar mensaxes na carpeta \"%s\""
 
-#~ msgid "Marking message %d of %d"
-#~ msgstr "Marcando a mensaxe %d de %d"
-
 #~ msgid "Forwarding a message without a subject"
 #~ msgstr "Reenviando unha mensaxe sen asunto"
 
@@ -9379,15 +10064,9 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgid "Could not rename folder `%s': %s exists"
 #~ msgstr "Non foi posible renomear a carpeta `%s': %s existe"
 
-#~ msgid "Open in New Window"
-#~ msgstr "Abrir nunha Nova Fiestra"
-
 #~ msgid "Forward Message"
 #~ msgstr "Reenviar esta mensaxe"
 
-#~ msgid "Move Message"
-#~ msgstr "Mover Mensaxe"
-
 #~ msgid "Copy Message"
 #~ msgstr "Copiar Mensaxe"
 
@@ -9409,9 +10088,6 @@ msgstr "Non foi posible inicializar Bonobo"
 #~ msgid "Don't know protocol to open URI `%s'"
 #~ msgstr "O protocolo para abrir o URI `%s' é descoñecido"
 
-#~ msgid "New Ca_lendar"
-#~ msgstr "Nova A_xenda"
-
 #~ msgid "_New appointment..."
 #~ msgstr "_Nova cita..."
author	Michael Meeks <michael@ximian.com>	2001-04-14 16:02:59 +0800
committer	Michael Meeks <michael@src.gnome.org>	2001-04-14 16:02:59 +0800
commit	04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2 (patch)
tree	b5e5eb3fca54a50b8643bfdf7125fef9b272e6dd /po/gl.po
parent	a5e6e0b5f3e06eee5726edfe276c5d3c65bb155c (diff)
download	gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.gz gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.bz2 gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.lz gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.xz gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.zst gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.zip