Updated Norwegian (bokmål) translation.

2001-01-09  Kjartan Maraas  <kmaraas@gnome.org>

	* no.po: Updated Norwegian (bokmål) translation.

svn path=/trunk/; revision=7317

1 files changed, 2328 insertions, 1730 deletions

diff --git a/po/gl.po b/po/gl.po
index 86061dc9f7..51e01dc792 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,10 +7,11 @@
 #
 # First Version: 2000-04-07 22:14+0200
 #
+#: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2000-12-13 16:26-0600\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\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"
@@ -280,10 +281,10 @@ msgstr ""
 #: 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:991
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1136
-#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
@@ -408,53 +409,36 @@ msgstr ""
 "Ocorreu un erro ó obter a lista de\n"
 "pilots do demo gnome-pilot"
 
-#: addressbook/conduit/address-conduit.c:197
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr "Non foi posible cargar o cursor\n"
 
-#: addressbook/conduit/address-conduit.c:210
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr "EBook non cargado\n"
 
-#: addressbook/conduit/address-conduit.c:583
-#: calendar/conduits/calendar/calendar-conduit.c:715
-#: calendar/conduits/todo/todo-conduit.c:523
+#: addressbook/conduit/address-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: 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:584
-#: calendar/conduits/calendar/calendar-conduit.c:716
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Non foi posible iniciar wombat"
 
-#: addressbook/conduit/address-conduit.c:616
-#: addressbook/conduit/address-conduit.c:619
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/categories-strings.h:7
-msgid "categories"
-msgstr "categorías"
-
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr "Elemento(s) pertencentes a estas categorías:"
-
-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
-msgstr "Categorías Dispoñibles:"
-
-#.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "¿Borrar Contacto?"
 
@@ -468,7 +452,7 @@ msgid "_Add"
 msgstr "_Engadir"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -482,12 +466,13 @@ msgid "New phone type"
 msgstr "Novo tipo de teléfono"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
-#: po/tmp/mail-config.glade.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
+#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr "Engadir"
 
@@ -528,7 +513,7 @@ msgid "_Mobile"
 msgstr "_Móbil"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1328
+#: addressbook/contact-editor/e-contact-editor.c:1336
 msgid "Primary Email"
 msgstr "Correo Electrónico Principal"
 
@@ -545,7 +530,7 @@ msgid "C_ontacts..."
 msgstr "C_ontactos..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: po/tmp/task-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ca_tegorías..."
 
@@ -562,7 +547,8 @@ msgid "_Address..."
 msgstr "_Enderezo..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/event-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:15
+#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr "Xeral"
 
@@ -607,143 +593,143 @@ msgid "No_tes:"
 msgstr "No_tas:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: po/tmp/task-editor-dialog.glade.h:13
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Detalles"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:1274
 msgid "Assistant"
 msgstr "Asistente"
 
-#: addressbook/contact-editor/e-contact-editor.c:1267
-#: addressbook/contact-editor/e-contact-editor.c:1371
+#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1379
 msgid "Business"
 msgstr "Traballo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1268
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "Business 2"
 msgstr "Traballo 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1269
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Business Fax"
 msgstr "Fax do Traballo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1270
+#: addressbook/contact-editor/e-contact-editor.c:1278
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Car"
 msgstr "Automóbil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Company"
 msgstr "Compañía"
 
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/contact-editor/e-contact-editor.c:1372
+#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1380
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Home 2"
 msgstr "Particular 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Home Fax"
 msgstr "Fax Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/contact-editor/e-contact-editor.c:1285
 msgid "Mobile"
 msgstr "Móbil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1373
-#: po/tmp/mail-config.glade.h:17
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/contact-editor/e-contact-editor.c:1381
+#: mail/mail-config.glade.h:17
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1287
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "Pager"
 msgstr "Localizador (Pager)"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1289
 msgid "Primary"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1290
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1291
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/contact-editor/e-contact-editor.c:1292
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1329
+#: addressbook/contact-editor/e-contact-editor.c:1337
 msgid "Email 2"
 msgstr "Correo Electrónico 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "Email 3"
 msgstr "Correo Electrónico 3"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/fulladdr.glade.h:6
+#: addressbook/contact-editor/fulladdr.glade.h:6
 msgid "Address _2:"
 msgstr "Enderezo _2:"
 
-#: po/tmp/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:7
 msgid "Canada"
 msgstr "Canadá"
 
-#: po/tmp/fulladdr.glade.h:8
+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr ""
 
-#: po/tmp/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "_País:"
 
-#: po/tmp/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "Finland"
 msgstr "Finlandia"
 
-#: po/tmp/fulladdr.glade.h:11
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "USA"
 msgstr "Estados Unidos"
 
-#: po/tmp/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Enderezo:"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: po/tmp/fulladdr.glade.h:14
+#: addressbook/contact-editor/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_Apdo. de Correos:"
 
-#: po/tmp/fulladdr.glade.h:15
+#: addressbook/contact-editor/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "Código _Postal:"
 
@@ -757,10 +743,13 @@ msgid "Check Full Name"
 msgstr ""
 
 #: addressbook/contact-editor/fullname-strings.h:8
+#, fuzzy
 msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 "\n"
@@ -773,7 +762,7 @@ msgstr ""
 "Dra.\n"
 "Prof.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -790,44 +779,49 @@ msgstr ""
 "II\n"
 "III\n"
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_First:"
 msgstr "_Nome:"
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr "_Tratamento:"
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 msgid "_Middle:"
 msgstr "_Outros nomes:"
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr "_Apelidos:"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr "_Sufixo:"
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 msgstr "Como _Minitarxetas"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:269
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:237
+#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Como unha _Táboa"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:374
+#, fuzzy, c-format
+msgid "Enter password for %s"
+msgstr "Introduza o contrasinal NNTP para %s@%s"
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook.c:391
+#: addressbook/gui/component/addressbook.c:407
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -839,81 +833,211 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
 #, fuzzy
 msgid "Show All"
 msgstr "Ver Todos"
 
-#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 #, fuzzy
 msgid "Any field contains"
 msgstr "O corpo contén"
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 #, fuzzy
 msgid "Name contains"
 msgstr "contén"
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 #, fuzzy
 msgid "Email contains"
 msgstr "contén"
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que amosará o navegador de carpetas"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-msgstr "Directorios Externos"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
-msgstr "Descrición:"
+#: addressbook/gui/component/addressbook-storage.c:95
+#, fuzzy
+msgid "Other Contacts"
+msgstr "_Novo Contacto"
 
-#: po/tmp/ldap-server-dialog.glade.h:7
-msgid "LDAP Server:"
+#: addressbook/gui/component/addressbook-config.c:139
+#, fuzzy
+msgid "LDAP Server"
 msgstr "Servidor LDAP:"
 
-#: po/tmp/ldap-server-dialog.glade.h:8
-msgid "Name:"
-msgstr "Nome:"
+#: addressbook/gui/component/addressbook-config.c:141
+#, fuzzy
+msgid "File"
+msgstr "_Ficheiro"
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "Número de Porto:"
+#: addressbook/gui/component/addressbook-config.c:144
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "Non se pode abrir o libro de enderezos"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "None (anonymous mode)"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:155
+#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/pop3/camel-pop3-store.c:148
+msgid "Password"
+msgstr "Contrasinal"
+
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:160
+#, fuzzy
+msgid "Unknown auth type"
+msgstr "Erro descoñecido"
+
+#: addressbook/gui/component/addressbook-config.c:169
+#, fuzzy
+msgid "Base"
+msgstr "Pegar"
+
+#: addressbook/gui/component/addressbook-config.c:171
+msgid "One"
+msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:10
+#: addressbook/gui/component/addressbook-config.c:173
+#, fuzzy
+msgid "Subtree"
+msgstr "Subscribir"
+
+#: addressbook/gui/component/addressbook-config.c:176
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:309
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:311
+#: mail/mail-config-gui.c:968
+msgid "Remember this password"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:360
+#: mail/mail-config-druid.glade.h:34
+#, fuzzy
+msgid "Host:"
+msgstr "Horas"
+
+#: addressbook/gui/component/addressbook-config.c:361
+#, fuzzy
+msgid "Port:"
+msgstr "Prioridade:"
+
+#: addressbook/gui/component/addressbook-config.c:364
 msgid "Root DN:"
 msgstr "DN Raíz:"
 
+#: addressbook/gui/component/addressbook-config.c:384
+#, fuzzy
+msgid "Search Scope:"
+msgstr "Buscar"
+
+#: addressbook/gui/component/addressbook-config.c:438
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
+msgid "Authentication:"
+msgstr "Autenticación:"
+
+#: addressbook/gui/component/addressbook-config.c:455
+#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
+msgid "Path:"
+msgstr "Camiño:"
+
+#: addressbook/gui/component/addressbook-config.c:460
+#, fuzzy
+msgid "Create path if it doesn't exist."
+msgstr "O ficheiro non existe."
+
+#: addressbook/gui/component/addressbook-config.c:593
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "Gardar no libro de enderezos"
+
+#: addressbook/gui/component/addressbook-config.c:595
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "Gardar no libro de enderezos"
+
+#: addressbook/gui/component/addressbook-config.c:611
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:616
+#: mail/mail-config-druid.glade.h:45
+msgid "Name:"
+msgstr "Nome:"
+
+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:7
+msgid "Description:"
+msgstr "Descrición:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Engadir Fonte"
+
+#: addressbook/gui/component/addressbook-config.glade.h:8
+#: calendar/gui/e-calendar-table.c:342
+#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
+#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
+#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
+#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
+msgid "Delete"
+msgstr "Eliminar"
+
+#: addressbook/gui/component/addressbook-config.glade.h:9
+#: filter/filter.glade.h:8 mail/folder-browser.c:671
+#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
+msgid "Edit"
+msgstr "Editar"
+
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Name"
+msgstr "Nome:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:11
+msgid "URI"
+msgstr ""
+
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Find..."
 msgstr "Buscar..."
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr ""
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "Select Names"
 msgstr ""
 
-#: po/tmp/select-names.glade.h:9
-msgid "Select name from List:"
+#: addressbook/gui/component/select-names/select-names.glade.h:9
+#, fuzzy
+msgid "Select name from:"
 msgstr "Seleccionar un nome da Lista:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
@@ -922,119 +1046,119 @@ msgid "Search"
 msgstr "Buscar"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/alphabet.glade.h:6
+#: addressbook/gui/widgets/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: po/tmp/alphabet.glade.h:7
+#: addressbook/gui/widgets/alphabet.glade.h:7
 msgid "a"
 msgstr "a"
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:417
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Gardar como VCard"
 
@@ -1057,189 +1181,178 @@ msgstr ""
 "Faga dobre clic aquí para crear un novo Contacto."
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/e-contact-print.glade.h:6
+#: addressbook/printing/e-contact-print.glade.h:6
 msgid "10 pt. Tahoma"
 msgstr "10 ptos. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 ptos. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:8
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr ""
 
-#: po/tmp/e-contact-print.glade.h:9
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "Corpo"
 
-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Inferior:"
 
-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Dimensións:"
 
-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Fonte..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Fontes"
 
-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr ""
 
-#: po/tmp/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "Formato"
 
-#: po/tmp/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Header"
 msgstr ""
 
-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr ""
 
-#: po/tmp/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "Cabeceiras"
 
-#: po/tmp/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr ""
 
-#: po/tmp/e-contact-print.glade.h:20
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "Altura:"
 
-#: po/tmp/e-contact-print.glade.h:21
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr ""
 
-#: po/tmp/e-contact-print.glade.h:22
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr ""
 
-#: po/tmp/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Horizontal"
 
-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Esquerda:"
 
-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "Pestanas coas letras no lateral"
 
-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "Marxes"
 
-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "Número de columnas:"
 
-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Opcións"
 
-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "Orientación"
 
-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Páxina"
 
-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "Configuración da Páxina:"
 
-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Papel"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Orixe do papel:"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Vertical"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "Previsualización:"
 
-#: po/tmp/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr "Imprimir usando sombreado gris"
 
-#: po/tmp/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "Invertir nas páxinas pares"
 
-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Dereita:"
 
-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "Seccións:"
 
-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "Sombreado"
 
-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "Iniciar nunha nova páxina"
 
-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Nome do estilo:"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "Superior:"
 
-#: po/tmp/e-contact-print.glade.h:45
+#: addressbook/printing/e-contact-print.glade.h:45
+#: mail/mail-config-druid.glade.h:75
 msgid "Type:"
 msgstr "Tipo:"
 
-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Largura:"
 
-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "label26"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
-#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
-#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
-msgid "pm"
-msgstr "pm"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Conducto de Axenda de Evolution"
@@ -1248,13 +1361,13 @@ msgstr "Conducto de Axenda de Evolution"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:671
-#: calendar/conduits/todo/todo-conduit.c:479
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr "Erro comunicando co servidor de axenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:773
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1266,123 +1379,161 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Utilidade de configuración para o conducto a-facer de evolution.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:578
-#: calendar/conduits/todo/todo-conduit.c:581
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:60
-msgid "Outline:"
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
+msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:61
-msgid "Headings:"
+#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
+msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:62
-msgid "Empty days:"
-msgstr "Días baleiros:"
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
+msgid "Calendar Repository"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:63
-msgid "Appointments:"
-msgstr "Citas:"
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
+#, fuzzy
+msgid "Calendar Server"
+msgstr "Axenda"
 
-#: calendar/gui/calendar-commands.c:64
-msgid "Highlighted day:"
-msgstr "Día salientado:"
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Evolution calendar executive summary component."
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:65
-msgid "Day numbers:"
-msgstr "Números dos días:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Conducto de Axenda de Evolution"
 
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
-msgstr "Número do día actual:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Evolution component for handling the calendar."
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:67
-msgid "To-Do item that is not yet due:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory for the Calendar Summary component."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:68
-msgid "To-Do item that is due today:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:69
-msgid "To-Do item that is overdue:"
+#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
+#: calendar/gui/alarm-notify.c:940
+msgid "Reminder of your appointment at "
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:354
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "Adiar"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
+#: mail/mail-search-dialogue.c:104
+msgid "Ok"
+msgstr "Aceptar"
+
+#: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "Ficheiro non atopado"
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:253
 msgid "Open calendar"
 msgstr "Abrir axenda"
 
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:295
 msgid "Save calendar"
 msgstr "Gardar axenda"
 
+#: calendar/gui/calendar-commands.c:432
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgstr ""
+
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:282
+#: calendar/gui/calendar-model.c:284
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
+#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
 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,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
+#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:741
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:346
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "Público"
 
-#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:349
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:352
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:517
 msgid "Transparent"
 msgstr "Transparente"
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:520
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:744
+#: calendar/gui/calendar-model.c:746
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1394,35 +1545,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:863
+#: calendar/gui/calendar-model.c:865
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:866
+#: calendar/gui/calendar-model.c:868
 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.
-#: calendar/gui/calendar-model.c:870
+#: calendar/gui/calendar-model.c:872
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:873
+#: calendar/gui/calendar-model.c:875
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:993
+#: calendar/gui/calendar-model.c:995
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1432,14 +1583,37 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1033
+#: calendar/gui/calendar-model.c:1035
 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:1073
+#: calendar/gui/calendar-model.c:1075
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "A prioridade ten que estar entre 1 e 9, inclusive"
 
+#: calendar/gui/calendar-summary.c:81
+#, fuzzy
+msgid "%A, %e %B %Y"
+msgstr "%A, %d de %B de %Y"
+
+#: calendar/gui/calendar-summary.c:224
+#, fuzzy
+msgid "<b>Error loading calendar</b>"
+msgstr "Erro cargando o ficheiro: %s"
+
+#: calendar/gui/calendar-summary.c:229
+msgid "<b>Error loading calendar:<br>Calendar in use."
+msgstr ""
+
+#: calendar/gui/calendar-summary.c:235
+msgid "<b>Error loading calendar:<br>Method not supported"
+msgstr ""
+
+#: calendar/gui/calendar-summary.c:293
+#, fuzzy
+msgid "Loading Calendar"
+msgstr "Imprimir axenda"
+
 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "O URI que amosará a axenda"
@@ -1457,350 +1631,402 @@ msgid "No summary available."
 msgstr ""
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/alarm-notify.glade.h:6 po/tmp/evolution-contact-editor.xml.h:6
-#: po/tmp/evolution-event-editor.xml.h:13
-#: po/tmp/evolution-message-composer.xml.h:8
-#: po/tmp/evolution-subscribe.xml.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:6
+#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
 msgid "Close"
 msgstr "Pechar"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Editar cita"
 
-#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "Adiar"
-
-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Tempo de adiamento (minutos)"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "05 minutes"
 msgstr "05 minutos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "10 minutes"
 msgstr "10 minutos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12 horas (am/pm)"
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "15 minutes"
 msgstr "15 minutos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24 horas"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "30 minutes"
 msgstr "30 minutos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Audio Alarms"
 msgstr "Alarmas Sonoras"
 
-#: po/tmp/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "Axenda"
 
-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "Preferencias da Axenda"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Cores"
 
-#: po/tmp/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "Final do día:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "Primeiro día da semana:"
 
-#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/gnome-month-item.c:741
 msgid "Fri"
 msgstr "Ven"
 
-#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/event-editor.c:433
 msgid "Friday"
 msgstr "Venres"
 
-#: po/tmp/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/gnome-month-item.c:737
 msgid "Mon"
 msgstr "Lun"
 
-#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/event-editor.c:429
 msgid "Monday"
 msgstr "Luns"
 
-#: po/tmp/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr ""
 
-#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
 msgid "Priority"
 msgstr "Prioridade"
 
-#: po/tmp/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/gnome-month-item.c:742
 msgid "Sat"
 msgstr "Sáb"
 
-#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/event-editor.c:434
 msgid "Saturday"
 msgstr "Sábado"
 
-#: po/tmp/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "Amosar números de semana"
 
-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "Inicio do día:"
 
 #. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/gnome-month-item.c:736
 msgid "Sun"
 msgstr "Dom"
 
-#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/event-editor.c:435
 msgid "Sunday"
 msgstr "Domingo"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/gnome-month-item.c:740
 msgid "Thu"
 msgstr "Xov"
 
-#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:432
 msgid "Thursday"
 msgstr "Xoves"
 
-#: po/tmp/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Formato da hora:"
 
-#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: calendar/gui/gnome-month-item.c:738
 msgid "Tue"
 msgstr "Mar"
 
-#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/event-editor.c:430
 msgid "Tuesday"
 msgstr "Martes"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "Alarmas Visuais"
 
-#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: calendar/gui/gnome-month-item.c:739
 msgid "Wed"
 msgstr "Mér"
 
-#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: calendar/gui/event-editor.c:431
 msgid "Wednesday"
 msgstr "Mércores"
 
-#: po/tmp/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:62
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:63
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr "segundos."
 
+#: calendar/gui/dialogs/delete-comp.c:62
+#, 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:65
+#, 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:71
+#, 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:74
+#, 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:80
+#, 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:83
+#, fuzzy
+msgid "Are you sure want to delete this untitled journal entry?"
+msgstr ""
+"¿Está seguro de que quere\n"
+"borrar este contacto?"
+
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/task-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
 msgid "% Comp_lete:"
 msgstr "% Comp_leta:"
 
-#: po/tmp/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr "C_lasificación:"
 
-#: po/tmp/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Cancelled"
 msgstr "Cancelada"
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "Completada"
 
-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "Alta"
 
-#: po/tmp/task-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 msgid "In Progress"
 msgstr "En Progreso"
 
-#: po/tmp/task-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "Baixa"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
-#: widgets/misc/e-dateedit.c:1446
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
 msgid "None"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 msgid "Normal"
 msgstr "Normal"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 msgid "Not Started"
 msgstr "Non Iniciada"
 
-#: po/tmp/task-editor-dialog.glade.h:22
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr "_Resume"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Data de _Inicio:"
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Tarefa"
 
-#: po/tmp/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
-#: po/tmp/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
 msgid "_Contacts..."
 msgstr "_Contactos..."
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "_Due Date:"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "_Prioridade:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr "_Estado:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr "diálogo-editor-tarefas"
 
@@ -1808,26 +2034,26 @@ msgstr "diálogo-editor-tarefas"
 msgid "Edit Task"
 msgstr "Editar Tarefa"
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
 msgid "No summary"
 msgstr "Sen resume"
 
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
 msgid "Do you want to save changes?"
 msgstr ""
 
@@ -1847,14 +2073,6 @@ msgstr "Marcar como Completa"
 msgid "Mark the task complete"
 msgstr "Marcar a tarefa como completa"
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:479 mail/mail-view.c:165
-#: po/tmp/event-editor-dialog.glade.h:12 po/tmp/evolution-addressbook.xml.h:8
-#: po/tmp/evolution-event-editor.xml.h:19 po/tmp/evolution-mail.xml.h:11
-#: po/tmp/filter.glade.h:7 po/tmp/mail-config.glade.h:8
-msgid "Delete"
-msgstr "Eliminar"
-
 #: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Borrar a tarefa"
@@ -1866,50 +2084,62 @@ 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:261 calendar/gui/e-day-view.c:1208
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: 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:265 calendar/gui/e-day-view.c:1222
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: 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:269 calendar/gui/e-day-view.c:1235
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d de %b"
 
-#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
-#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
+#: calendar/gui/print.c:610
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
+#: calendar/gui/print.c:609
+msgid "pm"
+msgstr "pm"
+
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 msgid "New appointment..."
 msgstr "Nova cita..."
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
-#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr "Editar esta cita..."
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Borrar esta cita"
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 msgid "Delete this occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr ""
 
@@ -1921,661 +2151,490 @@ msgid "%d %B"
 msgstr "%d de %b"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/event-editor-dialog.glade.h:6
+#: calendar/gui/event-editor-dialog.glade.h:6
 msgid "A_ll day event"
 msgstr "Evento de día _completo"
 
-#: po/tmp/event-editor-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:8
 msgid "Appointment Basics"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "Clasificación"
 
-#: po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:10
 msgid "Custom recurrence"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:11
 msgid "Days"
 msgstr "Días"
 
-#: po/tmp/event-editor-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:13
 msgid "Every"
 msgstr "Cada"
 
-#: po/tmp/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Exceptions"
 msgstr "Excepcións"
 
-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "Horas"
 
-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
 msgid "Mail _to:"
 msgstr "Enviar _a:"
 
-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Minutes"
 msgstr "Minutos"
 
-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:19
 msgid "Modify"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:20
 msgid "No recurrence"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:21
 #, fuzzy
 msgid "Preview"
 msgstr "Previsualización:"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:22
 msgid "Pri_vate"
 msgstr "Pri_vado"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:23
 msgid "Pu_blic"
 msgstr "Pú_blico"
 
-#: po/tmp/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24
 msgid "Recurrence"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:25
 msgid "Recurrence Rule"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:26
 msgid "Reminder"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:27
 msgid "Simple recurrence"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:28
+#: calendar/gui/event-editor-dialog.glade.h:28
 msgid "Su_mmary:"
 msgstr "_Resume:"
 
-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "Hora"
 
-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:30
 msgid "_Audio"
 msgstr "_Audio"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr "_Visualizar"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33
 msgid "_End time:"
 msgstr "Hora de _finalización:"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "_Correo"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:35
 msgid "_Program"
 msgstr "_Programa"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr "_Executar programa:"
 
-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "Data de _comezo:"
 
-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "day(s)"
 msgstr "día(s)"
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40
 msgid "event-editor-dialog"
 msgstr "diálogo-editor-eventos"
 
-#: po/tmp/event-editor-dialog.glade.h:41
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "for"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "forever"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "label21"
 msgstr "label21"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr "mes(es)"
 
-#: po/tmp/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "until"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "semana(s)"
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: calendar/gui/event-editor.c:329
+#: calendar/gui/event-editor.c:325
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/event-editor.c:407
+#: calendar/gui/event-editor.c:403
 msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
 msgid "day"
 msgstr "día"
 
-#: calendar/gui/event-editor.c:559
+#: calendar/gui/event-editor.c:555
 #, fuzzy
 msgid "on the"
 msgstr "mes"
 
-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:562
 #, fuzzy
 msgid "th"
 msgstr "4"
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:716
 #, fuzzy
 msgid "occurrences"
 msgstr "Fontes"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/getdate.y:391
-msgid "january"
-msgstr "xaneiro"
+#: calendar/gui/gnome-cal.c:676
+#, c-format
+msgid "Could not load the calendar in `%s'"
+msgstr "Non foi posible cargar a axenda en `%s'"
 
-#: calendar/gui/getdate.y:392
-msgid "february"
-msgstr "febreiro"
+#: calendar/gui/gnome-cal.c:687
+#, c-format
+msgid "Could not create a calendar in `%s'"
+msgstr "Non foi posible crear un calendario en `%s'"
 
-#: calendar/gui/getdate.y:393
-msgid "march"
-msgstr "marzo"
+#: calendar/gui/gnome-cal.c:698
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "O método requirido para cargar `%s' non está soportado"
 
-#: calendar/gui/getdate.y:394
-msgid "april"
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+msgid "April"
 msgstr "abril"
 
-#: calendar/gui/getdate.y:395
-msgid "may"
-msgstr "maio"
-
-#: calendar/gui/getdate.y:396
-msgid "june"
-msgstr "xuño"
-
-#: calendar/gui/getdate.y:397
-msgid "july"
-msgstr "xullo"
-
-#: calendar/gui/getdate.y:398
-msgid "august"
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
+msgid "August"
 msgstr "agosto"
 
-#: calendar/gui/getdate.y:399
-msgid "september"
-msgstr "setembro"
-
-#: calendar/gui/getdate.y:400
-msgid "sept"
-msgstr "setem"
-
-#: calendar/gui/getdate.y:401
-msgid "october"
-msgstr "outubro"
-
-#: calendar/gui/getdate.y:402
-msgid "november"
-msgstr "novembro"
-
-#: calendar/gui/getdate.y:403
-msgid "december"
+#: calendar/gui/goto-dialog.glade.h:8
+#, fuzzy
+msgid "December"
 msgstr "decembro"
 
-#: calendar/gui/getdate.y:404
-msgid "sunday"
-msgstr "domingo"
-
-#: calendar/gui/getdate.y:405
-msgid "monday"
-msgstr "luns"
-
-#: calendar/gui/getdate.y:406
-msgid "tuesday"
-msgstr "martes"
-
-#: calendar/gui/getdate.y:407
-msgid "tues"
-msgstr "mart"
-
-#: calendar/gui/getdate.y:408
-msgid "wednesday"
-msgstr "mércores"
-
-#: calendar/gui/getdate.y:409
-msgid "wednes"
-msgstr "mércor"
-
-#: calendar/gui/getdate.y:410
-msgid "thursday"
-msgstr "xoves"
-
-#: calendar/gui/getdate.y:411
-msgid "thur"
-msgstr "xov"
-
-#: calendar/gui/getdate.y:412
-msgid "thurs"
-msgstr "xoves"
-
-#: calendar/gui/getdate.y:413
-msgid "friday"
-msgstr "venres"
-
-#: calendar/gui/getdate.y:414
-msgid "saturday"
-msgstr "sábado"
-
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
-msgid "year"
-msgstr "ano"
-
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
-msgid "month"
-msgstr "mes"
-
-#: calendar/gui/getdate.y:422
-msgid "fortnight"
-msgstr "quincena"
-
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-msgid "week"
-msgstr "semana"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-msgid "hour"
-msgstr "hora"
-
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minuto"
-
-#: calendar/gui/getdate.y:427
-msgid "min"
-msgstr "min"
-
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-msgid "second"
-msgstr "segundo"
-
-#: calendar/gui/getdate.y:429
-msgid "sec"
-msgstr "seg"
-
-#: calendar/gui/getdate.y:435
-msgid "tomorrow"
-msgstr "mañá"
-
-#: calendar/gui/getdate.y:436
-msgid "yesterday"
-msgstr "onte"
-
-#: calendar/gui/getdate.y:437
-msgid "today"
-msgstr "hoxe"
-
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
-msgid "now"
-msgstr "agora"
-
-#: calendar/gui/getdate.y:439
-msgid "last"
-msgstr ""
-
-#: calendar/gui/getdate.y:440
-msgid "this"
-msgstr ""
-
-#: calendar/gui/getdate.y:441
-msgid "next"
-msgstr ""
-
-#: calendar/gui/getdate.y:442
-msgid "first"
-msgstr "primeiro"
-
-#. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:444
-msgid "third"
-msgstr "terceiro"
-
-#: calendar/gui/getdate.y:445
-msgid "fourth"
-msgstr "cuarto"
-
-#: calendar/gui/getdate.y:446
-msgid "fifth"
-msgstr "quinto"
-
-#: calendar/gui/getdate.y:447
-msgid "sixth"
-msgstr "sexto"
-
-#: calendar/gui/getdate.y:448
-msgid "seventh"
-msgstr "sétimo"
-
-#: calendar/gui/getdate.y:449
-msgid "eighth"
-msgstr "oitavo"
-
-#: calendar/gui/getdate.y:450
-msgid "ninth"
-msgstr "noveno"
-
-#: calendar/gui/getdate.y:451
-msgid "tenth"
-msgstr "décimo"
-
-#: calendar/gui/getdate.y:452
-msgid "eleventh"
-msgstr "décimo primeiro"
+#: calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+msgid "February"
+msgstr "febreiro"
 
-#: calendar/gui/getdate.y:453
-msgid "twelfth"
-msgstr "décimo segundo"
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "Go To Date"
+msgstr "Ir á data"
 
-#: calendar/gui/getdate.y:454
-msgid "ago"
-msgstr ""
+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "Go To Today"
+msgstr "Ir a hoxe"
 
-#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
-#: calendar/gui/gnome-cal.c:1530
-msgid "Reminder of your appointment at "
-msgstr ""
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "January"
+msgstr "xaneiro"
 
-#: calendar/gui/gnome-cal.c:1152
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Non foi posible cargar a axenda en `%s'"
+#: calendar/gui/goto-dialog.glade.h:13
+#, fuzzy
+msgid "July"
+msgstr "xullo"
 
-#: calendar/gui/gnome-cal.c:1163
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Non foi posible crear un calendario en `%s'"
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "June"
+msgstr "xuño"
 
-#: calendar/gui/gnome-cal.c:1174
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "O método requirido para cargar `%s' non está soportado"
+#: calendar/gui/goto-dialog.glade.h:15
+#, fuzzy
+msgid "March"
+msgstr "marzo"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Aceptar"
+#: calendar/gui/goto-dialog.glade.h:16
+#, fuzzy
+msgid "May"
+msgstr "Luns"
 
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "Ano:"
+#: calendar/gui/goto-dialog.glade.h:17
+#, fuzzy
+msgid "November"
+msgstr "novembro"
 
-#: calendar/gui/goto.c:270
-msgid "Go to date"
-msgstr "Ir á data"
+#: calendar/gui/goto-dialog.glade.h:18
+#, fuzzy
+msgid "October"
+msgstr "outubro"
 
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
-"Seleccione a data á que quere ir.\n"
-"Cando prema nun día, será levado a esa data."
+#: calendar/gui/goto-dialog.glade.h:19
+#, fuzzy
+msgid "September"
+msgstr "setembro"
 
-#: calendar/gui/goto.c:318
-msgid "Go to today"
-msgstr "Ir a hoxe"
+#: calendar/gui/main.c:49
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Non foi posible inicializar Bonobo"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:299
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Th"
 msgstr "Xo"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Sa"
 msgstr "Sa"
 
-#: calendar/gui/print.c:936
+#: calendar/gui/print.c:941
 msgid "Tasks"
 msgstr "Tarefas"
 
 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr "Día actual (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1080 calendar/gui/print.c:1084
+#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1081
+#: calendar/gui/print.c:1086
 msgid "%a %d %Y"
 msgstr "%a %d de %Y"
 
-#: calendar/gui/print.c:1092
+#: calendar/gui/print.c:1097
 #, 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:1100
+#: calendar/gui/print.c:1105
 msgid "Current month (%b %Y)"
 msgstr "Mes actual (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr "Ano actual (%Y)"
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 msgid "Print Calendar"
 msgstr "Imprimir axenda"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr "Previsualizar da Impresión"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "LMMXVSD"
-
-#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "DLMMXVS"
 
@@ -2665,60 +2724,61 @@ msgstr "Non foi posible cargar %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:182
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:162
 #, 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:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(máquina descoñecida)"
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr ""
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "O URL '%s' necesita unha parte co nome do usuario"
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, 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:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte co camiño"
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, 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:360
+#: camel/camel-session.c:388
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2742,52 +2802,52 @@ 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"
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, fuzzy, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr "Non foi posible crear unha canalización: %s"
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Resposta non agardada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:231
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta non agardada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:286
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:407
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:443
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:196
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:586
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2799,33 +2859,27 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:234
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid "Password"
-msgstr "Contrasinal"
-
-#: camel/providers/imap/camel-imap-store.c:236
+#: camel/providers/imap/camel-imap-store.c:248
 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:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Esta opción conectarase ó servidor IMAP usando autenticación Kerberos 4."
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, 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:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2836,7 +2890,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Non foi posible crear o directorio %s: %s"
@@ -2921,12 +2975,12 @@ 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:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: 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:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2936,14 +2990,14 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 #, fuzzy
 msgid "No such message"
 msgstr "Re-enviar esta mensaxe"
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr ""
 
@@ -2991,19 +3045,19 @@ msgstr "Non foi posible borrar a carpeta `%s': %s"
 msgid "not a maildir directory"
 msgstr "`%s' non é un directorio."
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, 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:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, 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:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3012,11 +3066,11 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -3071,58 +3125,58 @@ msgstr ""
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, 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:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, 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:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, 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:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erro escribindo á caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, 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:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, 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:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, 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:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posible renomear a carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro descoñecido: %s"
@@ -3155,7 +3209,7 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr "O servidor rexeitou o nome de usuario/contrasinal"
 
-#: camel/providers/nntp/camel-nntp-folder.c:144
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Mensaxe %s non atopada."
@@ -3206,16 +3260,16 @@ 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:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
@@ -3262,17 +3316,17 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Non foi posible autenticarse co servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, 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:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, 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:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3281,12 +3335,12 @@ msgstr ""
 "Non foi posible conectarse ó servidor POP.\n"
 "Erro enviando o nome de usuario: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 msgid "(Unknown)"
 msgstr "(Descoñecido)"
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3294,7 +3348,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:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3303,12 +3357,13 @@ msgstr ""
 "Non foi posible conectarse ó servidor POP.\n"
 "Erro enviando o contrasinal: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Non existe a carpeta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3359,8 +3414,140 @@ msgstr "sendmail"
 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-druid.glade.h:59
+msgid "SMTP"
+msgstr "SMTP"
+
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:187
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:281
+#, fuzzy
+msgid "No authentication required"
+msgstr "Autenticación"
+
+#: camel/providers/smtp/camel-smtp-transport.c:283
+#, 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."
+
+#: camel/providers/smtp/camel-smtp-transport.c:292
+#: camel/providers/smtp/camel-smtp-transport.c:297
+#: mail/mail-config-druid.glade.h:16
+msgid "CRAM-MD5"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:294
+#, fuzzy
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr ""
+"Esta opción conectarase ó servidor IMAP usando autenticación Kerberos 4."
+
+#: camel/providers/smtp/camel-smtp-transport.c:332
+#, c-format
+msgid "SMTP server %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:334
+#, 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:359
+msgid "Cannot send message: sender address not defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:366
+msgid "Cannot send message: sender address not valid."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+msgid "Cannot send message: no recipients defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:490
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:529
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:570
+#, 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:586
+#, 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:617
+#, 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:633
+#, 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:648
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, 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:682
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:722
+#, fuzzy, c-format
+msgid "RSET response error: %s"
+msgstr "Erro descoñecido: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:745
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
 #: camel/providers/vee/camel-vee-provider.c:30
@@ -3396,82 +3583,82 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:417
-#: po/tmp/evolution-message-composer.xml.h:7
+#: composer/e-msg-composer-attachment-bar.c:413
+#: ui/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Incluír un ficheiro"
 
-#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/filter.glade.h:14
+#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
 #: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Quitar"
 
-#: composer/e-msg-composer-attachment-bar.c:465
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Quitar os elementos seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "Engadir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Attach a file to the message"
 msgstr "Incluír un ficheiro como anexo na mensaxe"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "Propiedades do anexo"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Nome de ficheiro:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:621
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
+#: mail/mail-format.c:626
 msgid "From:"
 msgstr "De:"
 
-#: composer/e-msg-composer-hdrs.c:238
+#: composer/e-msg-composer-hdrs.c:247
 msgid "Click here for the address book"
 msgstr "Prema aquí para o libro de enderezos"
 
-#: composer/e-msg-composer-hdrs.c:291
+#: composer/e-msg-composer-hdrs.c:304
 msgid "Enter the identity you wish to send this message from"
 msgstr "Introduza a identidade coa que desexa enviar esta mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:314
 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:306
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: composer/e-msg-composer-hdrs.c:320
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3479,15 +3666,15 @@ msgstr ""
 "Introduza os enderezos que recibirán unha copia da mensaxe sen apareceren na "
 "lista de destinatarios."
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Enter the subject of the mail"
 msgstr "Introduza o asunto da mensaxe"
 
-#: composer/e-msg-composer.c:429
+#: composer/e-msg-composer.c:430
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3496,38 +3683,38 @@ msgstr ""
 "Non foi posible abrir o ficheiro de sinatura %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:599
+#: composer/e-msg-composer.c:600
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: composer/e-msg-composer.c:610
+#: composer/e-msg-composer.c:611
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:630
+#: composer/e-msg-composer.c:631
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:653
 msgid "Saving changes to message..."
 msgstr "Gardando as modificacións da mensaxe..."
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:655
 msgid "Save changes to message..."
 msgstr "Gardar as modificacións da mensaxe..."
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:745
+#: composer/e-msg-composer.c:747
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3537,27 +3724,27 @@ msgstr ""
 "\n"
 "¿Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:767
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr "O ficheiro non existe."
 
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr "Non é un ficheiro normal."
 
-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr "O ficheiro existe pero non se pode ler."
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:928
 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:945
+#: composer/e-msg-composer.c:950
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3565,15 +3752,15 @@ msgstr ""
 "O ficheiro é moi longo (máis de 100K).\n"
 "¿Está seguro de querer inserilo?"
 
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1350
 msgid "Compose a message"
 msgstr "Compoñer unha mensaxe"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1427
 msgid "Could not create composer window."
 msgstr ""
 
@@ -3587,14 +3774,26 @@ msgid "Sear_ch"
 msgstr "Buscar"
 
 #: filter/filter-datespec.c:62
+msgid "year"
+msgstr "ano"
+
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "anos"
 
 #: filter/filter-datespec.c:63
+msgid "month"
+msgstr "mes"
+
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr "meses"
 
 #: filter/filter-datespec.c:64
+msgid "week"
+msgstr "semana"
+
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "semanas"
 
@@ -3603,14 +3802,26 @@ msgid "days"
 msgstr "días"
 
 #: filter/filter-datespec.c:66
+msgid "hour"
+msgstr "hora"
+
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "horas"
 
 #: filter/filter-datespec.c:67
+msgid "minute"
+msgstr "minuto"
+
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minutos"
 
 #: filter/filter-datespec.c:68
+msgid "second"
+msgstr "segundo"
+
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr "segundos"
 
@@ -3660,6 +3871,10 @@ msgstr "unha relativa ó momento actual"
 msgid "Compare against"
 msgstr ""
 
+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+msgid "now"
+msgstr "agora"
+
 #: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<prema aquí para seleccionar unha data>"
@@ -3685,7 +3900,7 @@ msgstr ""
 "Entrante\n"
 "Saínte\n"
 
-#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+#: filter/filter-editor.c:456 filter/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "Editar Filtros"
 
@@ -3720,7 +3935,7 @@ msgstr "Introduza o URI da carpeta"
 msgid "<click here to select a folder>"
 msgstr "<prema aquí para seleccionar unha carpeta>"
 
-#: filter/filter-input.c:184
+#: filter/filter-input.c:185
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3729,241 +3944,252 @@ msgstr ""
 "Erro na expresión regular '%s':\n"
 "%s"
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 msgid "Failed to perform regex search on message header: %s"
 msgstr ""
 
-#: filter/filter-part.c:456
+#: filter/filter-part.c:467
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:520
+#: filter/filter-rule.c:530
 msgid "Rule name: "
 msgstr "Nome da regra: "
 
-#: filter/filter-rule.c:524
+#: filter/filter-rule.c:534
 msgid "Untitled"
 msgstr "Sen_título"
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:557
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr "Executar accións"
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr "se se cumpren tódolos criterios"
 
-#: filter/filter-rule.c:566
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr "se se cumpre algún criterio"
 
-#: filter/filter-rule.c:577
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr "Engadir criterio"
 
-#: filter/filter-rule.c:583
+#: filter/filter-rule.c:593
 msgid "Remove criterion"
 msgstr "Eliminar criterio"
 
-#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Editar"
+#: filter/filter-system-flag.c:63
+#, fuzzy
+msgid "Replied to"
+msgstr "Responder a Todos"
 
-#: po/tmp/filter.glade.h:10
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
+#: filter/filter-system-flag.c:66
+msgid "Important"
+msgstr ""
+
+#: filter/filter-system-flag.c:67
+#, fuzzy
+msgid "Read"
+msgstr "Refacer"
+
+#: filter/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr ""
 
-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "Reglas de Filtrado"
 
-#: po/tmp/filter.glade.h:12
+#: filter/filter.glade.h:12
 #, fuzzy
 msgid "Incoming"
 msgstr ""
 "Entrante\n"
 "Saínte\n"
 
-#: po/tmp/filter.glade.h:13
+#: filter/filter.glade.h:13
 #, fuzzy
 msgid "Outgoing"
 msgstr ""
 "Entrante\n"
 "Saínte\n"
 
-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Carpetas Virtuais"
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr ""
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+msgid "after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Asignar Cor"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Asignar Puntuación"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
+msgid "before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:6
+msgid "contains"
+msgstr "contén"
+
+#: filter/libfilter-i18n.h:7
 msgid "Copy to Folder"
 msgstr "Copiar á Carpeta"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Data de recepción"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Data de envío"
 
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Expresión"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Reenviar ó Enderezo"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Corpo da Mensaxe"
-
 #: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "Corpo da Mensaxe"
+msgid "does not contain"
+msgstr "non contén"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr ""
+msgid "does not end with"
+msgstr "non termina en"
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr ""
+msgid "does not exist"
+msgstr "non existe"
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Mover para a Carpeta"
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:15
+msgid "does not start with"
+msgstr "non empeza por"
 
 #: filter/libfilter-i18n.h:16
-msgid "Recipients"
-msgstr "Destinatarios"
+msgid "ends with"
+msgstr "termina en"
 
 #: filter/libfilter-i18n.h:17
-msgid "Regex Match"
-msgstr ""
+msgid "exists"
+msgstr "existe"
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Autor"
+msgid "Expression"
+msgstr "Expresión"
 
 #: filter/libfilter-i18n.h:19
-#, fuzzy
-msgid "Set Status"
-msgstr "_Estado:"
+msgid "Forward to Address"
+msgstr "Reenviar ó Enderezo"
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr ""
+msgid "is"
+msgstr "é"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr ""
+msgid "is greater than"
+msgstr "é maior que"
 
 #: filter/libfilter-i18n.h:22
-#, fuzzy
-msgid "Status"
-msgstr "_Estado:"
+msgid "is less than"
+msgstr "é menor que"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr ""
+msgid "is not"
+msgstr "non é"
 
 #: filter/libfilter-i18n.h:24
-msgid "Subject"
-msgstr "Asunto"
+msgid "Message Body"
+msgstr "Corpo da Mensaxe"
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr ""
+#, fuzzy
+msgid "Message Header"
+msgstr "Corpo da Mensaxe"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "contén"
+msgid "Message was sent"
+msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "non contén"
+msgid "Move to Folder"
+msgstr "Mover para a Carpeta"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "non termina en"
+msgid "on or after"
+msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "non existe"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
+msgid "on or before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "non empeza por"
+msgid "Recipients"
+msgstr "Destinatarios"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "termina en"
+msgid "Regex Match"
+msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "existe"
+msgid "Sender"
+msgstr "Autor"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "é maior que"
+#, fuzzy
+msgid "Set Status"
+msgstr "_Estado:"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "é menor que"
+msgid "sounds like"
+msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "non é"
+msgid "Source"
+msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "é"
+msgid "Specific header"
+msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
+msgid "starts with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
+#, fuzzy
+msgid "Status"
+msgstr "_Estado:"
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
+msgid "Stop Processing"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr ""
+msgid "Subject"
+msgstr "Asunto"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -3993,140 +4219,222 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compoñente de correo de Evolution."
 
-#: mail/component-factory.c:266
+#: mail/component-factory.c:316
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:16
+#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Gardar"
 
-#: mail/folder-browser.c:153
+#: mail/folder-browser.c:236
 msgid "Body or subject contains"
 msgstr "O corpo ou o asunto conteñen"
 
-#: mail/folder-browser.c:154
+#: mail/folder-browser.c:237
 msgid "Body contains"
 msgstr "O corpo contén"
 
-#: mail/folder-browser.c:155
+#: mail/folder-browser.c:238
 msgid "Subject contains"
 msgstr "O asunto contén"
 
-#: mail/folder-browser.c:156
+#: mail/folder-browser.c:239
 msgid "Body does not contain"
 msgstr "O corpo non contén"
 
-#: mail/folder-browser.c:157
+#: mail/folder-browser.c:240
 msgid "Subject does not contain"
 msgstr "O asunto non contén"
 
-#: mail/folder-browser.c:453
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:454
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:458
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:459
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#: mail/folder-browser.c:655
+#, fuzzy
+msgid "Show all hidden"
+msgstr "Ver Todos"
+
+#: mail/folder-browser.c:657
+msgid "Hide selected"
+msgstr ""
+
+#. could use another mask, but not enough api do to it
+#: mail/folder-browser.c:660
+#, fuzzy
+msgid "Hide read"
+msgstr "Agochar"
+
+#: mail/folder-browser.c:661
+#, fuzzy
+msgid "Hide deleted"
+msgstr "Eliminar"
+
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
+#, fuzzy
+msgid "Hide Subject"
+msgstr "Asunto"
+
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
+#, fuzzy
+msgid "Hide from Sender"
+msgstr "Responder ó Autor"
+
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 #, fuzzy
 msgid "Open"
 msgstr "_Abrir"
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:672
 #, fuzzy
 msgid "Save As..."
 msgstr "Gardar _Como..."
 
-#: mail/folder-browser.c:467 mail/mail-view.c:163
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:28
+#: mail/folder-browser.c:673 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
+#: ui/evolution-mail.xml.h:32
 msgid "Print"
 msgstr "Imprimir"
 
-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
 msgstr "Responder ó Autor"
 
-#: mail/folder-browser.c:470 mail/mail-view.c:156
-#: po/tmp/evolution-mail.xml.h:34
+#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
-#: mail/folder-browser.c:471 mail/mail-view.c:159
-#: po/tmp/evolution-mail.xml.h:17
+#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Re-enviar"
 
-#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 #, fuzzy
 msgid "Forward inline"
 msgstr "Ir para diante no tempo"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:680
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:683
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Mover para a Carpeta"
 
-#: mail/folder-browser.c:478
+#: mail/folder-browser.c:684
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Copiar á Carpeta"
 
-#: mail/folder-browser.c:480
+#: mail/folder-browser.c:686
 #, fuzzy
 msgid "Undelete"
 msgstr "Eliminar"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:484
+#: mail/folder-browser.c:690
 msgid "Apply Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:546
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide Messages"
+msgstr "Editar Mensaxe"
+
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-browser.c:787
+#, fuzzy, c-format
+msgid "Hide Subject \"%s\""
+msgstr "O asunto é %s"
+
+#: mail/folder-browser.c:793
+#, c-format
+msgid "Hide from Sender <%s>"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: mail/local-config.glade.h:6
+#, fuzzy
+msgid "Current store format:"
+msgstr "Non foi posible iniciar wombat"
+
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "Formato"
+
+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "New store format:"
+msgstr "Tipo de fonte de Novas:"
+
+#: mail/local-config.glade.h:9
+msgid ""
+"Note: When converting between mailbox formats, a failure (such as lack of "
+"disk space) may not be automatically recoverable.  Please use this feature "
+"with care."
+msgstr ""
+
+#: mail/local-config.glade.h:10
+msgid "maildir"
+msgstr ""
+
+#: mail/local-config.glade.h:11
+msgid "mbox"
+msgstr ""
+
+#: mail/local-config.glade.h:12
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4181,7 +4489,7 @@ msgstr "Non definiu ningún método de envío de correo"
 msgid "You have no Outbox configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:246
+#: mail/mail-callbacks.c:244
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4189,19 +4497,24 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "¿Enviar realmente?"
 
-#: mail/mail-callbacks.c:291
+#: mail/mail-callbacks.c:312
 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:552
+#: mail/mail-callbacks.c:530
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "Mensaxe reenviada - %s"
+
+#: mail/mail-callbacks.c:611
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4209,11 +4522,11 @@ msgstr ""
 "Só pode editar mensaxes gardados\n"
 "na carpeta de Borrador."
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "¿Sobrescribir ficheiro?"
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4221,17 +4534,17 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "¿Sobrescribilo?"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:830
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Gardar como..."
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:832
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Gardar como..."
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4240,46 +4553,267 @@ msgstr ""
 "Erro cargando a información do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:961
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:969
+#: mail/mail-callbacks.c:1008
 msgid "Printing of message failed"
 msgstr "A impresión da mensaxe fallou"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/mail-config-druid.glade.h:6
+#: mail/mail-config-druid.glade.h:6
+#, fuzzy
+msgid "Account"
+msgstr "Contas"
+
+#: mail/mail-config-druid.glade.h:7
+msgid "Account Information"
+msgstr "Información de Contas"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr "Xestión e Contas"
+
+#: mail/mail-config-druid.glade.h:9
+#, fuzzy
+msgid "Account Properties"
+msgstr "Propiedades do anexo"
+
+#: mail/mail-config-druid.glade.h:11
+msgid "Advanced"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:12
+msgid "Authentication"
+msgstr "Autenticación"
+
+#: mail/mail-config-druid.glade.h:13
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "Autenticación:"
+
+#: mail/mail-config-druid.glade.h:15
+msgid "Automatically check mail every "
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:17
+#, fuzzy
+msgid "Congratulations, your mail configuration is complete.\n"
+msgstr "Noraboa, a configuración do correo está completa."
+
+#: mail/mail-config-druid.glade.h:23
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:24
+#, fuzzy
+msgid "Default"
+msgstr "Eliminar"
+
+#: mail/mail-config-druid.glade.h:26
+#, fuzzy
+msgid "Delete mail from server"
+msgstr "Non borrar as mensaxes do servidor"
+
+#: mail/mail-config-druid.glade.h:27
+#, fuzzy
+msgid "Done"
+msgstr "mes"
+
+#: mail/mail-config-druid.glade.h:28
+#, fuzzy
+msgid "E-Mail Address:"
+msgstr "Enderezo de Email:"
+
+#: mail/mail-config-druid.glade.h:30
+msgid "Email Address:"
+msgstr "Enderezo de Email:"
+
+#: mail/mail-config-druid.glade.h:31
+msgid "Evolution Mail Configuration"
+msgstr "Configuración de Correo do Evolution"
+
+#: mail/mail-config-druid.glade.h:32
+msgid "Full Name:"
+msgstr "Nome Completo:"
+
+#: mail/mail-config-druid.glade.h:35
+#, fuzzy
+msgid "Hostname:"
+msgstr "Nome de usuario:"
+
+#: mail/mail-config-druid.glade.h:36
+msgid "IMAP"
+msgstr "IMAP"
+
+#: mail/mail-config-druid.glade.h:37
 msgid "Identity"
 msgstr "Identidade"
 
-#: po/tmp/mail-config-druid.glade.h:7
+#: mail/mail-config-druid.glade.h:38
+msgid "Incoming Mail Server"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:39
+#, fuzzy
+msgid "Kerberos"
+msgstr "Kerberos 4"
+
+#: mail/mail-config-druid.glade.h:40
+msgid "Mail"
+msgstr "Correo"
+
+#: mail/mail-config-druid.glade.h:41
+#, fuzzy
+msgid "Mail Account"
+msgstr "Contas"
+
+#: mail/mail-config-druid.glade.h:42
 msgid "Mail Configuration"
 msgstr "Configuración do Correo"
 
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "Fonte de Correo"
+#: mail/mail-config-druid.glade.h:43
+msgid "Mail Configuration Druid"
+msgstr "Axudante da Configuración do Correo"
 
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "Transporte do Correo"
+#: mail/mail-config-druid.glade.h:44
+msgid "Make this my default account"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:46
+msgid "News"
+msgstr "Novas"
+
+#: mail/mail-config-druid.glade.h:48
+msgid "Optional"
+msgstr "Opcional"
+
+#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "Organización:"
+
+#: mail/mail-config-druid.glade.h:50
+msgid "Outgoing Mail Server"
+msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:10
+#: mail/mail-config-druid.glade.h:51
+msgid "Password:"
+msgstr "Contrasinal:"
+
+#: mail/mail-config-druid.glade.h:53
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:55
+msgid "Remember my password"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+msgid "Reply-To:"
+msgstr "Responder-A:"
+
+#: mail/mail-config-druid.glade.h:57
+msgid "Reply-to:"
+msgstr "Responder-a:"
+
+#: mail/mail-config-druid.glade.h:58
 #, fuzzy
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
-msgstr "¡Benvido ó axudante da Configuración de Correo do Evolution!"
+msgid "Required"
+msgstr "Persoas _Requiridas"
+
+#: mail/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "Gardar como VCard"
+
+#: mail/mail-config-druid.glade.h:61
+#, fuzzy
+msgid "Select signature file"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-config-druid.glade.h:62
+#, fuzzy
+msgid "Sending Email"
+msgstr "Enviando Correo"
+
+#: mail/mail-config-druid.glade.h:64
+msgid "Server Configuration"
+msgstr "Configuración do Servidor"
+
+#: mail/mail-config-druid.glade.h:65
+#, fuzzy
+msgid "Server Timeouts"
+msgstr "Tipo de Servidor: "
+
+#: mail/mail-config-druid.glade.h:66
+msgid "Server Type: "
+msgstr "Tipo de Servidor: "
+
+#: mail/mail-config-druid.glade.h:67
+#, fuzzy
+msgid "Server requires authentication"
+msgstr "O servidor SMTP require autenticación"
+
+#: mail/mail-config-druid.glade.h:68
+#, fuzzy
+msgid "Servers"
+msgstr "Servidor:"
+
+#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+msgid "Signature file:"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-config-druid.glade.h:70
+#, fuzzy
+msgid "Signature:"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Fontes"
+
+#: mail/mail-config-druid.glade.h:72
+#, fuzzy
+msgid "This server requires a secure connection (SSL)"
+msgstr "O servidor SMTP require autenticación"
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: mail/mail-config-druid.glade.h:73
+#, fuzzy
+msgid "Type"
+msgstr "Tipo:"
+
+#: mail/mail-config-druid.glade.h:74
 msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
+"Type the name by which you would like to refer to these servers. For "
+"example: \"Work\" or \"Home\"."
 msgstr ""
-"A configuración do correo electrónico está completa.\n"
-"Prema \"Finalizar\" para gardar a nova configuración"
+
+#: mail/mail-config-druid.glade.h:76
+#, fuzzy
+msgid "User Information"
+msgstr "Sen Información"
+
+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "Nome de usuario:"
+
+#: mail/mail-config-druid.glade.h:78
+#, fuzzy
+msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+msgstr "¡Benvido ó axudante da Configuración de Correo do Evolution!"
+
+#: mail/mail-config-druid.glade.h:81
+#, fuzzy
+msgid "minute(s)"
+msgstr "minutos"
 
 #: mail/mail-config-gui.c:433
 msgid ""
@@ -4296,15 +4830,7 @@ msgstr "Nome completo:"
 msgid "Email address:"
 msgstr "Enderezo de email:"
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organización:"
-
-#: mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Ficheiro de sinatura:"
-
-#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
+#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "Ficheiro de Sinatura"
 
@@ -4312,26 +4838,10 @@ msgstr "Ficheiro de Sinatura"
 msgid "Server:"
 msgstr "Servidor:"
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Nome de usuario:"
-
-#: mail/mail-config-gui.c:934
-msgid "Path:"
-msgstr "Camiño:"
-
-#: mail/mail-config-gui.c:943
-msgid "Authentication:"
-msgstr "Autenticación:"
-
 #: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Detectar tipos soportados..."
 
-#: mail/mail-config-gui.c:968
-msgid "Remember this password"
-msgstr ""
-
 #: mail/mail-config-gui.c:991
 msgid "Don't delete messages from server"
 msgstr "Non borrar as mensaxes do servidor"
@@ -4344,7 +4854,7 @@ msgstr "Probar Configuración"
 msgid "Mail source type:"
 msgstr "Tipo de fonte de correo:"
 
-#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
+#: mail/mail-config-gui.c:1135
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -4370,6 +4880,14 @@ msgstr ""
 msgid "Mail transport type:"
 msgstr "Tipo de transporte de correo:"
 
+#: mail/mail-config-gui.c:1183
+msgid ""
+"Select the kind of mail server you have, and enter the relevant information "
+"about it.\n"
+"If the server requires authentication, you can click the \"Detect supported "
+"types...\" button after entering the other information."
+msgstr ""
+
 #: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "Engadir Identidade"
@@ -4418,60 +4936,68 @@ msgstr ""
 msgid "Query authorization at \"%s\""
 msgstr ""
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:7
 msgid "Address"
 msgstr "Enderezo"
 
-#: po/tmp/mail-config.glade.h:10
+#: mail/mail-config.glade.h:10
 msgid "Identities"
 msgstr "Identidades"
 
-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "Fontes de Correo"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Transporte do Correo"
+
+#: mail/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr "Marcar mensaxe como lida [ms]: "
 
-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "Servidores de News"
 
-#: po/tmp/mail-config.glade.h:15
+#: mail/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "Fontes de Novas"
 
-#: po/tmp/mail-config.glade.h:16
+#: mail/mail-config.glade.h:16
 msgid "Organization"
 msgstr "Organización"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Enviar mensaxes en formato HTML"
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Fontes"
-
-#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
+#: mail/mail-crypto.c:781
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Introduza o seu contrasinal de PGP/GPG."
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:785
 msgid "No password provided."
 msgstr "Non se indicou un contrasinal."
 
-#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Non foi posible crear unha canalización co GPG/PGP: %s"
 
-#: mail/mail-crypto.c:625
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr "O programa GPG/PGP non está dispoñible."
 
-#: mail/mail-display.c:90
+#: mail/mail-crypto.c:953
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Non foi posible crear unha canalización: %s"
+
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4480,464 +5006,377 @@ msgstr ""
 "Non foi posible abrir o ficheiro %s:\n"
 "%s"
 
-#: mail/mail-display.c:113
+#: mail/mail-display.c:131
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-display.c:218
+#: mail/mail-display.c:229
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:258
+#: mail/mail-display.c:269
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Non foi posible crear o directorio temporal: %s"
 
-#: mail/mail-display.c:300
+#: mail/mail-display.c:311
 msgid "Save to Disk..."
 msgstr "Gardar ó Disco..."
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:313
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:339
 msgid "External Viewer"
 msgstr "Visualizador Externo"
 
-#: mail/mail-display.c:351
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:355
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-format.c:500
+#: mail/mail-format.c:503
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:623
-msgid "Reply-To:"
-msgstr "Responder-A:"
-
-#: mail/mail-format.c:845
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "Non hai soporte de GPG/PGP dispoñible nesta copia do Evolution."
 
-#: mail/mail-format.c:857
+#: mail/mail-format.c:863
 msgid "Encrypted message not displayed"
 msgstr "Mensaxe cifrada non visualizada"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:869
 msgid "Encrypted message"
 msgstr "Mensaxe cifrada"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1470
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1486
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1520
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1695
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando a carpeta \"%s\" ó formato \"%s\""
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Cambiar carpeta \"%s\" ó formato \"%s\""
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:251
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "_Configurar Carpeta"
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr "Pechando a carpeta actual"
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr "Renomeando a carpeta antiga e abrindo"
 
-#: mail/mail-local.c:314
+#: mail/mail-local.c:313
 msgid "Creating new folder"
 msgstr "Creando unha nova carpeta"
 
-#: mail/mail-local.c:329
+#: mail/mail-local.c:327
 msgid "Copying messages"
 msgstr "Copiando as mensaxes"
 
-#: mail/mail-local.c:341
+#: mail/mail-local.c:348
 #, 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:372
+#: mail/mail-local.c:379
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:781
+#: mail/mail-local.c:787
 #, fuzzy
 msgid "Registering local folder"
 msgstr "Creando unha nova carpeta"
 
-#: mail/mail-local.c:783
+#: mail/mail-local.c:789
 #, fuzzy
 msgid "Register local folder"
 msgstr "Crear unha nova carpeta"
 
-#: mail/mail-ops.c:79
+#: mail/mail-local.c:894
+#, fuzzy, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr ""
+"Non foi posible crear a carpeta `%s':\n"
+"%s"
+
+#: mail/mail-mt.c:85
+#, fuzzy, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"Erro na expresión regular '%s':\n"
+"%s"
+
+#: mail/mail-mt.c:87
+#, fuzzy, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"Erro cargando a información do filtro:\n"
+"%s"
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "Movendo"
+
+#: mail/mail-ops.c:88
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Recibindo correo de %s"
 
-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:90
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Recibir correo de %s"
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:335
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Non hai novo correo en %s."
 
-#: mail/mail-ops.c:401
+#: mail/mail-ops.c:405
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:403
+#: mail/mail-ops.c:407
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:538
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
-msgstr "Enviando unha mensaxe sen asunto"
-
-#: mail/mail-ops.c:546
-#, c-format
-msgid "Send \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:549
-msgid "Send a message without a subject"
-msgstr "Enviar unha mensaxe sen asunto"
+#: mail/mail-ops.c:553
+#, fuzzy
+msgid "Sending message"
+msgstr "Borrar esta mensaxe"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Movendo mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Copiando mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Mover mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Copiar mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s mensaxe %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1141
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "Marcando mensaxes na carpeta \"%s\""
-
-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "Marcar mensaxes na carpeta \"%s\""
-
-#: mail/mail-ops.c:1175
-#, c-format
-msgid "Marking message %d of %d"
-msgstr "Marcando a mensaxe %d de %d"
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1297
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr "(Sen descrición)"
 
-#: mail/mail-ops.c:1432
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1435
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1535
-#, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "Reenviando mensaxes \"%s\""
-
-#: mail/mail-ops.c:1539
-msgid "Forwarding a message without a subject"
-msgstr "Reenviando unha mensaxe sen asunto"
-
-#: mail/mail-ops.c:1542
-#, c-format
-msgid "Forward message \"%s\""
-msgstr "Reenviar mensaxe \"%s\""
-
-#: mail/mail-ops.c:1546
-msgid "Forward a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:1593
-#, 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:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1164
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-ops.c:1679
-#, fuzzy
-msgid "Forwarded message:\n"
-msgstr "Mensaxe reenviada - %s"
-
-#: mail/mail-ops.c:1748
-#, c-format
-msgid "Loading \"%s\""
-msgstr "Cargando \"%s\""
-
-#: mail/mail-ops.c:1750
-#, c-format
-msgid "Load \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1853
-#, c-format
-msgid "Creating \"%s\""
-msgstr "Creando \"%s\""
-
-#: mail/mail-ops.c:1855
-#, c-format
-msgid "Create \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1903
-msgid "Exception while reporting result to shell component listener."
-msgstr ""
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#, fuzzy, c-format
+msgid "Opening folder %s"
+msgstr "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1949
-#, c-format
-msgid "Synchronizing \"%s\""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
 msgstr "Sincronizando \"%s\""
 
-#: mail/mail-ops.c:1951
-#, c-format
-msgid "Synchronize \"%s\""
+#: mail/mail-ops.c:1386
+msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:2015
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2018
-msgid "Clearing message display"
-msgstr ""
-
-#: mail/mail-ops.c:2021
-#, c-format
-msgid "Display message UID \"%s\""
-msgstr "Amosar a mensaxe co UID \"%s\""
-
-#: mail/mail-ops.c:2024
-msgid "Clear message display"
-msgstr ""
+#: mail/mail-ops.c:1434
+#, fuzzy, c-format
+msgid "Retrieving message %s"
+msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/mail-ops.c:2137
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr "Abrindo as mensaxes da carpeta \"%s\""
+#: mail/mail-ops.c:1497
+#, fuzzy
+msgid "Retrieving messages"
+msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/mail-ops.c:2140
+#: mail/mail-ops.c:1507
 #, c-format
-msgid "Open messages from \"%s\""
-msgstr ""
+msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgstr "Recibindo a mensaxe número %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2244
-#, c-format
-msgid "Loading %s Folder"
+#: mail/mail-ops.c:1655
+#, fuzzy, c-format
+msgid "Loading %s Folder for %s"
 msgstr "Cargando a Carpeta %s"
 
-#: mail/mail-ops.c:2246
-#, c-format
-msgid "Load %s Folder"
-msgstr ""
-
-#: mail/mail-ops.c:2310
-#, c-format
-msgid "Viewing messages from folder \"%s\""
-msgstr "Vendo as mensaxes da carpeta \"%s\""
-
-#: mail/mail-ops.c:2313
-#, c-format
-msgid "View messages from \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2339
-#, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr "Recibindo a mensaxe %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:2428
+#: mail/mail-ops.c:1657
 #, fuzzy, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "Abrindo as mensaxes da carpeta \"%s\""
+msgid "Load %s Folder for %s"
+msgstr "Cargando a Carpeta %s"
+
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "Copiando as mensaxes"
 
-#: mail/mail-ops.c:2431
+#: mail/mail-ops.c:1902
 #, fuzzy, c-format
-msgid "Save messages from folder \"%s\""
-msgstr "Abrindo as mensaxes da carpeta \"%s\""
+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:2474
+#: mail/mail-ops.c:1915
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Recibindo a mensaxe %d de %d (uid \"%s\")"
 
+#: mail/mail-ops.c:1929
+#, fuzzy, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr "Erro gardando o ficheiro: %s"
+
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:675
+#: mail/mail-threads.c:676
 #, c-format
 msgid ""
 "Error while `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:732
+#: mail/mail-threads.c:733
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:797
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:916
+#: mail/mail-threads.c:917
 msgid "Could not create dialog box."
 msgstr "Non foi posible crear a caixa de diálogo."
 
-#: mail/mail-threads.c:927
+#: mail/mail-threads.c:928
 msgid "User cancelled query."
 msgstr "O usuario cancelou a consulta."
 
@@ -4947,53 +5386,52 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr "Examinando %s"
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Escribindo a mensaxe %d de %d"
 
-#: mail/mail-tools.c:332
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Gardando as modificacións de %s"
 
-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (mensaxe reenviada)"
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (sen asunto)"
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr "Mensaxe reenviada (sen asunto)"
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5002,76 +5440,96 @@ msgstr ""
 "Non se pode abrir a localizaión `%s':\n"
 "%s"
 
-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 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:153 po/tmp/evolution-mail.xml.h:33
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Responder ó autor desta mensaxe"
 
-#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Responder a tódolos destinatarios desta mensaxe"
 
-#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Re-enviar esta mensaxe"
 
-#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr "Imprimir a mensaxe seleccionada"
 
-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Borrar esta mensaxe"
 
-#: mail/message-list.c:572
+#: mail/message-list.c:590
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:575
+#: mail/message-list.c:593
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:578
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:846
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr ""
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:858 mail/message-list.c:873
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:896 mail/message-list.c:912
 #, fuzzy
 msgid "<unknown>"
 msgstr "Descoñecido"
 
-#: mail/message-list.c:2068
-msgid "Rebuilding message view"
+#: mail/message-list.c:965
+msgid "?"
 msgstr ""
 
-#: mail/message-list.c:2070
-msgid "Rebuild message view"
+#: mail/message-list.c:972
+#, fuzzy
+msgid "Today %l:%M %p"
+msgstr "%I:%M %p"
+
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
 msgstr ""
 
+#: mail/message-list.c:993
+#, fuzzy
+msgid "%a %l:%M %p"
+msgstr "%I:%M %p"
+
+#: mail/message-list.c:1001
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: mail/message-list.c:1003
+#, fuzzy
+msgid "%b %d %Y"
+msgstr "%a %d de %Y"
+
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
 msgstr ""
@@ -5086,27 +5544,27 @@ msgstr ""
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, fuzzy, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, fuzzy, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "Instalación de Evolution"
 
@@ -5123,24 +5581,24 @@ 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:155
+#: shell/e-setup.c:157
 msgid "Could not update files correctly"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr "Ficheiros de Evolution instalados con éxito."
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr "Semella que é a primeira vez que executa Evolution."
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 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:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5151,7 +5609,7 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5160,7 +5618,7 @@ msgstr ""
 "Non se poden copiar os ficheiros a\n"
 "`%s'."
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5171,7 +5629,7 @@ msgstr ""
 "Móvao para poder instalar os ficheiros de\n"
 "usuario de Evolution."
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5207,7 +5665,7 @@ msgstr ""
 "O tipo da carpeta seleccionada non é válido para\n"
 "a operación solicitada."
 
-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 msgid "New..."
 msgstr "Nova..."
 
@@ -5215,23 +5673,19 @@ msgstr "Nova..."
 msgid "(Untitled)"
 msgstr "(Sen_título)"
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy non foi atopado no seu $PATH."
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 msgid "Bug buddy could not be run."
 msgstr "Non se puido executar Bug buddy."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5241,7 +5695,7 @@ msgstr ""
 "en grupo para xestión de correo, axenda e contactos\n"
 "dentro do ambiente de escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 msgid "Go to folder..."
 msgstr "Ir á carpeta..."
 
@@ -5341,9 +5795,8 @@ msgstr "Eliminar este atallo da barra de atallos"
 msgid "Error saving shortcuts."
 msgstr "Erro gardando atallos."
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:43 po/tmp/evolution.xml.h:34
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
+#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
 msgid "_View"
 msgstr "_Vista"
 
@@ -5404,8 +5857,8 @@ msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\n"
+"Over the time since the past release, our focus has been on making\n"
+"Evolution usable.  Many of the Evolution developers are now using\n"
 "Evolution to read their mail full time. You could too. (Just\n"
 "be sure to keep a backup.)\n"
 "\n"
@@ -5441,1136 +5894,1156 @@ msgstr "Desactivar."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Non se pode inicializar o sistema de compoñentes de Bonobo"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-msgid "N_ew Directory Server"
-msgstr "Novo Servidor de _Directorio"
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-msgid "_Actions"
-msgstr "_Accións"
-
-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Crear un novo contacto"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Borrar un contacto"
 
-#: po/tmp/evolution-addressbook.xml.h:10
-#: po/tmp/evolution-event-editor.xml.h:67
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
 msgid "Find"
 msgstr "Buscar"
 
-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Buscar un contacto"
 
-#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Novo"
 
-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Imprimir contactos"
 
-#: po/tmp/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Parar"
 
-#: po/tmp/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Parar a Carga"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Ver Todos"
 
-#: po/tmp/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Ver tódolos contactos"
 
-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "_Addressbook Configuration..."
+msgstr "Configuración do _Correo..."
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "_Imprimir Contactos..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr "_Buscar contactos"
 
-#: po/tmp/evolution-addressbook.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_Ferramentas"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 Días"
 
-#: po/tmp/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Ca_lendar"
 msgstr "Axenda"
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Preferencias da Axenda..."
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Crear unha nova cita"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Crear unha nova axenda"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Día"
 
-#: po/tmp/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Ir para atrás no tempo"
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Ir para diante no tempo"
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Ir para"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Ir para a data especificada"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mes"
 
-#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
+#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr "Seguinte"
 
-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Abrir unha axenda"
 
-#: po/tmp/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Imprimir esta axenda"
 
-#: po/tmp/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:25
 msgid "Save calendar as something else"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Amosar un día"
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Amosar un mes"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Amosar unha semana"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Amosar a semana laboral"
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Hoxe"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Semana"
 
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
 msgid "_New"
 msgstr "_Novo"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "_Abrir axenda"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "_Imprimir esta axenda"
 
-#: po/tmp/evolution-calendar.xml.h:35
-msgid "_Save Calendar As"
-msgstr "_Gardar Axenda Como"
+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "_Save As..."
+msgstr "Gardar _Como..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Borrar este elemento"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:8
 #, fuzzy
 msgid "Delete..."
 msgstr "Eliminar"
 
-#: po/tmp/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "Axuda"
 
-#: po/tmp/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:10
 #, fuzzy
 msgid "Print En_velope..."
 msgstr "_Configuración da Impresión..."
 
-#: po/tmp/evolution-contact-editor.xml.h:11
-#: po/tmp/evolution-event-editor.xml.h:81
+#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
 msgid "Print this item"
 msgstr "Imprimir este elemento"
 
-#: po/tmp/evolution-contact-editor.xml.h:12
-#: po/tmp/evolution-event-editor.xml.h:82
+#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:18
+#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Gardar _Como..."
 
-#: po/tmp/evolution-contact-editor.xml.h:14
-#: po/tmp/evolution-event-editor.xml.h:90
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
 msgid "Save and Close"
 msgstr "Gardar e Pechar"
 
-#: po/tmp/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-editor.xml.h:15
 msgid "Save the contact and close the dialog box"
 msgstr "Gardar o contacto e pechar a caixa de diálogo"
 
-#: po/tmp/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-editor.xml.h:16
 msgid "Se_nd contact to other..."
 msgstr ""
 
-#: po/tmp/evolution-contact-editor.xml.h:17
-#: po/tmp/evolution-event-editor.xml.h:98
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
 msgid "See online help"
 msgstr "Ver a axuda online"
 
-#: po/tmp/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:18
 #, fuzzy
 msgid "Send _message to contact..."
 msgstr "Enviar unha mensaxe sen asunto"
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:38
-#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
+#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
+#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 #, fuzzy
 msgid "_Print..."
 msgstr "Imprimir..."
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:42
+#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Save"
 msgstr "_Gardar"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:6
 msgid "About this application"
 msgstr "Acerca desta aplicación"
 
-#: po/tmp/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "Acerca de..."
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "Acció_ns"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "_Limpar"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "Co_rtar"
 
-#: po/tmp/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "Limpar"
 
-#: po/tmp/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "Limpar a selección"
 
-#: po/tmp/evolution-event-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "Pechar esta cita"
 
-#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
+#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
 msgid "Copy"
 msgstr "Copiar"
 
-#: po/tmp/evolution-event-editor.xml.h:16
+#: ui/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Copiar a selección"
 
-#: po/tmp/evolution-event-editor.xml.h:17
+#: ui/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Cortar"
 
-#: po/tmp/evolution-event-editor.xml.h:18
+#: ui/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "Cortar a selección"
 
-#: po/tmp/evolution-event-editor.xml.h:21
+#: ui/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr "Envorcar XML"
 
-#: po/tmp/evolution-event-editor.xml.h:22
+#: ui/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "Envorcar a descrición Xml da Interface"
 
-#: po/tmp/evolution-event-editor.xml.h:23
+#: ui/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: _Libro de enderezos..."
 
-#: po/tmp/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: Es_colla un Formulario..."
 
-#: po/tmp/evolution-event-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: Veri_ficar Nomes"
 
-#: po/tmp/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: Cop_iar á Carpeta..."
 
-#: po/tmp/evolution-event-editor.xml.h:27
+#: ui/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr "FIXME: _Deseñar un Formulario..."
 
-#: po/tmp/evolution-event-editor.xml.h:28
+#: ui/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr "FIXME: Definir E_stilos de Impresión"
 
-#: po/tmp/evolution-event-editor.xml.h:29
+#: ui/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: Deseñar este _Formulario"
 
-#: po/tmp/evolution-event-editor.xml.h:30
+#: ui/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: Pri_meiro elemento na Carpeta"
 
-#: po/tmp/evolution-event-editor.xml.h:31
+#: ui/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "FIXME: _Reenviar"
 
-#: po/tmp/evolution-event-editor.xml.h:32
+#: ui/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Reenviar como v_Calendar"
 
-#: po/tmp/evolution-event-editor.xml.h:33
+#: ui/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "FIXME: Axuda"
 
-#: po/tmp/evolution-event-editor.xml.h:34
+#: ui/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: Tarefa in_completa"
 
-#: po/tmp/evolution-event-editor.xml.h:35
+#: ui/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr "FIXME: Inserir Ficheiro"
 
-#: po/tmp/evolution-event-editor.xml.h:36
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "FIXME: _Elemento..."
 
-#: po/tmp/evolution-event-editor.xml.h:37
+#: ui/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr "FIXME: Pegar _Especial..."
 
-#: po/tmp/evolution-event-editor.xml.h:38
+#: ui/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: Pre_visualización da Impresión"
 
-#: po/tmp/evolution-event-editor.xml.h:39
+#: ui/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr "FIXME: Pu_blicar Formulario Como..."
 
-#: po/tmp/evolution-event-editor.xml.h:40
+#: ui/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: Publicar _Formulario..."
 
-#: po/tmp/evolution-event-editor.xml.h:41
+#: ui/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:42
+#: ui/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "FIXME: _Enviar"
 
-#: po/tmp/evolution-event-editor.xml.h:43
+#: ui/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Gardar Ane_xos..."
 
-#: po/tmp/evolution-event-editor.xml.h:44
+#: ui/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: _Depurador de Script"
 
-#: po/tmp/evolution-event-editor.xml.h:45
+#: ui/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Solicitude de _Tarefa"
 
-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "FIXME: _Contacto"
 
-#: po/tmp/evolution-event-editor.xml.h:47
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "FIXME: _Personalizar..."
 
-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "FIXME: _Ficheiro..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "FIXME: _Fonte..."
 
-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr "FIXME: Fo_rmato"
 
-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "FIXME: _Elemento"
 
-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: Entrada de _Xornal"
 
-#: po/tmp/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: _Derradeiro Elemento na Carpeta"
 
-#: po/tmp/evolution-event-editor.xml.h:54
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: Enviar _Mensaxe"
 
-#: po/tmp/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: _Mover para a Carpeta..."
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: _Nova Cita"
 
-#: po/tmp/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "FIXME: _Nota"
 
-#: po/tmp/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "FIXME: _Obxecto..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: _Parágrafo..."
 
-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: _Ortografía..."
 
-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "FIXME: _Estándar"
 
-#: po/tmp/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "FIXME: _Tarefa"
 
-#: po/tmp/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: Elemento _non Lido"
 
-#: po/tmp/evolution-event-editor.xml.h:65
+#: ui/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:10
+#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
 msgid "F_ormat"
 msgstr "_Formatar"
 
-#: po/tmp/evolution-event-editor.xml.h:68
+#: ui/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "Buscar Novamente"
 
-#: po/tmp/evolution-event-editor.xml.h:69
+#: ui/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Buscar _Novamente"
 
-#: po/tmp/evolution-event-editor.xml.h:70
+#: ui/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "Ir ó elemento seguinte"
 
-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Ir ó elemento anterior"
 
-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr "Modificar as propiedades do ficheiro"
 
-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "Se_guinte"
 
-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Pegar"
 
-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do cartafol"
 
-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "An_terior"
 
-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "Anterior"
 
-#: po/tmp/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "_Configuración da Impresión..."
 
-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "Configuración da Impresión"
 
-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "Propiedades"
 
-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "Refacer"
 
-#: po/tmp/evolution-event-editor.xml.h:85
+#: ui/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "Refacer a acción desfeita"
 
-#: po/tmp/evolution-event-editor.xml.h:86
+#: ui/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "Substituír"
 
-#: po/tmp/evolution-event-editor.xml.h:87
+#: ui/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "Substituír unha cadea"
 
-#: po/tmp/evolution-event-editor.xml.h:91
+#: ui/evolution-event-editor.xml.h:91
 msgid "Save the appointment and close the dialog box"
 msgstr "Gardar a cita e pechar a caixa de diálogo"
 
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:21
+#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: po/tmp/evolution-event-editor.xml.h:93
+#: ui/evolution-event-editor.xml.h:93
 #, fuzzy
 msgid "Schedule Meeting"
 msgstr "FIXME: Programar Reunión"
 
-#: po/tmp/evolution-event-editor.xml.h:94
+#: ui/evolution-event-editor.xml.h:94
 #, fuzzy
 msgid "Schedule _Meeting"
 msgstr "FIXME: _Programar Reunión"
 
-#: po/tmp/evolution-event-editor.xml.h:95
+#: ui/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:96
+#: ui/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "Buscar novamente a mesma cadea"
 
-#: po/tmp/evolution-event-editor.xml.h:97
+#: ui/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "Buscar unha cadea"
 
-#: po/tmp/evolution-event-editor.xml.h:99
+#: ui/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "Seleccionar todo"
 
-#: po/tmp/evolution-event-editor.xml.h:101
+#: ui/evolution-event-editor.xml.h:101
 msgid "Setup the page settings for your current printer"
 msgstr "Configurar as opcións de páxina para a impresora actual"
 
-#: po/tmp/evolution-event-editor.xml.h:102
+#: ui/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "Desfacer"
 
-#: po/tmp/evolution-event-editor.xml.h:103
+#: ui/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "Desfacer a última acción"
 
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:34
+#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
 msgid "_About..."
 msgstr "_Acerca de..."
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 msgid "_Close"
 msgstr "_Pechar"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:36
+#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
 msgid "_Debug"
 msgstr "_Depuración"
 
-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:37
-#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
+#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
 msgid "_Edit"
 msgstr "_Editar"
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "_Buscar..."
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "_Formularios"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
+#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
+#: ui/evolution.xml.h:28
 msgid "_Help"
 msgstr "A_xuda"
 
-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Obxecto"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "_Refacer"
 
-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "_Substituír..."
 
-#: po/tmp/evolution-event-editor.xml.h:122
+#: ui/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "_Barras de ferramentas"
 
-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "_Desfacer"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-mail.xml.h:6
+#: ui/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr "Redactar"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Redactar unha nova mensaxe"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Copiar a mensaxe nunha nova carpeta"
 
-#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
+#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr "_Carpeta"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Esquecer _Contrasinais"
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Recibir Correo"
 
-#: po/tmp/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:22
 #, fuzzy
-msgid "Mail _Filters"
+msgid "Hide _Deleted messages"
+msgstr "Borrar Mensaxe"
+
+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "Mensaxe reenviada - %s"
+
+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Hide _Selected messages"
+msgstr "Imprimir a mensaxe seleccionada"
+
+#: ui/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Mail _Filters..."
 msgstr "_Filtros de Correo..."
 
-#: po/tmp/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions"
+msgid "Manage Subscriptions..."
 msgstr "Descrición:"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr "Marcar como _Lida"
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:28
 msgid "Mark As U_nread"
 msgstr "Marcar como _non Lida"
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:29
 msgid "Move"
 msgstr "Mover"
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:30
 msgid "Move message to a new folder"
 msgstr "Mover mensaxe a unha nova carpeta"
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr "Previsualiza a mensaxe que se vai imprimir"
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:33
 msgid "Print Preview of message..."
 msgstr "Previsualización da Impresión da mensaxe..."
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr "Imprimir mensaxe na impresora"
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:35
 msgid "Print message..."
 msgstr "Imprimir mensaxe..."
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:39
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: po/tmp/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _Sender"
 msgstr "Responder ó _Autor"
 
-#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Seleccionar _Todo"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr "Enviar o correo na cola e recibir o correo novo"
 
-#: po/tmp/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Show _All messages"
+msgstr "Ver Todos"
+
+#: ui/evolution-mail.xml.h:46
 msgid "Threaded Message list"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr "_Aplicar Filtros"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr "_Configurar Carpeta"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:52
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Copiar á Carpeta"
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:54
 msgid "_Edit Message"
 msgstr "_Editar Mensaxe"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "_Inverter Selección"
 
-#: po/tmp/evolution-mail.xml.h:54
-#, fuzzy
-msgid "_Mail Configuration"
-msgstr "Configuración do Correo"
+#: ui/evolution-mail.xml.h:59
+msgid "_Mail Configuration..."
+msgstr "Configuración do _Correo..."
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:60
 msgid "_Message"
 msgstr "_Mensaxe"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:61
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "_Mover para a Carpeta"
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr "_Abrir nunha Nova Fiestra"
 
-#: po/tmp/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:63
 msgid "_Print Message"
 msgstr "_Imprimir Mensaxe"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:64
 #, fuzzy
 msgid "_Save Message As..."
 msgstr "Gardar como..."
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:65
 #, fuzzy
 msgid "_Source"
 msgstr "Fontes"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:67
 #, fuzzy
 msgid "_Undelete"
 msgstr "_Borrar"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor"
+msgid "_Virtual Folder Editor..."
 msgstr "Carpetas Virtuais"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:6
 #, fuzzy
 msgid "Attach"
 msgstr "Incluír un ficheiro"
 
-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
 msgid "Close the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: po/tmp/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "Mensaxe cifrada"
+
+#: ui/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 #, fuzzy
 msgid "Insert a file as text into the message"
 msgstr "Incluír un ficheiro como anexo na mensaxe"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
 msgid "Open a file"
 msgstr "Abrir ficheiro"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:17
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save As"
 msgstr "Gardar _Como"
 
-#: po/tmp/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "Ir á carpeta..."
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
 msgid "Save the current file with a different name"
 msgstr "Gardar o ficheiro actual"
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
 msgid "Save the message in a specified folder"
 msgstr "Mover mensaxe a unha nova carpeta"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
 msgid "Send"
 msgstr "Autor"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Send _Later"
 msgstr "Autor"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Send _later"
 msgstr "Autor"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
 msgid "Send the mail in HTML format"
 msgstr "Enviar mensaxes en formato HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "Previsualiza a mensaxe que se vai imprimir"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send the message now"
 msgstr "Enviar mensaxes en formato HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Send this message now"
 msgstr "Borrar esta mensaxe"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "Gardar Anexo"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
 msgid "Show _attachments"
 msgstr "anexo"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Show attachments"
 msgstr "anexo"
 
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your PGP key"
+msgstr "Enviando unha mensaxe sen asunto"
+
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
 msgid "_Open..."
 msgstr "Abrir..."
 
+#: ui/evolution-message-composer.xml.h:47
+msgid "_Security"
+msgstr ""
+
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr "Engadir a carpeta á súa lista de carpetas subscritas"
 
-#: po/tmp/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Actualizar Lista"
 
-#: po/tmp/evolution-subscribe.xml.h:10
+#: ui/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Actualizar Lista de Carpetas"
 
-#: po/tmp/evolution-subscribe.xml.h:11
+#: ui/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Eliminar a carpeta da súa lista de carpetas subscritas"
 
-#: po/tmp/evolution-subscribe.xml.h:13
+#: ui/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Subscribir"
 
-#: po/tmp/evolution-subscribe.xml.h:14
+#: ui/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Desubscribir"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution.xml.h:6
+#: ui/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr "Visualizar unha carpeta diferente"
 
-#: po/tmp/evolution.xml.h:7
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Saír"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "_Atallo da barra do Evolution"
 
-#: po/tmp/evolution.xml.h:9
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Saír do programa"
 
-#: po/tmp/evolution.xml.h:10
+#: ui/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "_Iniciación"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Amosar información sobre o Evolution"
 
-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Amosar a Barra de _Carpetas"
 
-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Amosar a Barra de _Atallos"
 
-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Submit _Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: po/tmp/evolution.xml.h:15
+#: ui/evolution.xml.h:15
 #, fuzzy
 msgid "Submit bug report using Bug Buddy."
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: po/tmp/evolution.xml.h:16
+#: ui/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:17
+#: ui/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:18
+#: ui/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "Uso do Xestor de Co_ntactos"
 
-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "Uso da _Axenda"
 
-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "Uso do Cliente de _Correo"
 
-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_Acerca do Evolution..."
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "_Cita (FIXME)"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Contacto (FIXME)"
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_Ir para a Carpeta..."
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:29
 msgid "_Index"
 msgstr "Í_ndice"
 
-#: po/tmp/evolution.xml.h:30
+#: ui/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:32
+#: ui/evolution.xml.h:32
 msgid "_Settings"
 msgstr "_Configuración"
 
-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "_Tarefa (FIXME)"
 
 #. 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:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -6650,28 +7123,34 @@ msgstr "Hora do _final da reunión:"
 msgid "All Attendees"
 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
+msgid "MTWTFSS"
+msgstr "LMMXVSD"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 msgid "%B %Y"
 msgstr "%B de %Y"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:408
+#: widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr "Agora"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
-#: widgets/misc/e-dateedit.c:1487
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
-#: widgets/misc/e-dateedit.c:1490
+#: 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"
 
@@ -6680,19 +7159,210 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "Grupo %i"
 
+#~ msgid "categories"
+#~ msgstr "categorías"
+
+#~ msgid "Item(s) belong to these categories:"
+#~ msgstr "Elemento(s) pertencentes a estas categorías:"
+
+#~ msgid "Available Categories:"
+#~ msgstr "Categorías Dispoñibles:"
+
+#~ msgid "External Directories"
+#~ msgstr "Directorios Externos"
+
+#~ msgid "Port Number:"
+#~ msgstr "Número de Porto:"
+
+#~ msgid "Empty days:"
+#~ msgstr "Días baleiros:"
+
+#~ msgid "Appointments:"
+#~ msgstr "Citas:"
+
+#~ msgid "Highlighted day:"
+#~ msgstr "Día salientado:"
+
+#~ msgid "Day numbers:"
+#~ msgstr "Números dos días:"
+
+#~ msgid "Current day's number:"
+#~ msgstr "Número do día actual:"
+
+#~ msgid "may"
+#~ msgstr "maio"
+
+#~ msgid "sept"
+#~ msgstr "setem"
+
+#~ msgid "sunday"
+#~ msgstr "domingo"
+
+#~ msgid "monday"
+#~ msgstr "luns"
+
+#~ msgid "tuesday"
+#~ msgstr "martes"
+
+#~ msgid "tues"
+#~ msgstr "mart"
+
+#~ msgid "wednesday"
+#~ msgstr "mércores"
+
+#~ msgid "wednes"
+#~ msgstr "mércor"
+
+#~ msgid "thursday"
+#~ msgstr "xoves"
+
+#~ msgid "thur"
+#~ msgstr "xov"
+
+#~ msgid "thurs"
+#~ msgstr "xoves"
+
+#~ msgid "friday"
+#~ msgstr "venres"
+
+#~ msgid "saturday"
+#~ msgstr "sábado"
+
+#~ msgid "fortnight"
+#~ msgstr "quincena"
+
+#~ msgid "min"
+#~ msgstr "min"
+
+#~ msgid "sec"
+#~ msgstr "seg"
+
+#~ msgid "tomorrow"
+#~ msgstr "mañá"
+
+#~ msgid "yesterday"
+#~ msgstr "onte"
+
+#~ msgid "today"
+#~ msgstr "hoxe"
+
+#~ msgid "first"
+#~ msgstr "primeiro"
+
+#~ msgid "third"
+#~ msgstr "terceiro"
+
+#~ msgid "fourth"
+#~ msgstr "cuarto"
+
+#~ msgid "fifth"
+#~ msgstr "quinto"
+
+#~ msgid "sixth"
+#~ msgstr "sexto"
+
+#~ msgid "seventh"
+#~ msgstr "sétimo"
+
+#~ msgid "eighth"
+#~ msgstr "oitavo"
+
+#~ msgid "ninth"
+#~ msgstr "noveno"
+
+#~ msgid "tenth"
+#~ msgstr "décimo"
+
+#~ msgid "eleventh"
+#~ msgstr "décimo primeiro"
+
+#~ msgid "twelfth"
+#~ msgstr "décimo segundo"
+
+#~ msgid "Year:"
+#~ msgstr "Ano:"
+
+#~ msgid ""
+#~ "Please select the date you want to go to.\n"
+#~ "When you click on a day, you will be taken\n"
+#~ "to that date."
+#~ msgstr ""
+#~ "Seleccione a data á que quere ir.\n"
+#~ "Cando prema nun día, será levado a esa data."
+
+#~ msgid "Mail Source"
+#~ msgstr "Fonte de Correo"
+
 #~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
+#~ "Your email configuration is now complete.\n"
+#~ "Click \"Finish\" to save your new settings"
 #~ msgstr ""
-#~ "¿Está seguro de que quere\n"
-#~ "borrar este contacto?"
+#~ "A configuración do correo electrónico está completa.\n"
+#~ "Prema \"Finalizar\" para gardar a nova configuración"
+
+#~ 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 messages \"%s\""
+#~ msgstr "Reenviando mensaxes \"%s\""
+
+#~ msgid "Forwarding a message without a subject"
+#~ msgstr "Reenviando unha mensaxe sen asunto"
+
+#~ msgid "Forward message \"%s\""
+#~ msgstr "Reenviar mensaxe \"%s\""
+
+#~ msgid "Loading \"%s\""
+#~ msgstr "Cargando \"%s\""
+
+#~ msgid "Creating \"%s\""
+#~ msgstr "Creando \"%s\""
+
+#~ msgid "Display message UID \"%s\""
+#~ msgstr "Amosar a mensaxe co UID \"%s\""
+
+#~ msgid "Opening messages from folder \"%s\""
+#~ msgstr "Abrindo as mensaxes da carpeta \"%s\""
+
+#~ msgid "Viewing messages from folder \"%s\""
+#~ msgstr "Vendo as mensaxes da carpeta \"%s\""
+
+#~ msgid "Retrieving message %d of %d (uid \"%s\")"
+#~ msgstr "Recibindo a mensaxe %d de %d (uid \"%s\")"
+
+#, fuzzy
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "Abrindo as mensaxes da carpeta \"%s\""
+
+#, fuzzy
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "Abrindo as mensaxes da carpeta \"%s\""
+
+#~ msgid "N_ew Directory Server"
+#~ msgstr "Novo Servidor de _Directorio"
+
+#~ msgid "_Actions"
+#~ msgstr "_Accións"
+
+#~ msgid "_Save Calendar As"
+#~ msgstr "_Gardar Axenda Como"
+
+#, fuzzy
+#~ msgid "_Mail Configuration"
+#~ msgstr "Configuración do Correo"
 
 #~ msgid "window2"
 #~ msgstr "window2"
 
-#~ msgid "Priority:"
-#~ msgstr "Prioridade:"
-
 #~ msgid "Time format"
 #~ msgstr "Formato da hora"
 
@@ -6732,90 +7402,24 @@ msgstr "Grupo %i"
 #~ msgid "Open in New Window"
 #~ msgstr "Abrir nunha Nova Fiestra"
 
-#~ msgid "Edit Message"
-#~ msgstr "Editar Mensaxe"
-
 #~ msgid "Forward Message"
 #~ msgstr "Reenviar esta mensaxe"
 
-#~ msgid "Delete Message"
-#~ msgstr "Borrar Mensaxe"
-
 #~ msgid "Move Message"
 #~ msgstr "Mover Mensaxe"
 
 #~ msgid "Copy Message"
 #~ msgstr "Copiar Mensaxe"
 
-#~ msgid "Account Information"
-#~ msgstr "Información de Contas"
-
-#~ msgid "Account Management"
-#~ msgstr "Xestión e Contas"
-
-#~ msgid "Accounts"
-#~ msgstr "Contas"
-
 #~ msgid "Add Optional Fields..."
 #~ msgstr "Engadir Campos Opcionais..."
 
-#~ msgid "Authentication"
-#~ msgstr "Autenticación"
-
 #~ msgid "Browse..."
 #~ msgstr "Explorar..."
 
-#~ msgid "Congratulations, your mail configuration is complete."
-#~ msgstr "Noraboa, a configuración do correo está completa."
-
-#~ msgid "Email Address:"
-#~ msgstr "Enderezo de Email:"
-
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Configuración de Correo do Evolution"
-
-#~ msgid "Full Name:"
-#~ msgstr "Nome Completo:"
-
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-#~ msgid "Mail"
-#~ msgstr "Correo"
-
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Axudante da Configuración do Correo"
-
-#~ msgid "News"
-#~ msgstr "Novas"
-
-#~ msgid "Optional"
-#~ msgstr "Opcional"
-
 #~ msgid "Optional Information"
 #~ msgstr "Información Opcional"
 
-#~ msgid "Password:"
-#~ msgstr "Contrasinal:"
-
-#~ msgid "Reply-to:"
-#~ msgstr "Responder-a:"
-
-#~ msgid "SMTP"
-#~ msgstr "SMTP"
-
-#~ msgid "SMTP server requires authentication"
-#~ msgstr "O servidor SMTP require autenticación"
-
-#~ msgid "Sending Mail"
-#~ msgstr "Enviando Correo"
-
-#~ msgid "Server Configuration"
-#~ msgstr "Configuración do Servidor"
-
-#~ msgid "Server Type: "
-#~ msgstr "Tipo de Servidor: "
-
 #~ msgid "Couldn't create pipe to %s: %s"
 #~ msgstr "Non foi posible crear unha canalización con %s: %s"
 
@@ -6828,17 +7432,11 @@ msgstr "Grupo %i"
 #~ msgid "Don't know protocol to open URI `%s'"
 #~ msgstr "O protocolo para abrir o URI `%s' é descoñecido"
 
-#~ msgid "_New Contact"
-#~ msgstr "_Novo Contacto"
-
 #~ msgid "New Ca_lendar"
 #~ msgstr "Nova A_xenda"
 
 #~ msgid "_New appointment..."
 #~ msgstr "_Nova cita..."
 
-#~ msgid "_Mail Configuration..."
-#~ msgstr "Configuración do _Correo..."
-
 #~ msgid "_Create New Folder..."
 #~ msgstr "_Crear unha Nova Carpeta..."