Updated Galician translation

svn path=/trunk/; revision=6406
author: Jesus Bravo Alvarez <jesusb@src.gnome.org> 2000-11-06 02:40:43 +0800
committer: Jesus Bravo Alvarez <jesusb@src.gnome.org> 2000-11-06 02:40:43 +0800
commit: 2e53ea5326b120e26d3e062897b955d95988ff4f (patch)
tree: 48ba1bbff9af57a72179b9c3333e3ff6d090b0c1 /po/gl.po
parent: 781040666b66f5b772b73df7384e053802545ef6 (diff)
download: gsoc2013-evolution-2e53ea5326b120e26d3e062897b955d95988ff4f.tar
gsoc2013-evolution-2e53ea5326b120e26d3e062897b955d95988ff4f.tar.gz
gsoc2013-evolution-2e53ea5326b120e26d3e062897b955d95988ff4f.tar.bz2
gsoc2013-evolution-2e53ea5326b120e26d3e062897b955d95988ff4f.tar.lz
gsoc2013-evolution-2e53ea5326b120e26d3e062897b955d95988ff4f.tar.xz
gsoc2013-evolution-2e53ea5326b120e26d3e062897b955d95988ff4f.tar.zst
gsoc2013-evolution-2e53ea5326b120e26d3e062897b955d95988ff4f.zip
1 files changed, 3799 insertions, 1413 deletions
diff --git a/po/gl.po b/po/gl.po
index 08fbcd71e3..046c0a85df 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2000-10-03 10:45+0200\n"
+"POT-Creation-Date: 2000-11-05 16:06+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"
@@ -18,14 +18,272 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/e-card.c:3044
+msgid "Card: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3046
+msgid ""
+"\n"
+"Name: "
+msgstr ""
+"\n"
+"Nome: "
+
+#: addressbook/backend/ebook/e-card.c:3047
+msgid ""
+"\n"
+"  Prefix:     "
+msgstr ""
+"\n"
+"  Prefixo:    "
+
+#: addressbook/backend/ebook/e-card.c:3048
+msgid ""
+"\n"
+"  Given:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3049
+msgid ""
+"\n"
+"  Additional: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3050
+msgid ""
+"\n"
+"  Family:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3051
+msgid ""
+"\n"
+"  Suffix:     "
+msgstr ""
+"\n"
+"  Sufixo:     "
+
+#: addressbook/backend/ebook/e-card.c:3065
+msgid ""
+"\n"
+"Birth Date: "
+msgstr ""
+"\n"
+"Data de Nacemento: "
+
+#: addressbook/backend/ebook/e-card.c:3076
+msgid ""
+"\n"
+"Address:"
+msgstr ""
+"\n"
+"Enderezo:"
+
+#: addressbook/backend/ebook/e-card.c:3078
+msgid ""
+"\n"
+"  Postal Box:  "
+msgstr ""
+"\n"
+"  Apdo. de Correos: "
+
+#: addressbook/backend/ebook/e-card.c:3079
+msgid ""
+"\n"
+"  Ext:         "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3080
+msgid ""
+"\n"
+"  Street:      "
+msgstr ""
+"\n"
+"  Rúa:         "
+
+#: addressbook/backend/ebook/e-card.c:3081
+msgid ""
+"\n"
+"  City:        "
+msgstr ""
+"\n"
+"  Cidade:      "
+
+#: addressbook/backend/ebook/e-card.c:3082
+msgid ""
+"\n"
+"  Region:      "
+msgstr ""
+"\n"
+"  Rexión:      "
+
+#: addressbook/backend/ebook/e-card.c:3083
+msgid ""
+"\n"
+"  Postal Code: "
+msgstr ""
+"\n"
+"  Código Postal: "
+
+#: addressbook/backend/ebook/e-card.c:3084
+msgid ""
+"\n"
+"  Country:     "
+msgstr ""
+"\n"
+"  País:        "
+
+#: addressbook/backend/ebook/e-card.c:3097
+msgid ""
+"\n"
+"Delivery Label: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3109
+msgid ""
+"\n"
+"Telephones:\n"
+msgstr ""
+"\n"
+"Teléfonos:\n"
+
+#: addressbook/backend/ebook/e-card.c:3112
+msgid ""
+"\n"
+"Telephone:"
+msgstr ""
+"\n"
+"Teléfono:"
+
+#: addressbook/backend/ebook/e-card.c:3136
+msgid ""
+"\n"
+"E-mail:\n"
+msgstr ""
+"\n"
+"Correo Electrónico:\n"
+
+#: addressbook/backend/ebook/e-card.c:3139
+msgid ""
+"\n"
+"E-mail:"
+msgstr ""
+"\n"
+"Correo Electrónico:"
+
+#: addressbook/backend/ebook/e-card.c:3158
+msgid ""
+"\n"
+"Mailer: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3164
+msgid ""
+"\n"
+"Time Zone: "
+msgstr ""
+"\n"
+"Zona Horaria: "
+
+#: addressbook/backend/ebook/e-card.c:3172
+msgid ""
+"\n"
+"Geo Location: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3176
+msgid ""
+"\n"
+"Business Role: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3188
+msgid ""
+"\n"
+"Org: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3189
+msgid ""
+"\n"
+"  Name:  "
+msgstr ""
+"\n"
+"  Nome:  "
+
+#: addressbook/backend/ebook/e-card.c:3190
+msgid ""
+"\n"
+"  Unit:  "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3191
+msgid ""
+"\n"
+"  Unit2: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3192
+msgid ""
+"\n"
+"  Unit3: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3193
+msgid ""
+"\n"
+"  Unit4: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3197
+msgid ""
+"\n"
+"Categories: "
+msgstr ""
+"\n"
+"Categorías: "
+
+#: addressbook/backend/ebook/e-card.c:3198
+msgid ""
+"\n"
+"Comment: "
+msgstr ""
+"\n"
+"Comentario: "
+
+#. if (crd->sound.prop.used) {
+#. if (crd->sound.type != SOUND_PHONETIC)
+#. addPropSizedValue (string, _ ("\nPronunciation: "),
+#. crd->sound.data, crd->sound.size);
+#. else
+#. add_strProp_to_string (string, _ ("\nPronunciation: "),
+#. crd->sound.data);
+#.
+#. add_SoundType (string, crd->sound.type);
+#. }
+#: addressbook/backend/ebook/e-card.c:3211
+msgid ""
+"\n"
+"Unique String: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3214
+msgid ""
+"\n"
+"Public Key: "
+msgstr ""
+"\n"
+"Clave Pública: "
+
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1215
+#: addressbook/conduit/address-conduit.c:910
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1673
-#: calendar/conduits/todo/todo-conduit.c:1173 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1091
+#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
@@ -33,83 +291,98 @@ msgstr "Non foi posible inicializar Bonobo"
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
 #.
-#: addressbook/conduit/address-conduit-control-applet.c:54
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:55
-#: calendar/conduits/todo/todo-conduit-control-applet.c:70
+#: addressbook/conduit/address-conduit-control-applet.c:77
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
+#: calendar/conduits/todo/todo-conduit-control-applet.c:77
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: addressbook/conduit/address-conduit-control-applet.c:55
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:56
-#: calendar/conduits/todo/todo-conduit-control-applet.c:71
+#: addressbook/conduit/address-conduit-control-applet.c:78
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
+#: calendar/conduits/todo/todo-conduit-control-applet.c:78
 msgid "Synchronize"
 msgstr "Sincronizar"
 
-#: addressbook/conduit/address-conduit-control-applet.c:56
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:57
-#: calendar/conduits/todo/todo-conduit-control-applet.c:72
+#: addressbook/conduit/address-conduit-control-applet.c:79
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
+#: calendar/conduits/todo/todo-conduit-control-applet.c:79
 msgid "Copy From Pilot"
 msgstr "Copiar do Pilot"
 
-#: addressbook/conduit/address-conduit-control-applet.c:57
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:58
-#: calendar/conduits/todo/todo-conduit-control-applet.c:73
+#: addressbook/conduit/address-conduit-control-applet.c:80
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
+#: calendar/conduits/todo/todo-conduit-control-applet.c:80
 msgid "Copy To Pilot"
 msgstr "Copiar ó Pilot"
 
-#: addressbook/conduit/address-conduit-control-applet.c:58
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:59
-#: calendar/conduits/todo/todo-conduit-control-applet.c:74
+#: addressbook/conduit/address-conduit-control-applet.c:81
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
+#: calendar/conduits/todo/todo-conduit-control-applet.c:81
 msgid "Merge From Pilot"
 msgstr "Mesturar do Pilot"
 
-#: addressbook/conduit/address-conduit-control-applet.c:59
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:60
-#: calendar/conduits/todo/todo-conduit-control-applet.c:75
+#: addressbook/conduit/address-conduit-control-applet.c:82
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
+#: calendar/conduits/todo/todo-conduit-control-applet.c:82
 msgid "Merge To Pilot"
 msgstr "Mesturar ó Pilot"
 
-#: addressbook/conduit/address-conduit-control-applet.c:143
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:144
-#: calendar/conduits/todo/todo-conduit-control-applet.c:116
+#: addressbook/conduit/address-conduit-control-applet.c:121
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
+#: calendar/conduits/todo/todo-conduit-control-applet.c:121
+msgid "JP Rosevear <jpr@helixcode.com>"
+msgstr "JP Rosevear <jpr@helixcode.com>"
+
+#: addressbook/conduit/address-conduit-control-applet.c:122
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
+#: calendar/conduits/todo/todo-conduit-control-applet.c:122
+msgid "Original Author:"
+msgstr "Autor Orixinal:"
+
+#: addressbook/conduit/address-conduit-control-applet.c:123
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
+#: calendar/conduits/todo/todo-conduit-control-applet.c:123
 msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
-#: addressbook/conduit/address-conduit-control-applet.c:145
-msgid "Gpilotd address conduit"
-msgstr "Conducto de enderezos para Gpilotd"
+#: addressbook/conduit/address-conduit-control-applet.c:127
+msgid "Evolution Addressbook Conduit"
+msgstr "Conducto de Libro de Enderezos de Evolution"
 
-#: addressbook/conduit/address-conduit-control-applet.c:146
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:147
-msgid "(C) 1998 the Free Software Foundation"
-msgstr "(C) 1998 a Free Software Foundation"
+#: addressbook/conduit/address-conduit-control-applet.c:128
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
+#: calendar/conduits/todo/todo-conduit-control-applet.c:128
+msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+msgstr "(C) 1998-2000 a Free Software Foundation e Helix Code"
 
-#: addressbook/conduit/address-conduit-control-applet.c:148
-msgid "Configuration utility for the address conduit.\n"
-msgstr "Utilidade de configuración do conducto de enderezos.\n"
+#: addressbook/conduit/address-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution addressbook conduit.\n"
+msgstr ""
+"Utilidade de configuración para o conducto de libro de enderezos de "
+"evolution.\n"
 
-#: addressbook/conduit/address-conduit-control-applet.c:149
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:150
-#: calendar/conduits/todo/todo-conduit-control-applet.c:124
+#: addressbook/conduit/address-conduit-control-applet.c:131
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
+#: calendar/conduits/todo/todo-conduit-control-applet.c:131
 msgid "gnome-unknown.xpm"
 msgstr "gnome-unknown.xpm"
 
-#: addressbook/conduit/address-conduit-control-applet.c:190
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:191
-#: calendar/conduits/todo/todo-conduit-control-applet.c:155
+#: addressbook/conduit/address-conduit-control-applet.c:162
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
+#: calendar/conduits/todo/todo-conduit-control-applet.c:162
 msgid "Synchronize Action"
 msgstr "Sincronizar Acción"
 
-#: addressbook/conduit/address-conduit-control-applet.c:261
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:262
+#: addressbook/conduit/address-conduit-control-applet.c:214
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
 #: calendar/conduits/todo/todo-conduit-control-applet.c:214
 msgid "Conduit state"
 msgstr "Estado do conducto"
 
-#: addressbook/conduit/address-conduit-control-applet.c:315
-#: addressbook/conduit/address-conduit-control-applet.c:328
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:316
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:329
+#: addressbook/conduit/address-conduit-control-applet.c:266
+#: addressbook/conduit/address-conduit-control-applet.c:279
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
 #: calendar/conduits/todo/todo-conduit-control-applet.c:266
 #: calendar/conduits/todo/todo-conduit-control-applet.c:279
 msgid ""
@@ -119,46 +392,47 @@ msgstr ""
 "Non hai ningún pilot configurado, escolla\n"
 "primeiro a capplet 'Propiedades da Ligazón co Pilot'."
 
-#: addressbook/conduit/address-conduit-control-applet.c:334
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:335
+#: addressbook/conduit/address-conduit-control-applet.c:285
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
 #: calendar/conduits/todo/todo-conduit-control-applet.c:285
 msgid "Not connected to the gnome-pilot daemon"
 msgstr "Non conectado ó demo gnome-pilot"
 
-#: addressbook/conduit/address-conduit-control-applet.c:339
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:340
+#: addressbook/conduit/address-conduit-control-applet.c:290
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
 #: calendar/conduits/todo/todo-conduit-control-applet.c:290
 msgid ""
 "An error occured when trying to fetch\n"
 "pilot list from the gnome-pilot daemon"
 msgstr ""
-"Ocorreu un erro ó obte-la lista de\n"
+"Ocorreu un erro ó obter a lista de\n"
 "pilots do demo gnome-pilot"
 
-#: addressbook/conduit/address-conduit.c:127
-#: addressbook/conduit/address-conduit.c:141
-msgid "BLARG\n"
-msgstr "BLARG\n"
+#: addressbook/conduit/address-conduit.c:193
+msgid "Cursor could not be loaded\n"
+msgstr "Non foi posible cargar o cursor\n"
 
-#: addressbook/conduit/address-conduit.c:471
-#, c-format
-msgid "Address holds %ld address entries"
-msgstr ""
+#: addressbook/conduit/address-conduit.c:206
+msgid "EBook not loaded\n"
+msgstr "EBook non cargado\n"
 
-#: addressbook/conduit/address-conduit.c:497
-#: addressbook/conduit/address-conduit.c:499
-msgid "Could not start addressbook server"
-msgstr "Non se puido inicia-lo servidor de libro de enderezos"
+#: addressbook/conduit/address-conduit.c:490
+#: calendar/conduits/calendar/calendar-conduit.c:651
+#: calendar/conduits/todo/todo-conduit.c:524
+msgid "Could not start wombat server"
+msgstr "Non foi posible iniciar o servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:512
-#: addressbook/conduit/address-conduit.c:515
+#: addressbook/conduit/address-conduit.c:491
+#: calendar/conduits/calendar/calendar-conduit.c:652
+#: calendar/conduits/todo/todo-conduit.c:525
+msgid "Could not start wombat"
+msgstr "Non foi posible iniciar wombat"
+
+#: addressbook/conduit/address-conduit.c:517
+#: addressbook/conduit/address-conduit.c:520
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:853
-msgid "Error while communicating with address server"
-msgstr "Erro ó comunicarse co servidor de enderezos"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -228,7 +502,7 @@ msgstr "Móbil"
 
 #: addressbook/contact-editor/e-contact-editor.c:1230
 #: addressbook/contact-editor/e-contact-editor.c:1325
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:28 mail/mail-config.glade.h:40
 msgid "Other"
 msgstr "Outro"
 
@@ -283,6 +557,7 @@ msgstr ""
 "borrar este contacto?"
 
 #: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:10
 msgid "Delete Contact?"
 msgstr "¿Borrar Contacto?"
 
@@ -296,7 +571,7 @@ msgid "_Add"
 msgstr "_Engadir"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: calendar/gui/dialogs/task-editor.c:459 calendar/gui/event-editor.c:1203
+#: ui/evolution-event-editor.xml.h:109 ui/evolution-mail.xml.h:46
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -310,8 +585,12 @@ msgid "New phone type"
 msgstr "Novo tipo de teléfono"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:90 mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:16 mail/mail-config.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:71
+#: calendar/gui/event-editor-dialog.glade.h:80 filter/filter.glade.h:12
+#: filter/filter.glade.h:17 filter/filter.glade.h:21 filter/filter.glade.h:24
+#: filter/filter.glade.h:26 mail/mail-config-druid.glade.h:22
+#: mail/mail-config.glade.h:11 mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:22 mail/mail-config.glade.h:29
 msgid "Add"
 msgstr "Engadir"
 
@@ -365,12 +644,13 @@ msgstr "C_ontactos..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:34
 msgid "Ca_tegories..."
 msgstr "Ca_tegorías..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:27
 msgid "_Job title:"
-msgstr "Posto:"
+msgstr "_Posto:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:28
 msgid "_Company:"
@@ -382,6 +662,7 @@ msgstr "_Enderezo..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
 #: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:87
 msgid "General"
 msgstr "Xeral"
 
@@ -427,6 +708,7 @@ msgstr "No_tas:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:36
 msgid "Details"
 msgstr "Detalles"
 
@@ -436,43 +718,56 @@ msgstr "Detalles"
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:19
 msgid "Check Address"
 msgstr ""
 
 #: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_Street Address:"
-msgstr "_Rúa:"
+#: addressbook/contact-editor/fulladdr.glade.h:21
+msgid "_Address:"
+msgstr "_Enderezo:"
 
 #: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "City:"
-msgstr "Cidade:"
+#: addressbook/contact-editor/fulladdr.glade.h:22
+msgid "_City:"
+msgstr "_Cidade:"
 
 #: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "State/Province:"
-msgstr "Estado/Provincia:"
+#: addressbook/contact-editor/fulladdr.glade.h:23
+msgid "_PO Box:"
+msgstr "_Apdo. de Correos:"
 
 #: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "Country:"
-msgstr "País:"
+#: addressbook/contact-editor/fulladdr.glade.h:18
+msgid "Address _2:"
+msgstr "Enderezo _2:"
 
 #: addressbook/contact-editor/fulladdr.glade.h:12
-msgid "ZIP/Postal Code:"
-msgstr "Código Postal:"
+#: addressbook/contact-editor/fulladdr.glade.h:24
+msgid "_State/Province:"
+msgstr "E_stado/Provincia:"
 
 #: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "E_xt:"
-msgstr ""
+msgid "USA"
+msgstr "Estados Unidos"
 
 #: addressbook/contact-editor/fulladdr.glade.h:14
-msgid ""
-"USA\n"
-"Canada\n"
-"Finland\n"
-msgstr ""
+msgid "Canada"
+msgstr "Canadá"
 
-#: addressbook/contact-editor/fulladdr.glade.h:18
-msgid "PO Box:"
-msgstr "Apdo. de Correos:"
+#: addressbook/contact-editor/fulladdr.glade.h:15
+msgid "Finland"
+msgstr "Finlandia"
+
+#: addressbook/contact-editor/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:25
+msgid "_ZIP Code:"
+msgstr "Código _Postal:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:17
+#: addressbook/contact-editor/fulladdr.glade.h:20
+msgid "Countr_y:"
+msgstr "_País:"
 
 #.
 #. * Translatable strings file generated by Glade.
@@ -537,11 +832,25 @@ msgstr "_Apelidos:"
 msgid "_Suffix:"
 msgstr "_Sufixo:"
 
-#: addressbook/gui/component/addressbook.c:426
+#: addressbook/gui/component/addressbook.c:265
+msgid "As _Minicards"
+msgstr "Como _Minitarxetas"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
+#.
+#: addressbook/gui/component/addressbook.c:271
+#: ui/evolution-addressbook.xml.h:7
+msgid "As _Table"
+msgstr "Como unha _Táboa"
+
+#: addressbook/gui/component/addressbook.c:386
 msgid "Unable to open addressbook"
-msgstr "Non se pode abri-lo libro de enderezos"
+msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook.c:431
+#: addressbook/gui/component/addressbook.c:391
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -553,15 +862,7 @@ msgid ""
 "OpenLDAP and recompile and install evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:548
-msgid "As _Minicards"
-msgstr "Como _Minitarxetas"
-
-#: addressbook/gui/component/addressbook.c:553
-msgid "As _Table"
-msgstr "Como unha _Táboa"
-
-#: addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:574
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que amosará o navegador de carpetas"
 
@@ -575,24 +876,30 @@ msgstr "Directorios Externos"
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/gui/component/ldap-server-dialog.glade.h:7
+#: addressbook/gui/component/ldap-server-dialog.glade.h:12
 #: composer/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:12
 msgid "Description:"
 msgstr "Descrición:"
 
 #: addressbook/gui/component/ldap-server-dialog.glade.h:8
+#: addressbook/gui/component/ldap-server-dialog.glade.h:13
 msgid "LDAP Server:"
 msgstr "Servidor LDAP:"
 
 #: addressbook/gui/component/ldap-server-dialog.glade.h:9
+#: addressbook/gui/component/ldap-server-dialog.glade.h:15
 msgid "Port Number:"
 msgstr "Número de Porto:"
 
 #: addressbook/gui/component/ldap-server-dialog.glade.h:10
+#: addressbook/gui/component/ldap-server-dialog.glade.h:16
 msgid "Root DN:"
 msgstr "DN Raíz:"
 
 #: addressbook/gui/component/ldap-server-dialog.glade.h:11
-#: composer/e-msg-composer-address-dialog.glade.h:8
+#: addressbook/gui/component/ldap-server-dialog.glade.h:14
+#: mail/mail-config-druid.glade.h:49
 msgid "Name:"
 msgstr "Nome:"
 
@@ -602,18 +909,22 @@ msgstr "Nome:"
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:13
 msgid "Select Names"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:11
 msgid "Find..."
 msgstr "Buscar..."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:9
+#: addressbook/gui/component/select-names/select-names.glade.h:14
 msgid "Select name from List:"
 msgstr "Seleccionar un nome da Lista:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:10
+#: addressbook/gui/component/select-names/select-names.glade.h:12
 msgid "Message Recipients"
 msgstr ""
 
@@ -623,10 +934,12 @@ msgstr ""
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/gui/widgets/alphabet.glade.h:7
+#: addressbook/gui/widgets/alphabet.glade.h:36
 msgid "window2"
 msgstr "window2"
 
 #: addressbook/gui/widgets/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:35
 msgid "123"
 msgstr "123"
 
@@ -735,15 +1048,11 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-addressbook-view.c:414
 #: addressbook/gui/widgets/e-minicard.c:337
 msgid "Save as VCard"
 msgstr "Gardar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:543
-msgid "* Click here to add a contact *"
-msgstr "* Prema aquí para engadir un contacto *"
-
 #: addressbook/gui/widgets/e-minicard-control.c:278
 msgid "Save in addressbook"
 msgstr "Gardar no libro de enderezos"
@@ -762,9 +1071,8 @@ msgstr ""
 "\n"
 "Faga dobre clic aquí para crear un novo Contacto."
 
-#. gtk_signal_connect(fb->search_entry, "changed", search_activate, fb);
 #: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:405
+#: mail/folder-browser.c:643 mail/mail-search-dialogue.c:101
 msgid "Search"
 msgstr "Buscar"
 
@@ -774,54 +1082,67 @@ msgstr "Buscar"
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/printing/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:82
 msgid "Page Setup:"
 msgstr "Configuración da Páxina:"
 
 #: addressbook/printing/e-contact-print.glade.h:8
+#: addressbook/printing/e-contact-print.glade.h:94
 msgid "Style name:"
 msgstr "Nome do estilo:"
 
 #: addressbook/printing/e-contact-print.glade.h:9
+#: addressbook/printing/e-contact-print.glade.h:86
 msgid "Preview:"
 msgstr "Previsualización:"
 
 #: addressbook/printing/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:79
 msgid "Options"
 msgstr "Opcións"
 
 #: addressbook/printing/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:73
 msgid "Include:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:90
 msgid "Sections:"
 msgstr "Seccións:"
 
 #: addressbook/printing/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:72
 msgid "Immediately follow each other"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:76
 msgid "Letter tabs on side"
 msgstr "Pestanas coas letras no lateral"
 
 #: addressbook/printing/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:70
 msgid "Headings for each letter"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:93
 msgid "Start on a new page"
 msgstr "Iniciar nunha nova páxina"
 
 #: addressbook/printing/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:78
 msgid "Number of columns:"
 msgstr "Número de columnas:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:59
 msgid "Blank forms at end:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:64
 msgid "Fonts"
 msgstr "Fontes"
 
@@ -829,299 +1150,263 @@ msgstr "Fontes"
 #: addressbook/printing/e-contact-print.glade.h:21
 #: addressbook/printing/e-contact-print.glade.h:51
 #: addressbook/printing/e-contact-print.glade.h:54
+#: addressbook/printing/e-contact-print.glade.h:63
 msgid "Font..."
 msgstr "Fonte..."
 
 #: addressbook/printing/e-contact-print.glade.h:22
+#: addressbook/printing/e-contact-print.glade.h:69
 msgid "Headings"
 msgstr "Cabeceiras"
 
 #: addressbook/printing/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:57
 msgid "10 pt. Tahoma"
 msgstr "10 ptos. Tahoma"
 
 #: addressbook/printing/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:60
 msgid "Body"
 msgstr "Corpo"
 
 #: addressbook/printing/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:58
 msgid "8 pt. Tahoma"
 msgstr "8 ptos. Tahoma"
 
 #: addressbook/printing/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:91
 msgid "Shading"
 msgstr "Sombreado"
 
 #: addressbook/printing/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:87
 msgid "Print using gray shading"
 msgstr "Imprimir usando sombreado gris"
 
 #: addressbook/printing/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:66
 msgid "Format"
 msgstr "Formato"
 
 #: addressbook/printing/e-contact-print.glade.h:29
 #: addressbook/printing/e-contact-print.glade.h:50
+#: addressbook/printing/e-contact-print.glade.h:83
 msgid "Paper"
 msgstr "Papel"
 
 #: addressbook/printing/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:96
+#: mail/mail-config-druid.glade.h:78
 msgid "Type:"
 msgstr "Tipo:"
 
 #: addressbook/printing/e-contact-print.glade.h:31
 #: addressbook/printing/e-contact-print.glade.h:43
-#: calendar/gui/event-editor-dialog.glade.h:80
+#: addressbook/printing/e-contact-print.glade.h:98
 msgid "label26"
 msgstr "label26"
 
 #: addressbook/printing/e-contact-print.glade.h:32
 #: addressbook/printing/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:62
 msgid "Dimensions:"
 msgstr "Dimensións:"
 
 #: addressbook/printing/e-contact-print.glade.h:33
 #: addressbook/printing/e-contact-print.glade.h:45
+#: addressbook/printing/e-contact-print.glade.h:97
 msgid "Width:"
 msgstr "Largura:"
 
 #: addressbook/printing/e-contact-print.glade.h:34
 #: addressbook/printing/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:71
 msgid "Height:"
 msgstr "Altura:"
 
 #: addressbook/printing/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:84
 msgid "Paper source:"
 msgstr "Orixe do papel:"
 
 #: addressbook/printing/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:77
 msgid "Margins"
 msgstr "Marxes"
 
 #: addressbook/printing/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:95
 msgid "Top:"
 msgstr "Superior:"
 
 #: addressbook/printing/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:61
 msgid "Bottom:"
 msgstr "Inferior:"
 
 #: addressbook/printing/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:75
 msgid "Left:"
 msgstr "Esquerda:"
 
 #: addressbook/printing/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:89
 msgid "Right:"
 msgstr "Dereita:"
 
 #: addressbook/printing/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:81
 msgid "Page"
 msgstr "Páxina"
 
 #: addressbook/printing/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:92
 msgid "Size:"
 msgstr "Tamaño:"
 
 #: addressbook/printing/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:80
 msgid "Orientation"
 msgstr "Orientación"
 
 #: addressbook/printing/e-contact-print.glade.h:48
+#: addressbook/printing/e-contact-print.glade.h:85
 msgid "Portrait"
 msgstr "Vertical"
 
 #: addressbook/printing/e-contact-print.glade.h:49
+#: addressbook/printing/e-contact-print.glade.h:74
 msgid "Landscape"
 msgstr "Horizontal"
 
 #: addressbook/printing/e-contact-print.glade.h:52
+#: addressbook/printing/e-contact-print.glade.h:67
 msgid "Header"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:53
+#: addressbook/printing/e-contact-print.glade.h:65
 msgid "Footer:"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:55
+#: addressbook/printing/e-contact-print.glade.h:88
 msgid "Reverse on even pages"
 msgstr "Invertir nas páxinas pares"
 
 #: addressbook/printing/e-contact-print.glade.h:56
+#: addressbook/printing/e-contact-print.glade.h:68
 msgid "Header/Footer"
 msgstr ""
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
 msgid "am"
 msgstr "am"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:603
+#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
 msgid "pm"
 msgstr "pm"
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:146
-msgid "Gpilotd calendar conduit"
-msgstr "Conducto de axenda do Gpilotd"
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
+msgid "Evolution Calendar Conduit"
+msgstr "Conducto de Axenda de Evolution"
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:149
-msgid "Configuration utility for the calendar conduit.\n"
-msgstr "Utilidade de configuración para o conducto de axenda.\n"
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
+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:398
-#: calendar/conduits/calendar/calendar-conduit.c:1111
-#: calendar/conduits/todo/todo-conduit.c:554
+#: calendar/conduits/calendar/calendar-conduit.c:607
+#: calendar/conduits/todo/todo-conduit.c:480
 msgid "Error while communicating with calendar server"
 msgstr "Erro comunicando co servidor de axenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/calendar/calendar-conduit.c:780
-msgid "Could not start gnomecal server"
-msgstr "Non foi posible inicia-lo servidor gnomecal"
-
-#: calendar/conduits/calendar/calendar-conduit.c:808
-#: calendar/conduits/calendar/calendar-conduit.c:811
-msgid "Could not read pilot's DateBook application block"
+#: calendar/conduits/calendar/calendar-conduit.c:706
+#: calendar/conduits/calendar/calendar-conduit.c:709
+msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:114
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr "JP Rosevear <jpr@helixcode.com>"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:115
-msgid "Original Author:"
-msgstr "Autor Orixinal:"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:120
+#: calendar/conduits/todo/todo-conduit-control-applet.c:127
 msgid "Evolution ToDo Conduit"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr "(C) 1998-2000 a Free Software Foundation e Helix Code"
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
+#: calendar/conduits/todo/todo-conduit-control-applet.c:130
 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:599
-msgid "Could not start wombat server"
-msgstr "Non foi posible inicia-lo servidor wombat"
-
-#: calendar/conduits/todo/todo-conduit.c:600
-msgid "Could not start wombat"
-msgstr "Non foi posible iniciar wombat"
-
-#: calendar/conduits/todo/todo-conduit.c:658
-#: calendar/conduits/todo/todo-conduit.c:661
+#: calendar/conduits/todo/todo-conduit.c:579
+#: calendar/conduits/todo/todo-conduit.c:582
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:59
+#: calendar/gui/calendar-commands.c:60
 msgid "Outline:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:60
+#: calendar/gui/calendar-commands.c:61
 msgid "Headings:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:61
+#: calendar/gui/calendar-commands.c:62
 msgid "Empty days:"
 msgstr "Días baleiros:"
 
-#: calendar/gui/calendar-commands.c:62
+#: calendar/gui/calendar-commands.c:63
 msgid "Appointments:"
 msgstr "Citas:"
 
-#: calendar/gui/calendar-commands.c:63
+#: calendar/gui/calendar-commands.c:64
 msgid "Highlighted day:"
 msgstr "Día salientado:"
 
-#: calendar/gui/calendar-commands.c:64
+#: calendar/gui/calendar-commands.c:65
 msgid "Day numbers:"
 msgstr "Números dos días:"
 
-#: calendar/gui/calendar-commands.c:65
+#: calendar/gui/calendar-commands.c:66
 msgid "Current day's number:"
 msgstr "Número do día actual:"
 
-#: calendar/gui/calendar-commands.c:66
+#: calendar/gui/calendar-commands.c:67
 msgid "To-Do item that is not yet due:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:67
+#: calendar/gui/calendar-commands.c:68
 msgid "To-Do item that is due today:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:68
+#: calendar/gui/calendar-commands.c:69
 msgid "To-Do item that is overdue:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:370
+#: calendar/gui/calendar-commands.c:382
 msgid "File not found"
 msgstr "Ficheiro non atopado"
 
-#: calendar/gui/calendar-commands.c:394
+#: calendar/gui/calendar-commands.c:406
 msgid "Open calendar"
 msgstr "Abrir axenda"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:445
 msgid "Save calendar"
 msgstr "Gardar axenda"
 
-#: calendar/gui/calendar-commands.c:464
-msgid "Day"
-msgstr "Día"
-
-#: calendar/gui/calendar-commands.c:464
-msgid "Show 1 day"
-msgstr "Amosar un día"
-
-#: calendar/gui/calendar-commands.c:467
-msgid "5 Days"
-msgstr "5 Días"
-
-#: calendar/gui/calendar-commands.c:467
-msgid "Show the working week"
-msgstr "Amosa-la semana laboral"
-
-#: calendar/gui/calendar-commands.c:470
-msgid "Week"
-msgstr "Semana"
-
-#: calendar/gui/calendar-commands.c:470
-msgid "Show 1 week"
-msgstr "Amosar unha semana"
-
-#: calendar/gui/calendar-commands.c:473
-msgid "Month"
-msgstr "Mes"
-
-#: calendar/gui/calendar-commands.c:473
-msgid "Show 1 month"
-msgstr "Amosar un mes"
-
-#: calendar/gui/calendar-commands.c:477
-msgid "Year"
-msgstr "Ano"
-
-#: calendar/gui/calendar-commands.c:477
-msgid "Show 1 year"
-msgstr "Amosar un ano"
-
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
 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:740
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:726
 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:743
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:729
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -1168,7 +1453,7 @@ msgstr "Transparente"
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:748
+#: calendar/gui/calendar-model.c:734
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1180,35 +1465,36 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:849 calendar/gui/calendar-model.c:897
-#: widgets/misc/e-dateedit.c:475 widgets/misc/e-dateedit.c:507
-#: widgets/misc/e-dateedit.c:664 widgets/misc/e-dateedit.c:720
+#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
+#: widgets/misc/e-dateedit.c:228 widgets/misc/e-dateedit.c:514
+#: widgets/misc/e-dateedit.c:545 widgets/misc/e-dateedit.c:701
 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:867
+#: calendar/gui/calendar-model.c:853
 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:870
+#: calendar/gui/calendar-model.c:856
 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:874
+#: calendar/gui/calendar-model.c:860
 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:877
+#: calendar/gui/calendar-model.c:863
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:983
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1218,11 +1504,11 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1037
+#: calendar/gui/calendar-model.c:1023
 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:1077
+#: calendar/gui/calendar-model.c:1063
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "A prioridade ten que estar entre 1 e 9, inclusive"
 
@@ -1248,351 +1534,349 @@ msgstr ""
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: calendar/gui/event-editor.c:1372
+#: calendar/gui/dialogs/alarm-notify.glade.h:11
+#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:14
+#: ui/evolution-subscribe.xml.h:8
 msgid "Close"
 msgstr "Pechar"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1427
+#: calendar/gui/dialogs/alarm-notify.glade.h:8
+#: calendar/gui/dialogs/alarm-notify.glade.h:13 calendar/gui/gnome-cal.c:1458
 msgid "Snooze"
 msgstr "Adiar"
 
 #: calendar/gui/dialogs/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:12
 msgid "Edit appointment"
 msgstr "Editar cita"
 
 #: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: calendar/gui/dialogs/alarm-notify.glade.h:14
 msgid "Snooze time (minutes)"
 msgstr "Tempo de adiamento (minutos)"
 
-#: calendar/gui/dialogs/task-editor.c:427
-#: calendar/gui/dialogs/task-editor.c:434 calendar/gui/event-editor.c:1178
-msgid "FIXME: _Task"
-msgstr "FIXME: _Tarefa"
-
-#: calendar/gui/dialogs/task-editor.c:428
-#: calendar/gui/dialogs/task-editor.c:435 calendar/gui/event-editor.c:1179
-msgid "FIXME: Task _Request"
-msgstr "FIXME: Solicitude de _Tarefa"
-
-#: calendar/gui/dialogs/task-editor.c:430 calendar/gui/event-editor.c:1176
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: Enviar _Mensaxe"
-
-#: calendar/gui/dialogs/task-editor.c:431
-msgid "FIXME: _Appointment"
-msgstr "FIXME: _Cita"
-
-#: calendar/gui/dialogs/task-editor.c:432
-msgid "FIXME: Meeting Re_quest"
-msgstr "FIXME: _Solicitude de Reunión"
-
-#: calendar/gui/dialogs/task-editor.c:433 calendar/gui/event-editor.c:1177
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Contacto"
-
-#: calendar/gui/dialogs/task-editor.c:436 calendar/gui/event-editor.c:1180
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: Entrada de _Xornal"
-
-#: calendar/gui/dialogs/task-editor.c:437 calendar/gui/event-editor.c:1181
-msgid "FIXME: _Note"
-msgstr "FIXME: _Nota"
-
-#: calendar/gui/dialogs/task-editor.c:439
-#: calendar/gui/dialogs/task-editor.c:547 calendar/gui/event-editor.c:1183
-#: calendar/gui/event-editor.c:1291
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Es_colla un Formulario..."
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
+msgid "Calendar Preferences"
+msgstr "Preferencias da Axenda"
 
-#: calendar/gui/dialogs/task-editor.c:444 calendar/gui/event-editor.c:1188
-msgid "FIXME: _Memo Style"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:111
+msgid "Work week"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:446 calendar/gui/event-editor.c:1190
-msgid "FIXME: Define Print _Styles..."
-msgstr "FIXME: Definir E_stilos de Impresión..."
-
-#: calendar/gui/dialogs/task-editor.c:453 calendar/gui/event-editor.c:1197
-msgid "FIXME: S_end"
-msgstr "FIXME: _Enviar"
-
-#: calendar/gui/dialogs/task-editor.c:457 calendar/gui/event-editor.c:1201
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Gardar Ane_xos..."
-
-#: calendar/gui/dialogs/task-editor.c:461 calendar/gui/event-editor.c:1205
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: _Mover á Carpeta..."
-
-#: calendar/gui/dialogs/task-editor.c:462 calendar/gui/event-editor.c:1206
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Cop_iar á Carpeta..."
-
-#: calendar/gui/dialogs/task-editor.c:464 calendar/gui/event-editor.c:1208
-msgid "Page Set_up"
-msgstr "_Configuración da Páxina"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:90
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Lun"
 
-#: calendar/gui/dialogs/task-editor.c:465 calendar/gui/event-editor.c:1209
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Pre_visualización da Impresión"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:108
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Mar"
 
-#: calendar/gui/dialogs/task-editor.c:486 calendar/gui/event-editor.c:1230
-msgid "FIXME: Paste _Special..."
-msgstr "FIXME: Pegar _Especial..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:110
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Mér"
 
-#: calendar/gui/dialogs/task-editor.c:491 calendar/gui/event-editor.c:1235
-msgid "FIXME: Mark as U_nread"
-msgstr "FIXME: Marcar como _non Lidos"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:104
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Xov"
 
-#: calendar/gui/dialogs/task-editor.c:495 calendar/gui/event-editor.c:1239
-msgid "_Object"
-msgstr "_Obxecto"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:84
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Ven"
 
-#: calendar/gui/dialogs/task-editor.c:500
-#: calendar/gui/dialogs/task-editor.c:508 calendar/gui/event-editor.c:1244
-#: calendar/gui/event-editor.c:1251
-msgid "FIXME: _Item"
-msgstr "FIXME: _Elemento"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:97
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Sáb"
 
-#: calendar/gui/dialogs/task-editor.c:501
-#: calendar/gui/dialogs/task-editor.c:509 calendar/gui/event-editor.c:1245
-#: calendar/gui/event-editor.c:1252
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: Elemento _non Lido"
+#. Initialize by default to three-letter day names
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:102
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Dom"
 
-#: calendar/gui/dialogs/task-editor.c:502
-#: calendar/gui/dialogs/task-editor.c:510
-msgid "FIXME: In_complete Task"
-msgstr "FIXME: Tarefa in_completa"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
+msgid "First day of week:"
+msgstr "Primeiro día da semana:"
 
-#: calendar/gui/dialogs/task-editor.c:503 calendar/gui/event-editor.c:1246
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: Pri_meiro elemento na Carpeta"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:45 calendar/gui/prop.c:354
+msgid "Monday"
+msgstr "Luns"
 
-#: calendar/gui/dialogs/task-editor.c:511 calendar/gui/event-editor.c:1253
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _Derradeiro Elemento na Carpeta"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:46
+msgid "Tuesday"
+msgstr "Martes"
 
-#: calendar/gui/dialogs/task-editor.c:516 calendar/gui/event-editor.c:1258
-msgid "FIXME: _Standard"
-msgstr "FIXME: _Estándar"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:47
+msgid "Wednesday"
+msgstr "Mércores"
 
-#: calendar/gui/dialogs/task-editor.c:518
-msgid "FIXME: __Formatting"
-msgstr ""
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:48
+msgid "Thursday"
+msgstr "Xoves"
 
-#: calendar/gui/dialogs/task-editor.c:521 calendar/gui/event-editor.c:1263
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Personalizar..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:49
+msgid "Friday"
+msgstr "Venres"
 
-#: calendar/gui/dialogs/task-editor.c:526 calendar/gui/event-editor.c:1268
-msgid "Pre_vious"
-msgstr "An_terior"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:50
+msgid "Saturday"
+msgstr "Sábado"
 
-#: calendar/gui/dialogs/task-editor.c:527 calendar/gui/event-editor.c:1269
-msgid "Ne_xt"
-msgstr "Se_guinte"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:51 calendar/gui/prop.c:353
+msgid "Sunday"
+msgstr "Domingo"
 
-#: calendar/gui/dialogs/task-editor.c:529 calendar/gui/event-editor.c:1273
-msgid "_Toolbars"
-msgstr "_Barras de ferramentas"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:101
+msgid "Start of day:"
+msgstr "Inicio do día:"
 
-#: calendar/gui/dialogs/task-editor.c:534 calendar/gui/event-editor.c:1278
-msgid "FIXME: _File..."
-msgstr "FIXME: _Ficheiro..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:82
+msgid "End of day:"
+msgstr "Final do día:"
 
-#: calendar/gui/dialogs/task-editor.c:535 calendar/gui/event-editor.c:1279
-msgid "FIXME: It_em..."
-msgstr "FIXME: _Elemento..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
+msgid "Display options"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:536 calendar/gui/event-editor.c:1280
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Obxecto..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:106
+msgid "Time divisions:"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:541 calendar/gui/event-editor.c:1285
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Fonte..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:107
+msgid "Time format:"
+msgstr "Formato da hora:"
 
-#: calendar/gui/dialogs/task-editor.c:542 calendar/gui/event-editor.c:1286
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: _Parágrafo..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:99
+msgid "Show appointment end times"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:549 calendar/gui/event-editor.c:1293
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Deseñar este _Formulario"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+msgid "Compress weekends"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:550 calendar/gui/event-editor.c:1294
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: _Deseñar un Formulario..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
+msgid "12 hour (am/pm)"
+msgstr "12 horas (am/pm)"
 
-#: calendar/gui/dialogs/task-editor.c:552 calendar/gui/event-editor.c:1296
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Publicar _Formulario..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+msgid "24 hour"
+msgstr "24 horas"
 
-#: calendar/gui/dialogs/task-editor.c:553 calendar/gui/event-editor.c:1297
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: Pu_blicar Formulario Como..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+msgid "60 minutes"
+msgstr "60 minutos"
 
-#: calendar/gui/dialogs/task-editor.c:555 calendar/gui/event-editor.c:1299
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: _Depurador de Script"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "30 minutes"
+msgstr "30 minutos"
 
-#: calendar/gui/dialogs/task-editor.c:560 calendar/gui/event-editor.c:1304
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Ortografía..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+msgid "15 minutes"
+msgstr "15 minutos"
 
-#: calendar/gui/dialogs/task-editor.c:562 calendar/gui/event-editor.c:1306
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: Veri_ficar Nomes"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+msgid "10 minutes"
+msgstr "10 minutos"
 
-#: calendar/gui/dialogs/task-editor.c:563 calendar/gui/event-editor.c:1307
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: _Libro de enderezos..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "05 minutes"
+msgstr "05 minutos"
 
-#: calendar/gui/dialogs/task-editor.c:565 calendar/gui/event-editor.c:1309
-msgid "_Forms"
-msgstr "_Formularios"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+msgid "Date navigator options"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:570
-msgid "FIXME: _New Task"
-msgstr "FIXME: _Nova Tarefa"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:100
+msgid "Show week numbers"
+msgstr "Amosar números de semana"
 
-#: calendar/gui/dialogs/task-editor.c:572
-msgid "FIXME: S_end Status Report"
-msgstr "FIXME: En_viar Informe do Estado"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+msgid "Calendar"
+msgstr "Axenda"
 
-#: calendar/gui/dialogs/task-editor.c:573
-msgid "FIXME: _Mark Complete"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:98
+msgid "Show"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:575 calendar/gui/event-editor.c:1316
-msgid "FIXME: Rec_urrence..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:80 calendar/gui/prop.c:610
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:576
-msgid "FIXME: S_kip Occurrence"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:105 calendar/gui/prop.c:612
+msgid "Time Until Due"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:578
-msgid "FIXME: Assig_n Task"
-msgstr "FIXME: Asi_gnar Tarefa"
-
-#: calendar/gui/dialogs/task-editor.c:580
-msgid "FIXME: _Reply"
-msgstr "FIXME: _Responder"
-
-#: calendar/gui/dialogs/task-editor.c:581
-msgid "FIXME: Reply to A_ll"
-msgstr "FIXME: Responder a _Todos"
-
-#: calendar/gui/dialogs/task-editor.c:582 calendar/gui/event-editor.c:1321
-msgid "FIXME: For_ward"
-msgstr "FIXME: _Reenviar"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:94 calendar/gui/prop.c:611
+#: filter/libfilter-i18n.h:18
+msgid "Priority"
+msgstr "Prioridade"
 
-#: calendar/gui/dialogs/task-editor.c:595 calendar/gui/event-editor.c:1334
-msgid "_Insert"
-msgstr "_Inserir"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
+msgid "Highlight"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:596 calendar/gui/event-editor.c:1335
-#: composer/e-msg-composer.c:1022
-msgid "F_ormat"
-msgstr "_Formatar"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:91
+msgid "Overdue Items"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:597 calendar/gui/event-editor.c:1336
-msgid "_Tools"
-msgstr "_Utilidades"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:86
+msgid "Items Due Today"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:598 calendar/gui/event-editor.c:1337
-msgid "Actio_ns"
-msgstr "Acció_ns"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:88
+msgid "Items Not Yet Due"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:624 calendar/gui/event-editor.c:1362
-msgid "Save and Close"
-msgstr "Gardar e Pechar"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:75 calendar/gui/prop.c:528
+msgid "Colors"
+msgstr "Cores"
 
-#: calendar/gui/dialogs/task-editor.c:625
-msgid "Save the task and close the dialog box"
-msgstr "Garda-la tarefa e pecha-la caixa de diálogo"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:93
+msgid "Pick a color"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:629 calendar/gui/event-editor.c:1379
-msgid "FIXME: Print..."
-msgstr "FIXME: Imprimir..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:89
+msgid "Items Not Yet Due:"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:630 calendar/gui/event-editor.c:1380
-msgid "Print this item"
-msgstr "Imprimir este elemento"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:87
+msgid "Items Due Today:"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:633 calendar/gui/event-editor.c:1385
-msgid "FIXME: Insert File..."
-msgstr "FIXME: Inserir Ficheiro..."
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:92
+msgid "Overdue Items:"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:634 calendar/gui/event-editor.c:1386
-msgid "Insert a file as an attachment"
-msgstr "Inserir un ficheiro como anexo"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:103
+msgid "TaskPad"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:639
-msgid "FIXME: Assign Task..."
-msgstr "FIXME: Asignar Tarefa..."
+#. populate default frame/box
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:78 calendar/gui/prop.c:842
+msgid "Defaults"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:640
-msgid "Assign the task to someone"
-msgstr "Asigna-la tarefa a alguén"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:95
+msgid "Remind me of all appointments"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:644 calendar/gui/e-calendar-table.c:324
-#: calendar/gui/event-editor-dialog.glade.h:92
-#: calendar/gui/event-editor.c:1367 mail/mail-config.glade.h:13
-#: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
-#: mail/mail-view.c:163
-msgid "Delete"
-msgstr "Eliminar"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:112
+msgid "minutes before they occur."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:645
-msgid "Delete this task"
-msgstr "Eliminar esta tarefa"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:109
+msgid "Visual Alarms"
+msgstr "Alarmas Visuais"
 
-#: calendar/gui/dialogs/task-editor.c:649 calendar/gui/event-editor.c:1396
-msgid "FIXME: Previous"
-msgstr "FIXME: Anterior"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
+msgid "Beep when alarm windows appear."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:650 calendar/gui/event-editor.c:1397
-msgid "Go to the previous item"
-msgstr "Ir ó elemento anterior"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+msgid "Audio Alarms"
+msgstr "Alarmas Sonoras"
 
-#: calendar/gui/dialogs/task-editor.c:653 calendar/gui/event-editor.c:1399
-msgid "FIXME: Next"
-msgstr "FIXME: Seguinte"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+msgid "Alarms timeout after"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:654 calendar/gui/event-editor.c:1400
-msgid "Go to the next item"
-msgstr "Ir ó elemento seguinte"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:113
+msgid "seconds."
+msgstr "segundos."
 
-#: calendar/gui/dialogs/task-editor.c:657 calendar/gui/event-editor.c:1402
-msgid "FIXME: Help"
-msgstr "FIXME: Axuda"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
+msgid "Enable snoozing for"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:658 calendar/gui/event-editor.c:1403
-msgid "See online help"
-msgstr "Ve-la axuda online"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:96
+msgid "Reminders"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:913
+#: calendar/gui/dialogs/task-editor.c:655
 msgid "Edit Task"
 msgstr "Editar Tarefa"
 
-#: calendar/gui/dialogs/task-editor.c:919 calendar/gui/event-editor.c:285
+#: calendar/gui/dialogs/task-editor.c:661 calendar/gui/event-editor.c:302
 msgid "No summary"
 msgstr "Sen resume"
 
-#: calendar/gui/dialogs/task-editor.c:925 calendar/gui/event-editor.c:291
+#: calendar/gui/dialogs/task-editor.c:667 calendar/gui/event-editor.c:308
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/task-editor.c:928 calendar/gui/event-editor.c:294
+#: calendar/gui/dialogs/task-editor.c:670 calendar/gui/event-editor.c:311
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/task-editor.c:931 calendar/gui/event-editor.c:297
+#: calendar/gui/dialogs/task-editor.c:673 calendar/gui/event-editor.c:314
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
@@ -1603,26 +1887,32 @@ msgstr ""
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:45
 msgid "task-editor-dialog"
 msgstr "diálogo-editor-tarefas"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:37
 msgid "S_ummary"
 msgstr "_Resume"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:38
 msgid "Sta_rt Date:"
 msgstr "Data de _Inicio:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:42
 msgid "_Due Date:"
 msgstr ""
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:32
 msgid "% Comp_lete:"
 msgstr "% Comp_leta:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:44
 msgid "_Status:"
 msgstr "_Estado:"
 
@@ -1643,6 +1933,7 @@ msgid "Cancelled"
 msgstr "Cancelada"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:43
 msgid "_Priority:"
 msgstr "_Prioridade:"
 
@@ -1659,206 +1950,148 @@ msgid "Low"
 msgstr "Baixa"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:33
 msgid "C_lassification:"
 msgstr "C_lasificación:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:981
-#: widgets/misc/e-dateedit.c:332 widgets/misc/e-dateedit.c:704
-#: widgets/misc/e-dateedit.c:1027
+#: shell/e-shell-view.c:1017 widgets/misc/e-dateedit.c:212
+#: widgets/misc/e-dateedit.c:371 widgets/misc/e-dateedit.c:1171
 msgid "None"
 msgstr ""
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:41
 msgid "_Contacts..."
 msgstr "_Contactos..."
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:39
 msgid "Task"
 msgstr "Tarefa"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:35
 msgid "Date Completed:"
 msgstr ""
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:40
 msgid "URL:"
 msgstr "URL:"
 
-#. Create the header columns
-#: calendar/gui/e-calendar-table.c:196
-msgid "Categories"
-msgstr "Categorías"
-
-#: calendar/gui/e-calendar-table.c:197
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Classification"
-msgstr "Clasificación"
-
-#: calendar/gui/e-calendar-table.c:198
-msgid "Completion date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:199
-msgid "End date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:200
-msgid "Start date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:201
-msgid "Due date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:202
-msgid "Geographical position"
-msgstr "Posición xeográfica"
-
-#: calendar/gui/e-calendar-table.c:203
-msgid "Percent complete"
-msgstr "Porcentaxe completada"
-
-#: calendar/gui/e-calendar-table.c:204 calendar/gui/prop.c:611
-msgid "Priority"
-msgstr "Prioridade"
-
-#: calendar/gui/e-calendar-table.c:212
-msgid "Summary"
-msgstr "Resume"
-
-#: calendar/gui/e-calendar-table.c:216
-msgid "Transparency"
-msgstr "Transparencia"
-
-#: calendar/gui/e-calendar-table.c:217
-msgid "URL"
-msgstr "URL"
-
-#: calendar/gui/e-calendar-table.c:219 calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr "Alarmas"
-
-#: calendar/gui/e-calendar-table.c:318
+#: calendar/gui/e-calendar-table.c:294
 msgid "Open..."
 msgstr "Abrir..."
 
-#: calendar/gui/e-calendar-table.c:319
+#: calendar/gui/e-calendar-table.c:295
 msgid "Open the task"
-msgstr "Abri-la tarefa"
+msgstr "Abrir a tarefa"
 
-#: calendar/gui/e-calendar-table.c:321
+#: calendar/gui/e-calendar-table.c:297
 msgid "Mark Complete"
 msgstr "Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:322
+#: calendar/gui/e-calendar-table.c:298
 msgid "Mark the task complete"
-msgstr "Marca-la tarefa como completa"
+msgstr "Marcar a tarefa como completa"
+
+#: calendar/gui/e-calendar-table.c:300
+#: calendar/gui/event-editor-dialog.glade.h:73
+#: calendar/gui/event-editor-dialog.glade.h:84 filter/filter.glade.h:14
+#: filter/filter.glade.h:19 filter/filter.glade.h:27 filter/libfilter-i18n.h:8
+#: mail/mail-config-druid.glade.h:35 mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:31 mail/mail-view.c:165
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:20 ui/evolution-mail.xml.h:11
+msgid "Delete"
+msgstr "Eliminar"
 
-#: calendar/gui/e-calendar-table.c:325
+#: calendar/gui/e-calendar-table.c:301
 msgid "Delete the task"
-msgstr "Borra-la tarefa"
+msgstr "Borrar a tarefa"
 
-#: calendar/gui/e-day-view-time-item.c:393
+#: calendar/gui/e-day-view-time-item.c:406
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1173
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1172
+#: 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.c:1187
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1186
+#: 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.c:1200
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1199
+#: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d de %b"
 
-#: calendar/gui/e-day-view.c:2594 calendar/gui/e-day-view.c:2601
-#: calendar/gui/e-day-view.c:2610 calendar/gui/e-week-view.c:2958
-#: calendar/gui/e-week-view.c:2965 calendar/gui/e-week-view.c:2974
+#: calendar/gui/e-day-view.c:2634 calendar/gui/e-day-view.c:2641
+#: calendar/gui/e-day-view.c:2650 calendar/gui/e-week-view.c:2932
+#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2948
 msgid "New appointment..."
 msgstr "Nova cita..."
 
-#: calendar/gui/e-day-view.c:2598 calendar/gui/e-day-view.c:2605
-#: calendar/gui/e-week-view.c:2962 calendar/gui/e-week-view.c:2969
+#: calendar/gui/e-day-view.c:2638 calendar/gui/e-day-view.c:2645
+#: calendar/gui/e-week-view.c:2936 calendar/gui/e-week-view.c:2943
 msgid "Edit this appointment..."
 msgstr "Editar esta cita..."
 
-#: calendar/gui/e-day-view.c:2599 calendar/gui/e-week-view.c:2963
-#: calendar/gui/event-editor.c:1368
+#: calendar/gui/e-day-view.c:2639 calendar/gui/e-week-view.c:2937
+#: ui/evolution-event-editor.xml.h:21
 msgid "Delete this appointment"
 msgstr "Borrar esta cita"
 
-#: calendar/gui/e-day-view.c:2606 calendar/gui/e-week-view.c:2970
+#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2944
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2607 calendar/gui/e-week-view.c:2971
+#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2945
 msgid "Delete this occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2608 calendar/gui/e-week-view.c:2972
+#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2946
 msgid "Delete all occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:279
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342
+msgid "%d %B"
+msgstr "%d de %b"
+
+#: calendar/gui/event-editor.c:296
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/event-editor.c:1260
-msgid "FIXME: _Formatting"
+#: calendar/gui/event-editor.c:341
+msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1271
-msgid "FIXME: Ca_lendar..."
-msgstr "FIXME: A_xenda..."
-
-#: calendar/gui/event-editor.c:1314
-msgid "FIXME: _New Appointment"
-msgstr "FIXME: _Nova Cita"
-
-#: calendar/gui/event-editor.c:1318
-msgid "Schedule _Meeting..."
+#: calendar/gui/event-editor.c:469
+msgid "ocurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1320
-msgid "FIXME: Forward as v_Calendar"
-msgstr "FIXME: Reenviar como v_Calendar"
-
-#: calendar/gui/event-editor.c:1363
-msgid "Save and close this appointment"
-msgstr "Gardar e pechar esta cita"
-
-#: calendar/gui/event-editor.c:1373
-msgid "Close this appointment"
-msgstr "Pechar esta cita"
-
-#: calendar/gui/event-editor.c:1389
-msgid "FIXME: Invite Attendees..."
-msgstr "FIXME: Invitar ós Asistentes..."
-
-#: calendar/gui/event-editor.c:1390
-msgid "Invite attendees to a meeting"
-msgstr "Invitar ós asistentes a unha reunión"
-
-#: calendar/gui/event-editor.c:1947
+#: calendar/gui/event-editor.c:2358 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
 #. todo
 #.
-#. build some of the recur stuff by hand to take into account
-#. the start-on-monday preference?
-#.
 #. get the apply button to work right
 #.
 #. make the properties stuff unglobal
@@ -1875,246 +2108,243 @@ msgstr "%a, %d de %b de %Y"
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/event-editor-dialog.glade.h:7
+#: calendar/gui/event-editor-dialog.glade.h:112
 msgid "event-editor-dialog"
 msgstr "diálogo-editor-eventos"
 
 #: calendar/gui/event-editor-dialog.glade.h:8
-msgid "_Summary:"
+#: calendar/gui/event-editor-dialog.glade.h:56
+#: calendar/gui/event-editor-dialog.glade.h:98
+msgid "Su_mmary:"
 msgstr "_Resume:"
 
 #: calendar/gui/event-editor-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:102
 msgid "Time"
 msgstr "Hora"
 
 #: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Start time:"
+#: calendar/gui/event-editor-dialog.glade.h:110
+msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
 #: calendar/gui/event-editor-dialog.glade.h:11
-msgid "End time:"
-msgstr "Hora de remate:"
+#: calendar/gui/event-editor-dialog.glade.h:106
+msgid "_End time:"
+msgstr "Hora de _finalización:"
 
 #: calendar/gui/event-editor-dialog.glade.h:12
+#: calendar/gui/event-editor-dialog.glade.h:79
 msgid "A_ll day event"
 msgstr "Evento de día _completo"
 
+#: calendar/gui/event-editor-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:82
+msgid "Classification"
+msgstr "Clasificación"
+
 #: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:92
 msgid "Pu_blic"
 msgstr "Pú_blico"
 
 #: calendar/gui/event-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:91
 msgid "Pri_vate"
 msgstr "Pri_vado"
 
 #: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:104
 msgid "_Confidential"
 msgstr "_Confidencial"
 
 #: calendar/gui/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:27
+msgid "Minutes"
+msgstr "Minutos"
+
+#: calendar/gui/event-editor-dialog.glade.h:19
 #: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:28
+msgid "Hours"
+msgstr "Horas"
+
+#: calendar/gui/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:23
 #: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days\n"
-msgstr ""
-"Minutos\n"
-"Horas\n"
-"Días\n"
+#: calendar/gui/event-editor-dialog.glade.h:29
+msgid "Days"
+msgstr "Días"
 
-#: calendar/gui/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:105
 msgid "_Display"
 msgstr "_Visualizar"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Audio"
-msgstr "_Audio"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:108
 msgid "_Program"
 msgstr "_Programa"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:107
 msgid "_Mail"
 msgstr "_Correo"
 
-#: calendar/gui/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:88
 msgid "Mail _to:"
 msgstr "Enviar _a:"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:109
 msgid "_Run program:"
 msgstr "_Executar programa:"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:103
+msgid "_Audio"
+msgstr "_Audio"
+
+#: calendar/gui/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:96
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "Recurrence rule"
+#: calendar/gui/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:93
+msgid "Recur on the"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "Daily"
-msgstr "Diariamente"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "Weekly"
-msgstr "Semanalmente"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "Monthly"
-msgstr "Mensualmente"
+#: calendar/gui/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:115
+msgid "th day of the month"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "Yearly"
-msgstr "Anualmente"
+#: calendar/gui/event-editor-dialog.glade.h:40 calendar/gui/print.c:288
+msgid "1st"
+msgstr "1"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "label23"
-msgstr "label23"
+#: calendar/gui/event-editor-dialog.glade.h:41 calendar/gui/print.c:288
+msgid "2nd"
+msgstr "2"
 
-#: calendar/gui/event-editor-dialog.glade.h:48
-#: calendar/gui/event-editor-dialog.glade.h:51
-#: calendar/gui/event-editor-dialog.glade.h:81
-msgid "Every "
-msgstr "Cada "
+#: calendar/gui/event-editor-dialog.glade.h:42 calendar/gui/print.c:288
+msgid "3rd"
+msgstr "3"
 
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "day(s)"
-msgstr "día(s)"
+#: calendar/gui/event-editor-dialog.glade.h:43 calendar/gui/print.c:288
+msgid "4th"
+msgstr "4"
 
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "label24"
-msgstr "label24"
+#: calendar/gui/event-editor-dialog.glade.h:44 calendar/gui/print.c:288
+msgid "5th"
+msgstr "5"
 
 #: calendar/gui/event-editor-dialog.glade.h:52
-msgid "week(s)"
-msgstr "semana(s)"
+#: calendar/gui/event-editor-dialog.glade.h:62
+#: calendar/gui/event-editor-dialog.glade.h:85
+msgid "Every"
+msgstr "Cada"
 
 #: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Lun"
+#: calendar/gui/event-editor-dialog.glade.h:65
+#: calendar/gui/event-editor-dialog.glade.h:114
+msgid "month(s)"
+msgstr "mes(es)"
 
 #: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Mar"
+#: calendar/gui/event-editor-dialog.glade.h:78
+#: calendar/gui/event-editor-dialog.glade.h:94
+msgid "Recurrence"
+msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:55
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Mér"
-
-#: calendar/gui/event-editor-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Xov"
+#: calendar/gui/event-editor-dialog.glade.h:81
+msgid "Appointment Basics"
+msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:57
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Ven"
+#: calendar/gui/event-editor-dialog.glade.h:111
+msgid "_Starting date:"
+msgstr "Data de _comezo:"
 
 #: calendar/gui/event-editor-dialog.glade.h:58
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Sáb"
+#: calendar/gui/event-editor-dialog.glade.h:95
+msgid "Recurrence Rule"
+msgstr ""
 
-#. Initialize by default to three-letter day names
 #: calendar/gui/event-editor-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Dom"
+#: calendar/gui/event-editor-dialog.glade.h:90
+msgid "No recurrence"
+msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:60
-msgid "label25"
-msgstr "label25"
+#: calendar/gui/event-editor-dialog.glade.h:97
+msgid "Simple recurrence"
+msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:61
-#: calendar/gui/event-editor-dialog.glade.h:62
-msgid "Recur on the"
+#: calendar/gui/event-editor-dialog.glade.h:83
+msgid "Custom recurrence"
 msgstr ""
 
 #: calendar/gui/event-editor-dialog.glade.h:63
-msgid "th day of the month"
-msgstr ""
+msgid "day(s)"
+msgstr "día(s)"
 
 #: calendar/gui/event-editor-dialog.glade.h:64
-msgid ""
-"1st\n"
-"2nd\n"
-"3rd\n"
-"4th\n"
-"5th\n"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:70
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday\n"
-msgstr ""
-"Luns\n"
-"Martes\n"
-"Mércores\n"
-"Xoves\n"
-"Venres\n"
-"Sábado\n"
-"Domingo\n"
-
-#: calendar/gui/event-editor-dialog.glade.h:78
-msgid "Every"
-msgstr "Cada"
-
-#: calendar/gui/event-editor-dialog.glade.h:79
-msgid "month(s)"
-msgstr "mes(es)"
+msgid "week(s)"
+msgstr "semana(s)"
 
-#: calendar/gui/event-editor-dialog.glade.h:82
+#: calendar/gui/event-editor-dialog.glade.h:66
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: calendar/gui/event-editor-dialog.glade.h:83
-msgid "label27"
-msgstr "label27"
-
-#: calendar/gui/event-editor-dialog.glade.h:84
-msgid "Ending date"
+#: calendar/gui/event-editor-dialog.glade.h:67
+msgid "for"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:85
-msgid "Repeat forever"
+#: calendar/gui/event-editor-dialog.glade.h:68
+msgid "until"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:86
-msgid "End on "
+#: calendar/gui/event-editor-dialog.glade.h:69
+msgid "forever"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:87
-msgid "End after"
-msgstr ""
+#: calendar/gui/event-editor-dialog.glade.h:70
+#: calendar/gui/event-editor-dialog.glade.h:86
+msgid "Exceptions"
+msgstr "Excepcións"
 
-#: calendar/gui/event-editor-dialog.glade.h:88
-msgid "occurrence(s)"
+#: calendar/gui/event-editor-dialog.glade.h:72
+#: calendar/gui/event-editor-dialog.glade.h:89
+msgid "Modify"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:89
-msgid "Exceptions"
-msgstr "Excepcións"
+#: calendar/gui/event-editor-dialog.glade.h:74
+#: calendar/gui/event-editor-dialog.glade.h:113
+msgid "label21"
+msgstr "label21"
 
-#: calendar/gui/event-editor-dialog.glade.h:91
-msgid "Change"
+#: calendar/gui/event-editor-dialog.glade.h:75
+msgid ""
+"This appointment has custom recurrence rules that cannot be edited by "
+"Evolution.\n"
+"\n"
+"However, the appointment will recur at the appropriate time and will be "
+"displayed properly in the calendar views."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:93
-msgid "Recurrence"
+#: calendar/gui/event-editor-dialog.glade.h:99
+msgid ""
+"This appointment has custom recurrence rules that cannot be edited by "
+"Evolution."
 msgstr ""
 
 #: calendar/gui/getdate.y:391
@@ -2213,11 +2443,11 @@ msgstr "venres"
 msgid "saturday"
 msgstr "sábado"
 
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:61
+#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
 msgid "year"
 msgstr "ano"
 
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:62
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
 msgid "month"
 msgstr "mes"
 
@@ -2225,19 +2455,19 @@ msgstr "mes"
 msgid "fortnight"
 msgstr "quincena"
 
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:63
+#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
 msgid "week"
 msgstr "semana"
 
-#: calendar/gui/getdate.y:424 filter/filter-datespec.c:64
+#: calendar/gui/getdate.y:424 filter/filter-datespec.c:65
 msgid "day"
 msgstr "día"
 
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:65
+#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
 msgid "hour"
 msgstr "hora"
 
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:66
+#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
 msgid "minute"
 msgstr "minuto"
 
@@ -2245,7 +2475,7 @@ msgstr "minuto"
 msgid "min"
 msgstr "min"
 
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:67
+#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
 msgid "second"
 msgstr "segundo"
 
@@ -2265,8 +2495,8 @@ msgstr "onte"
 msgid "today"
 msgstr "hoxe"
 
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:504
-#: filter/filter-datespec.c:664
+#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
+#: filter/filter-datespec.c:693
 msgid "now"
 msgstr "agora"
 
@@ -2355,28 +2585,29 @@ msgstr "Prioridade:"
 msgid "Item Comments:"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:697 calendar/gui/gnome-cal.c:1435
-#: calendar/gui/gnome-cal.c:1491
+#: calendar/gui/gnome-cal.c:710 calendar/gui/gnome-cal.c:1466
+#: calendar/gui/gnome-cal.c:1522
 msgid "Reminder of your appointment at "
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1131
+#: calendar/gui/gnome-cal.c:1144
 #, c-format
 msgid "Could not load the calendar in `%s'"
-msgstr "Non foi posible carga-la axenda en `%s'"
+msgstr "Non foi posible cargar a axenda en `%s'"
 
-#: calendar/gui/gnome-cal.c:1142
+#: calendar/gui/gnome-cal.c:1155
 #, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "Non foi posible crear un calendario en `%s'"
 
-#: calendar/gui/gnome-cal.c:1153
+#: calendar/gui/gnome-cal.c:1166
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "O método requirido para cargar `%s' non está soportado"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1440 calendar/gui/gnome-cal.c:1495
+#: calendar/gui/gnome-cal.c:1471 calendar/gui/gnome-cal.c:1526
+#: mail/mail-search-dialogue.c:101
 msgid "Ok"
 msgstr "Aceptar"
 
@@ -2402,26 +2633,6 @@ msgstr ""
 msgid "Go to today"
 msgstr "Ir a hoxe"
 
-#: calendar/gui/print.c:288
-msgid "1st"
-msgstr "1"
-
-#: calendar/gui/print.c:288
-msgid "2nd"
-msgstr "2"
-
-#: calendar/gui/print.c:288
-msgid "3rd"
-msgstr "3"
-
-#: calendar/gui/print.c:288
-msgid "4th"
-msgstr "4"
-
-#: calendar/gui/print.c:288
-msgid "5th"
-msgstr "5"
-
 #: calendar/gui/print.c:289
 msgid "6th"
 msgstr "6"
@@ -2554,56 +2765,44 @@ msgstr "Ve"
 msgid "Sa"
 msgstr "Sa"
 
-#: calendar/gui/print.c:951
-msgid "TODO Items"
-msgstr ""
+#: calendar/gui/print.c:936
+msgid "Tasks"
+msgstr "Tarefas"
 
 #. Day
-#: calendar/gui/print.c:1052
+#: calendar/gui/print.c:1066
 msgid "Current day (%a %b %d %Y)"
 msgstr "Día actual (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1072 calendar/gui/print.c:1086
-#: calendar/gui/print.c:1087
-msgid "%a"
-msgstr "%a"
+#: calendar/gui/print.c:1080 calendar/gui/print.c:1084
+msgid "%a %b %d"
+msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1073 calendar/gui/print.c:1074
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1089
-msgid "%b"
-msgstr "%b"
+#: calendar/gui/print.c:1081
+msgid "%a %d %Y"
+msgstr "%a %d de %Y"
 
-#: calendar/gui/print.c:1076
+#: calendar/gui/print.c:1092
 #, c-format
-msgid "Current week (%s %s %d - %s %d %d)"
-msgstr ""
-
-#: calendar/gui/print.c:1093
-#, c-format
-msgid "Current week (%s %s %d - %s %s %d %d)"
-msgstr ""
-
-#: calendar/gui/print.c:1099
-#, c-format
-msgid "Current week (%s %s %d %d - %s %s %d %d)"
-msgstr ""
+msgid "Current week (%s - %s)"
+msgstr "Semana actual (%s - %s)"
 
 # Isto está mal, o %a é o nome de semana
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%a %Y)"
+#: calendar/gui/print.c:1100
+msgid "Current month (%b %Y)"
 msgstr "Mes actual (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
+#: calendar/gui/print.c:1107
 msgid "Current year (%Y)"
 msgstr "Ano actual (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:1144
 msgid "Print Calendar"
 msgstr "Imprimir axenda"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:785
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:834
 msgid "Print Preview"
 msgstr "Previsualizar da Impresión"
 
@@ -2629,14 +2828,6 @@ msgstr "24 horas"
 msgid "Weeks start on"
 msgstr "A semana comeza o"
 
-#: calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "Domingo"
-
-#: calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "Luns"
-
 #. Day range
 #: calendar/gui/prop.c:364
 msgid "Day range"
@@ -2662,22 +2853,10 @@ msgstr ""
 msgid "Colors for display"
 msgstr ""
 
-#: calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "Cores"
-
 #: calendar/gui/prop.c:605
 msgid "Show on TODO List:"
 msgstr ""
 
-#: calendar/gui/prop.c:610
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/prop.c:612
-msgid "Time Until Due"
-msgstr ""
-
 #: calendar/gui/prop.c:643
 msgid "To Do List style options:"
 msgstr ""
@@ -2706,6 +2885,10 @@ msgstr ""
 msgid "Preferences"
 msgstr "Preferencias"
 
+#: calendar/gui/prop.c:786
+msgid "Alarms"
+msgstr "Alarmas"
+
 #. build miscellaneous box
 #: calendar/gui/prop.c:789
 msgid "Alarm Properties"
@@ -2717,7 +2900,7 @@ msgstr ""
 
 #: calendar/gui/prop.c:809
 msgid "Audio alarms timeout after"
-msgstr ""
+msgstr "As alarmas sonoras expiran tras"
 
 #: calendar/gui/prop.c:820 calendar/gui/prop.c:837
 msgid " seconds"
@@ -2727,137 +2910,738 @@ msgstr " segundos"
 msgid "Enable snoozing for "
 msgstr ""
 
-#. populate default frame/box
-#: calendar/gui/prop.c:842
-msgid "Defaults"
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: calendar/gui/weekday-picker.c:326 widgets/misc/e-calendar-item.c:416
+msgid "MTWTFSS"
+msgstr "LMMXVSD"
+
+#: calendar/gui/weekday-picker.c:328 calendar/gui/weekday-picker.c:418
+msgid "SMTWTFS"
+msgstr "DLMMXVS"
+
+#: camel/camel-movemail.c:96
+#, c-format
+msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:186
-msgid "Cut"
-msgstr "Cortar"
+#: camel/camel-movemail.c:133 camel/camel-movemail.c:180
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Non foi posible crear o ficheiro de bloqueo para %s: %s"
 
-#: composer/e-msg-composer-address-dialog.c:187
-msgid "Cut selected item into clipboard"
-msgstr "Borrar e copiar o elemento seleccionado ó cartafol"
+#: camel/camel-movemail.c:143
+#, c-format
+msgid "Could not open mail file %s: %s"
+msgstr "Non foi posible abrir o ficheiro de correo %s: %s"
 
-#: composer/e-msg-composer-address-dialog.c:190
-msgid "Copy"
-msgstr "Copiar"
+#: camel/camel-movemail.c:153
+#, c-format
+msgid "Could not open temporary mail file %s: %s"
+msgstr "Non foi posible abrir o ficheiro de correo temporal %s: %s"
 
-#: composer/e-msg-composer-address-dialog.c:191
-msgid "Copy selected item into clipboard"
-msgstr "Copiar o elemento seleccionado ó cartafol"
+#: camel/camel-movemail.c:194
+#, c-format
+msgid "Could not test lock file for %s: %s"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:194
-#: composer/e-msg-composer-address-dialog.c:202
-msgid "Paste"
-msgstr "Pegar"
+#: camel/camel-movemail.c:214
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:195
-#: composer/e-msg-composer-address-dialog.c:203
-msgid "Paste item from clipboard"
-msgstr "Pegar elemento do cartafol"
+#: camel/camel-movemail.c:240
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Erro lendo o ficheiro de correo: %s"
 
-#: composer/e-msg-composer-address-dialog.c:529
-msgid "Select recipients' addresses"
-msgstr "Seleccionar os enderezos dos destinatarios"
+#: camel/camel-movemail.c:251
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Erro escribindo o ficheiro temporal de correo: %s"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: composer/e-msg-composer-address-dialog.glade.h:7
-msgid "Recipient list:"
-msgstr "Lista de destinatarios:"
+#: camel/camel-movemail.c:269
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
+msgstr "Erro ó almacenar o correo no ficheiro temporal %s: %s"
 
-#: composer/e-msg-composer-address-dialog.glade.h:9
-msgid "Search..."
-msgstr "Buscar..."
+#: camel/camel-movemail.c:301
+#, c-format
+msgid "Could not create pipe: %s"
+msgstr "Non foi posible crear unha canalización: %s"
 
-#: composer/e-msg-composer-address-dialog.glade.h:10
-msgid "Name"
-msgstr "Nome"
+#: camel/camel-movemail.c:313
+#, c-format
+msgid "Could not fork: %s"
+msgstr "Non foi posible facer fork: %s"
 
-#: composer/e-msg-composer-address-dialog.glade.h:11
-#: mail/mail-config.glade.h:8
-msgid "Address"
-msgstr "Enderezo"
+#: camel/camel-movemail.c:351
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr "O programa movemail fallou: %s"
+
+#: camel/camel-movemail.c:352
+msgid "(Unknown error)"
+msgstr "(Erro descoñecido)"
+
+#: camel/camel-provider.c:133
+#, c-format
+msgid "Could not load %s: %s"
+msgstr "Non foi posible cargar %s: %s"
+
+#: camel/camel-provider.c:141
+#, c-format
+msgid "Could not load %s: No initialization code in module."
+msgstr ""
+
+#: camel/camel-remote-store.c:182
+#, c-format
+msgid "%s server %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:186
+#, c-format
+msgid "%s service for %s on %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:227
+#, 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
+msgid "(unknown host)"
+msgstr "(máquina descoñecida)"
+
+#: camel/camel-service.c:120
+#, 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
+#, 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
+#, c-format
+msgid "URL '%s' needs a path component"
+msgstr "O URL '%s' necesita unha parte co camiño"
+
+#: camel/camel-service.c:486
+#, c-format
+msgid "No such host %s."
+msgstr ""
+
+#: camel/camel-service.c:489
+#, c-format
+msgid "Temporarily unable to look up hostname %s."
+msgstr ""
+
+#: camel/camel-session.c:271
+#, 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:359
+#, c-format
+msgid ""
+"Could not create directory %s:\n"
+"%s"
+msgstr ""
+"Non foi posible crear o directorio %s:\n"
+"%s"
+
+#: camel/camel-url.c:78
+#, c-format
+msgid "URL string `%s' contains no protocol"
+msgstr "O URL `%s' non contén ningún protocolo"
+
+#: camel/camel-url.c:93
+#, c-format
+msgid "URL string `%s' contains an invalid protocol"
+msgstr "O URL `%s' contén un protocolo non válido"
+
+#: camel/camel-url.c:154
+#, c-format
+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-command.c:216
+#, 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
+#, 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:349
+msgid "Unknown error"
+msgstr "Erro descoñecido"
+
+#: camel/providers/imap/camel-imap-command.c:366
+#, c-format
+msgid "IMAP server response did not contain %s information"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:402
+#, c-format
+msgid "Unexpected OK response from IMAP server: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:216
+#, c-format
+msgid "Could not load summary for %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:581
+msgid "Could not find message body in FETCH response."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:39
+msgid "IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:41
+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
+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
+msgid "Kerberos 4"
+msgstr "Kerberos 4"
+
+#: camel/providers/imap/camel-imap-store.c:247
+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
+#, 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
+#, c-format
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"Non foi posible autenticarse co servidor IMAP.\n"
+"%s\n"
+"\n"
+
+#: camel/providers/imap/camel-imap-store.c:539
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "Non foi posible crear o directorio %s: %s"
+
+#. FIXME: right error code
+#: camel/providers/mbox/camel-mbox-folder.c:223
+msgid "Could not create summary"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-folder.c:378
+#: camel/providers/mbox/camel-mbox-folder.c:381
+#, c-format
+msgid "Cannot append message to mbox file: %s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-folder.c:485
+#, c-format
+msgid "Cannot get message: %s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-provider.c:34
+msgid "UNIX mbox-format mail files"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-provider.c:36
+msgid ""
+"For reading mail delivered by the local system, and for storing mail on "
+"local disk."
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-store.c:118
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"Non foi posible abrir o ficheiro `%s':\n"
+"%s"
+
+#: camel/providers/mbox/camel-mbox-store.c:125
+#: camel/providers/mh/camel-mh-store.c:119
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "A carpeta `%s' non existe."
+
+#: camel/providers/mbox/camel-mbox-store.c:134
+#, c-format
+msgid ""
+"Could not create file `%s':\n"
+"%s"
+msgstr ""
+"Non foi posible crear o ficheiro `%s':\n"
+"%s"
+
+#: camel/providers/mbox/camel-mbox-store.c:143
+#: camel/providers/mbox/camel-mbox-store.c:177
+#, c-format
+msgid "`%s' is not a regular file."
+msgstr "`%s' non é un ficheiro regular."
+
+#: camel/providers/mbox/camel-mbox-store.c:169
+#: camel/providers/mbox/camel-mbox-store.c:205
+#, c-format
+msgid ""
+"Could not delete folder `%s':\n"
+"%s"
+msgstr ""
+"Non foi posible borrar a carpeta `%s':\n"
+"%s"
+
+#: camel/providers/mbox/camel-mbox-store.c:184
+#, c-format
+msgid "Folder `%s' is not empty. Not deleted."
+msgstr "A carpeta `%s' non está baleira. Non borrada."
+
+#: camel/providers/mbox/camel-mbox-store.c:222
+#, c-format
+msgid "Could not rename folder %s to %s: destination exists"
+msgstr "Non foi posible renomear a carpeta %s a %s: o destino xa existe"
+
+#: camel/providers/mbox/camel-mbox-store.c:260
+msgid "Mbox folders may not be nested."
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-store.c:274
+#, c-format
+msgid "Local mail file %s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:667
+#, c-format
+msgid "Could not open summary %s"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:688
+#, c-format
+msgid "Cannot open temporary mailbox: %s"
+msgstr "Non é posible abrir a caixa de correo temporal: %s"
+
+#: camel/providers/mbox/camel-mbox-summary.c:734
+msgid "Summary mismatch, aborting sync"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:754
+msgid "Summary mismatch, X-Evolution header missing"
+msgstr ""
+
+#: camel/providers/mbox/camel-mbox-summary.c:776
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr "Erro escribindo á caixa de correo temporal: %s"
+
+#: camel/providers/mbox/camel-mbox-summary.c:789
+#: camel/providers/mbox/camel-mbox-summary.c:807
+#, c-format
+msgid "Cannot copy data to output file: %s"
+msgstr "Non é posible copiar os datos ó ficheiro de saída: %s"
+
+#: camel/providers/mbox/camel-mbox-summary.c:832
+#, c-format
+msgid "Could not close source folder %s: %s"
+msgstr "Non foi posible pechar a carpeta orixe %s: %s"
+
+#: camel/providers/mbox/camel-mbox-summary.c:841
+#, c-format
+msgid "Could not close temp folder: %s"
+msgstr "Non foi posible pechar a carpeta temporal: %s"
+
+#: camel/providers/mbox/camel-mbox-summary.c:849
+#, c-format
+msgid "Could not rename folder: %s"
+msgstr "Non foi posible renomear a carpeta: %s"
+
+#: camel/providers/mbox/camel-mbox-summary.c:861
+#, c-format
+msgid "Unknown error: %s"
+msgstr "Erro descoñecido: %s"
+
+#. FIXME: right error code
+#: camel/providers/mh/camel-mh-folder.c:213
+msgid "Could not load or create summary"
+msgstr ""
+
+#: camel/providers/mh/camel-mh-folder.c:336
+#: camel/providers/mh/camel-mh-folder.c:339
+#, c-format
+msgid "Cannot append message to mh folder: %s"
+msgstr "Non é posible engadir a mensaxe á carpeta mh: %s"
+
+#: camel/providers/mh/camel-mh-folder.c:405
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"Non é posible obter a mensaxe: %s\n"
+"  %s"
+
+#: camel/providers/mh/camel-mh-provider.c:34
+msgid "UNIX MH-format mail directories"
+msgstr ""
+
+#: camel/providers/mh/camel-mh-provider.c:36
+msgid "For storing local mail in MH-like mail directories"
+msgstr ""
+
+#: camel/providers/mh/camel-mh-store.c:112
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Non é posible abrir a carpeta `%s':\n"
+"%s"
+
+#: camel/providers/mh/camel-mh-store.c:127
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Non foi posible crear a carpeta `%s':\n"
+"%s"
+
+#: camel/providers/mh/camel-mh-store.c:136
+#, c-format
+msgid "`%s' is not a directory."
+msgstr "`%s' non é un directorio."
+
+#: camel/providers/mh/camel-mh-store.c:155
+#: camel/providers/mh/camel-mh-store.c:168
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "Non foi posible borrar a carpeta `%s': %s"
+
+#: camel/providers/mh/camel-mh-store.c:186
+#: camel/providers/mh/camel-mh-store.c:190
+#, c-format
+msgid "Could not rename folder `%s': %s"
+msgstr "Non foi posible renomear a carpeta `%s': %s"
+
+#: camel/providers/mh/camel-mh-store.c:194
+#, c-format
+msgid "Could not rename folder `%s': %s exists"
+msgstr "Non foi posible renomear a carpeta `%s': %s existe"
+
+#: camel/providers/mh/camel-mh-store.c:202
+msgid "MH folders may not be nested."
+msgstr ""
+
+#: camel/providers/mh/camel-mh-store.c:214
+#, c-format
+msgid "Local mail directory %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:41
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "Introduza o contrasinal NNTP para %s@%s"
+
+#: camel/providers/nntp/camel-nntp-auth.c:62
+msgid "Server rejected username"
+msgstr "O servidor rexeitou o nome de usuario"
+
+#: camel/providers/nntp/camel-nntp-auth.c:68
+msgid "Failed to send username to server"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:77
+msgid "Server rejected username/password"
+msgstr "O servidor rexeitou o nome de usuario/contrasinal"
+
+#: camel/providers/nntp/camel-nntp-folder.c:140
+#, c-format
+msgid "Message %s not found."
+msgstr "Mensaxe %s non atopada."
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+msgid "Could not get group list from server."
+msgstr "Non foi posible recibir a lista de grupos do servidor."
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:94
+#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:38
+msgid "USENET news"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:40
+msgid "This is a provider for reading from and posting toUSENET newsgroups."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:226
+#, c-format
+msgid "Could not open directory for news server: %s"
+msgstr "Non foi posible abrir o directorio para o servidor de novas: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:288
+#, c-format
+msgid "USENET News via %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:295
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+"Esta opción autenticarase co servidor NNTP usando un contrasinal sen cifrar."
+
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:500
+#, c-format
+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:177
+msgid "Could not open folder: message listing was incomplete."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:271
+#, c-format
+msgid "No message with uid %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:285
+#, c-format
+msgid "Could not retrieve message from POP server %s: %s"
+msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
+
+#: camel/providers/pop3/camel-pop3-provider.c:34
+msgid "POP"
+msgstr "POP"
+
+#: camel/providers/pop3/camel-pop3-provider.c:36
+msgid ""
+"For connecting to POP servers. The POP protocol can also be used to retrieve "
+"mail from certain web mail providers and proprietary email systems."
+msgstr ""
+"Para conectarse a servidores POP. O protocolo POP tamén se pode usar para "
+"recibir correo de certos provedores de correo web, e de sistemas de email "
+"propietarios."
+
+#: camel/providers/pop3/camel-pop3-store.c:150
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP 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/pop3/camel-pop3-store.c:160
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+"Esta opción conectarase ó servidor POP usando un contrasinal cifrado a "
+"través do protocolo APOP. Pode que isto non funcione para tódolos usuarios, "
+"mesmo naqueles que indican que o soportan."
+
+#: camel/providers/pop3/camel-pop3-store.c:172
+msgid ""
+"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+msgstr ""
+"Isto conectarase ó servidor POP e usará Kerberos 4 para autenticarse con el."
+
+#: camel/providers/pop3/camel-pop3-store.c:217
+#, c-format
+msgid "Could not authenticate to KPOP server: %s"
+msgstr "Non foi posible autenticarse co servidor KPOP: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:335
+#, 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
+#, 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
+#, c-format
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending username: %s"
+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
+msgid "(Unknown)"
+msgstr "(Descoñecido)"
+
+#: camel/providers/pop3/camel-pop3-store.c:438
+msgid ""
+"Unable to connect to POP server.\n"
+"No support for requested authentication mechanism."
+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
+#, c-format
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending password: %s"
+msgstr ""
+"Non foi posible conectarse ó servidor POP.\n"
+"Erro enviando o contrasinal: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:553
+#, c-format
+msgid "No such folder `%s'."
+msgstr "Non existe a carpeta `%s'."
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:34
+msgid "Sendmail"
+msgstr "Sendmail"
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+"Para entregar o correo pasándollo ó programa \"sendmail\" no sistema local."
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#, c-format
+msgid "Could not create pipe to sendmail: %s: mail not sent"
+msgstr ""
+"Non foi posible crear unha canalización para o sendmail: %s: correo non "
+"enviado"
 
-#: composer/e-msg-composer-address-dialog.glade.h:12
-msgid "Properties..."
-msgstr "Propiedades..."
+#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#, c-format
+msgid "Could not fork sendmail: %s: mail not sent"
+msgstr "Non foi posible facer fork para o sendmail: %s: correo non enviado"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#, c-format
+msgid "Could not send message: %s"
+msgstr "Non foi posible enviar a mensaxe: %s"
 
-#: composer/e-msg-composer-address-dialog.glade.h:13
-msgid "Add..."
-msgstr "Engadir..."
+#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#, c-format
+msgid "sendmail exited with signal %s: mail not sent."
+msgstr "o sendmail saíu co sinal %s: correo non enviado."
 
-#: composer/e-msg-composer-address-dialog.glade.h:14
-msgid "To: >>"
-msgstr "A: >>"
+#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#, c-format
+msgid "Could not execute %s: mail not sent."
+msgstr "Non foi posible executar %s: correo non enviado."
 
-#: composer/e-msg-composer-address-dialog.glade.h:15
-msgid "Cc: >>"
-msgstr "Cc: >>"
+#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#, c-format
+msgid "sendmail exited with status %d: mail not sent."
+msgstr "o sendmail saíu con estado %d: correo non enviado."
 
-#: composer/e-msg-composer-address-dialog.glade.h:16
-msgid "Bcc: >>"
-msgstr "Bcc: >>"
+#: camel/providers/sendmail/camel-sendmail-transport.c:220
+msgid "sendmail"
+msgstr "sendmail"
 
-#: composer/e-msg-composer-address-dialog.glade.h:17
-msgid "label9"
-msgstr "label9"
+#: camel/providers/sendmail/camel-sendmail-transport.c:222
+msgid "Mail delivery via the sendmail program"
+msgstr "Entrega de correo a través do programa sendmail"
 
-#: composer/e-msg-composer-address-dialog.glade.h:18
-msgid "label7"
-msgstr "label7"
+#: camel/providers/smtp/camel-smtp-provider.c:36
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:19
-msgid "label8"
-msgstr "label8"
+#: camel/providers/vee/camel-vee-provider.c:30
+msgid "Virtual folder email provider"
+msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:82
+#: camel/providers/vee/camel-vee-provider.c:32
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: composer/e-msg-composer-attachment-bar.c:86
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:84
+#: composer/e-msg-composer-attachment-bar.c:88
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:91
+#: composer/e-msg-composer-attachment-bar.c:95
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:300 mail/mail-display.c:116
+msgid "attachment"
+msgstr "anexo"
+
 #: composer/e-msg-composer-attachment-bar.c:396
-msgid "Add attachment"
-msgstr "Engadir anexo"
+msgid "Attach a file"
+msgstr "Incluír un ficheiro"
 
-#: composer/e-msg-composer-attachment-bar.c:459 shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:443 filter/filter.glade.h:22
+#: filter/filter.glade.h:25 filter/filter.glade.h:32
+#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Quitar"
 
-#: composer/e-msg-composer-attachment-bar.c:460
+#: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove selected items from the attachment list"
 msgstr "Quitar os elementos seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:475
 msgid "Add attachment..."
 msgstr "Engadir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:476
 msgid "Attach a file to the message"
 msgstr "Incluír un ficheiro como anexo na mensaxe"
 
@@ -2867,50 +3651,54 @@ msgstr "Incluír un ficheiro como anexo na mensaxe"
 #. * DO NOT compile it as part of your application.
 #.
 #: composer/e-msg-composer-attachment.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:11
 msgid "Attachment properties"
 msgstr "Propiedades do anexo"
 
 #: composer/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:14
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:10
+#: composer/e-msg-composer-attachment.glade.h:13
 msgid "File name:"
 msgstr "Nome de ficheiro:"
 
-#: composer/e-msg-composer-hdrs.c:138 composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
+#: mail/mail-format.c:589
 msgid "From:"
 msgstr "De:"
 
-#: composer/e-msg-composer-hdrs.c:244
+#: composer/e-msg-composer-hdrs.c:243
 msgid "Click here for the address book"
 msgstr "Prema aquí para o libro de enderezos"
 
-#: composer/e-msg-composer-hdrs.c:297
+#: composer/e-msg-composer-hdrs.c:296
 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:301
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:602
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:302
+#: composer/e-msg-composer-hdrs.c:301
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:305 mail/mail-format.c:609
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: composer/e-msg-composer-hdrs.c:306
 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:312
+#: composer/e-msg-composer-hdrs.c:311
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:313
+#: composer/e-msg-composer-hdrs.c:312
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -2918,41 +3706,55 @@ msgstr ""
 "Introduza os enderezos que recibirán unha copia da mensaxe sen apareceren na "
 "lista de destinatarios."
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:318 mail/mail-format.c:614
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Enter the subject of the mail"
 msgstr "Introduza o asunto da mensaxe"
 
-#: composer/e-msg-composer.c:468
+#: composer/e-msg-composer.c:302
+#, c-format
+msgid ""
+"Could not open signature file %s:\n"
+"%s"
+msgstr ""
+"Non foi posible abrir o ficheiro de sinatura %s:\n"
+"%s"
+
+#: composer/e-msg-composer.c:458
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: composer/e-msg-composer.c:479
+#: composer/e-msg-composer.c:469
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:499
+#: composer/e-msg-composer.c:489
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:521
+#: composer/e-msg-composer.c:511
 msgid "Saving changes to message..."
-msgstr "Gardando os cambios da mensaxe..."
+msgstr "Gardando as modificacións da mensaxe..."
 
-#: composer/e-msg-composer.c:523
-msgid "About to save changes to message..."
-msgstr "A piques de garda-los cambios da mensaxe..."
+#: composer/e-msg-composer.c:513
+msgid "Save changes to message..."
+msgstr "Gardar as modificacións da mensaxe..."
+
+#: composer/e-msg-composer.c:554
+#, c-format
+msgid "Error saving composition to 'Drafts': %s"
+msgstr ""
 
-#: composer/e-msg-composer.c:608 shell/e-shell-view-menu.c:166
+#: composer/e-msg-composer.c:598 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:614
+#: composer/e-msg-composer.c:604
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -2960,29 +3762,29 @@ msgid ""
 msgstr ""
 "Esta mensaxe non foi enviada.\n"
 "\n"
-"¿Desexa garda-los cambios?"
+"¿Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:636
+#: composer/e-msg-composer.c:626
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:755
+#: composer/e-msg-composer.c:752
 msgid "That file does not exist."
 msgstr "O ficheiro non existe."
 
-#: composer/e-msg-composer.c:765
+#: composer/e-msg-composer.c:762
 msgid "That is not a regular file."
 msgstr "Non é un ficheiro normal."
 
-#: composer/e-msg-composer.c:775
+#: composer/e-msg-composer.c:772
 msgid "That file exists but is not readable."
 msgstr "O ficheiro existe pero non se pode ler."
 
-#: composer/e-msg-composer.c:785
+#: composer/e-msg-composer.c:782
 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:807
+#: composer/e-msg-composer.c:804
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -2990,168 +3792,72 @@ msgstr ""
 "O ficheiro é moi longo (máis de 100K).\n"
 "¿Está seguro de querer inserilo?"
 
-#: composer/e-msg-composer.c:828
+#: composer/e-msg-composer.c:825
 msgid "An error occurred while reading the file."
 msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: composer/e-msg-composer.c:924
-msgid "_File"
-msgstr "_Ficheiro"
-
-#: composer/e-msg-composer.c:930
-msgid "_Open..."
-msgstr "_Abrir..."
-
-#: composer/e-msg-composer.c:931
-msgid "Load a previously saved message"
-msgstr "Cargar unha mensaxe previamente gardada"
-
-#: composer/e-msg-composer.c:939
-msgid "_Save..."
-msgstr "_Gardar..."
-
-#: composer/e-msg-composer.c:940
-msgid "Save message"
-msgstr "Gardar mensaxe"
-
-#: composer/e-msg-composer.c:948
-msgid "Save _as..."
-msgstr "Gardar _como..."
-
-#: composer/e-msg-composer.c:949
-msgid "Save message with a different name"
-msgstr "Garda-la mensaxe cun nome diferente"
-
-#: composer/e-msg-composer.c:957
-msgid "Save in _folder..."
-msgstr "Gardar en _carpeta..."
-
-#: composer/e-msg-composer.c:958
-msgid "Save the message in a specified folder"
-msgstr "Garda-la mensaxe na carpeta indicada"
-
-#: composer/e-msg-composer.c:967
-msgid "_Insert text file... (FIXME)"
-msgstr "_Inserir ficheiro de texto... (FIXME)"
-
-#: composer/e-msg-composer.c:968
-msgid "Insert a file as text into the message"
-msgstr "Inserir un ficheiro como texto na mensaxe"
-
-#: composer/e-msg-composer.c:977
-msgid "Send _Now"
-msgstr "Enviar _Agora"
-
-#: composer/e-msg-composer.c:978
-msgid "Send the message now"
-msgstr "Enviar agora a mensaxe"
-
-#: composer/e-msg-composer.c:986
-msgid "Send _Later"
-msgstr "Enviar máis _Tarde"
-
-#: composer/e-msg-composer.c:987
-msgid "Send the message later"
-msgstr "Enviar máis tarde a mensaxe"
-
-#: composer/e-msg-composer.c:997
-msgid "_Close..."
-msgstr "_Pechar..."
-
-#: composer/e-msg-composer.c:998
-msgid "Quit the message composer"
-msgstr "Saír do editor de mensaxes"
-
-#: composer/e-msg-composer.c:1011
-msgid "_Edit"
-msgstr "_Editar"
-
-#: composer/e-msg-composer.c:1028
-msgid "HTML"
-msgstr "HTML"
-
-#: composer/e-msg-composer.c:1029
-msgid "Send the mail in HTML format"
-msgstr "Envia-la mensaxe en formato HTML"
-
-#: composer/e-msg-composer.c:1042 shell/e-storage-set-view.c:221
-msgid "_View"
-msgstr "_Ver"
-
-#: composer/e-msg-composer.c:1048
-msgid "Show _attachments"
-msgstr "Amosar _anexos"
-
-#: composer/e-msg-composer.c:1049
-msgid "Show/hide attachments"
-msgstr "Amosar/agochar anexos"
-
-#: composer/e-msg-composer.c:1082
-msgid "Send"
-msgstr "Enviar"
-
-#: composer/e-msg-composer.c:1083
-msgid "Send this message"
-msgstr "Enviar esta mensaxe"
-
-#: composer/e-msg-composer.c:1092
-msgid "Attach"
-msgstr "Incluír"
-
-#: composer/e-msg-composer.c:1093
-msgid "Attach a file"
-msgstr "Incluír un ficheiro"
-
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1209
 msgid "Compose a message"
 msgstr "Compoñer unha mensaxe"
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1283
 msgid "Could not create composer window."
 msgstr ""
 
-#: filter/filter-datespec.c:61
+#: composer/evolution-composer.c:307
+msgid "Cannot initialize Evolution's composer."
+msgstr ""
+
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "anos"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr "meses"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "semanas"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:65
 msgid "days"
 msgstr "días"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "horas"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minutos"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr "segundos"
 
-#: filter/filter-datespec.c:232
+#: filter/filter-datespec.c:183
+msgid "Oops. You have forgotten to choose a date."
+msgstr "Oops. Esqueceu escoller unha data."
+
+#: filter/filter-datespec.c:185
+msgid "Oops. You have chosen an invalid date."
+msgstr "Oops. Escolleu unha data non válida."
+
+#: filter/filter-datespec.c:259
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:254
+#: filter/filter-datespec.c:282
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:293
+#: filter/filter-datespec.c:322
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -3159,98 +3865,338 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "the current time"
 msgstr "a hora actual"
 
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "a time you specify"
 msgstr "unha hora que especifique"
 
-#: filter/filter-datespec.c:329
+#: filter/filter-datespec.c:358
 msgid "a time relative to the current time"
 msgstr "unha relativa ó momento actual"
 
 #. The label
-#: filter/filter-datespec.c:387
+#: filter/filter-datespec.c:416
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:661
+#: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<prema aquí para seleccionar unha data>"
 
-#: filter/filter-editor.c:158 filter/score-editor.c:127
-#: filter/vfolder-editor.c:153
-msgid "Add Rule"
-msgstr "Engadir Regra"
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:289
+#: mail/mail-autofilter.c:338
+msgid "Add Filter Rule"
+msgstr "Engadir Regra de Filtrado"
+
+#: filter/filter-editor.c:233
+msgid "Edit Filter Rule"
+msgstr "Editar Regra de Filtrado"
 
-#: filter/filter-editor.c:199
-msgid "Edit Rule"
-msgstr "Editar Regra"
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: filter/filter-editor.c:456 filter/filter.glade.h:7 filter/filter.glade.h:29
+msgid "Edit Filters"
+msgstr "Editar Filtros"
 
 #. and now for the action area
-#: filter/filter-filter.c:396
+#: filter/filter-filter.c:401
 msgid "Then"
-msgstr ""
+msgstr "Entón"
 
-#: filter/filter-filter.c:409
+#: filter/filter-filter.c:414
 msgid "Add action"
 msgstr "Engadir acción"
 
-#: filter/filter-filter.c:415
+#: filter/filter-filter.c:420
 msgid "Remove action"
 msgstr "Eliminar acción"
 
-#: filter/filter-folder.c:186 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:143
+msgid ""
+"Oops, you forgot to choose a folder.\n"
+"Please go back and specify a valid folder to deliver mail to."
+msgstr ""
+
+#: filter/filter-folder.c:212 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "Seleccionar Carpeta"
 
-#: filter/filter-folder.c:209
+#: filter/filter-folder.c:235
 msgid "Enter folder URI"
 msgstr "Introduza o URI da carpeta"
 
-#: filter/filter-folder.c:253
+#: filter/filter-folder.c:281
 msgid "<click here to select a folder>"
 msgstr "<prema aquí para seleccionar unha carpeta>"
 
-#: filter/filter-part.c:420
+#: filter/filter-input.c:188
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Erro na expresión regular '%s':\n"
+"%s"
+
+#: filter/filter-part.c:458
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:504
+#: filter/filter-rule.c:520
 msgid "Rule name: "
 msgstr "Nome da regra: "
 
-#: filter/filter-rule.c:508
-msgid "untitled"
-msgstr "sen_título"
+#: filter/filter-rule.c:524
+msgid "Untitled"
+msgstr "Sen_título"
 
-#: filter/filter-rule.c:519
+#: filter/filter-rule.c:538
 msgid "If"
-msgstr ""
+msgstr "Se"
 
-#: filter/filter-rule.c:536
+#: filter/filter-rule.c:555
 msgid "Execute actions"
 msgstr "Executar accións"
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:559
 msgid "if all criteria are met"
 msgstr "se se cumpren tódolos criterios"
 
-#: filter/filter-rule.c:547
+#: filter/filter-rule.c:564
 msgid "if any criteria are met"
 msgstr "se se cumpre algún criterio"
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:575
 msgid "Add criterion"
 msgstr "Engadir criterio"
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:581
 msgid "Remove criterion"
 msgstr "Eliminar criterio"
 
-#: filter/score-editor.c:165
+#: filter/filter.glade.h:8
+msgid ""
+"Incoming\n"
+"Outgoing\n"
+msgstr ""
+"Entrante\n"
+"Saínte\n"
+
+#: filter/filter.glade.h:11 filter/filter.glade.h:31
+msgid "Filter Rules"
+msgstr "Reglas de Filtrado"
+
+#: filter/filter.glade.h:13 filter/filter.glade.h:18 filter/filter.glade.h:28
+#: mail/mail-config-druid.glade.h:38 mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:17 mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:32
+msgid "Edit"
+msgstr "Editar"
+
+#: filter/filter.glade.h:15 filter/filter.glade.h:30
+msgid "Edit VFolders"
+msgstr ""
+
+#: filter/filter.glade.h:16 filter/filter.glade.h:33
+msgid "Virtual Folders"
+msgstr "Carpetas Virtuais"
+
+#: filter/filter.glade.h:20 filter/filter.glade.h:23 filter/filter.glade.h:34
+msgid "vFolder Sources"
+msgstr ""
+
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2 mail/message-list.c:511
+msgid "Answered"
+msgstr ""
+
+#: filter/libfilter-i18n.h:3
+msgid "Assign Colour"
+msgstr "Asignar Cor"
+
+#: filter/libfilter-i18n.h:4
+msgid "Assign Score"
+msgstr "Asignar Puntuación"
+
+#: filter/libfilter-i18n.h:5
+msgid "Copy to Folder"
+msgstr "Copiar á Carpeta"
+
+#: filter/libfilter-i18n.h:6
+msgid "Date received"
+msgstr "Data de recepción"
+
+#: filter/libfilter-i18n.h:7
+msgid "Date sent"
+msgstr "Data de envío"
+
+#: filter/libfilter-i18n.h:9
+msgid "Deleted"
+msgstr ""
+
+#: filter/libfilter-i18n.h:10
+msgid "Draft"
+msgstr ""
+
+#: filter/libfilter-i18n.h:11
+msgid "Expression"
+msgstr "Expresión"
+
+#: filter/libfilter-i18n.h:12
+msgid "Flagged"
+msgstr ""
+
+#: filter/libfilter-i18n.h:13
+msgid "Forward to Address"
+msgstr "Reenviar ó Enderezo"
+
+#: filter/libfilter-i18n.h:14
+msgid "Message Body"
+msgstr "Corpo da Mensaxe"
+
+#: filter/libfilter-i18n.h:15
+msgid "Message was received"
+msgstr ""
+
+#: filter/libfilter-i18n.h:16
+msgid "Message was sent"
+msgstr ""
+
+#: filter/libfilter-i18n.h:17
+msgid "Move to Folder"
+msgstr "Mover para a Carpeta"
+
+#: filter/libfilter-i18n.h:19
+msgid "Recipients"
+msgstr "Destinatarios"
+
+#: filter/libfilter-i18n.h:20 mail/message-list.c:508
+msgid "Seen"
+msgstr ""
+
+#: filter/libfilter-i18n.h:21
+msgid "Sender"
+msgstr "Autor"
+
+#: filter/libfilter-i18n.h:22
+msgid "Set Flag"
+msgstr ""
+
+#: filter/libfilter-i18n.h:23
+msgid "Source"
+msgstr ""
+
+#: filter/libfilter-i18n.h:24
+msgid "Specific header"
+msgstr ""
+
+#: filter/libfilter-i18n.h:25
+msgid "Stop Processing"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26
+msgid "Subject"
+msgstr "Asunto"
+
+#: filter/libfilter-i18n.h:27
+msgid "after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:28
+msgid "before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:29
+msgid "contains"
+msgstr "contén"
+
+#: filter/libfilter-i18n.h:30
+msgid "does not contain"
+msgstr "non contén"
+
+#: filter/libfilter-i18n.h:31
+msgid "does not end with"
+msgstr "non termina en"
+
+#: filter/libfilter-i18n.h:32
+msgid "does not exist"
+msgstr "non existe"
+
+#: filter/libfilter-i18n.h:33
+msgid "does not match regex"
+msgstr ""
+
+#: filter/libfilter-i18n.h:34
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:35
+msgid "does not start with"
+msgstr "non empeza por"
+
+#: filter/libfilter-i18n.h:36
+msgid "ends with"
+msgstr "termina en"
+
+#: filter/libfilter-i18n.h:37
+msgid "exists"
+msgstr "existe"
+
+#: filter/libfilter-i18n.h:38
+msgid "is greater than"
+msgstr "é maior que"
+
+#: filter/libfilter-i18n.h:39
+msgid "is less than"
+msgstr "é menor que"
+
+#: filter/libfilter-i18n.h:40
+msgid "is not"
+msgstr "non é"
+
+#: filter/libfilter-i18n.h:41
+msgid "is"
+msgstr "é"
+
+#: filter/libfilter-i18n.h:42
+msgid "matches regex"
+msgstr ""
+
+#: filter/libfilter-i18n.h:43
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:44
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:46
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:47
+msgid "was after"
+msgstr "foi posterior a"
+
+#: filter/libfilter-i18n.h:48
+msgid "was before"
+msgstr "foi anterior a"
+
+#: filter/score-editor.c:127
+msgid "Add Rule"
+msgstr "Engadir Regra"
+
+#: filter/score-editor.c:166
 msgid "Edit Score Rule"
 msgstr ""
 
@@ -3258,43 +4204,168 @@ msgstr ""
 msgid "Score"
 msgstr "Puntuación"
 
-#: filter/vfolder-editor.c:192
+#: filter/vfolder-editor.c:155
+msgid "Add VFolder Rule"
+msgstr ""
+
+#: filter/vfolder-editor.c:204
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:198
+#: mail/component-factory.c:230
 msgid "Cannot initialize Evolution's mail component."
-msgstr "Non se pode inicializa-lo compoñente de correo de Evolution."
+msgstr "Non se pode inicializar o compoñente de correo de Evolution."
+
+#: mail/component-factory.c:236
+msgid "Cannot initialize Evolution's mail summary component."
+msgstr ""
 
-#: mail/folder-browser-factory.c:50
+#: mail/component-factory.c:241
+msgid "Cannot initialize Evolution's mail storage hash."
+msgstr ""
+
+#: mail/component-factory.c:279
+msgid "Cannot register storage with shell"
+msgstr ""
+
+#: mail/folder-browser.c:143
+msgid "Body or subject contains"
+msgstr "O corpo ou o asunto conteñen"
+
+#: mail/folder-browser.c:144
+msgid "Body contains"
+msgstr "O corpo contén"
+
+#: mail/folder-browser.c:145
+msgid "Subject contains"
+msgstr "O asunto contén"
+
+#: mail/folder-browser.c:146
+msgid "Body does not contain"
+msgstr "O corpo non contén"
+
+#: mail/folder-browser.c:147
+msgid "Subject does not contain"
+msgstr "O asunto non contén"
+
+#: mail/folder-browser.c:148
+msgid "Custom search"
+msgstr ""
+
+#: mail/folder-browser.c:320
+msgid "Custom"
+msgstr ""
+
+#: mail/folder-browser.c:478
+msgid "Open in New Window"
+msgstr "Abrir nunha Nova Fiestra"
+
+#: mail/folder-browser.c:479
+msgid "Edit Message"
+msgstr "Editar Mensaxe"
+
+#: mail/folder-browser.c:480 mail/mail-callbacks.c:794
+msgid "Print Message"
+msgstr "Imprimir Mensaxe"
+
+#: mail/folder-browser.c:482
+msgid "Reply to Sender"
+msgstr "Responder ó Autor"
+
+#: mail/folder-browser.c:483 mail/mail-view.c:156 ui/evolution-mail.xml.h:33
+msgid "Reply to All"
+msgstr "Responder a Todos"
+
+#: mail/folder-browser.c:484
+msgid "Forward Message"
+msgstr "Reenviar esta mensaxe"
+
+#: mail/folder-browser.c:486
+msgid "Mark as Read"
+msgstr ""
+
+#: mail/folder-browser.c:487
+msgid "Mark as Unread"
+msgstr ""
+
+#: mail/folder-browser.c:488
+msgid "Delete Message"
+msgstr "Borrar Mensaxe"
+
+#: mail/folder-browser.c:489
+msgid "Move Message"
+msgstr "Mover Mensaxe"
+
+#: mail/folder-browser.c:490
+msgid "Copy Message"
+msgstr "Copiar Mensaxe"
+
+#: mail/folder-browser.c:491
+msgid "Apply Filters"
+msgstr "Aplicar Filtros"
+
+#: mail/folder-browser.c:493
+msgid "VFolder on Subject"
+msgstr ""
+
+#: mail/folder-browser.c:494
+msgid "VFolder on Sender"
+msgstr ""
+
+#: mail/folder-browser.c:495
+msgid "VFolder on Recipients"
+msgstr ""
+
+#: mail/folder-browser.c:497
+msgid "Filter on Subject"
+msgstr ""
+
+#: mail/folder-browser.c:498
+msgid "Filter on Sender"
+msgstr ""
+
+#: mail/folder-browser.c:499
+msgid "Filter on Recipients"
+msgstr ""
+
+#: mail/folder-browser.c:500 mail/folder-browser.c:523
+msgid "Filter on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:525
 #, c-format
-msgid "Run filter \"%s\""
-msgstr "Executar filtro \"%s\""
+msgid "Filter on Mailing List (%s)"
+msgstr ""
+
+#: mail/folder-browser.c:641
+msgid "Full Search"
+msgstr ""
 
-#: mail/folder-browser.c:408
+#: mail/folder-browser.c:646 ui/evolution-event-editor.xml.h:91
 msgid "Save"
 msgstr "Gardar"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Enviar por correo a %s"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:214
+#, c-format
+msgid "Subject is %s"
+msgstr "O asunto é %s"
+
+#: mail/mail-autofilter.c:232
 #, c-format
 msgid "Mail from %s"
 msgstr "Enviar dende %s"
 
-#: mail/mail-autofilter.c:283 mail/mail-autofilter.c:332
-msgid "Add Filter Rule"
-msgstr "Engadir Regra de Filtrado"
-
-#: mail/mail-autofilter.c:328
+#: mail/mail-autofilter.c:334
 #, c-format
 msgid "%s mailing list"
-msgstr ""
+msgstr "lista de correo %s"
 
-#: mail/mail-callbacks.c:72
+#: mail/mail-callbacks.c:74
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3302,7 +4373,7 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:112
+#: mail/mail-callbacks.c:114
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -3310,13 +4381,25 @@ msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: mail/mail-callbacks.c:126
+#: mail/mail-callbacks.c:128
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:241
+#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
+msgid "You have no mail sources configured"
+msgstr "Non ten ningunha fonte de correo configurada"
+
+#: mail/mail-callbacks.c:213
+msgid "You have not set a mail transport method"
+msgstr "Non definiu ningún método de envío de correo"
+
+#: mail/mail-callbacks.c:222
+msgid "You have no Outbox configured"
+msgstr ""
+
+#: mail/mail-callbacks.c:246
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -3324,15 +4407,19 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "¿Enviar realmente?"
 
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:291
+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:533
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:506
+#: mail/mail-callbacks.c:535
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:607
+#: mail/mail-callbacks.c:650
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -3340,7 +4427,7 @@ msgstr ""
 "Só pode editar mensaxes gardados\n"
 "na carpeta de Borrador."
 
-#: mail/mail-callbacks.c:698
+#: mail/mail-callbacks.c:749
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -3349,11 +4436,7 @@ msgstr ""
 "Erro cargando a información do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:745 mail/message-list.c:1640
-msgid "Print Message"
-msgstr "Imprimir Mensaxe"
-
-#: mail/mail-callbacks.c:792
+#: mail/mail-callbacks.c:841
 msgid "Printing of message failed"
 msgstr "A impresión da mensaxe fallou"
 
@@ -3372,47 +4455,52 @@ msgstr "Nome completo:"
 msgid "Email address:"
 msgstr "Enderezo de email:"
 
-#: mail/mail-config-gui.c:484
+#: mail/mail-config-druid.glade.h:53 mail/mail-config-gui.c:484
 msgid "Organization:"
 msgstr "Organización:"
 
-#: mail/mail-config-gui.c:495
+#: mail/mail-config-druid.glade.h:75 mail/mail-config-gui.c:495
 msgid "Signature file:"
 msgstr "Ficheiro de sinatura:"
 
 #: mail/mail-config-gui.c:500 mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:42
 msgid "Signature File"
 msgstr "Ficheiro de Sinatura"
 
-#: mail/mail-config-gui.c:897
+#: mail/mail-config-druid.glade.h:74 mail/mail-config-gui.c:906
 msgid "Server:"
 msgstr "Servidor:"
 
-#: mail/mail-config-gui.c:903
+#: mail/mail-config-druid.glade.h:79 mail/mail-config-gui.c:912
 msgid "Username:"
 msgstr "Nome de usuario:"
 
-#: mail/mail-config-gui.c:909
+#: mail/mail-config-druid.glade.h:55 mail/mail-config-gui.c:918
 msgid "Path:"
 msgstr "Camiño:"
 
-#: mail/mail-config-gui.c:918
+#: mail/mail-config-druid.glade.h:26 mail/mail-config-gui.c:927
 msgid "Authentication:"
 msgstr "Autenticación:"
 
-#: mail/mail-config-gui.c:930
+#: mail/mail-config-gui.c:940
 msgid "Detect supported types..."
 msgstr "Detectar tipos soportados..."
 
-#: mail/mail-config-gui.c:957
+#: mail/mail-config-druid.glade.h:36 mail/mail-config-gui.c:967
 msgid "Don't delete messages from server"
-msgstr "Non borra-las mensaxes do servidor"
+msgstr "Non borrar as mensaxes do servidor"
 
-#: mail/mail-config-gui.c:969
+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:979
 msgid "Test Settings"
-msgstr ""
+msgstr "Probar Configuración"
 
-#: mail/mail-config-gui.c:1101 mail/mail-config-gui.c:1149
+#: mail/mail-config-gui.c:1106
+msgid "Mail source type:"
+msgstr "Tipo de fonte de correo:"
+
+#: mail/mail-config-gui.c:1111 mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -3421,7 +4509,11 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1125
+#: mail/mail-config-gui.c:1130
+msgid "News source type:"
+msgstr "Tipo de fonte de Novas:"
+
+#: mail/mail-config-gui.c:1135
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -3430,44 +4522,54 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1144
+#: mail/mail-config-gui.c:1154
 msgid "Mail transport type:"
 msgstr "Tipo de transporte de correo:"
 
-#: mail/mail-config-gui.c:1199
+#: mail/mail-config-gui.c:1209
 msgid "Add Identity"
 msgstr "Engadir Identidade"
 
-#: mail/mail-config-gui.c:1201
+#: mail/mail-config-gui.c:1211
 msgid "Edit Identity"
 msgstr "Editar Identidade"
 
-#: mail/mail-config-gui.c:1293
+#: mail/mail-config-gui.c:1309
 msgid "Add Source"
-msgstr ""
+msgstr "Engadir Fonte"
 
-#: mail/mail-config-gui.c:1295
+#: mail/mail-config-gui.c:1311
 msgid "Edit Source"
-msgstr ""
+msgstr "Editar Fonte"
 
-#: mail/mail-config-gui.c:1390
+#: mail/mail-config-gui.c:1406
 msgid "Add News Server"
 msgstr "Engadir Servidor de News"
 
-#: mail/mail-config-gui.c:1392
+#: mail/mail-config-gui.c:1408
 msgid "Edit News Server"
 msgstr "Editar Servidor de News"
 
-#: mail/mail-config-gui.c:2263
+#: mail/mail-config-gui.c:2232
+#, c-format
+msgid "Testing \"%s\""
+msgstr "Probando \"%s\""
+
+#: mail/mail-config-gui.c:2234
+#, c-format
+msgid "Test connection to \"%s\""
+msgstr ""
+
+#: mail/mail-config-gui.c:2275
 msgid "The connection was successful!"
 msgstr "¡A conexión foi correcta!"
 
-#: mail/mail-config-gui.c:2313
+#: mail/mail-config-gui.c:2325
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr ""
 
-#: mail/mail-config-gui.c:2315
+#: mail/mail-config-gui.c:2327
 #, c-format
 msgid "Query authorization at \"%s\""
 msgstr ""
@@ -3478,7 +4580,7 @@ msgstr ""
 #. * DO NOT compile it as part of your application.
 #.
 #: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
+#: mail/mail-config-druid.glade.h:16 mail/mail-config-druid.glade.h:46
 msgid "Mail Configuration"
 msgstr "Configuración do Correo"
 
@@ -3490,17 +4592,18 @@ msgid ""
 "right away. Click Next to continue."
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:13
+#: mail/mail-config-druid.glade.h:13 mail/mail-config-druid.glade.h:44
 msgid "Identity"
 msgstr "Identidade"
 
 #: mail/mail-config-druid.glade.h:14
 msgid "Mail Source"
-msgstr ""
+msgstr "Fonte de Correo"
 
 #: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:35
 msgid "Mail Transport"
-msgstr ""
+msgstr "Transporte do Correo"
 
 #: mail/mail-config-druid.glade.h:17
 msgid ""
@@ -3508,7 +4611,180 @@ msgid ""
 "Click \"Finish\" to save your new settings"
 msgstr ""
 "A configuración do correo electrónico está completa.\n"
-"Prema \"Finalizar\" para garda-la nova configuración"
+"Prema \"Finalizar\" para gardar a nova configuración"
+
+#: mail/mail-config-druid.glade.h:19
+msgid "Account Information"
+msgstr "Información de Contas"
+
+#: mail/mail-config-druid.glade.h:20
+msgid "Account Management"
+msgstr "Xestión e Contas"
+
+#: mail/mail-config-druid.glade.h:21
+msgid "Accounts"
+msgstr "Contas"
+
+#: mail/mail-config-druid.glade.h:23
+msgid "Add Optional Fields..."
+msgstr "Engadir Campos Opcionais..."
+
+#: mail/mail-config-druid.glade.h:24
+msgid "Additional Identity Fields"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:25
+msgid "Authentication"
+msgstr "Autenticación"
+
+#: mail/mail-config-druid.glade.h:27
+msgid "Browse..."
+msgstr "Explorar..."
+
+#: mail/mail-config-druid.glade.h:28
+msgid "Congratulations, your mail configuration is complete."
+msgstr "Noraboa, a configuración do correo está completa."
+
+#: mail/mail-config-druid.glade.h:34
+msgid "Default"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:37
+msgid "Done"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:39
+msgid "Edit Mail Configuration Settings"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:40
+msgid "Email Address:"
+msgstr "Enderezo de Email:"
+
+#: mail/mail-config-druid.glade.h:41
+msgid "Evolution Mail Configuration"
+msgstr "Configuración de Correo do Evolution"
+
+#: mail/mail-config-druid.glade.h:42
+msgid "Full Name:"
+msgstr "Nome Completo:"
+
+#: mail/mail-config-druid.glade.h:43
+msgid "IMAP"
+msgstr "IMAP"
+
+#: mail/mail-config-druid.glade.h:45
+msgid "Mail"
+msgstr "Correo"
+
+#: mail/mail-config-druid.glade.h:47
+msgid "Mail Configuration Druid"
+msgstr "Axudante da Configuración do Correo"
+
+#: mail/mail-config-druid.glade.h:48
+msgid "Make this my default account"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:50
+msgid "News"
+msgstr "Novas"
+
+#: mail/mail-config-druid.glade.h:51
+msgid "Optional"
+msgstr "Opcional"
+
+#: mail/mail-config-druid.glade.h:52
+msgid "Optional Information"
+msgstr "Información Opcional"
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Password:"
+msgstr "Contrasinal:"
+
+#: mail/mail-config-druid.glade.h:56
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:58
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know "
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:60
+msgid ""
+"Please enter your name and email address below. The &quot;optional&quot; "
+"fields below do not "
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:62
+msgid "Preferred type: "
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:63
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:64
+msgid "Receiving Mail"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:65
+msgid "Remember my password"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:66
+msgid "Reply-to:"
+msgstr "Responder-a:"
+
+#: mail/mail-config-druid.glade.h:67
+msgid "Required"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:68
+msgid "SMTP"
+msgstr "SMTP"
+
+#: mail/mail-config-druid.glade.h:69
+msgid "SMTP server requires authentication"
+msgstr "O servidor SMTP require autenticación"
+
+#: mail/mail-config-druid.glade.h:70
+msgid "Sending Email"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:71
+msgid "Sending Mail"
+msgstr "Enviando Correo"
+
+#: mail/mail-config-druid.glade.h:72
+msgid "Server Configuration"
+msgstr "Configuración do Servidor"
+
+#: mail/mail-config-druid.glade.h:73
+msgid "Server Type: "
+msgstr "Tipo de Servidor: "
+
+#: mail/mail-config-druid.glade.h:76 mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:43
+msgid "Sources"
+msgstr "Fontes"
+
+#: mail/mail-config-druid.glade.h:80
+msgid "Welcome to the Evolution Mail Configuration Druid! "
+msgstr "¡Benvido ó axudante da Configuración de Correo do Evolution!"
+
+#: mail/mail-config-druid.glade.h:86
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:90
+msgid "Your mail server supports the following types of authentication. Please"
+msgstr ""
 
 #.
 #. * Translatable strings file generated by Glade.
@@ -3516,64 +4792,75 @@ msgstr ""
 #. * DO NOT compile it as part of your application.
 #.
 #: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:33
 msgid "Identities"
 msgstr "Identidades"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:8 mail/mail-config.glade.h:30
+msgid "Address"
+msgstr "Enderezo"
+
+#: mail/mail-config.glade.h:9 mail/mail-config.glade.h:39
 msgid "Organization"
 msgstr "Organización"
 
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Editar"
-
-#: mail/mail-config.glade.h:15
-msgid "Sources"
-msgstr ""
-
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:19 mail/mail-config.glade.h:34
 msgid "Mail Sources"
-msgstr ""
+msgstr "Fontes de Correo"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:21 mail/mail-config.glade.h:37
 msgid "News Servers"
 msgstr "Servidores de News"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:25 mail/mail-config.glade.h:38
 msgid "News Sources"
-msgstr ""
+msgstr "Fontes de Novas"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:26 mail/mail-config.glade.h:41
 msgid "Send messages in HTML format"
 msgstr "Enviar mensaxes en formato HTML"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:27 mail/mail-config.glade.h:36
 msgid "Mark message as seen [ms]: "
-msgstr ""
+msgstr "Marcar mensaxe como lida [ms]: "
+
+#: mail/mail-crypto.c:136
+#, c-format
+msgid "Couldn't create pipe to %s: %s"
+msgstr "Non foi posible crear unha canalización con %s: %s"
 
-#: mail/mail-crypto.c:345 mail/mail-crypto.c:441 mail/mail-crypto.c:604
+#: mail/mail-crypto.c:163
+#, c-format
+msgid "Could not execute %s: %s\n"
+msgstr "Non foi posible executar %s: %s\n"
+
+#: mail/mail-crypto.c:167
+#, c-format
+msgid "Cannot fork %s: %s"
+msgstr "Non é posible facer un fork a %s: %s"
+
+#: mail/mail-crypto.c:344 mail/mail-crypto.c:440 mail/mail-crypto.c:603
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Introduza o seu contrasinal de PGP/GPG."
 
-#: mail/mail-crypto.c:349 mail/mail-crypto.c:445 mail/mail-crypto.c:609
+#: mail/mail-crypto.c:348 mail/mail-crypto.c:444 mail/mail-crypto.c:608
 msgid "No password provided."
 msgstr "Non se indicou un contrasinal."
 
-#: mail/mail-crypto.c:355 mail/mail-crypto.c:451 mail/mail-crypto.c:615
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:450 mail/mail-crypto.c:614
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr ""
+msgstr "Non foi posible crear unha canalización co GPG/PGP: %s"
 
-#: mail/mail-crypto.c:600
+#: mail/mail-crypto.c:599
 msgid "No GPG/PGP program available."
 msgstr "O programa GPG/PGP non está dispoñible."
 
-#: mail/mail-display.c:68
+#: mail/mail-display.c:66
 msgid "Overwrite file?"
 msgstr "¿Sobrescribir ficheiro?"
 
-#: mail/mail-display.c:72
+#: mail/mail-display.c:70
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3581,6 +4868,29 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "¿Sobrescribilo?"
 
+#: mail/mail-display.c:84
+#, c-format
+msgid ""
+"Could not open file %s:\n"
+"%s"
+msgstr ""
+"Non foi posible abrir o ficheiro %s:\n"
+"%s"
+
+#: mail/mail-display.c:96
+#, c-format
+msgid "Could not write data: %s"
+msgstr "Non foi posible escribir os datos: %s"
+
+#: mail/mail-display.c:192
+msgid "Save Attachment"
+msgstr "Gardar Anexo"
+
+#: mail/mail-display.c:232
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Non foi posible crear o directorio temporal: %s"
+
 #: mail/mail-display.c:274
 msgid "Save to Disk..."
 msgstr "Gardar ó Disco..."
@@ -3594,323 +4904,420 @@ msgstr "Abrir en %s..."
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:302
 msgid "External Viewer"
 msgstr "Visualizador Externo"
 
-#: mail/mail-display.c:322
+#: mail/mail-display.c:325
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:326
+#: mail/mail-display.c:329
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-local.c:257
+#: mail/mail-format.c:478
+#, c-format
+msgid "%s attachment"
+msgstr ""
+
+#: mail/mail-format.c:595
+msgid "Reply-To:"
+msgstr "Responder-A:"
+
+#: mail/mail-format.c:835
+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:847
+msgid "Encrypted message not displayed"
+msgstr "Mensaxe cifrada non visualizada"
+
+#: mail/mail-format.c:853
+msgid "Encrypted message"
+msgstr "Mensaxe cifrada"
+
+#: mail/mail-format.c:854
+msgid "Click icon to decrypt."
+msgstr ""
+
+#: mail/mail-format.c:1456
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1468
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: mail/mail-format.c:1472
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1506
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: mail/mail-format.c:1511
+msgid "Malformed external-body part."
+msgstr ""
+
+#: mail/mail-local.c:279
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando a carpeta \"%s\" ó formato \"%s\""
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:283
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Cambiar carpeta \"%s\" ó formato \"%s\""
 
+#: mail/mail-local.c:327
+msgid "Closing current folder"
+msgstr "Pechando a carpeta actual"
+
+#: mail/mail-local.c:359
+msgid "Renaming old folder and opening"
+msgstr "Renomeando a carpeta antiga e abrindo"
+
+#: mail/mail-local.c:380
+msgid "Creating new folder"
+msgstr "Creando unha nova carpeta"
+
+#: mail/mail-local.c:395
+msgid "Copying messages"
+msgstr "Copiando as mensaxes"
+
+#: mail/mail-local.c:407
+#, 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:443
+msgid ""
+"If you can no longer open this mailbox, then\n"
+"you may need to repair it manually."
+msgstr ""
+
 #. This is how we could do to display extra information about the
 #. folder.
 #: mail/mail-local-storage.c:97
 msgid " (XXX unread)"
 msgstr " (XXX sen ler)"
 
-#: mail/mail-ops.c:68
+#: mail/mail-ops.c:69
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Recibindo correo de %s"
 
-#: mail/mail-ops.c:70
+#: mail/mail-ops.c:71
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Recibir correo de %s"
 
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:311
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Non hai novo correo en %s."
 
-#: mail/mail-ops.c:312
+#: mail/mail-ops.c:366
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:314
+#: mail/mail-ops.c:368
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:481
+#: mail/mail-ops.c:500
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:486
+#: mail/mail-ops.c:505
 msgid "Sending a message without a subject"
 msgstr "Enviando unha mensaxe sen asunto"
 
-#: mail/mail-ops.c:489
+#: mail/mail-ops.c:508
 #, c-format
 msgid "Send \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:492
+#: mail/mail-ops.c:511
 msgid "Send a message without a subject"
 msgstr "Enviar unha mensaxe sen asunto"
 
-#: mail/mail-ops.c:636
+#: mail/mail-ops.c:682
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:638
+#: mail/mail-ops.c:684
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:774 mail/mail-ops.c:781
+#: mail/mail-ops.c:820 mail/mail-ops.c:827
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:778 mail/mail-ops.c:784
+#: mail/mail-ops.c:824 mail/mail-ops.c:830
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:856
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Expunging \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:858
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Expunge \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:963
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Movendo mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:965
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Copiando mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:968
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Mover mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:924
+#: mail/mail-ops.c:970
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Copiar mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:954
+#: mail/mail-ops.c:1001
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:957
+#: mail/mail-ops.c:1004
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:969
+#: mail/mail-ops.c:1024
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s mensaxe %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1046
+#: mail/mail-ops.c:1103
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Marcando mensaxes na carpeta \"%s\""
 
-#: mail/mail-ops.c:1049
+#: mail/mail-ops.c:1106
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Marcar mensaxes na carpeta \"%s\""
 
-#: mail/mail-ops.c:1192
+#: mail/mail-ops.c:1137
+#, c-format
+msgid "Marking message %d of %d"
+msgstr "Marcando a mensaxe %d de %d"
+
+#: mail/mail-ops.c:1260
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1195
+#: mail/mail-ops.c:1262
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1331 mail/subscribe-dialog.c:324
 msgid "(No description)"
 msgstr "(Sen descrición)"
 
-#: mail/mail-ops.c:1322
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1325
+#: mail/mail-ops.c:1395
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1428
+#: mail/mail-ops.c:1498
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Reenviando mensaxes \"%s\""
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1503
 msgid "Forwarding a message without a subject"
 msgstr "Reenviando unha mensaxe sen asunto"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Reenviar mensaxe \"%s\""
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1511
 msgid "Forward a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1470
+#: mail/mail-ops.c:1548
 #, 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:1483
+#: mail/mail-ops.c:1565
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 
-#: mail/mail-ops.c:1569
+#: mail/mail-ops.c:1651
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Cargando \"%s\""
 
-#: mail/mail-ops.c:1571
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Load \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1673
+#: mail/mail-ops.c:1755
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Creando \"%s\""
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1757
 #, c-format
 msgid "Create \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1805
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 
-#: mail/mail-ops.c:1767
+#: mail/mail-ops.c:1851
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Sincronizando \"%s\""
 
-#: mail/mail-ops.c:1769
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1832
+#: mail/mail-ops.c:1917
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1835
+#: mail/mail-ops.c:1920
 msgid "Clearing message display"
 msgstr ""
 
-#: mail/mail-ops.c:1838
+#: mail/mail-ops.c:1923
 #, c-format
 msgid "Display message UID \"%s\""
-msgstr ""
+msgstr "Amosar a mensaxe co UID \"%s\""
 
-#: mail/mail-ops.c:1841
+#: mail/mail-ops.c:1926
 msgid "Clear message display"
 msgstr ""
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:2039
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
-#: mail/mail-ops.c:1953
+#: mail/mail-ops.c:2042
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2057
+#: mail/mail-ops.c:2146
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Cargando a Carpeta %s"
 
-#: mail/mail-ops.c:2059
+#: mail/mail-ops.c:2148
 #, c-format
 msgid "Load %s Folder"
 msgstr ""
 
-#: mail/mail-ops.c:2124
+#: mail/mail-ops.c:2215
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Vendo as mensaxes da carpeta \"%s\""
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2218
 #, c-format
 msgid "View messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2153
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Recibindo a mensaxe %d de %d (uid \"%s\")"
 
-#: mail/mail-threads.c:274
+#: mail/mail-search-dialogue.c:101
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: mail/mail-summary.c:97 mail/mail-threads.c:703
+msgid "Incomplete message written on pipe!"
+msgstr ""
+
+#: mail/mail-summary.c:370
+msgid "Mailbox summary"
+msgstr ""
+
+#: mail/mail-threads.c:301
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:623
+#: mail/mail-threads.c:650
 #, c-format
 msgid ""
 "Error while `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:676
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-threads.c:680
+#: mail/mail-threads.c:707
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:745
+#: mail/mail-threads.c:772
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:856
+#: mail/mail-threads.c:891
 msgid "Could not create dialog box."
-msgstr ""
+msgstr "Non foi posible crear a caixa de diálogo."
 
-#: mail/mail-threads.c:865
+#: mail/mail-threads.c:902
 msgid "User cancelled query."
-msgstr ""
+msgstr "O usuario cancelou a consulta."
 
-#: mail/mail-tools.c:206
+#: mail/mail-tools.c:210
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
-msgstr ""
+msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
+
+#. Get all uids of source
+#: mail/mail-tools.c:264
+#, c-format
+msgid "Examining %s"
+msgstr "Examinando %s"
 
 #: mail/mail-tools.c:294
 #, c-format
@@ -3918,208 +5325,207 @@ msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#: mail/mail-tools.c:387
+#. Info
+#: mail/mail-tools.c:315
 #, c-format
-msgid "[%s] %s"
-msgstr ""
+msgid "Retrieving message %d of %d"
+msgstr "Recibindo a mensaxe %d de %d"
+
+#. Append it to dest
+#: mail/mail-tools.c:328
+#, c-format
+msgid "Writing message %d of %d"
+msgstr "Escribindo a mensaxe %d de %d"
 
-#: mail/mail-tools.c:389
+#: mail/mail-tools.c:357
+#, c-format
+msgid "Saving changes to %s"
+msgstr "Gardando as modificacións de %s"
+
+#: mail/mail-tools.c:391
 #, c-format
 msgid "[%s] (forwarded message)"
-msgstr ""
+msgstr "[%s] (mensaxe reenviada)"
 
-#: mail/mail-tools.c:398
+#: mail/mail-tools.c:400
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (sen asunto)"
 
-#: mail/mail-tools.c:435
+#: mail/mail-tools.c:437
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-tools.c:437
+#: mail/mail-tools.c:439
 msgid "Forwarded message (no subject)"
 msgstr "Mensaxe reenviada (sen asunto)"
 
-#: mail/mail-tools.c:556
+#: mail/mail-tools.c:510
 #, c-format
 msgid "Don't know protocol to open URI `%s'"
-msgstr "O protocolo para abri-lo URI `%s' é descoñecido"
+msgstr "O protocolo para abrir o URI `%s' é descoñecido"
 
-#: mail/mail-tools.c:585
+#: mail/mail-tools.c:539
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
 "%s"
 msgstr ""
-"Non se pode abri-la localizaión `%s':\n"
+"Non se pode abrir a localizaión `%s':\n"
 "%s"
 
-#: mail/mail-vfolder.c:302
+#: mail/mail-vfolder.c:147
+msgid "VFolders"
+msgstr ""
+
+#: mail/mail-vfolder.c:292
 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:151
+#: mail/mail-view.c:153 ui/evolution-mail.xml.h:32
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/mail-view.c:151
+#: mail/mail-view.c:153 ui/evolution-mail.xml.h:37
 msgid "Reply to the sender of this message"
 msgstr "Responder ó autor desta mensaxe"
 
-#: mail/mail-view.c:154 mail/message-list.c:1643
-msgid "Reply to All"
-msgstr "Responder a Todos"
-
-#: mail/mail-view.c:154
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:36
 msgid "Reply to all recipients of this message"
 msgstr "Responder a tódolos destinatarios desta mensaxe"
 
-#: mail/mail-view.c:157
+#: mail/mail-view.c:159 ui/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Re-enviar"
 
-#: mail/mail-view.c:157
+#: mail/mail-view.c:159 ui/evolution-mail.xml.h:18
 msgid "Forward this message"
 msgstr "Re-enviar esta mensaxe"
 
-#: mail/mail-view.c:161
+#: mail/mail-view.c:163 ui/evolution-addressbook.xml.h:14
+#: ui/evolution-calendar.xml.h:24 ui/evolution-mail.xml.h:27
 msgid "Print"
 msgstr "Imprimir"
 
-#: mail/mail-view.c:161
+#: mail/mail-view.c:163 ui/evolution-mail.xml.h:31
 msgid "Print the selected message"
 msgstr "Imprimir a mensaxe seleccionada"
 
-#: mail/mail-view.c:163
+#: mail/mail-view.c:165 ui/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Borrar esta mensaxe"
 
-#: mail/message-list.c:967
-msgid "From"
-msgstr "De"
-
-#: mail/message-list.c:974
-msgid "Subject"
-msgstr "Asunto"
-
-#: mail/message-list.c:981
-msgid "Date"
-msgstr "Data"
-
-#: mail/message-list.c:988
-msgid "Received"
-msgstr "Recibido"
-
-#: mail/message-list.c:995
-msgid "To"
-msgstr "A"
-
-#: mail/message-list.c:1002
-msgid "Size"
-msgstr "Tamaño"
-
-#: mail/message-list.c:1638
-msgid "Open in New Window"
-msgstr "Abrir nunha Nova Fiestra"
-
-#: mail/message-list.c:1639
-msgid "Edit Message"
-msgstr "Editar Mensaxe"
-
-#: mail/message-list.c:1642
-msgid "Reply to Sender"
-msgstr "Responder ó Autor"
-
-#: mail/message-list.c:1644
-msgid "Forward Message"
-msgstr "Reenviar esta mensaxe"
+#: mail/message-list.c:505
+msgid "Unseen"
+msgstr ""
 
-#: mail/message-list.c:1646
-msgid "Delete Message"
-msgstr "Borrar Mensaxe"
+#: mail/message-list.c:2043
+msgid "Rebuilding message view"
+msgstr ""
 
-#: mail/message-list.c:1647
-msgid "Move Message"
-msgstr "Mover Mensaxe"
+#: mail/message-list.c:2045
+msgid "Rebuild message view"
+msgstr ""
 
-#: mail/message-list.c:1648
-msgid "Copy Message"
-msgstr "Copiar Mensaxe"
+#: mail/message-thread.c:582
+msgid "Threading message list"
+msgstr ""
 
-#: mail/message-list.c:1650
-msgid "VFolder on Subject"
+#: mail/message-thread.c:584
+msgid "Thread message list"
 msgstr ""
 
-#: mail/message-list.c:1651
-msgid "VFolder on Sender"
+#: mail/subscribe-dialog.c:139
+msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/message-list.c:1652
-msgid "VFolder on Recipients"
+#: mail/subscribe-dialog.c:172
+#, c-format
+msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/message-list.c:1654
-msgid "Filter on Subject"
+#: mail/subscribe-dialog.c:175
+#, c-format
+msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/message-list.c:1655
-msgid "Filter on Sender"
+#: mail/subscribe-dialog.c:280
+#, c-format
+msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/message-list.c:1656
-msgid "Filter on Recipients"
+#: mail/subscribe-dialog.c:283
+#, c-format
+msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/message-list.c:1657 mail/message-list.c:1680
-msgid "Filter on Mailing List"
+#: mail/subscribe-dialog.c:387
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/message-list.c:1682
+#: mail/subscribe-dialog.c:390
 #, c-format
-msgid "Filter on Mailing List (%s)"
+msgid "Unsubscribe to folder \"%s\""
 msgstr ""
 
-#: shell/e-setup.c:47
+#: shell/e-setup.c:106 shell/e-setup.c:175
 msgid "Evolution installation"
 msgstr "Instalación de Evolution"
 
-#: shell/e-setup.c:51
+#: shell/e-setup.c:110
+msgid ""
+"This new version of Evolution needs to install additional files\n"
+"into your personal Evolution directory"
+msgstr ""
+"Esta nova versión do Evolution necesita instalar ficheiros\n"
+"adicionais no seu directorio persoal do Evolution"
+
+#: shell/e-setup.c:111
+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:152
+msgid "Could not update files correctly"
+msgstr "Non foi posible actualizar os ficheiros correctamente"
+
+#: shell/e-setup.c:156 shell/e-setup.c:216
+msgid "Evolution files successfully installed."
+msgstr "Ficheiros de Evolution instalados con éxito."
+
+#: shell/e-setup.c:179
 msgid "This seems to be the first time you run Evolution."
 msgstr "Semella que é a primeira vez que executa Evolution."
 
-#: shell/e-setup.c:52
+#: shell/e-setup.c:180
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
-"Prema \"Aceptar\" para instala-los ficheiros de usuario de Evolution en"
+"Prema \"Aceptar\" para instalar os ficheiros de usuario de Evolution en"
 
-#: shell/e-setup.c:69
+#: shell/e-setup.c:197
 #, c-format
 msgid ""
 "Cannot create the directory\n"
 "%s\n"
 "Error: %s"
 msgstr ""
-"Non se pode crea-lo directorio\n"
+"Non se pode crear o directorio\n"
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:84
+#: shell/e-setup.c:212
 #, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr ""
-"Non se poden copia-los ficheiros a\n"
+"Non se poden copiar os ficheiros a\n"
 "`%s'."
 
-#: shell/e-setup.c:88
-msgid "Evolution files successfully installed."
-msgstr "Ficheiros de Evolution instalados con éxito."
-
-#: shell/e-setup.c:109
+#: shell/e-setup.c:237
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -4127,10 +5533,10 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 "O ficheiro `%s' non é un directorio.\n"
-"Móvao para poder instala-los ficheiros de\n"
+"Móvao para poder instalar os ficheiros de\n"
 "usuario de Evolution."
 
-#: shell/e-setup.c:121
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -4139,7 +5545,7 @@ msgid ""
 msgstr ""
 "O directorio `%s' existe pero non é o\n"
 "directorio de Evolution. Móvao para poder\n"
-"instala-los ficheiros de usuario de Evolution."
+"instalar os ficheiros de usuario de Evolution."
 
 #: shell/e-shell-folder-creation-dialog.c:82
 #, c-format
@@ -4147,7 +5553,7 @@ msgid ""
 "Cannot create the specified folder:\n"
 "%s"
 msgstr ""
-"Non se pode crea-la carpeta indicada:\n"
+"Non se pode crear a carpeta indicada:\n"
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:134
@@ -4166,11 +5572,11 @@ msgstr ""
 "O tipo da carpeta seleccionada non é válido para\n"
 "a operación solicitada."
 
-#: shell/e-shell-folder-selection-dialog.c:274
+#: shell/e-shell-folder-selection-dialog.c:291
 msgid "New..."
-msgstr ""
+msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:448 shell/e-shell-folder-title-bar.c:449
+#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
 msgid "(Untitled)"
 msgstr "(Sen_título)"
 
@@ -4186,42 +5592,54 @@ msgstr "Bug buddy non foi atopado no seu $PATH."
 msgid "Bug buddy could not be run."
 msgstr "Non se puido executar Bug buddy."
 
-#: shell/e-shell-view-menu.c:168
+#: 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:170
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
+"Evolution é unha suite de aplicacións de traballo\n"
+"en grupo para xestión de correo, axenda e contactos\n"
+"dentro do ambiente de escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:325
+#: shell/e-shell-view-menu.c:332
 msgid "Go to folder..."
 msgstr "Ir á carpeta..."
 
-#: shell/e-shell-view.c:130
+#: shell/e-shell-view.c:136
 msgid "(No folder displayed)"
-msgstr ""
+msgstr "(Ningunha carpeta visualizada)"
 
-#: shell/e-shell-view.c:409
+#: shell/e-shell-view.c:417
 msgid "Folders"
 msgstr "Carpetas"
 
-#: shell/e-shell-view.c:985
+#: shell/e-shell-view.c:1021
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:331
+#: shell/e-shell-view.c:1167
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' has died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"Ooops!  A vista de `%s' morreu inesperadamente.  :-(\n"
+"Isto significa probablemente que o compoñente %s se estragou."
+
+#: shell/e-shell.c:336
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Non se pode activar o almacenamento local -- %s"
 
 #: shell/e-shortcuts-view.c:122
 msgid "Create new shortcut group"
-msgstr ""
+msgstr "Crear novo grupo de atallos"
 
 #: shell/e-shortcuts-view.c:125
 msgid "Group name:"
@@ -4233,10 +5651,12 @@ msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
+"¿Realmente desexa eliminar o grupo\n"
+"`%s' da barra de atallos?"
 
 #: shell/e-shortcuts-view.c:239
 msgid "Don't remove"
-msgstr ""
+msgstr "Non eliminar"
 
 #: shell/e-shortcuts-view.c:250
 msgid "_Small Icons"
@@ -4244,7 +5664,7 @@ msgstr "Iconas _Pequenas"
 
 #: shell/e-shortcuts-view.c:251
 msgid "Show the shortcuts as small icons"
-msgstr "Amosa-los atallos como iconas pequenas"
+msgstr "Amosar os atallos como iconas pequenas"
 
 #: shell/e-shortcuts-view.c:253
 msgid "_Large Icons"
@@ -4252,7 +5672,7 @@ msgstr "Iconas _Grandes"
 
 #: shell/e-shortcuts-view.c:254
 msgid "Show the shortcuts as large icons"
-msgstr "Amosa-los atallos como iconas grandes"
+msgstr "Amosar os atallos como iconas grandes"
 
 #: shell/e-shortcuts-view.c:265
 msgid "_New Group..."
@@ -4260,7 +5680,7 @@ msgstr "_Novo Grupo..."
 
 #: shell/e-shortcuts-view.c:266
 msgid "Create a new shortcut group"
-msgstr ""
+msgstr "Crear un novo grupo de atallos"
 
 #: shell/e-shortcuts-view.c:268
 msgid "_Remove This Group..."
@@ -4268,7 +5688,7 @@ msgstr "_Eliminar este Grupo..."
 
 #: shell/e-shortcuts-view.c:269
 msgid "Remove this shortcut group"
-msgstr ""
+msgstr "Eliminar este grupo de atallos"
 
 #: shell/e-shortcuts-view.c:353
 msgid "Activate"
@@ -4286,63 +5706,64 @@ msgstr "Eliminar este atallo da barra de atallos"
 msgid "Error saving shortcuts."
 msgstr "Erro gardando atallos."
 
-#: shell/e-storage.c:127
+#: shell/e-storage.c:128
 msgid "(No name)"
 msgstr "(Sen nome)"
 
-#: shell/e-storage.c:318
+#: shell/e-storage.c:327
 msgid "No error"
 msgstr "Sen erro"
 
-#: shell/e-storage.c:320
+#: shell/e-storage.c:329
 msgid "Generic error"
 msgstr "Erro xenérico"
 
-#: shell/e-storage.c:322
+#: shell/e-storage.c:331
 msgid "A folder with the same name already exists"
 msgstr "Xa existe unha carpeta co mesmo nome"
 
-#: shell/e-storage.c:324
+#: shell/e-storage.c:333
 msgid "The specified folder type is not valid"
 msgstr "O tipo da carpeta especificada non é válido"
 
-#: shell/e-storage.c:326
+#: shell/e-storage.c:335
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:328
+#: shell/e-storage.c:337
 msgid "Not enough space to create the folder"
-msgstr "Non hai espacio dabondo para crea-la carpeta"
+msgstr "Non hai espacio dabondo para crear a carpeta"
 
-#: shell/e-storage.c:330
+#: shell/e-storage.c:339
 msgid "The specified folder was not found"
 msgstr "Non se atopou a carpeta especificada"
 
-#: shell/e-storage.c:332
+#: shell/e-storage.c:341
 msgid "Function not implemented in this storage"
 msgstr "Función non implementada neste almacenamento"
 
-#: shell/e-storage.c:334
+#: shell/e-storage.c:343
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: shell/e-storage.c:336
+#: shell/e-storage.c:345
 msgid "Operation not supported"
 msgstr "Operación non soportada"
 
-#: shell/e-storage.c:338
+#: shell/e-storage.c:347
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado non está soportado neste almacenamento"
 
-#: shell/e-storage.c:340
-msgid "Unknown error"
-msgstr "Erro descoñecido"
+#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:126
+#: ui/evolution.xml.h:37
+msgid "_View"
+msgstr "_Vista"
 
-#: shell/e-storage-set-view.c:221
+#: shell/e-storage-set-view.c:235
 msgid "View the selected folder"
 msgstr "Ver carpeta seleccionada"
 
-#: shell/main.c:68
+#: shell/main.c:70
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -4364,7 +5785,7 @@ msgid ""
 "await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:95
+#: shell/main.c:97
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -4372,14 +5793,986 @@ msgstr ""
 "Graciñas\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:123
+#: shell/main.c:122
 msgid "Cannot initialize the Evolution shell."
 msgstr "Non se pode inicializar a shell de Evolution."
 
-#: shell/main.c:160
+#: shell/main.c:144
+msgid "Disable."
+msgstr "Desactivar."
+
+#: shell/main.c:166
 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.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
+#.
+#: ui/evolution-addressbook-ldap.xml.h:7
+msgid "N_ew Directory Server"
+msgstr "Novo Servidor de _Directorio"
+
+#: ui/evolution-addressbook-ldap.xml.h:8
+msgid "_Actions"
+msgstr "_Accións"
+
+#: ui/evolution-addressbook.xml.h:8
+msgid "Create a new contact"
+msgstr "Crear un novo contacto"
+
+#: ui/evolution-addressbook.xml.h:10
+msgid "Delete a contact"
+msgstr "Borrar un contacto"
+
+#: ui/evolution-addressbook.xml.h:11 ui/evolution-event-editor.xml.h:70
+msgid "Find"
+msgstr "Buscar"
+
+#: ui/evolution-addressbook.xml.h:12
+msgid "Find a contact"
+msgstr "Buscar un contacto"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:19
+msgid "New"
+msgstr "Novo"
+
+#: ui/evolution-addressbook.xml.h:15
+msgid "Print contacts"
+msgstr "Imprimir contactos"
+
+#: ui/evolution-addressbook.xml.h:16
+msgid "Stop"
+msgstr "Parar"
+
+#: ui/evolution-addressbook.xml.h:17
+msgid "Stop Loading"
+msgstr "Parar a Carga"
+
+#: ui/evolution-addressbook.xml.h:18
+msgid "View All"
+msgstr "Ver Todos"
+
+#: ui/evolution-addressbook.xml.h:19
+msgid "View all contacts"
+msgstr "Ver tódolos contactos"
+
+#: ui/evolution-addressbook.xml.h:20
+msgid "_New Contact"
+msgstr "_Novo Contacto"
+
+#: ui/evolution-addressbook.xml.h:21
+msgid "_Print Contacts..."
+msgstr "_Imprimir Contactos..."
+
+#: ui/evolution-addressbook.xml.h:22
+msgid "_Search for contacts"
+msgstr "_Buscar contactos"
+
+#: ui/evolution-addressbook.xml.h:23 ui/evolution-event-editor.xml.h:124
+msgid "_Tools"
+msgstr "_Ferramentas"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
+#.
+#: ui/evolution-calendar.xml.h:7
+msgid "5 Days"
+msgstr "5 Días"
+
+#: ui/evolution-calendar.xml.h:8
+msgid "Alter preferences"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:9
+msgid "Calendar Preferences..."
+msgstr "Preferencias da Axenda..."
+
+#: ui/evolution-calendar.xml.h:10
+msgid "Create a new appointment"
+msgstr "Crear unha nova cita"
+
+#: ui/evolution-calendar.xml.h:11
+msgid "Create a new calendar"
+msgstr "Crear unha nova axenda"
+
+#: ui/evolution-calendar.xml.h:12
+msgid "Day"
+msgstr "Día"
+
+#: ui/evolution-calendar.xml.h:13
+msgid "Go back in time"
+msgstr "Ir para atrás no tempo"
+
+#: ui/evolution-calendar.xml.h:14
+msgid "Go forward in time"
+msgstr "Ir para diante no tempo"
+
+#: ui/evolution-calendar.xml.h:15
+msgid "Go to"
+msgstr "Ir para"
+
+#: ui/evolution-calendar.xml.h:16
+msgid "Go to a specific date"
+msgstr "Ir para a data especificada"
+
+#: ui/evolution-calendar.xml.h:17
+msgid "Go to present time"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:18
+msgid "Month"
+msgstr "Mes"
+
+#: ui/evolution-calendar.xml.h:20
+msgid "New Ca_lendar"
+msgstr "Nova A_xenda"
+
+#: ui/evolution-calendar.xml.h:21 ui/evolution-event-editor.xml.h:77
+msgid "Next"
+msgstr "Seguinte"
+
+#: ui/evolution-calendar.xml.h:22
+msgid "Open a calendar"
+msgstr "Abrir unha axenda"
+
+#: ui/evolution-calendar.xml.h:23
+msgid "Prev"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:25
+msgid "Print this calendar"
+msgstr "Imprimir esta axenda"
+
+#: ui/evolution-calendar.xml.h:26
+msgid "Save calendar As something else"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:27
+msgid "Show 1 day"
+msgstr "Amosar un día"
+
+#: ui/evolution-calendar.xml.h:28
+msgid "Show 1 month"
+msgstr "Amosar un mes"
+
+#: ui/evolution-calendar.xml.h:29
+msgid "Show 1 week"
+msgstr "Amosar unha semana"
+
+#: ui/evolution-calendar.xml.h:30
+msgid "Show the working week"
+msgstr "Amosar a semana laboral"
+
+#: ui/evolution-calendar.xml.h:31 widgets/misc/e-dateedit.c:365
+msgid "Today"
+msgstr "Hoxe"
+
+#: ui/evolution-calendar.xml.h:32
+msgid "Week"
+msgstr "Semana"
+
+#: ui/evolution-calendar.xml.h:33 ui/evolution.xml.h:33
+msgid "_New"
+msgstr "_Novo"
+
+#: ui/evolution-calendar.xml.h:34
+msgid "_New appointment..."
+msgstr "_Nova cita..."
+
+#: ui/evolution-calendar.xml.h:35
+msgid "_Open"
+msgstr "_Abrir"
+
+#: ui/evolution-calendar.xml.h:36
+msgid "_Open Calendar"
+msgstr "_Abrir axenda"
+
+#: ui/evolution-calendar.xml.h:37
+msgid "_Print this calendar"
+msgstr "_Imprimir esta axenda"
+
+#: ui/evolution-calendar.xml.h:38
+msgid "_Save Calendar As"
+msgstr "_Gardar Axenda Como"
+
+#: ui/evolution-contact-editor.xml.h:9
+msgid "Delete this item"
+msgstr "Borrar este elemento"
+
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Help"
+msgstr "Axuda"
+
+#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:84
+msgid "Print this item"
+msgstr "Imprimir este elemento"
+
+#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:85
+msgid "Print..."
+msgstr "Imprimir..."
+
+#: ui/evolution-contact-editor.xml.h:13
+msgid "Save _As"
+msgstr "Gardar _Como"
+
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:93
+msgid "Save and Close"
+msgstr "Gardar e Pechar"
+
+#: 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"
+
+#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:99
+msgid "See online help"
+msgstr "Ver a axuda online"
+
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:111
+#: ui/evolution-subscribe.xml.h:17 ui/evolution.xml.h:27
+msgid "_File"
+msgstr "_Ficheiro"
+
+#: ui/evolution-contact-editor.xml.h:18 ui/evolution-event-editor.xml.h:118
+msgid "_Print"
+msgstr "_Imprimir"
+
+#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:122
+msgid "_Save"
+msgstr "_Gardar"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
+#.
+#: ui/evolution-event-editor.xml.h:7
+msgid "About this application"
+msgstr "Acerca desta aplicación"
+
+#: ui/evolution-event-editor.xml.h:8
+msgid "About..."
+msgstr "Acerca de..."
+
+#: ui/evolution-event-editor.xml.h:9
+msgid "Actio_ns"
+msgstr "Acció_ns"
+
+#: ui/evolution-event-editor.xml.h:10
+msgid "C_lear"
+msgstr "_Limpar"
+
+#: ui/evolution-event-editor.xml.h:11
+msgid "C_ut"
+msgstr "Co_rtar"
+
+#: ui/evolution-event-editor.xml.h:12
+msgid "Clear"
+msgstr "Limpar"
+
+#: ui/evolution-event-editor.xml.h:13
+msgid "Clear the selection"
+msgstr "Limpar a selección"
+
+#: ui/evolution-event-editor.xml.h:15
+msgid "Close this appointment"
+msgstr "Pechar esta cita"
+
+#: ui/evolution-event-editor.xml.h:16 ui/evolution-mail.xml.h:9
+msgid "Copy"
+msgstr "Copiar"
+
+#: ui/evolution-event-editor.xml.h:17
+msgid "Copy the selection"
+msgstr "Copiar a selección"
+
+#: ui/evolution-event-editor.xml.h:18
+msgid "Cut"
+msgstr "Cortar"
+
+#: ui/evolution-event-editor.xml.h:19
+msgid "Cut the selection"
+msgstr "Cortar a selección"
+
+#: ui/evolution-event-editor.xml.h:22
+msgid "Dump XML"
+msgstr "Envorcar XML"
+
+#: ui/evolution-event-editor.xml.h:23
+msgid "Dump the UI Xml description"
+msgstr "Envorcar a descrición Xml da Interface"
+
+#: ui/evolution-event-editor.xml.h:24
+msgid "FIXME: Address _Book..."
+msgstr "FIXME: _Libro de enderezos..."
+
+#: ui/evolution-event-editor.xml.h:25
+msgid "FIXME: Ch_oose Form..."
+msgstr "FIXME: Es_colla un Formulario..."
+
+#: ui/evolution-event-editor.xml.h:26
+msgid "FIXME: Chec_k Names"
+msgstr "FIXME: Veri_ficar Nomes"
+
+#: ui/evolution-event-editor.xml.h:27
+msgid "FIXME: Cop_y to Folder..."
+msgstr "FIXME: Cop_iar á Carpeta..."
+
+#: ui/evolution-event-editor.xml.h:28
+msgid "FIXME: D_esign a Form..."
+msgstr "FIXME: _Deseñar un Formulario..."
+
+#: ui/evolution-event-editor.xml.h:29
+msgid "FIXME: Define Print _Styles"
+msgstr "FIXME: Definir E_stilos de Impresión"
+
+#: ui/evolution-event-editor.xml.h:30
+msgid "FIXME: Desi_gn This Form"
+msgstr "FIXME: Deseñar este _Formulario"
+
+#: ui/evolution-event-editor.xml.h:31
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "FIXME: Pri_meiro elemento na Carpeta"
+
+#: ui/evolution-event-editor.xml.h:32
+msgid "FIXME: For_ward"
+msgstr "FIXME: _Reenviar"
+
+#: ui/evolution-event-editor.xml.h:33
+msgid "FIXME: Forward as v_Calendar"
+msgstr "FIXME: Reenviar como v_Calendar"
+
+#: ui/evolution-event-editor.xml.h:34
+msgid "FIXME: Help"
+msgstr "FIXME: Axuda"
+
+#: ui/evolution-event-editor.xml.h:35
+msgid "FIXME: In_complete Task"
+msgstr "FIXME: Tarefa in_completa"
+
+#: ui/evolution-event-editor.xml.h:36
+msgid "FIXME: Insert File"
+msgstr "FIXME: Inserir Ficheiro"
+
+#: ui/evolution-event-editor.xml.h:37
+msgid "FIXME: It_em..."
+msgstr "FIXME: _Elemento..."
+
+#: ui/evolution-event-editor.xml.h:38
+msgid "FIXME: Paste _Special... "
+msgstr "FIXME: Pegar _Especial..."
+
+#: ui/evolution-event-editor.xml.h:39
+msgid "FIXME: Print Pre_view"
+msgstr "FIXME: Pre_visualización da Impresión"
+
+#: ui/evolution-event-editor.xml.h:40
+msgid "FIXME: Pu_blish Form As..."
+msgstr "FIXME: Pu_blicar Formulario Como..."
+
+#: ui/evolution-event-editor.xml.h:41
+msgid "FIXME: Publish _Form..."
+msgstr "FIXME: Publicar _Formulario..."
+
+#: ui/evolution-event-editor.xml.h:42
+msgid "FIXME: Rec_urrence..."
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:43
+msgid "FIXME: S_end"
+msgstr "FIXME: _Enviar"
+
+#: ui/evolution-event-editor.xml.h:44
+msgid "FIXME: Save Attac_hments..."
+msgstr "FIXME: Gardar Ane_xos..."
+
+#: ui/evolution-event-editor.xml.h:45
+msgid "FIXME: Schedule Meeting"
+msgstr "FIXME: Programar Reunión"
+
+#: ui/evolution-event-editor.xml.h:46
+msgid "FIXME: Schedule _Meeting"
+msgstr "FIXME: _Programar Reunión"
+
+#: ui/evolution-event-editor.xml.h:47
+msgid "FIXME: Script _Debugger"
+msgstr "FIXME: _Depurador de Script"
+
+#: ui/evolution-event-editor.xml.h:48
+msgid "FIXME: Task _Request"
+msgstr "FIXME: Solicitude de _Tarefa"
+
+#: ui/evolution-event-editor.xml.h:49
+msgid "FIXME: _Contact"
+msgstr "FIXME: _Contacto"
+
+#: ui/evolution-event-editor.xml.h:50
+msgid "FIXME: _Customize..."
+msgstr "FIXME: _Personalizar..."
+
+#: ui/evolution-event-editor.xml.h:51
+msgid "FIXME: _File..."
+msgstr "FIXME: _Ficheiro..."
+
+#: ui/evolution-event-editor.xml.h:52
+msgid "FIXME: _Font..."
+msgstr "FIXME: _Fonte..."
+
+#: ui/evolution-event-editor.xml.h:53
+msgid "FIXME: _Formatting"
+msgstr "FIXME: Fo_rmato"
+
+#: ui/evolution-event-editor.xml.h:54
+msgid "FIXME: _Item"
+msgstr "FIXME: _Elemento"
+
+#: ui/evolution-event-editor.xml.h:55
+msgid "FIXME: _Journal Entry"
+msgstr "FIXME: Entrada de _Xornal"
+
+#: ui/evolution-event-editor.xml.h:56
+msgid "FIXME: _Last Item in Folder"
+msgstr "FIXME: _Derradeiro Elemento na Carpeta"
+
+#: ui/evolution-event-editor.xml.h:57
+msgid "FIXME: _Mail Message"
+msgstr "FIXME: Enviar _Mensaxe"
+
+#: ui/evolution-event-editor.xml.h:58
+msgid "FIXME: _Memo Style"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:59
+msgid "FIXME: _Move to Folder..."
+msgstr "FIXME: _Mover para a Carpeta..."
+
+#: ui/evolution-event-editor.xml.h:60
+msgid "FIXME: _New Appointment"
+msgstr "FIXME: _Nova Cita"
+
+#: ui/evolution-event-editor.xml.h:61
+msgid "FIXME: _Note"
+msgstr "FIXME: _Nota"
+
+#: ui/evolution-event-editor.xml.h:62
+msgid "FIXME: _Object..."
+msgstr "FIXME: _Obxecto..."
+
+#: ui/evolution-event-editor.xml.h:63
+msgid "FIXME: _Paragraph..."
+msgstr "FIXME: _Parágrafo..."
+
+#: ui/evolution-event-editor.xml.h:64
+msgid "FIXME: _Spelling..."
+msgstr "FIXME: _Ortografía..."
+
+#: ui/evolution-event-editor.xml.h:65
+msgid "FIXME: _Standard"
+msgstr "FIXME: _Estándar"
+
+#: ui/evolution-event-editor.xml.h:66
+msgid "FIXME: _Task"
+msgstr "FIXME: _Tarefa"
+
+#: ui/evolution-event-editor.xml.h:67
+msgid "FIXME: _Unread Item"
+msgstr "FIXME: Elemento _non Lido"
+
+#: ui/evolution-event-editor.xml.h:68
+msgid "FIXME: what goes here?"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:69
+msgid "F_ormat"
+msgstr "_Formatar"
+
+#: ui/evolution-event-editor.xml.h:71
+msgid "Find Again"
+msgstr "Buscar Novamente"
+
+#: ui/evolution-event-editor.xml.h:72
+msgid "Find _Again"
+msgstr "Buscar _Novamente"
+
+#: ui/evolution-event-editor.xml.h:73
+msgid "Go to the next item"
+msgstr "Ir ó elemento seguinte"
+
+#: ui/evolution-event-editor.xml.h:74
+msgid "Go to the previous item"
+msgstr "Ir ó elemento anterior"
+
+#: ui/evolution-event-editor.xml.h:75
+msgid "Modify the file's properties"
+msgstr "Modificar as propiedades do ficheiro"
+
+#: ui/evolution-event-editor.xml.h:76
+msgid "N_ext"
+msgstr "Se_guinte"
+
+#: ui/evolution-event-editor.xml.h:78
+msgid "Paste"
+msgstr "Pegar"
+
+#: ui/evolution-event-editor.xml.h:79
+msgid "Paste the clipboard"
+msgstr "Pegar o contido do cartafol"
+
+#: ui/evolution-event-editor.xml.h:80
+msgid "Pre_vious"
+msgstr "An_terior"
+
+#: ui/evolution-event-editor.xml.h:81
+msgid "Previous"
+msgstr "Anterior"
+
+#: ui/evolution-event-editor.xml.h:82
+msgid "Print S_etup..."
+msgstr "_Configuración da Impresión..."
+
+#: ui/evolution-event-editor.xml.h:83
+msgid "Print Setup"
+msgstr "Configuración da Impresión"
+
+#: ui/evolution-event-editor.xml.h:86
+msgid "Properties"
+msgstr "Propiedades"
+
+#: ui/evolution-event-editor.xml.h:87
+msgid "Redo"
+msgstr "Refacer"
+
+#: ui/evolution-event-editor.xml.h:88
+msgid "Redo the undone action"
+msgstr "Refacer a acción desfeita"
+
+#: ui/evolution-event-editor.xml.h:89
+msgid "Replace"
+msgstr "Substituír"
+
+#: ui/evolution-event-editor.xml.h:90
+msgid "Replace a string"
+msgstr "Substituír unha cadea"
+
+#: ui/evolution-event-editor.xml.h:92
+msgid "Save _As..."
+msgstr "Gardar _Como..."
+
+#: ui/evolution-event-editor.xml.h:94
+msgid "Save the appointment and close the dialog box"
+msgstr "Gardar a cita e pechar a caixa de diálogo"
+
+#: ui/evolution-event-editor.xml.h:95
+msgid "Save the current file"
+msgstr "Gardar o ficheiro actual"
+
+#: ui/evolution-event-editor.xml.h:96
+msgid "Schedule some sort of a meeting"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:97
+msgid "Search again for the same string"
+msgstr "Buscar novamente a mesma cadea"
+
+#: ui/evolution-event-editor.xml.h:98
+msgid "Search for a string"
+msgstr "Buscar unha cadea"
+
+#: ui/evolution-event-editor.xml.h:100
+msgid "Select All"
+msgstr ""
+
+#: ui/evolution-event-editor.xml.h:101
+msgid "Select everything"
+msgstr "Seleccionar todo"
+
+#: ui/evolution-event-editor.xml.h:102
+msgid "Setup the page settings for your current printer"
+msgstr "Configurar as opcións de páxina para a impresora actual"
+
+#: ui/evolution-event-editor.xml.h:103
+msgid "Undo"
+msgstr "Desfacer"
+
+#: ui/evolution-event-editor.xml.h:104
+msgid "Undo the last action"
+msgstr "Desfacer a última acción"
+
+#: ui/evolution-event-editor.xml.h:105
+msgid "_About..."
+msgstr "_Acerca de..."
+
+#: ui/evolution-event-editor.xml.h:106
+msgid "_Close"
+msgstr "_Pechar"
+
+#: ui/evolution-event-editor.xml.h:107
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: ui/evolution-event-editor.xml.h:108
+msgid "_Debug"
+msgstr "_Depuración"
+
+#: ui/evolution-event-editor.xml.h:110 ui/evolution-subscribe.xml.h:16
+#: ui/evolution.xml.h:26
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ui/evolution-event-editor.xml.h:112
+msgid "_Find..."
+msgstr "_Buscar..."
+
+#: ui/evolution-event-editor.xml.h:113
+msgid "_Forms"
+msgstr "_Formularios"
+
+#: ui/evolution-event-editor.xml.h:114 ui/evolution.xml.h:30
+msgid "_Help"
+msgstr "A_xuda"
+
+#: ui/evolution-event-editor.xml.h:115
+msgid "_Insert"
+msgstr "_Inserir"
+
+#: ui/evolution-event-editor.xml.h:116
+msgid "_Object"
+msgstr "_Obxecto"
+
+#: ui/evolution-event-editor.xml.h:117
+msgid "_Paste"
+msgstr "_Pegar"
+
+#: ui/evolution-event-editor.xml.h:119
+msgid "_Properties..."
+msgstr "_Propiedades..."
+
+#: ui/evolution-event-editor.xml.h:120
+msgid "_Redo"
+msgstr "_Refacer"
+
+#: ui/evolution-event-editor.xml.h:121
+msgid "_Replace..."
+msgstr "_Substituír..."
+
+#: ui/evolution-event-editor.xml.h:123
+msgid "_Toolbars"
+msgstr "_Barras de ferramentas"
+
+#: ui/evolution-event-editor.xml.h:125
+msgid "_Undo"
+msgstr "_Desfacer"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
+#.
+#: ui/evolution-mail.xml.h:7
+msgid "Compose"
+msgstr "Redactar"
+
+#: ui/evolution-mail.xml.h:8
+msgid "Compose a new message"
+msgstr "Redactar unha nova mensaxe"
+
+#: ui/evolution-mail.xml.h:10
+msgid "Copy message to a new folder"
+msgstr "Copiar a mensaxe nunha nova carpeta"
+
+#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:9
+msgid "F_older"
+msgstr "_Carpeta"
+
+#: ui/evolution-mail.xml.h:14
+msgid "Fi_lter on Sender"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:15
+msgid "Filter on Rec_ipients"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:16
+msgid "Forget _Passwords"
+msgstr "Esquecer _Contrasinais"
+
+#: ui/evolution-mail.xml.h:19
+msgid "Get Mail"
+msgstr "Recibir Correo"
+
+#: ui/evolution-mail.xml.h:20
+msgid "Mail _Filters..."
+msgstr "_Filtros de Correo..."
+
+#: ui/evolution-mail.xml.h:21
+msgid "Manage Subscriptions..."
+msgstr ""
+
+#: ui/evolution-mail.xml.h:22
+msgid "Mar_k As Read"
+msgstr "Marcar como _Lida"
+
+#: ui/evolution-mail.xml.h:23
+msgid "Mark As U_nread"
+msgstr "Marcar como _non Lida"
+
+#: ui/evolution-mail.xml.h:24
+msgid "Move"
+msgstr "Mover"
+
+#: ui/evolution-mail.xml.h:25
+msgid "Move message to a new folder"
+msgstr "Mover mensaxe a unha nova carpeta"
+
+#: ui/evolution-mail.xml.h:26
+msgid "Previews the message to be printed"
+msgstr "Previsualiza a mensaxe que se vai imprimir"
+
+#: ui/evolution-mail.xml.h:28
+msgid "Print Preview of message..."
+msgstr "Previsualización da Impresión da mensaxe..."
+
+#: ui/evolution-mail.xml.h:29
+msgid "Print message to the printer"
+msgstr "Imprimir mensaxe na impresora"
+
+#: ui/evolution-mail.xml.h:30
+msgid "Print message..."
+msgstr "Imprimir mensaxe..."
+
+#: ui/evolution-mail.xml.h:34
+msgid "Reply to _All"
+msgstr "Responder a _Todos"
+
+#: ui/evolution-mail.xml.h:35
+msgid "Reply to _Sender"
+msgstr "Responder ó _Autor"
+
+#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:13
+msgid "Select _All"
+msgstr "Seleccionar _Todo"
+
+#: ui/evolution-mail.xml.h:39
+msgid "Send queued mail and retrieve new mail"
+msgstr "Enviar o correo na cola e recibir o correo novo"
+
+#: ui/evolution-mail.xml.h:40
+msgid "Threaded Message list"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:41
+msgid "VFolder on Se_nder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:42
+msgid "VFolder on _Recipients"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:43
+msgid "_Apply Filters"
+msgstr "_Aplicar Filtros"
+
+#: ui/evolution-mail.xml.h:44
+msgid "_Configure Folder"
+msgstr "_Configurar Carpeta"
+
+#: ui/evolution-mail.xml.h:45
+msgid "_Copy to Folder"
+msgstr "_Copiar á Carpeta"
+
+#: ui/evolution-mail.xml.h:47
+msgid "_Edit Message"
+msgstr "_Editar Mensaxe"
+
+#: ui/evolution-mail.xml.h:48
+msgid "_Expunge"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:49
+msgid "_Filter on Subject"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:50
+msgid "_Forward"
+msgstr "_Reenviar"
+
+#: ui/evolution-mail.xml.h:51 ui/evolution-subscribe.xml.h:18
+msgid "_Invert Selection"
+msgstr "_Inverter Selección"
+
+#: ui/evolution-mail.xml.h:52
+msgid "_Mail Configuration..."
+msgstr "Configuración do _Correo..."
+
+#: ui/evolution-mail.xml.h:53
+msgid "_Message"
+msgstr "_Mensaxe"
+
+#: ui/evolution-mail.xml.h:54
+msgid "_Move to Folder"
+msgstr "_Mover para a Carpeta"
+
+#: ui/evolution-mail.xml.h:55
+msgid "_Open in New Window"
+msgstr "_Abrir nunha Nova Fiestra"
+
+#: ui/evolution-mail.xml.h:56
+msgid "_Print Message"
+msgstr "_Imprimir Mensaxe"
+
+#: ui/evolution-mail.xml.h:57
+msgid "_Threaded"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:58
+msgid "_VFolder on Subject"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:59
+msgid "_Virtual Folder Editor..."
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
+#.
+#: ui/evolution-subscribe.xml.h:7
+msgid "Add folder to your list of subscribed folders"
+msgstr "Engadir a carpeta á súa lista de carpetas subscritas"
+
+#: ui/evolution-subscribe.xml.h:10
+msgid "Refresh List"
+msgstr "Actualizar Lista"
+
+#: ui/evolution-subscribe.xml.h:11
+msgid "Refresh List of Folders"
+msgstr "Actualizar Lista de Carpetas"
+
+#: ui/evolution-subscribe.xml.h:12
+msgid "Remove folder from your list of subscribed folders"
+msgstr "Eliminar a carpeta da súa lista de carpetas subscritas"
+
+#: ui/evolution-subscribe.xml.h:14
+msgid "Subscribe"
+msgstr "Subscribir"
+
+#: ui/evolution-subscribe.xml.h:15
+msgid "Unsubscribe"
+msgstr "Desubscribir"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
+#.
+#: ui/evolution.xml.h:7
+msgid "Create a new folder"
+msgstr "Crear unha nova carpeta"
+
+#: ui/evolution.xml.h:8
+msgid "Display a different folder"
+msgstr "Visualizar unha carpeta diferente"
+
+#: ui/evolution.xml.h:9
+msgid "E_xit"
+msgstr "_Saír"
+
+#: ui/evolution.xml.h:10
+msgid "Evolution bar _shortcut"
+msgstr "_Atallo da barra do Evolution"
+
+#: ui/evolution.xml.h:11
+msgid "Exit the program"
+msgstr "Saír do programa"
+
+#: ui/evolution.xml.h:12
+msgid "Getting _Started"
+msgstr "_Iniciación"
+
+#: ui/evolution.xml.h:13
+msgid "Show information about Evolution"
+msgstr "Amosar información sobre o Evolution"
+
+#: ui/evolution.xml.h:14
+msgid "Show the _Folder Bar"
+msgstr "Amosar a Barra de _Carpetas"
+
+#: ui/evolution.xml.h:15
+msgid "Show the _Shortcut Bar"
+msgstr "Amosar a Barra de _Atallos"
+
+#: ui/evolution.xml.h:16
+msgid "Submit bug report using Bug Buddy"
+msgstr "Enviar un informe de erro usando o Bug Buddy"
+
+#: ui/evolution.xml.h:17
+msgid "Toggle whether to show the folder bar"
+msgstr ""
+
+#: ui/evolution.xml.h:18
+msgid "Toggle whether to show the shortcut bar"
+msgstr ""
+
+#: ui/evolution.xml.h:19
+msgid "Using the C_ontact Manager"
+msgstr "Uso do Xestor de Co_ntactos"
+
+#: ui/evolution.xml.h:20
+msgid "Using the _Calendar"
+msgstr "Uso da _Axenda"
+
+#: ui/evolution.xml.h:21
+msgid "Using the _Mailer"
+msgstr "Uso do Cliente de _Correo"
+
+#: ui/evolution.xml.h:22
+msgid "_About Evolution..."
+msgstr "_Acerca do Evolution..."
+
+#: ui/evolution.xml.h:23
+msgid "_Appointment (FIXME)"
+msgstr "_Cita (FIXME)"
+
+#: ui/evolution.xml.h:24
+msgid "_Contact (FIXME)"
+msgstr "_Contacto (FIXME)"
+
+#: ui/evolution.xml.h:25
+msgid "_Create New Folder..."
+msgstr "_Crear unha Nova Carpeta..."
+
+#: ui/evolution.xml.h:28
+msgid "_Folder"
+msgstr "_Carpeta"
+
+#: ui/evolution.xml.h:29
+msgid "_Go to Folder..."
+msgstr "_Ir para a Carpeta..."
+
+#: ui/evolution.xml.h:31
+msgid "_Index"
+msgstr "Í_ndice"
+
+#: ui/evolution.xml.h:32
+msgid "_Mail message (FIXME)"
+msgstr ""
+
+#: ui/evolution.xml.h:34
+msgid "_Settings"
+msgstr "_Configuración"
+
+#: ui/evolution.xml.h:35
+msgid "_Submit Bug Report"
+msgstr "_Enviar un Informe de Erro"
+
+#: ui/evolution.xml.h:36
+msgid "_Task (FIXME)"
+msgstr "_Tarefa (FIXME)"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr ""
@@ -4430,27 +6823,27 @@ msgstr ">_>"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:539
 msgid "_All People and Resources"
-msgstr ""
+msgstr "_Tódalas Persoas e Recursos"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:552
 msgid "All _People and One Resource"
-msgstr ""
+msgstr "Tódalas _Persoas e Un Recurso"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:565
 msgid "_Required People"
-msgstr ""
+msgstr "Persoas _Requiridas"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:578
 msgid "Required People and _One Resource"
-msgstr ""
+msgstr "Persoas Requiridas e _Un Recurso"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:601
 msgid "Meeting _start time:"
-msgstr "Hora de _comezo da reunión:"
+msgstr "Hora do _inicio da reunión:"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:625
 msgid "Meeting _end time:"
-msgstr "Hora de _remate da reunión:"
+msgstr "Hora do _final da reunión:"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:738
 msgid "All Attendees"
@@ -4458,45 +6851,38 @@ msgstr ""
 
 #. 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:2468
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#. 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:415
-msgid "MTWTFSS"
-msgstr "LMMXVSD"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1039 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
 msgstr "%B de %Y"
 
-#: widgets/misc/e-clipped-label.c:106
+#: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:320
-msgid "Now"
-msgstr "Agora"
-
-#: widgets/misc/e-dateedit.c:326
-msgid "Today"
-msgstr "Hoxe"
-
-#. This is a strptime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:636 widgets/misc/e-dateedit.c:726
-#: widgets/misc/e-dateedit.c:983
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:234 widgets/misc/e-dateedit.c:673
+#: widgets/misc/e-dateedit.c:766 widgets/misc/e-dateedit.c:811
+#: widgets/misc/e-dateedit.c:1127
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. This is a strptime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:639 widgets/misc/e-dateedit.c:729
-#: widgets/misc/e-dateedit.c:986
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:237 widgets/misc/e-dateedit.c:676
+#: widgets/misc/e-dateedit.c:769 widgets/misc/e-dateedit.c:814
+#: widgets/misc/e-dateedit.c:1130
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
+#: widgets/misc/e-dateedit.c:359
+msgid "Now"
+msgstr "Agora"
+
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
author	Jesus Bravo Alvarez <jesusb@src.gnome.org>	2000-11-06 02:40:43 +0800
committer	Jesus Bravo Alvarez <jesusb@src.gnome.org>	2000-11-06 02:40:43 +0800
commit	2e53ea5326b120e26d3e062897b955d95988ff4f (patch)
tree	48ba1bbff9af57a72179b9c3333e3ff6d090b0c1 /po/gl.po
parent	781040666b66f5b772b73df7384e053802545ef6 (diff)
download	gsoc2013-evolution-2e53ea5326b120e26d3e062897b955d95988ff4f.tar gsoc2013-evolution-2e53ea5326b120e26d3e062897b955d95988ff4f.tar.gz gsoc2013-evolution-2e53ea5326b120e26d3e062897b955d95988ff4f.tar.bz2 gsoc2013-evolution-2e53ea5326b120e26d3e062897b955d95988ff4f.tar.lz gsoc2013-evolution-2e53ea5326b120e26d3e062897b955d95988ff4f.tar.xz gsoc2013-evolution-2e53ea5326b120e26d3e062897b955d95988ff4f.tar.zst gsoc2013-evolution-2e53ea5326b120e26d3e062897b955d95988ff4f.zip