Added Azeri language file

fixed various po files fixed a no-c-format tag svn path=/trunk/; revision=8733
author: Pablo Saratxaga <pablo@src.gnome.org> 2001-03-15 18:42:18 +0800
committer: Pablo Saratxaga <pablo@src.gnome.org> 2001-03-15 18:42:18 +0800
commit: 9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7 (patch)
tree: 957874003612aaafdb3b6bdbc748c99979eb0715 /po/gl.po
parent: ed1060cbfb536be02c0122135d66b71c3f5fb228 (diff)
download: gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar
gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.gz
gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.bz2
gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.lz
gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.xz
gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.zst
gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.zip
1 files changed, 5491 insertions, 2928 deletions
diff --git a/po/gl.po b/po/gl.po
index 0f0b916bc1..aae4a510ce 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,11 +7,10 @@
 #
 # First Version: 2000-04-07 22:14+0200
 #
-#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-01-17 18:47-0500\n"
+"POT-Creation-Date: 2001-03-15 11:05+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"
@@ -19,183 +18,11 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Non se pode inicializar o compoñente de correo de Evolution."
-
-#: 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:1090
-#: addressbook/gui/component/addressbook-factory.c:38
-#: addressbook/gui/widgets/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "Non foi posible inicializar Bonobo"
-
-#: addressbook/gui/widgets/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/widgets/test-minicard-view.c:101
-#, fuzzy
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: addressbook/gui/widgets/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-provider.c:36
-msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
-msgstr ""
-
-#: camel/providers/vee/camel-vee-folder.c:604
-#, fuzzy, c-format
-msgid "No such message: %s"
-msgstr "Re-enviar esta mensaxe"
-
-#: executive-summary/component/e-summary-callbacks.c:267
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:62
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:63
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Recibindo correo de %s"
-
-#: executive-summary/component/e-summary-url.c:64
-#, c-format
-msgid "Change the view to %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:65
-#, c-format
-msgid "Run %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:67
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Pechar"
-
-#: executive-summary/component/e-summary-url.c:68
-#, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Mover para a Carpeta"
-
-#: executive-summary/component/e-summary-url.c:69
-#, c-format
-msgid "Move %s to the right"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:70
-#, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "Ir ó elemento anterior"
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "Ir ó elemento seguinte"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "_Configurar Carpeta"
-
-#: executive-summary/component/e-summary.c:919
-#, fuzzy, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Non foi posible abrir o ficheiro %s:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:933
-#, fuzzy, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr "Erro lendo o ficheiro de correo: %s"
-
-#: executive-summary/component/e-summary.c:951
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
-#: executive-summary/component/main.c:59
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/rdf-summary.c:443
-#: executive-summary/test-service/rdf-summary.c:479
-#: executive-summary/test-service/rdf-summary.c:524
-#, fuzzy
-msgid "Error"
-msgstr "Sen erro"
-
-#: mail/mail-config.c:799
-msgid "Connecting to server"
-msgstr ""
-
-#: mail/mail-config.c:801
-#, fuzzy
-msgid "Connect to server"
-msgstr "Non foi posible conectarse ó servidor POP en %s."
-
-#: notes/component-factory.c:27
-msgid "New"
-msgstr "Novo"
-
-#: notes/component-factory.c:27
-#, fuzzy
-msgid "Create a new note"
-msgstr "Crear un novo contacto"
-
-#: notes/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Non se pode inicializar o compoñente de correo de Evolution."
-
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Non foi posible inicializar Bonobo"
-
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3053
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "Name: "
@@ -203,7 +30,7 @@ msgstr ""
 "\n"
 "Nome: "
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Prefix:     "
@@ -211,25 +38,25 @@ msgstr ""
 "\n"
 "  Prefixo:    "
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3057
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3054
+#: addressbook/backend/ebook/e-card.c:3058
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3059
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3060
 msgid ""
 "\n"
 "  Suffix:     "
@@ -237,7 +64,7 @@ msgstr ""
 "\n"
 "  Sufixo:     "
 
-#: addressbook/backend/ebook/e-card.c:3070
+#: addressbook/backend/ebook/e-card.c:3074
 msgid ""
 "\n"
 "Birth Date: "
@@ -245,7 +72,7 @@ msgstr ""
 "\n"
 "Data de Nacemento: "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "Address:"
@@ -253,7 +80,7 @@ msgstr ""
 "\n"
 "Enderezo:"
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -261,13 +88,13 @@ msgstr ""
 "\n"
 "  Apdo. de Correos: "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Street:      "
@@ -275,7 +102,7 @@ msgstr ""
 "\n"
 "  Rúa:         "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3090
 msgid ""
 "\n"
 "  City:        "
@@ -283,7 +110,7 @@ msgstr ""
 "\n"
 "  Cidade:      "
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3091
 msgid ""
 "\n"
 "  Region:      "
@@ -291,7 +118,7 @@ msgstr ""
 "\n"
 "  Rexión:      "
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3092
 msgid ""
 "\n"
 "  Postal Code: "
@@ -299,7 +126,7 @@ msgstr ""
 "\n"
 "  Código Postal: "
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3093
 msgid ""
 "\n"
 "  Country:     "
@@ -307,13 +134,13 @@ msgstr ""
 "\n"
 "  País:        "
 
-#: addressbook/backend/ebook/e-card.c:3102
+#: addressbook/backend/ebook/e-card.c:3106
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3118
 msgid ""
 "\n"
 "Telephones:\n"
@@ -321,7 +148,7 @@ msgstr ""
 "\n"
 "Teléfonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3117
+#: addressbook/backend/ebook/e-card.c:3121
 msgid ""
 "\n"
 "Telephone:"
@@ -329,7 +156,7 @@ msgstr ""
 "\n"
 "Teléfono:"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3145
 msgid ""
 "\n"
 "E-mail:\n"
@@ -337,7 +164,7 @@ msgstr ""
 "\n"
 "Correo Electrónico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3144
+#: addressbook/backend/ebook/e-card.c:3148
 msgid ""
 "\n"
 "E-mail:"
@@ -345,13 +172,13 @@ msgstr ""
 "\n"
 "Correo Electrónico:"
 
-#: addressbook/backend/ebook/e-card.c:3163
+#: addressbook/backend/ebook/e-card.c:3167
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3169
+#: addressbook/backend/ebook/e-card.c:3173
 msgid ""
 "\n"
 "Time Zone: "
@@ -359,25 +186,25 @@ msgstr ""
 "\n"
 "Zona Horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3177
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3185
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Name:  "
@@ -385,31 +212,31 @@ msgstr ""
 "\n"
 "  Nome:  "
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3199
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3196
+#: addressbook/backend/ebook/e-card.c:3200
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3201
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3206
 msgid ""
 "\n"
 "Categories: "
@@ -417,7 +244,7 @@ msgstr ""
 "\n"
 "Categorías: "
 
-#: addressbook/backend/ebook/e-card.c:3203
+#: addressbook/backend/ebook/e-card.c:3207
 msgid ""
 "\n"
 "Comment: "
@@ -435,13 +262,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3220
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3219
+#: addressbook/backend/ebook/e-card.c:3223
 msgid ""
 "\n"
 "Public Key: "
@@ -449,126 +276,25 @@ msgstr ""
 "\n"
 "Clave Pública: "
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: 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: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: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: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: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: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: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:127
-msgid "Evolution Addressbook Conduit"
-msgstr "Conducto de Libro de Enderezos de Evolution"
-
-#: 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/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
+msgid "Factory to import GnomeCard files into Evolution."
+msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:130
-msgid "Configuration utility for the evolution addressbook conduit.\n"
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
+msgid "Imports GnomeCard files into Evolution."
 msgstr ""
-"Utilidade de configuración para o conducto de libro de enderezos de "
-"evolution.\n"
 
-#: 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: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: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: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 ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-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: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: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 ó obter a lista de\n"
-"pilots do demo gnome-pilot"
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
+#: addressbook/backend/ebook/load-pine-addressbook.c:17
+#: addressbook/backend/ebook/test-client-list.c:18
+#: addressbook/backend/ebook/test-client.c:29
+#: addressbook/conduit/address-conduit.c:1089
+#: addressbook/gui/component/addressbook-factory.c:39
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:965
+#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
+msgid "Could not initialize Bonobo"
+msgstr "Non foi posible inicializar Bonobo"
 
 #: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
@@ -578,353 +304,437 @@ msgstr "Non foi posible cargar o cursor\n"
 msgid "EBook not loaded\n"
 msgstr "EBook non cargado\n"
 
-#: addressbook/conduit/address-conduit.c:653
-#: calendar/conduits/calendar/calendar-conduit.c:729
-#: calendar/conduits/todo/todo-conduit.c:544
+#: addressbook/conduit/address-conduit.c:651
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Non foi posible iniciar o servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:652
+#: calendar/conduits/calendar/calendar-conduit.c:732
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Non foi posible iniciar wombat"
 
-#: addressbook/conduit/address-conduit.c:686
-#: addressbook/conduit/address-conduit.c:689
+#: addressbook/conduit/address-conduit.c:684
+#: addressbook/conduit/address-conduit.c:687
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
-msgstr "_Engadir"
+#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:1
+#: calendar/gui/e-meeting-dialog.glade.h:1
+#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
+#: mail/mail-config.glade.h:4
+msgid "Add"
+msgstr "Engadir"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
-msgid "_Delete"
-msgstr "_Borrar"
+#: addressbook/contact-editor/contact-editor.glade.h:2
+msgid "Anni_versary:"
+msgstr "Ani_versario:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "Tipos de Teléfono"
+#: addressbook/contact-editor/contact-editor.glade.h:3
+msgid "B_usiness"
+msgstr "T_raballo"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "Novo tipo de teléfono"
+#: addressbook/contact-editor/contact-editor.glade.h:4
+msgid "Business _Fax"
+msgstr "_Fax do Traballo"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-msgid "Add"
-msgstr "Engadir"
+#: addressbook/contact-editor/contact-editor.glade.h:5
+msgid "C_ontacts..."
+msgstr "C_ontactos..."
+
+#: addressbook/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
+#: calendar/gui/event-editor-dialog.glade.h:5
+msgid "Ca_tegories..."
+msgstr "Ca_tegorías..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
+#: addressbook/contact-editor/contact-editor.glade.h:7
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "Nome _Completo..."
+#: addressbook/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+msgid "Details"
+msgstr "Detalles"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
+#: addressbook/contact-editor/contact-editor.glade.h:9
 msgid "File As:"
 msgstr "Arquivar Como:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "Enderezo da páxina Web:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
-msgid "Wants to receive _HTML mail"
-msgstr "Quere recibir correo _HTML"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr "_Traballo"
+#: addressbook/contact-editor/contact-editor.glade.h:10
+#: executive-summary/component/executive-summary-config.glade.h:3
+#: mail/mail-config.glade.h:27
+msgid "General"
+msgstr "Xeral"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "_Particular"
+#: addressbook/contact-editor/contact-editor.glade.h:11
+msgid "New phone type"
+msgstr "Novo tipo de teléfono"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr "_Fax do Traballo"
+#: addressbook/contact-editor/contact-editor.glade.h:12
+msgid "No_tes:"
+msgstr "No_tas:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "_Móbil"
+#: addressbook/contact-editor/contact-editor.glade.h:13
+msgid "Phone Types"
+msgstr "Tipos de Teléfono"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
+#: addressbook/contact-editor/contact-editor.glade.h:14
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Primary Email"
 msgstr "Correo Electrónico Principal"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
-msgstr "T_raballo"
+#: addressbook/contact-editor/contact-editor.glade.h:15
+msgid "Wants to receive _HTML mail"
+msgstr "Quere recibir correo _HTML"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr "_Este é o enderezo da lista de correo"
+#: addressbook/contact-editor/contact-editor.glade.h:16
+msgid "Web page address:"
+msgstr "Enderezo da páxina Web:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr "C_ontactos..."
+#: addressbook/contact-editor/contact-editor.glade.h:17
+#: mail/mail-config.glade.h:80
+msgid "_Add"
+msgstr "_Engadir"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-msgid "Ca_tegories..."
-msgstr "Ca_tegorías..."
+#: addressbook/contact-editor/contact-editor.glade.h:18
+msgid "_Address..."
+msgstr "_Enderezo..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-msgid "_Job title:"
-msgstr "_Posto:"
+#: addressbook/contact-editor/contact-editor.glade.h:19
+msgid "_Assistant's name:"
+msgstr "Nome do _Asistente:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/contact-editor/contact-editor.glade.h:20
+msgid "_Birthday:"
+msgstr "Cu_mpreanos:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:21
+msgid "_Business"
+msgstr "_Traballo"
+
+#: addressbook/contact-editor/contact-editor.glade.h:22
 msgid "_Company:"
 msgstr "_Compañía:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "_Enderezo..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-msgid "General"
-msgstr "Xeral"
+#: addressbook/contact-editor/contact-editor.glade.h:23
+#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
+msgid "_Delete"
+msgstr "_Borrar"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
+#: addressbook/contact-editor/contact-editor.glade.h:24
 msgid "_Department:"
 msgstr "_Departamento:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
+#: addressbook/contact-editor/contact-editor.glade.h:25
+msgid "_Full Name..."
+msgstr "Nome _Completo..."
+
+#: addressbook/contact-editor/contact-editor.glade.h:26
+msgid "_Home"
+msgstr "_Particular"
+
+#: addressbook/contact-editor/contact-editor.glade.h:27
+msgid "_Job title:"
+msgstr "_Posto:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:28
+msgid "_Manager's Name:"
+msgstr ""
+
+#: addressbook/contact-editor/contact-editor.glade.h:29
+msgid "_Mobile"
+msgstr "_Móbil"
+
+#: addressbook/contact-editor/contact-editor.glade.h:30
+msgid "_Nickname:"
+msgstr "_Sobrenome:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:31
 msgid "_Office:"
 msgstr "_Oficina:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
+#: addressbook/contact-editor/contact-editor.glade.h:32
 msgid "_Profession:"
 msgstr "_Profesión:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr "_Sobrenome:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
+#: addressbook/contact-editor/contact-editor.glade.h:33
 msgid "_Spouse:"
 msgstr "_Cónxuxe:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "Cu_mpreanos:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr "Nome do _Asistente:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr "Ani_versario:"
+#: addressbook/contact-editor/contact-editor.glade.h:34
+msgid "_This is the mailing address"
+msgstr "_Este é o enderezo da lista de correo"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr "No_tas:"
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "¿Borrar Contacto?"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-msgid "Details"
-msgstr "Detalles"
+#: addressbook/contact-editor/e-contact-editor.c:590
+#, fuzzy
+msgid "This contact belongs to these categories:"
+msgstr "Elemento(s) pertencentes a estas categorías:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Assistant"
 msgstr "Asistente"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1297
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business"
 msgstr "Traballo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Business 2"
 msgstr "Traballo 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/contact-editor/e-contact-editor.c:1232
+#: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Business Fax"
 msgstr "Fax do Traballo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Car"
 msgstr "Automóbil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Company"
 msgstr "Compañía"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
+#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1298
+#: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Home 2"
 msgstr "Particular 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/contact-editor/e-contact-editor.c:1238
+#: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Home Fax"
 msgstr "Fax Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/contact-editor/e-contact-editor.c:1239
+#: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/contact-editor/e-contact-editor.c:1240
+#: addressbook/gui/widgets/e-addressbook-view.c:584
 msgid "Mobile"
 msgstr "Móbil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/contact-editor/e-contact-editor.c:1241
+#: addressbook/contact-editor/e-contact-editor.c:1299
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/contact-editor/e-contact-editor.c:1242
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Pager"
 msgstr "Localizador (Pager)"
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
+#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Primary"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:1245
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Email 2"
 msgstr "Correo Electrónico 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Email 3"
 msgstr "Correo Electrónico 3"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
+#: addressbook/contact-editor/e-contact-quick-add.c:214
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-quick-add.c:216
+#, fuzzy
+msgid "Edit Full"
+msgstr "Editar Filtros"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:253
+#, fuzzy
+msgid "Full Name"
+msgstr "Nome Completo:"
+
+#: addressbook/contact-editor/e-contact-quick-add.c:259
+#, fuzzy
+msgid "E-mail"
+msgstr "Correo Electrónico 2"
+
+#: addressbook/contact-editor/fulladdr.glade.h:1
+msgid "Address _2:"
+msgstr "Enderezo _2:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:2
+msgid "Canada"
+msgstr "Canadá"
+
+#: addressbook/contact-editor/fulladdr.glade.h:3
+#, fuzzy
+msgid "Check Address"
+msgstr "Enderezo"
+
+#: addressbook/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
+msgstr "_País:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:5
+msgid "Finland"
+msgstr "Finlandia"
+
+#: addressbook/contact-editor/fulladdr.glade.h:6
+msgid "USA"
+msgstr "Estados Unidos"
+
+#: addressbook/contact-editor/fulladdr.glade.h:7
+msgid "_Address:"
+msgstr "_Enderezo:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:8
+msgid "_City:"
+msgstr "_Cidade:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:9
+msgid "_PO Box:"
+msgstr "_Apdo. de Correos:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:10
+msgid "_State/Province:"
+msgstr "E_stado/Provincia:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:11
+msgid "_ZIP Code:"
+msgstr "Código _Postal:"
+
+#: addressbook/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:8
+#: addressbook/contact-editor/fullname.glade.h:2
+msgid "Dr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:3
+msgid "Esq."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:4
 #, fuzzy
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
+msgid "I"
+msgstr "Se"
+
+#: addressbook/contact-editor/fullname.glade.h:5
+msgid "II"
 msgstr ""
-"\n"
-"Sr.\n"
-"Sra.\n"
-"Srta.\n"
-"D.\n"
-"Dª.\n"
-"Dr.\n"
-"Dra.\n"
-"Prof.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
+#: addressbook/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:8
+#, fuzzy
+msgid "Miss"
+msgstr "é"
+
+#: addressbook/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr ""
+
+#: addressbook/contact-editor/fullname.glade.h:12
+msgid "Sr."
 msgstr ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_Nome:"
 
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr "_Tratamento:"
+#: addressbook/contact-editor/fullname.glade.h:14
+msgid "_Last:"
+msgstr "_Apelidos:"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_Outros nomes:"
 
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr "_Apelidos:"
-
-#: addressbook/contact-editor/fullname-strings.h:27
+#: addressbook/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_Sufixo:"
 
-#: addressbook/gui/component/addressbook.c:231
+#: addressbook/contact-editor/fullname.glade.h:17
+msgid "_Title:"
+msgstr "_Tratamento:"
+
+#: addressbook/gui/component/addressbook.c:237
 msgid "As _Minicards"
 msgstr "Como _Minitarxetas"
 
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:243
+#: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Como unha _Táboa"
 
-#: addressbook/gui/component/addressbook.c:374
+#: addressbook/gui/component/addressbook.c:412
 #, fuzzy, c-format
 msgid "Enter password for %s"
 msgstr "Introduza o contrasinal NNTP para %s@%s"
 
-#: addressbook/gui/component/addressbook.c:402
+#: addressbook/gui/component/addressbook.c:440
 msgid "Unable to open addressbook"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook.c:407
+#: addressbook/gui/component/addressbook.c:445
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -936,31 +746,31 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:568
 #, fuzzy
 msgid "Show All"
 msgstr "Ver Todos"
 
-#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
+#: addressbook/gui/component/addressbook.c:570
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:600
 #, fuzzy
 msgid "Any field contains"
 msgstr "O corpo contén"
 
-#: addressbook/gui/component/addressbook.c:563
+#: addressbook/gui/component/addressbook.c:601
 #, fuzzy
 msgid "Name contains"
 msgstr "contén"
 
-#: addressbook/gui/component/addressbook.c:564
+#: addressbook/gui/component/addressbook.c:602
 #, fuzzy
 msgid "Email contains"
 msgstr "contén"
 
-#: addressbook/gui/component/addressbook.c:707
+#: addressbook/gui/component/addressbook.c:745
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que amosará o navegador de carpetas"
 
@@ -969,200 +779,470 @@ msgstr "O URI que amosará o navegador de carpetas"
 msgid "Other Contacts"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/addressbook-config.c:139
+#: addressbook/gui/component/addressbook-config.c:143
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Servidor LDAP:"
 
-#: addressbook/gui/component/addressbook-config.c:141
+#: addressbook/gui/component/addressbook-config.c:145
 #, fuzzy
 msgid "File"
 msgstr "_Ficheiro"
 
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/component/addressbook-config.c:148
 #, fuzzy
 msgid "Unknown addressbook type"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook-config.c:153
+#: addressbook/gui/component/addressbook-config.c:158
 msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:249
+#: addressbook/gui/component/addressbook-config.c:160
+#: camel/providers/imap/camel-imap-store.c:261
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
+#: camel/providers/pop3/camel-pop3-store.c:145
 msgid "Password"
 msgstr "Contrasinal"
 
-#: addressbook/gui/component/addressbook-config.c:157
+#: addressbook/gui/component/addressbook-config.c:162
 msgid "SASL"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
+#: addressbook/gui/component/addressbook-config.c:165
 #, fuzzy
 msgid "Unknown auth type"
 msgstr "Erro descoñecido"
 
-#: addressbook/gui/component/addressbook-config.c:169
+#: addressbook/gui/component/addressbook-config.c:174
 #, fuzzy
 msgid "Base"
 msgstr "Pegar"
 
-#: addressbook/gui/component/addressbook-config.c:171
+#: addressbook/gui/component/addressbook-config.c:176
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:173
+#: addressbook/gui/component/addressbook-config.c:178
 #, fuzzy
 msgid "Subtree"
 msgstr "Subscribir"
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:309
+#: addressbook/gui/component/addressbook-config.c:348
 msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:311
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:351
 msgid "Remember this password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:360
+#: addressbook/gui/component/addressbook-config.c:401
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Host:"
 msgstr "Horas"
 
-#: addressbook/gui/component/addressbook-config.c:361
+#: addressbook/gui/component/addressbook-config.c:402
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:404
 #, fuzzy
 msgid "Port:"
 msgstr "Prioridade:"
 
-#: addressbook/gui/component/addressbook-config.c:364
+#: addressbook/gui/component/addressbook-config.c:405
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:409
 msgid "Root DN:"
 msgstr "DN Raíz:"
 
-#: addressbook/gui/component/addressbook-config.c:384
+#: addressbook/gui/component/addressbook-config.c:410
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:430
 #, fuzzy
 msgid "Search Scope:"
 msgstr "Buscar"
 
-#: addressbook/gui/component/addressbook-config.c:438
+#: addressbook/gui/component/addressbook-config.c:484
+#: mail/mail-config.glade.h:8
 msgid "Authentication:"
 msgstr "Autenticación:"
 
-#: addressbook/gui/component/addressbook-config.c:455
+#: addressbook/gui/component/addressbook-config.c:502
+#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
 msgid "Path:"
 msgstr "Camiño:"
 
-#: addressbook/gui/component/addressbook-config.c:460
+#: addressbook/gui/component/addressbook-config.c:503
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:508
 #, fuzzy
 msgid "Create path if it doesn't exist."
 msgstr "O ficheiro non existe."
 
-#: addressbook/gui/component/addressbook-config.c:593
+#: addressbook/gui/component/addressbook-config.c:642
 #, fuzzy
 msgid "Edit Addressbook"
 msgstr "Gardar no libro de enderezos"
 
-#: addressbook/gui/component/addressbook-config.c:595
+#: addressbook/gui/component/addressbook-config.c:644
 #, fuzzy
 msgid "Add Addressbook"
 msgstr "Gardar no libro de enderezos"
 
-#: addressbook/gui/component/addressbook-config.c:611
+#: addressbook/gui/component/addressbook-config.c:660
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:616
+#: addressbook/gui/component/addressbook-config.c:666
+#: mail/mail-config.glade.h:41
 msgid "Name:"
 msgstr "Nome:"
 
-#: addressbook/gui/component/addressbook-config.c:617
+#: addressbook/gui/component/addressbook-config.c:667
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:669
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "Description:"
 msgstr "Descrición:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
+#: addressbook/gui/component/addressbook-config.c:670
+msgid "FIXME Description help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Engadir Fonte"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+#: calendar/gui/e-meeting-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
+#: mail/mail-config.glade.h:20 mail/mail-view.c:150
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
+#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
+msgid "Delete"
+msgstr "Eliminar"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
+#: mail/mail-config.glade.h:22
+msgid "Edit"
+msgstr "Editar"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/widgets/e-addressbook-view.c:578
+#, fuzzy
+msgid "Name"
+msgstr "Nome:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#, fuzzy
+msgid "URI"
+msgstr "URL:"
+
+#: addressbook/gui/component/e-address-widget.c:259
+#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#, fuzzy
+msgid "Add to Contacts"
+msgstr "_Novo Contacto"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#, fuzzy
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+"Utilidade de configuración para o conducto de libro de enderezos de "
+"evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Conducto de Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Evolution component for handling contacts."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "Prema aquí para o libro de enderezos"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#, fuzzy
+msgid "Evolution's addressbook name selection interface."
+msgstr "Conducto de Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:121
+#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+msgid "Remove"
+msgstr "Quitar"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#, fuzzy
+msgid "Remove All"
+msgstr "Quitar"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:200
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Find..."
+msgstr "Buscar..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+#, fuzzy
+msgid "Message Recipients"
+msgstr "Destinatarios"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select Names"
+msgstr "Seleccionar un nome da Lista:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "Select name from:"
+msgstr "Seleccionar un nome da Lista:"
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:150
 msgid "Search"
 msgstr "Buscar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
+#: addressbook/gui/widgets/alphabet.glade.h:1
+msgid "123"
+msgstr "123"
+
+#: addressbook/gui/widgets/alphabet.glade.h:2
+msgid "a"
+msgstr "a"
+
+#: addressbook/gui/widgets/alphabet.glade.h:3
+msgid "b"
+msgstr "b"
+
+#: addressbook/gui/widgets/alphabet.glade.h:4
+msgid "c"
+msgstr "c"
+
+#: addressbook/gui/widgets/alphabet.glade.h:5
+msgid "d"
+msgstr "d"
+
+#: addressbook/gui/widgets/alphabet.glade.h:6
+msgid "e"
+msgstr "e"
+
+#: addressbook/gui/widgets/alphabet.glade.h:7
+msgid "f"
+msgstr "f"
+
+#: addressbook/gui/widgets/alphabet.glade.h:8
+msgid "g"
+msgstr "g"
+
+#: addressbook/gui/widgets/alphabet.glade.h:9
+msgid "h"
+msgstr "h"
+
+#: addressbook/gui/widgets/alphabet.glade.h:10
+msgid "i"
+msgstr "i"
+
+#: addressbook/gui/widgets/alphabet.glade.h:11
+msgid "j"
+msgstr "j"
+
+#: addressbook/gui/widgets/alphabet.glade.h:12
+msgid "k"
+msgstr "k"
+
+#: addressbook/gui/widgets/alphabet.glade.h:13
+msgid "l"
+msgstr "l"
+
+#: addressbook/gui/widgets/alphabet.glade.h:14
+msgid "m"
+msgstr "m"
+
+#: addressbook/gui/widgets/alphabet.glade.h:15
+msgid "n"
+msgstr "n"
+
+#: addressbook/gui/widgets/alphabet.glade.h:16
+msgid "o"
+msgstr "o"
+
+#: addressbook/gui/widgets/alphabet.glade.h:17
+msgid "p"
+msgstr "p"
+
+#: addressbook/gui/widgets/alphabet.glade.h:18
+msgid "q"
+msgstr "q"
+
+#: addressbook/gui/widgets/alphabet.glade.h:19
+msgid "r"
+msgstr "r"
+
+#: addressbook/gui/widgets/alphabet.glade.h:20
+msgid "s"
+msgstr "s"
+
+#: addressbook/gui/widgets/alphabet.glade.h:21
+msgid "t"
+msgstr "t"
+
+#: addressbook/gui/widgets/alphabet.glade.h:22
+msgid "u"
+msgstr "u"
+
+#: addressbook/gui/widgets/alphabet.glade.h:23
+msgid "v"
+msgstr "v"
+
+#: addressbook/gui/widgets/alphabet.glade.h:24
+msgid "w"
+msgstr "w"
+
+#: addressbook/gui/widgets/alphabet.glade.h:25
+msgid "x"
+msgstr "x"
+
+#: addressbook/gui/widgets/alphabet.glade.h:26
+msgid "y"
+msgstr "y"
+
+#: addressbook/gui/widgets/alphabet.glade.h:27
+msgid "z"
+msgstr "z"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:481
+#: addressbook/gui/widgets/e-minicard.c:435
 msgid "Save as VCard"
 msgstr "Gardar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:565
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 #, fuzzy
-msgid "Name"
-msgstr "Nome:"
+msgid "* Click here to add a contact *"
+msgstr "<prema aquí para seleccionar unha data>"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:566
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 #, fuzzy
 msgid "Email"
 msgstr "Correo Electrónico 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 msgid "Organization"
 msgstr "Organización"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/gui/widgets/e-addressbook-view.c:595
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:596
 #, fuzzy
 msgid "Department"
 msgstr "_Departamento:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/gui/widgets/e-addressbook-view.c:597
 #, fuzzy
 msgid "Office"
 msgstr "_Oficina:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:598
 #, fuzzy
 msgid "Title"
 msgstr "_Tratamento:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/gui/widgets/e-addressbook-view.c:599
 #, fuzzy
 msgid "Profession"
 msgstr "_Profesión:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/gui/widgets/e-addressbook-view.c:600
 #, fuzzy
 msgid "Manager"
 msgstr "Localizador (Pager)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 #, fuzzy
 msgid "Nickname"
 msgstr "_Sobrenome:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 #, fuzzy
 msgid "Spouse"
 msgstr "_Cónxuxe:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:604
 #, fuzzy
 msgid "Note"
 msgstr "No_tas:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Free-busy URL"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.c:606
+#, fuzzy
+msgid "Click here to add a contact"
+msgstr "<prema aquí para seleccionar unha data>"
+
 #: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "Gardar no libro de enderezos"
 
-#: addressbook/gui/widgets/e-minicard-view.c:129
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -1176,129 +1256,314 @@ msgstr ""
 "\n"
 "Faga dobre clic aquí para crear un novo Contacto."
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
-msgid "Evolution Calendar Conduit"
-msgstr "Conducto de Axenda de Evolution"
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+msgid "Card View"
+msgstr ""
 
-#: 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"
+#: addressbook/printing/e-contact-print.glade.h:1
+msgid "10 pt. Tahoma"
+msgstr "10 ptos. Tahoma"
 
-#: calendar/conduits/calendar/calendar-conduit.c:685
-#: calendar/conduits/todo/todo-conduit.c:500
-msgid "Error while communicating with calendar server"
-msgstr "Erro comunicando co servidor de axenda"
+#: addressbook/printing/e-contact-print.glade.h:2
+msgid "8 pt. Tahoma"
+msgstr "8 ptos. Tahoma"
 
-#: calendar/conduits/calendar/calendar-conduit.c:784
-#: calendar/conduits/calendar/calendar-conduit.c:787
-msgid "Could not read pilot's Calendar application block"
+#: addressbook/printing/e-contact-print.glade.h:3
+msgid "Blank forms at end:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:127
-msgid "Evolution ToDo Conduit"
+#: addressbook/printing/e-contact-print.glade.h:4
+msgid "Body"
+msgstr "Corpo"
+
+#: addressbook/printing/e-contact-print.glade.h:5
+msgid "Bottom:"
+msgstr "Inferior:"
+
+#: addressbook/printing/e-contact-print.glade.h:6
+msgid "Dimensions:"
+msgstr "Dimensións:"
+
+#: addressbook/printing/e-contact-print.glade.h:7
+msgid "Font..."
+msgstr "Fonte..."
+
+#: addressbook/printing/e-contact-print.glade.h:8
+msgid "Fonts"
+msgstr "Fontes"
+
+#: addressbook/printing/e-contact-print.glade.h:9
+#, fuzzy
+msgid "Footer:"
+msgstr "Carpetas"
+
+#: addressbook/printing/e-contact-print.glade.h:10
+msgid "Format"
+msgstr "Formato"
+
+#: addressbook/printing/e-contact-print.glade.h:11
+#, fuzzy
+msgid "Header"
+msgstr "Autor"
+
+#: addressbook/printing/e-contact-print.glade.h:12
+msgid "Header/Footer"
 msgstr ""
 
-#: 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"
+#: addressbook/printing/e-contact-print.glade.h:13
+msgid "Headings"
+msgstr "Cabeceiras"
 
-#: calendar/conduits/todo/todo-conduit.c:599
-#: calendar/conduits/todo/todo-conduit.c:602
-msgid "Could not read pilot's ToDo application block"
+#: addressbook/printing/e-contact-print.glade.h:14
+msgid "Headings for each letter"
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
-#: calendar/gui/alarm-notify.c:940
-msgid "Reminder of your appointment at "
+#: addressbook/printing/e-contact-print.glade.h:15
+msgid "Height:"
+msgstr "Altura:"
+
+#: addressbook/printing/e-contact-print.glade.h:16
+msgid "Immediately follow each other"
 msgstr ""
 
-#: calendar/gui/alarm-notify.c:876
-msgid "Snooze"
-msgstr "Adiar"
+#: addressbook/printing/e-contact-print.glade.h:17
+msgid "Include:"
+msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Aceptar"
+#: addressbook/printing/e-contact-print.glade.h:18
+msgid "Landscape"
+msgstr "Horizontal"
+
+#: addressbook/printing/e-contact-print.glade.h:19
+msgid "Left:"
+msgstr "Esquerda:"
+
+#: addressbook/printing/e-contact-print.glade.h:20
+msgid "Letter tabs on side"
+msgstr "Pestanas coas letras no lateral"
+
+#: addressbook/printing/e-contact-print.glade.h:21
+msgid "Margins"
+msgstr "Marxes"
+
+#: addressbook/printing/e-contact-print.glade.h:22
+#: executive-summary/component/executive-summary-config.glade.h:4
+msgid "Number of columns:"
+msgstr "Número de columnas:"
+
+#: addressbook/printing/e-contact-print.glade.h:23
+msgid "Options"
+msgstr "Opcións"
+
+#: addressbook/printing/e-contact-print.glade.h:24
+msgid "Orientation"
+msgstr "Orientación"
+
+#: addressbook/printing/e-contact-print.glade.h:25
+msgid "Page"
+msgstr "Páxina"
+
+#: addressbook/printing/e-contact-print.glade.h:26
+#, fuzzy
+msgid "Page Setup:"
+msgstr "Configuración da Páxina:"
+
+#: addressbook/printing/e-contact-print.glade.h:27
+msgid "Paper"
+msgstr "Papel"
+
+#: addressbook/printing/e-contact-print.glade.h:28
+msgid "Paper source:"
+msgstr "Orixe do papel:"
+
+#: addressbook/printing/e-contact-print.glade.h:29
+msgid "Portrait"
+msgstr "Vertical"
+
+#: addressbook/printing/e-contact-print.glade.h:30
+msgid "Preview:"
+msgstr "Previsualización:"
+
+#: addressbook/printing/e-contact-print.glade.h:31
+msgid "Print using gray shading"
+msgstr "Imprimir usando sombreado gris"
+
+#: addressbook/printing/e-contact-print.glade.h:32
+msgid "Reverse on even pages"
+msgstr "Invertir nas páxinas pares"
+
+#: addressbook/printing/e-contact-print.glade.h:33
+msgid "Right:"
+msgstr "Dereita:"
+
+#: addressbook/printing/e-contact-print.glade.h:34
+msgid "Sections:"
+msgstr "Seccións:"
+
+#: addressbook/printing/e-contact-print.glade.h:35
+msgid "Shading"
+msgstr "Sombreado"
+
+#: addressbook/printing/e-contact-print.glade.h:36
+#, fuzzy
+msgid "Size:"
+msgstr "Tamaño:"
+
+#: addressbook/printing/e-contact-print.glade.h:37
+msgid "Start on a new page"
+msgstr "Iniciar nunha nova páxina"
+
+#: addressbook/printing/e-contact-print.glade.h:38
+msgid "Style name:"
+msgstr "Nome do estilo:"
+
+#: addressbook/printing/e-contact-print.glade.h:39
+msgid "Top:"
+msgstr "Superior:"
+
+#: addressbook/printing/e-contact-print.glade.h:40
+msgid "Type:"
+msgstr "Tipo:"
+
+#: addressbook/printing/e-contact-print.glade.h:41
+msgid "Width:"
+msgstr "Largura:"
+
+#: calendar/conduits/calendar/calendar-conduit.c:687
+#: calendar/conduits/todo/todo-conduit.c:501
+msgid "Error while communicating with calendar server"
+msgstr "Erro comunicando co servidor de axenda"
+
+#: calendar/conduits/calendar/calendar-conduit.c:786
+#: calendar/conduits/calendar/calendar-conduit.c:789
+msgid "Could not read pilot's Calendar application block"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
+msgid "Could not read pilot's ToDo application block"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:245
+#: calendar/gui/calendar-commands.c:233
 msgid "File not found"
 msgstr "Ficheiro non atopado"
 
-#: calendar/gui/calendar-commands.c:269
+#: calendar/gui/calendar-commands.c:257
 msgid "Open calendar"
 msgstr "Abrir axenda"
 
-#: calendar/gui/calendar-commands.c:311
+#: calendar/gui/calendar-commands.c:299
 msgid "Save calendar"
 msgstr "Gardar axenda"
 
-#: calendar/gui/calendar-commands.c:448
+#: calendar/gui/calendar-commands.c:451
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:332
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. strftime format of a weekday, a date and a time,
-#. in 24-hour format.
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:766
-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:340 calendar/gui/calendar-model.c:769
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:374
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
+#: calendar/gui/e-calendar-table.c:329
 msgid "Public"
 msgstr "Público"
 
-#: calendar/gui/calendar-model.c:377
+#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
+#: calendar/gui/e-calendar-table.c:330
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:380
+#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
+#: calendar/gui/e-calendar-table.c:331
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:383 calendar/gui/calendar-model.c:551
+#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
+#: calendar/gui/event-editor.c:1617
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:463
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:471
+#: calendar/gui/calendar-model.c:463
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:465
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:473
+#: calendar/gui/calendar-model.c:465
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:545
+#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: calendar/gui/e-calendar-table.c:351
+msgid "High"
+msgstr "Alta"
+
+#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
+#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: calendar/gui/e-calendar-table.c:352
+msgid "Normal"
+msgstr "Normal"
+
+#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: calendar/gui/e-calendar-table.c:353
+msgid "Low"
+msgstr "Baixa"
+
+#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
+#: calendar/gui/e-calendar-table.c:405
 msgid "Transparent"
 msgstr "Transparente"
 
-#: calendar/gui/calendar-model.c:548
+#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
+#: calendar/gui/e-calendar-table.c:404
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:774
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: calendar/gui/e-calendar-table.c:425
+msgid "Not Started"
+msgstr "Non Iniciada"
+
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/e-calendar-table.c:426
+msgid "In Progress"
+msgstr "En Progreso"
+
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: calendar/gui/e-calendar-table.c:427
+#, fuzzy
+msgid "Completed"
+msgstr "% Comp_leta:"
+
+#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
+#: calendar/gui/e-calendar-table.c:428
+#, fuzzy
+msgid "Cancelled"
+msgstr "Cancelar"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:285
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: calendar/gui/calendar-model.c:805
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1309,36 +1574,24 @@ msgstr ""
 "\n"
 "%s"
 
-#. strptime format for a date.
-#: calendar/gui/calendar-model.c:875 calendar/gui/calendar-model.c:923
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:893
-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:896
-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:900
-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:903
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
+#: calendar/gui/calendar-model.c:885
+msgid ""
+"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
+#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
+#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
+#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
+#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
+#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
+#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr ""
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:973
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1348,57 +1601,121 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1013
 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:1103
-msgid "The priority must be between 1 and 9, inclusive"
-msgstr "A prioridade ten que estar entre 1 e 9, inclusive"
+#: calendar/gui/calendar-model.c:1054
+msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
+msgstr ""
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/e-calendar-table.c:354
+msgid "Undefined"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1108
+msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1598
+msgid "Recurring"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:97
+#: calendar/gui/calendar-model.c:1600
+#, fuzzy
+msgid "Assigned"
+msgstr "Asignar Puntuación"
+
+#: calendar/gui/calendar-model.c:1606
+msgid "Yes"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1606
+#, fuzzy
+msgid "No"
+msgstr "Agora"
+
+#: calendar/gui/calendar-summary.c:196
 #, fuzzy
 msgid "%A, %e %B %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: calendar/gui/calendar-summary.c:138 calendar/gui/calendar-summary.c:144
+#: calendar/gui/calendar-summary.c:239 calendar/gui/calendar-summary.c:245
 #, fuzzy
 msgid "%I:%M%p"
 msgstr "%I:%M %p"
 
-#: calendar/gui/calendar-summary.c:302
+#: calendar/gui/calendar-summary.c:437
 #, fuzzy
 msgid "<b>Error loading calendar</b>"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: calendar/gui/calendar-summary.c:314
+#: calendar/gui/calendar-summary.c:449
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:484
+#: calendar/gui/calendar-summary.c:616
 #, fuzzy
 msgid "Display"
 msgstr "_Visualizar"
 
-#: calendar/gui/calendar-summary.c:489
+#: calendar/gui/calendar-summary.c:621
 #, fuzzy
 msgid "Show appointments"
 msgstr "Nova cita..."
 
-#: calendar/gui/calendar-summary.c:497
+#: calendar/gui/calendar-summary.c:629
 #, fuzzy
 msgid "Show tasks"
 msgstr "anexo"
 
-#: calendar/gui/calendar-summary.c:583
+#: calendar/gui/calendar-summary.c:715 calendar/gui/e-itip-control.glade.h:7
 #, fuzzy
 msgid "Loading Calendar"
 msgstr "Imprimir axenda"
 
-#: calendar/gui/control-factory.c:127
+#: calendar/gui/control-factory.c:126
 msgid "The URI that the calendar will display"
 msgstr "O URI que amosará a axenda"
 
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "Adiar"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr "Aceptar"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+msgid "Factory for the alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Non foi posible inicializar Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:73
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr "Non foi posible crear o directorio temporal: %s"
+
 #: calendar/gui/dialogs/alarm-notify-dialog.c:184
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarma o %A, %d de %b de %Y, %H:%M"
@@ -1411,243 +1728,866 @@ msgstr "Notificación da súa cita o %A, %d de %b de %Y, %H:%M"
 msgid "No summary available."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:63
+#: calendar/gui/dialogs/alarm-notify.glade.h:1
+#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
+#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
+#, fuzzy
+msgid "Close"
+msgstr "_Pechar"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:2
+msgid "Edit appointment"
+msgstr "Editar cita"
+
+#: calendar/gui/dialogs/alarm-notify.glade.h:4
+msgid "Snooze time (minutes)"
+msgstr "Tempo de adiamento (minutos)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid "05 minutes"
+msgstr "05 minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+msgid "10 minutes"
+msgstr "10 minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+msgid "12 hour (am/pm)"
+msgstr "12 horas (am/pm)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+msgid "15 minutes"
+msgstr "15 minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+msgid "24 hour"
+msgstr "24 horas"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+msgid "30 minutes"
+msgstr "30 minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "60 minutes"
+msgstr "60 minutos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "Alarms timeout after"
+msgstr "As alarmas sonoras expiran tras"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "Audio Alarms"
+msgstr "Alarmas Sonoras"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+msgid "Beep when alarm windows appear."
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ui/evolution-calendar.xml.h:3
+msgid "Calendar"
+msgstr "Axenda"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "Calendar Preferences"
+msgstr "Preferencias da Axenda"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+msgid "Colors"
+msgstr "Cores"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Compress weekends"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Date navigator options"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Defaults"
+msgstr "Detalles"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#, fuzzy
+msgid "Display options"
+msgstr "_Visualizar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/e-calendar-table.c:161
+msgid "Due Date"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+msgid "Enable snoozing for"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid "End of day:"
+msgstr "Final do día:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid "First day of week:"
+msgstr "Primeiro día da semana:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "Fri"
+msgstr "Ven"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/event-editor.c:479
+msgid "Friday"
+msgstr "Venres"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#, fuzzy
+msgid "Highlight"
+msgstr "Día salientado:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Items Due Today"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Items Due Today:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+msgid "Items Not Yet Due"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Items Not Yet Due:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+msgid "Mon"
+msgstr "Lun"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/event-editor.c:475
+msgid "Monday"
+msgstr "Luns"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+msgid "Overdue Items"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "Overdue Items:"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+msgid "Pick a color"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/e-calendar-table.c:164
+msgid "Priority"
+msgstr "Prioridade"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#, fuzzy
+msgid "Remind me of all appointments"
+msgstr "Nova cita..."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:21
+#, fuzzy
+msgid "Reminders"
+msgstr "Autor"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Sat"
+msgstr "Sáb"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/event-editor.c:480
+msgid "Saturday"
+msgstr "Sábado"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#, fuzzy
+msgid "Show"
+msgstr "Ver Todos"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Show appointment end times"
+msgstr "Nova cita..."
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+msgid "Show week numbers"
+msgstr "Amosar números de semana"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+msgid "Start of day:"
+msgstr "Inicio do día:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Sun"
+msgstr "Dom"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/event-editor.c:481
+msgid "Sunday"
+msgstr "Domingo"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "TaskPad"
+msgstr "Tarefa"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+msgid "Thu"
+msgstr "Xov"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/event-editor.c:478
+msgid "Thursday"
+msgstr "Xoves"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "Time Until Due"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "Time divisions:"
+msgstr "Dimensións:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "Time format:"
+msgstr "Formato da hora:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+msgid "Tue"
+msgstr "Mar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:476
+msgid "Tuesday"
+msgstr "Martes"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+msgid "Visual Alarms"
+msgstr "Alarmas Visuais"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+msgid "Wed"
+msgstr "Mér"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: calendar/gui/event-editor.c:477
+msgid "Wednesday"
+msgstr "Mércores"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#, fuzzy
+msgid "Work week"
+msgstr "semana"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+msgid "minutes before they occur."
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: mail/mail-config.glade.h:84
+msgid "seconds."
+msgstr "segundos."
+
+#: calendar/gui/dialogs/delete-comp.c:68
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 "¿Está seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:66
+#: calendar/gui/dialogs/delete-comp.c:71
 #, fuzzy
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 "¿Está seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:72
+#: calendar/gui/dialogs/delete-comp.c:77
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 "¿Está seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:75
+#: calendar/gui/dialogs/delete-comp.c:80
 #, fuzzy
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 "¿Está seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:81
+#: calendar/gui/dialogs/delete-comp.c:86
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 "¿Está seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/delete-comp.c:84
+#: calendar/gui/dialogs/delete-comp.c:89
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
 "¿Está seguro de que quere\n"
 "borrar este contacto?"
 
-#: calendar/gui/dialogs/task-editor.c:690
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% Comp_leta:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
+#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/event-editor-dialog.glade.h:6
+msgid "Classification"
+msgstr "Clasificación"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: calendar/gui/event-editor-dialog.glade.h:8
+#, fuzzy
+msgid "Date & Time"
+msgstr "Data de envío"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+#, fuzzy
+msgid "Date Completed:"
+msgstr "% Comp_leta:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:16
+msgid "Pri_vate"
+msgstr "Pri_vado"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#, fuzzy
+msgid "Progress"
+msgstr "En Progreso"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
+msgid "Pu_blic"
+msgstr "Pú_blico"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#, fuzzy
+msgid "Sta_rt Date:"
+msgstr "Data de _Inicio:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:27
+msgid "Su_mmary:"
+msgstr "_Resume:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+msgid "Task"
+msgstr "Tarefa"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#, fuzzy
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:28
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:29
+msgid "_Contacts..."
+msgstr "_Contactos..."
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#, fuzzy
+msgid "_Due Date:"
+msgstr "_Departamento:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+msgid "_Priority:"
+msgstr "_Prioridade:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+msgid "_Status:"
+msgstr "_Estado:"
+
+#: calendar/gui/dialogs/task-editor.c:689
 msgid "Edit Task"
 msgstr "Editar Tarefa"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
 msgid "No summary"
 msgstr "Sen resume"
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:346
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:349
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3270
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:154
+#: calendar/gui/e-calendar-table.c:156
 #, fuzzy
 msgid "Categories"
 msgstr "categorías"
 
-#: calendar/gui/e-calendar-table.c:155
-msgid "Classification"
-msgstr "Clasificación"
-
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:158
 #, fuzzy
 msgid "Completion Date"
 msgstr "Completada"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:159
 #, fuzzy
 msgid "End Date"
 msgstr "Hora de _finalización:"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:160
 #, fuzzy
 msgid "Start Date"
 msgstr "Data de _Inicio:"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:162
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:163
 #, fuzzy
-msgid "Precent complete"
+msgid "Percent complete"
 msgstr "Marcar a tarefa como completa"
 
-#: calendar/gui/e-calendar-table.c:162
-msgid "Priority"
-msgstr "Prioridade"
-
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:165
 #, fuzzy
 msgid "Summary"
 msgstr "_Resume"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:166
 #, fuzzy
 msgid "Transparency"
 msgstr "Transparente"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:167
 #, fuzzy
 msgid "URL"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:168
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
-msgstr "Abrir..."
+#: calendar/gui/e-calendar-table.c:169
+#, fuzzy
+msgid "Click here to add a task"
+msgstr "Prema aquí para o libro de enderezos"
 
-#: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr "Abrir a tarefa"
+#: calendar/gui/e-calendar-table.c:373
+#, c-format
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:374
+#, c-format
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:375
+#, c-format
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:376
+#, c-format
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:377
+#, c-format
+msgid "40%"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:378
+#, c-format
+msgid "50%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:379
+#, c-format
+msgid "60%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:380
+#, c-format
+msgid "70%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:381
+#, c-format
+msgid "80%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:382
+#, c-format
+msgid "90%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:383
+#, c-format
+msgid "100%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:550
 msgid "Mark Complete"
 msgstr "Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark the task complete"
 msgstr "Marcar a tarefa como completa"
 
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:673 mail/mail-view.c:150
-msgid "Delete"
-msgstr "Eliminar"
+#: calendar/gui/e-calendar-table.c:556
+#, fuzzy
+msgid "Edit this task..."
+msgstr "Editar esta cita..."
 
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/e-calendar-table.c:557
+#, fuzzy
+msgid "Edit the task"
+msgstr "Editar Tarefa"
+
+#: calendar/gui/e-calendar-table.c:559
+#: ui/evolution-task-editor-dialog.xml.h:19
+#, fuzzy
+msgid "Delete this task"
+msgstr "Borrar a tarefa"
+
+#: calendar/gui/e-calendar-table.c:560
 msgid "Delete the task"
 msgstr "Borrar a tarefa"
 
-#: calendar/gui/e-day-view-time-item.c:517
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1271
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
 #: calendar/gui/e-week-view-main-item.c:321
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1285
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1288
 #: calendar/gui/e-week-view-main-item.c:330
 msgid "%a %d %b"
 msgstr "%a %d de %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1298
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
 #: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d de %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:553 calendar/gui/e-week-view.c:287
-#: calendar/gui/print.c:610
+#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
+#: calendar/gui/print.c:613
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:609
+#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
+#: calendar/gui/print.c:612
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3008 calendar/gui/e-day-view.c:3015
-#: calendar/gui/e-day-view.c:3024 calendar/gui/e-week-view.c:3211
-#: calendar/gui/e-week-view.c:3218 calendar/gui/e-week-view.c:3227
-msgid "New appointment..."
+#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
+#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
+#, fuzzy
+msgid "New Appointment..."
 msgstr "Nova cita..."
 
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-day-view.c:3019
-#: calendar/gui/e-week-view.c:3215 calendar/gui/e-week-view.c:3222
-msgid "Edit this appointment..."
-msgstr "Editar esta cita..."
+#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
+#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Open"
+msgstr "_Abrir"
 
-#: calendar/gui/e-day-view.c:3013 calendar/gui/e-week-view.c:3216
-msgid "Delete this appointment"
+#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+#, fuzzy
+msgid "Delete this Appointment"
 msgstr "Borrar esta cita"
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
-msgid "Make this appointment movable"
+#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: ui/evolution-event-editor.xml.h:45
+#, fuzzy
+msgid "Schedule Meeting"
+msgstr "FIXME: Programar Reunión"
+
+#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+#, fuzzy
+msgid "Make this Occurrence Movable"
+msgstr "Gardar o ficheiro actual"
+
+#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#, fuzzy
+msgid "Delete this Occurrence"
+msgstr "Borrar este elemento"
+
+#: calendar/gui/e-day-view.c:3047
+#, fuzzy
+msgid "Delete all Occurrences"
+msgstr "Borrar un contacto"
+
+#: calendar/gui/e-itip-control.c:153
+#, fuzzy
+msgid "I couldn't update your calendar file!\n"
+msgstr "Non foi posible crear un calendario en `%s'"
+
+#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
+#, fuzzy
+msgid "Component successfully updated."
+msgstr "Ficheiros de Evolution instalados con éxito."
+
+#: calendar/gui/e-itip-control.c:165
+msgid "There was an error loading the calendar file."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:189
+msgid "I couldn't open your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
+msgid "I couldn't load your calendar file!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:462
+#, fuzzy
+msgid "I couldn't read your calendar file!\n"
+msgstr "Non foi posible crear un calendario en `%s'"
+
+#: calendar/gui/e-itip-control.c:475
+msgid "This is a reply from someone who was uninvited!"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:491
+#, fuzzy
+msgid "I couldn't update your calendar store."
+msgstr "Non foi posible crear un calendario en `%s'"
+
+#: calendar/gui/e-itip-control.c:532
+msgid "I couldn't delete the calendar component!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:542
+#, fuzzy
+msgid "Component successfully deleted."
+msgstr "Ficheiros de Evolution instalados con éxito."
+
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "I don't recognize this type of calendar component."
+msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
+
+#: calendar/gui/e-itip-control.c:772
+#, fuzzy
+msgid "Add to Calendar"
+msgstr "Axenda"
+
+#: calendar/gui/e-itip-control.c:806
+#, fuzzy
+msgid "Accept"
+msgstr "Contas"
+
+#: calendar/gui/e-itip-control.c:807
+#, fuzzy
+msgid "Decline"
+msgstr "Eliminar"
+
+#: calendar/gui/e-itip-control.c:808
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:852
+#, fuzzy
+msgid "Update Calendar"
+msgstr "_Abrir axenda"
+
+#: calendar/gui/e-itip-control.c:875
+#, fuzzy
+msgid "Cancel Meeting"
+msgstr "FIXME: Programar Reunión"
+
+#: calendar/gui/e-itip-control.glade.h:2
+#, fuzzy, no-c-format
+msgid "%P %%"
+msgstr "%A, %d de %B"
+
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:4
+#, fuzzy
+msgid "Calendar Message"
+msgstr "Axenda"
+
+#: calendar/gui/e-itip-control.glade.h:5
+#, fuzzy
+msgid "Date:"
+msgstr "Pegar"
+
+#: calendar/gui/e-itip-control.glade.h:8
+#, fuzzy
+msgid "Loading calendar..."
+msgstr "Imprimir axenda"
+
+#: calendar/gui/e-itip-control.glade.h:9
+#, fuzzy
+msgid "Organizer:"
+msgstr "Organización:"
+
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
+msgid "Sender"
+msgstr "Autor"
+
+#: calendar/gui/e-itip-control.glade.h:11
+#, fuzzy
+msgid "Summary:"
+msgstr "_Resume:"
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:2
+msgid "Attendee"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:3
+#, fuzzy
+msgid "Attendee address"
+msgstr "Enderezo"
+
+#: calendar/gui/e-meeting-dialog.glade.h:4
+msgid "Attendees: "
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
-msgid "Delete this occurrence"
+#: calendar/gui/e-meeting-dialog.glade.h:5
+#, fuzzy
+msgid ""
+"Cancel\n"
+"Meeting"
+msgstr "FIXME: Programar Reunión"
+
+#: calendar/gui/e-meeting-dialog.glade.h:7
+#, fuzzy
+msgid "Chair"
+msgstr "Automóbil"
+
+#: calendar/gui/e-meeting-dialog.glade.h:10
+#, fuzzy
+msgid "Meeting Invitations"
+msgstr "Hora do _inicio da reunión:"
+
+#: calendar/gui/e-meeting-dialog.glade.h:11
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:12
+#, fuzzy
+msgid "Optional Participant"
+msgstr "Información Opcional"
+
+#: calendar/gui/e-meeting-dialog.glade.h:13
+#, fuzzy
+msgid "Organizer: "
+msgstr "Organización:"
+
+#: calendar/gui/e-meeting-dialog.glade.h:15
+msgid ""
+"Publish\n"
+"Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3022 calendar/gui/e-week-view.c:3225
-msgid "Delete all occurrences"
+#: calendar/gui/e-meeting-dialog.glade.h:17
+msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:140 calendar/gui/e-tasks.c:457
-#: calendar/gui/e-tasks.c:492
+#: calendar/gui/e-meeting-dialog.glade.h:18
+#, fuzzy
+msgid ""
+"Request\n"
+"Meeting"
+msgstr "FIXME: Programar Reunión"
+
+#: calendar/gui/e-meeting-dialog.glade.h:20
+#, fuzzy
+msgid "Required Participant"
+msgstr "Persoas _Requiridas"
+
+#: calendar/gui/e-meeting-dialog.glade.h:21
+#, fuzzy
+msgid "Role"
+msgstr "Móbil"
+
+#: calendar/gui/e-meeting-dialog.glade.h:22
+#, fuzzy
+msgid ""
+"Schedule\n"
+"Time"
+msgstr "FIXME: Programar Reunión"
+
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
+#: mail/message-list.c:1171
+#, fuzzy
+msgid "Status"
+msgstr "_Estado:"
+
+#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
+#: calendar/gui/e-tasks.c:501
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:146
+#: calendar/gui/e-tasks.c:154
 #, fuzzy
 msgid "Category:"
 msgstr ""
 "\n"
 "Categorías: "
 
-#: calendar/gui/e-tasks.c:285
+#: calendar/gui/e-tasks.c:297
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Non foi posible cargar a axenda en `%s'"
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:309
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "O método requirido para cargar `%s' non está soportado"
@@ -1659,306 +2599,590 @@ msgstr "O método requirido para cargar `%s' non está soportado"
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: calendar/gui/event-editor.c:331
-msgid "Edit Appointment"
-msgstr "Editar Cita"
+#: calendar/gui/e-week-view.c:3255
+#, fuzzy
+msgid "Delete All Occurrences"
+msgstr "Fontes"
 
-#: calendar/gui/event-editor.c:409
-msgid "on"
-msgstr ""
+#: calendar/gui/event-editor-dialog.glade.h:1
+msgid "A_ll day event"
+msgstr "Evento de día _completo"
 
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
-msgid "day"
-msgstr "día"
+#: calendar/gui/event-editor-dialog.glade.h:3
+#, fuzzy
+msgid "Appointment"
+msgstr "Citas:"
 
-#: calendar/gui/event-editor.c:435
-msgid "Monday"
+#: calendar/gui/event-editor-dialog.glade.h:4
+#, fuzzy
+msgid "Appointment Basics"
+msgstr "Citas:"
+
+#: calendar/gui/event-editor-dialog.glade.h:7
+#, fuzzy
+msgid "Custom recurrence"
+msgstr "Fontes"
+
+#: calendar/gui/event-editor-dialog.glade.h:10
+msgid "Every"
+msgstr "Cada"
+
+#: calendar/gui/event-editor-dialog.glade.h:11
+msgid "Exceptions"
+msgstr "Excepcións"
+
+#: calendar/gui/event-editor-dialog.glade.h:12
+#, fuzzy
+msgid "Modify"
 msgstr "Luns"
 
-#: calendar/gui/event-editor.c:436
-msgid "Tuesday"
-msgstr "Martes"
+#: calendar/gui/event-editor-dialog.glade.h:13
+#, fuzzy
+msgid "No recurrence"
+msgstr "Fontes"
 
-#: calendar/gui/event-editor.c:437
-msgid "Wednesday"
-msgstr "Mércores"
+#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:1577
+msgid "Play a sound"
+msgstr ""
 
-#: calendar/gui/event-editor.c:438
-msgid "Thursday"
-msgstr "Xoves"
+#: calendar/gui/event-editor-dialog.glade.h:15
+#, fuzzy
+msgid "Preview"
+msgstr "Previsualización:"
 
-#: calendar/gui/event-editor.c:439
-msgid "Friday"
-msgstr "Venres"
+#: calendar/gui/event-editor-dialog.glade.h:18
+#, fuzzy
+msgid "Recurrence"
+msgstr "Fontes"
 
-#: calendar/gui/event-editor.c:440
-msgid "Saturday"
-msgstr "Sábado"
+#: calendar/gui/event-editor-dialog.glade.h:19
+#, fuzzy
+msgid "Recurrence Rule"
+msgstr "Fontes"
 
-#: calendar/gui/event-editor.c:441
-msgid "Sunday"
-msgstr "Domingo"
+#: calendar/gui/event-editor-dialog.glade.h:20
+#, fuzzy
+msgid "Reminder"
+msgstr "Autor"
+
+#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:1586
+#, fuzzy
+msgid "Run a program"
+msgstr "_Executar programa:"
 
-#: calendar/gui/event-editor.c:561
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor.c:1583
+#, fuzzy
+msgid "Send an email"
+msgstr "Recibindo correo de %s"
+
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Settings..."
+msgstr "_Configuración"
+
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor.c:1580
+#, fuzzy
+msgid "Show a dialog"
+msgstr "Amosar un día"
+
+#: calendar/gui/event-editor-dialog.glade.h:26
+msgid "Simple recurrence"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:30
+#, fuzzy
+msgid "_End time:"
+msgstr "Hora de _finalización:"
+
+#: calendar/gui/event-editor-dialog.glade.h:31
+msgid "_Start time:"
+msgstr "Hora de _comezo:"
+
+#: calendar/gui/event-editor-dialog.glade.h:32
+msgid "_Starting date:"
+msgstr "Data de _comezo:"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:35
+msgid "day(s)"
+msgstr "día(s)"
+
+#: calendar/gui/event-editor-dialog.glade.h:36
+#, fuzzy
+msgid "end of appointment"
+msgstr "Editar cita"
+
+#: calendar/gui/event-editor-dialog.glade.h:37
+#, fuzzy
+msgid "for"
+msgstr "cuarto"
+
+#: calendar/gui/event-editor-dialog.glade.h:38
+msgid "forever"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:39
+#, fuzzy
+msgid "hour(s)"
+msgstr "horas"
+
+#: calendar/gui/event-editor-dialog.glade.h:40
+#, fuzzy
+msgid "minute(s)"
+msgstr "minutos"
+
+#: calendar/gui/event-editor-dialog.glade.h:41
+msgid "month(s)"
+msgstr "mes(es)"
+
+#: calendar/gui/event-editor-dialog.glade.h:42
+#, fuzzy
+msgid "start of appointment"
+msgstr "Editar cita"
+
+#: calendar/gui/event-editor-dialog.glade.h:43
+#, fuzzy
+msgid "until"
+msgstr "Sen_título"
+
+#: calendar/gui/event-editor-dialog.glade.h:44
+msgid "week(s)"
+msgstr "semana(s)"
+
+#: calendar/gui/event-editor-dialog.glade.h:45
+msgid "year(s)"
+msgstr "ano(s)"
+
+#: calendar/gui/event-editor.c:371
+msgid "Edit Appointment"
+msgstr "Editar Cita"
+
+#: calendar/gui/event-editor.c:449
+msgid "on"
+msgstr ""
+
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
+msgid "day"
+msgstr "día"
+
+#: calendar/gui/event-editor.c:601
 #, fuzzy
 msgid "on the"
 msgstr "mes"
 
-#: calendar/gui/event-editor.c:568
+#: calendar/gui/event-editor.c:608
 #, fuzzy
 msgid "th"
 msgstr "4"
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:754
 #, fuzzy
 msgid "occurrences"
 msgstr "Fontes"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:871
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3093 calendar/gui/print.c:1090
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
+#: calendar/gui/event-editor.c:1532
+#, fuzzy, c-format
+msgid " %d days"
+msgstr "días"
+
+#: calendar/gui/event-editor.c:1534
+#, fuzzy
+msgid " 1 day"
+msgstr "Amosar un día"
+
+#: calendar/gui/event-editor.c:1537
+#, fuzzy, c-format
+msgid " %d weeks"
+msgstr "semanas"
+
+#: calendar/gui/event-editor.c:1539
+#, fuzzy
+msgid " 1 week"
+msgstr "Amosar unha semana"
+
+#: calendar/gui/event-editor.c:1542
+#, fuzzy, c-format
+msgid " %d hours"
+msgstr "horas"
+
+#: calendar/gui/event-editor.c:1544
+#, fuzzy
+msgid " 1 hour"
+msgstr "hora"
+
+#: calendar/gui/event-editor.c:1547
+#, fuzzy, c-format
+msgid " %d minutes"
+msgstr "minutos"
+
+#: calendar/gui/event-editor.c:1549
+#, fuzzy
+msgid " 1 minute"
+msgstr "10 minutos"
+
+#: calendar/gui/event-editor.c:1552
+#, fuzzy, c-format
+msgid " %d seconds"
+msgstr " segundos"
+
+#: calendar/gui/event-editor.c:1554
+#, fuzzy
+msgid " 1 second"
+msgstr " segundos"
+
+#: calendar/gui/event-editor.c:1601
+#, fuzzy
+msgid " before start of appointment"
+msgstr "Crear unha nova cita"
+
+#: calendar/gui/event-editor.c:1603
+#, fuzzy
+msgid " after start of appointment"
+msgstr "Crear unha nova cita"
+
+#: calendar/gui/event-editor.c:1611
+#, fuzzy
+msgid " before end of appointment"
+msgstr "Borrar esta cita"
+
+#: calendar/gui/event-editor.c:1613
+#, fuzzy
+msgid " after end of appointment"
+msgstr "Crear unha nova cita"
+
+#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
+#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
-#: calendar/gui/gnome-cal.c:696
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Non se pode inicializar o compoñente de correo de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Conducto de Axenda de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, fuzzy
+msgid "Factory for the Calendar Summary component."
+msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the calendar iTip view control"
+msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the sample Calendar control"
+msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
+
+#: calendar/gui/gnome-cal.c:695
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 "Non é posible abrir a carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/gnome-cal.c:707
+#: calendar/gui/gnome-cal.c:706
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "O método requirido para cargar `%s' non está soportado"
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Dom"
+#: calendar/gui/goto-dialog.glade.h:1
+#, fuzzy
+msgid "April"
+msgstr "abril"
 
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Lun"
+#: calendar/gui/goto-dialog.glade.h:2
+#, fuzzy
+msgid "August"
+msgstr "agosto"
 
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Mar"
+#: calendar/gui/goto-dialog.glade.h:3
+#, fuzzy
+msgid "December"
+msgstr "decembro"
 
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Mér"
+#: calendar/gui/goto-dialog.glade.h:4
+#, fuzzy
+msgid "February"
+msgstr "febreiro"
 
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Xov"
+#: calendar/gui/goto-dialog.glade.h:5
+#, fuzzy
+msgid "Go To Date"
+msgstr "Ir á data"
 
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Ven"
+#: calendar/gui/goto-dialog.glade.h:6
+#, fuzzy
+msgid "Go To Today"
+msgstr "Ir a hoxe"
 
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Sáb"
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
+msgid "January"
+msgstr "xaneiro"
 
-#: calendar/gui/main.c:50
+#: calendar/gui/goto-dialog.glade.h:8
 #, fuzzy
-msgid "Could not initialize GNOME"
-msgstr "Non foi posible inicializar Bonobo"
+msgid "July"
+msgstr "xullo"
+
+#: calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+msgid "June"
+msgstr "xuño"
+
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "March"
+msgstr "marzo"
+
+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "May"
+msgstr "Luns"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "November"
+msgstr "novembro"
+
+#: calendar/gui/goto-dialog.glade.h:13
+#, fuzzy
+msgid "October"
+msgstr "outubro"
+
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "September"
+msgstr "setembro"
+
+#: calendar/gui/print.c:296
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:296
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:297
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:295
+#: calendar/gui/print.c:298
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:299
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:300
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:301
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:302
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Th"
 msgstr "Xo"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:355
+#: calendar/gui/print.c:358
 msgid "Sa"
 msgstr "Sa"
 
-#: calendar/gui/print.c:941
+#: calendar/gui/print.c:944
 msgid "Tasks"
 msgstr "Tarefas"
 
 #. Day
-#: calendar/gui/print.c:1071
+#: calendar/gui/print.c:1074
 msgid "Current day (%a %b %d %Y)"
 msgstr "Día actual (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
+#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1086
+#: calendar/gui/print.c:1089
 msgid "%a %d %Y"
 msgstr "%a %d de %Y"
 
-#: calendar/gui/print.c:1097
+#: calendar/gui/print.c:1100
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Semana actual (%s - %s)"
 
 # Isto está mal, o %a é o nome de semana
 #. Month
-#: calendar/gui/print.c:1105
+#: calendar/gui/print.c:1108
 msgid "Current month (%b %Y)"
 msgstr "Mes actual (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1112
+#: calendar/gui/print.c:1115
 msgid "Current year (%Y)"
 msgstr "Ano actual (%Y)"
 
-#: calendar/gui/print.c:1149
+#: calendar/gui/print.c:1152
 msgid "Print Calendar"
 msgstr "Imprimir axenda"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1068
+#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
+#: ui/evolution-mail.xml.h:32
 msgid "Print Preview"
 msgstr "Previsualizar da Impresión"
 
@@ -1967,10 +3191,84 @@ msgstr "Previsualizar da Impresión"
 msgid "The URI of the tasks folder to display"
 msgstr "O URI que amosará a axenda"
 
-#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
+#: calendar/gui/tasks-migrate.c:106
+msgid ""
+"Evolution has taken the tasks that were in your calendar folder and "
+"automatically migrated them to the new tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:109
+msgid ""
+"Evolution has tried to take the tasks that were in your calendar folder and "
+"migrate them to the new tasks folder.\n"
+"Some of the tasks could not be migrated, so this process may be attempted "
+"again in the future."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:121
+#, c-format
+msgid ""
+"Could not open `%s'; no items from the calendar folder will be migrated to "
+"the tasks folder."
+msgstr ""
+
+#: calendar/gui/tasks-migrate.c:134
+#, c-format
+msgid ""
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
+msgstr ""
+
+#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
 msgid "SMTWTFS"
 msgstr "DLMMXVS"
 
+#: camel/camel-filter-driver.c:790
+#, fuzzy, c-format
+msgid "Error parsing filter: %s: %s"
+msgstr "Erro gardando o ficheiro: %s"
+
+#: camel/camel-filter-driver.c:795
+#, fuzzy, c-format
+msgid "Error executing filter: %s: %s"
+msgstr "Erro gardando o ficheiro: %s"
+
+#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#, fuzzy, c-format
+msgid "Error executing filter search: %s: %s"
+msgstr "Erro gardando o ficheiro: %s"
+
+#: camel/camel-folder-search.c:323
+#, fuzzy, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Erro na expresión regular '%s':\n"
+"%s"
+
+#: camel/camel-folder-search.c:333
+#, fuzzy, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Erro na expresión regular '%s':\n"
+"%s"
+
+#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
+msgid "(match-all) requires a single bool result"
+msgstr ""
+
+#: camel/camel-folder-search.c:554
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
+msgid "Invalid type in body-contains, expecting string"
+msgstr ""
+
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
 #: camel/camel-movemail.c:183
@@ -2047,79 +3345,210 @@ msgstr "O programa movemail fallou: %s"
 msgid "(Unknown error)"
 msgstr "(Erro descoñecido)"
 
-#: camel/camel-provider.c:133
+#: camel/camel-provider.c:137
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Non foi posible cargar %s: %s"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:145
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:184
+#: camel/camel-remote-store.c:181
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:188
+#: camel/camel-remote-store.c:185
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:318
+#: camel/camel-remote-store.c:232
 #, fuzzy
 msgid "Connection cancelled"
 msgstr "Cancelada"
 
-#: camel/camel-remote-store.c:321 camel/camel-remote-store.c:334
-#: camel/providers/smtp/camel-smtp-transport.c:160
+#: camel/camel-remote-store.c:235
+#: camel/providers/smtp/camel-smtp-transport.c:244
 #, 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:322 camel/camel-remote-store.c:335
+#: camel/camel-remote-store.c:236
 msgid "(unknown host)"
 msgstr "(máquina descoñecida)"
 
-#: camel/camel-remote-store.c:426 camel/camel-remote-store.c:488
-#: camel/camel-remote-store.c:556
+#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
+#: camel/camel-remote-store.c:448
 #: camel/providers/imap/camel-imap-command.c:289
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Abrir axenda"
 
-#: camel/camel-service.c:137
+#: camel/camel-remote-store.c:453
+#, fuzzy
+msgid "Server unexpectedly disconnected"
+msgstr "O servidor rexeitou o nome de usuario"
+
+#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Autenticación"
+
+#: camel/camel-sasl-anonymous.c:106
+#, c-format
+msgid ""
+"Invalid email address trace information:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:118
+#, fuzzy, c-format
+msgid ""
+"Invalid opaque trace information:\n"
+"%s"
+msgstr ""
+"Erro cargando a información do filtro:\n"
+"%s"
+
+#: camel/camel-sasl-anonymous.c:130
+#, fuzzy, c-format
+msgid ""
+"Invalid trace information:\n"
+"%s"
+msgstr ""
+"Erro cargando a información do filtro:\n"
+"%s"
+
+#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+msgid "CRAM-MD5"
+msgstr ""
+
+#: camel/camel-sasl-cram-md5.c:34
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"Esta opción conectarase ó servidor IMAP usando autenticación Kerberos 4."
+
+#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:39
+#, fuzzy
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"Esta opción conectarase ó servidor IMAP usando un contrasinal sen cifrar."
+
+#: camel/camel-sasl-digest-md5.c:761
+msgid "Server challenge too long (>2048 octets)\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:770
+msgid "Server challenge invalid\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:776
+msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:798
+msgid "Server response did not contain authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:816
+msgid "Server response contained incomplete authorization data\n"
+msgstr ""
+
+#: camel/camel-sasl-digest-md5.c:826
+msgid "Server response does not match\n"
+msgstr ""
+
+#: camel/camel-sasl-kerberos4.c:38
+msgid "Kerberos 4"
+msgstr "Kerberos 4"
+
+#: camel/camel-sasl-kerberos4.c:40
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 4 authentication."
+msgstr ""
+"Esta opción conectarase ó servidor IMAP usando autenticación Kerberos 4."
+
+#: camel/camel-sasl-kerberos4.c:158
+#, fuzzy, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr "Non foi posible crear unha canalización: %s"
+
+#: camel/camel-sasl-kerberos4.c:215
+#: camel/providers/imap/camel-imap-store.c:381
+#, fuzzy
+msgid "Bad authentication response from server."
+msgstr "Resposta non agardada do servidor IMAP: %s"
+
+#: camel/camel-sasl-plain.c:29
+msgid "PLAIN"
+msgstr ""
+
+#: camel/camel-sasl-plain.c:31
+#, fuzzy
+msgid ""
+"This option will connect to the server using a the PLAIN SASL mechanism if "
+"the server supports it."
+msgstr ""
+"Esta opción conectarase ó servidor IMAP usando un contrasinal sen cifrar."
+
+#: camel/camel-search-private.c:105
+#, fuzzy, c-format
+msgid "Regular expression compilation failed: %s: %s"
+msgstr "Erro escribindo á caixa de correo temporal: %s"
+
+#: camel/camel-service.c:142
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "O URL '%s' necesita unha parte co nome do usuario"
 
-#: camel/camel-service.c:146
+#: camel/camel-service.c:151
 #, 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:155
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte co camiño"
 
-#: camel/camel-service.c:520
+#: camel/camel-service.c:512
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:523
+#: camel/camel-service.c:515
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:299
+#: camel/camel-session.c:54
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/camel-session.c:56
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: camel/camel-session.c:322
 #, 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:390
+#: camel/camel-session.c:417
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2128,32 +3557,32 @@ msgstr ""
 "Non foi posible crear o directorio %s:\n"
 "%s"
 
-#: camel/camel-url.c:75
+#. Fill in the new fields
+#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
+#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#, fuzzy
+msgid "Trash"
+msgstr "Tarefa"
+
+#: camel/camel-url.c:77
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "O URL `%s' non contén ningún protocolo"
 
-#: camel/camel-url.c:90
+#: camel/camel-url.c:92
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "O URL `%s' contén un protocolo non válido"
 
-#: camel/camel-url.c:150
+#: camel/camel-url.c:152
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "O número de porto no URL `%s' non é numérico"
 
-#: camel/providers/imap/camel-imap-auth.c:133
+#: camel/camel-vee-folder.c:960
 #, fuzzy, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr "Non foi posible crear unha canalización: %s"
-
-#: camel/providers/imap/camel-imap-auth.c:205
-#, fuzzy
-msgid "Bad authentication response from server."
-msgstr "Resposta non agardada do servidor IMAP: %s"
+msgid "No such message: %s"
+msgstr "Re-enviar esta mensaxe"
 
 #: camel/providers/imap/camel-imap-command.c:234
 #, c-format
@@ -2165,7 +3594,7 @@ msgstr "Resposta non agardada do servidor IMAP: %s"
 msgid "IMAP command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
@@ -2183,13 +3612,18 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:198
+#: camel/providers/imap/camel-imap-folder.c:199
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
+#: camel/providers/imap/camel-imap-folder.c:329
+#, fuzzy
+msgid "Scanning IMAP folder"
+msgstr "Examinando as carpetas en \"%s\""
+
+#: camel/providers/imap/camel-imap-folder.c:837
+#: camel/providers/imap/camel-imap-folder.c:999
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2201,27 +3635,44 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:251
+#: camel/providers/imap/camel-imap-provider.c:59
+#, fuzzy
+msgid "Secure IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:263
 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:260
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/providers/imap/camel-imap-store.c:262
-msgid ""
-"This option will connect to the IMAP server using Kerberos 4 authentication."
+#: camel/providers/imap/camel-imap-store.c:415
+#, fuzzy, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
-"Esta opción conectarase ó servidor IMAP usando autenticación Kerberos 4."
+"Non foi posible conectarse ó servidor POP.\n"
+"Non se soporta o mecanismo de autenticación solicitado."
+
+#: camel/providers/imap/camel-imap-store.c:426
+#, fuzzy, c-format
+msgid "No support for authentication type %s"
+msgstr "Autenticación"
 
-#: camel/providers/imap/camel-imap-store.c:361
+#: camel/providers/imap/camel-imap-store.c:454
 #, 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:389
+#: camel/providers/imap/camel-imap-store.c:469
+#: camel/providers/smtp/camel-smtp-transport.c:373
+msgid "You didn't enter a password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:498
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2232,7 +3683,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:645
+#: camel/providers/imap/camel-imap-store.c:772
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Non foi posible crear o directorio %s: %s"
@@ -2262,50 +3713,42 @@ msgstr ""
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:122
+#: camel/providers/local/camel-local-store.c:128
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-store.c:135
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "`%s' non é un ficheiro regular."
 
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
+#: camel/providers/local/camel-local-store.c:143
+#: camel/providers/local/camel-local-store.c:159
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Non é posible facer un fork a %s: %s"
 
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
+#: camel/providers/local/camel-local-store.c:174
+msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:200
+#: camel/providers/local/camel-local-store.c:184
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:256
+#: camel/providers/local/camel-local-store.c:240
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Non foi posible renomear a carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:297
+#: camel/providers/local/camel-local-store.c:282
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Non foi posible borrar a carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:306
+#: camel/providers/local/camel-local-store.c:292
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Non foi posible borrar a carpeta `%s': %s"
@@ -2344,8 +3787,8 @@ msgstr "Re-enviar esta mensaxe"
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-maildir-store.c:94
+#: camel/providers/local/camel-mh-store.c:88
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -2354,15 +3797,15 @@ msgstr ""
 "Non é posible abrir a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mbox-store.c:108
-#: camel/providers/local/camel-mh-store.c:103
+#: camel/providers/local/camel-maildir-store.c:98
+#: camel/providers/local/camel-mbox-store.c:99
+#: camel/providers/local/camel-mh-store.c:95
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "A carpeta `%s' non existe."
 
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:101
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -2371,19 +3814,19 @@ msgstr ""
 "Non foi posible crear a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:128
+#: camel/providers/local/camel-maildir-store.c:120
 #, fuzzy, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' non é un directorio."
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
+#: camel/providers/local/camel-maildir-store.c:149
+#: camel/providers/local/camel-maildir-store.c:186
+#: camel/providers/local/camel-mh-store.c:125
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Non foi posible borrar a carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:158
+#: camel/providers/local/camel-maildir-store.c:150
 #, fuzzy
 msgid "not a maildir directory"
 msgstr "`%s' non é un directorio."
@@ -2417,7 +3860,7 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:92
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -2426,7 +3869,7 @@ msgstr ""
 "Non foi posible abrir o ficheiro `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:108
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -2435,14 +3878,14 @@ msgstr ""
 "Non foi posible crear o ficheiro `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:144
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' non é un ficheiro regular."
 
-#: camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:168
+#: camel/providers/local/camel-mbox-store.c:136
+#: camel/providers/local/camel-mbox-store.c:159
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -2451,75 +3894,88 @@ msgstr ""
 "Non foi posible borrar a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:151
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "A carpeta `%s' non está baleira. Non borrada."
 
-#: camel/providers/local/camel-mbox-summary.c:234
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
+#: camel/providers/local/camel-mbox-summary.c:240
+#, fuzzy
+msgid "Summarising folder"
+msgstr "Sincronizando \"%s\""
+
+#: camel/providers/local/camel-mbox-summary.c:245
 #, fuzzy, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 "Non é posible abrir a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:268
+#: camel/providers/local/camel-mbox-summary.c:287
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-summary.c:362
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Non é posible facer un fork a %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:477
-#: camel/providers/local/camel-mbox-summary.c:668
+#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
+#, fuzzy
+msgid "Synchronising folder"
+msgstr "Sincronizando \"%s\""
+
+#: camel/providers/local/camel-mbox-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:699
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 "Non é posible abrir a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:515
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Non é posible abrir a caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:514
-#: camel/providers/local/camel-mbox-summary.c:522
-#: camel/providers/local/camel-mbox-summary.c:701
-#: camel/providers/local/camel-mbox-summary.c:709
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:548
+#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:745
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:565
+#: camel/providers/local/camel-mbox-summary.c:591
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erro escribindo á caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:582
+#: camel/providers/local/camel-mbox-summary.c:608
 #, fuzzy, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Erro escribindo á caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:759
+#: camel/providers/local/camel-mbox-summary.c:626
+#: camel/providers/local/camel-mbox-summary.c:795
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Non foi posible pechar a carpeta orixe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:609
+#: camel/providers/local/camel-mbox-summary.c:635
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Non foi posible pechar a carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:646
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posible renomear a carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:830
+#: camel/providers/local/camel-mbox-summary.c:870
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro descoñecido: %s"
@@ -2530,7 +3986,7 @@ msgstr "Erro descoñecido: %s"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Non é posible engadir a mensaxe á carpeta mh: %s"
 
-#: camel/providers/local/camel-mh-store.c:116
+#: camel/providers/local/camel-mh-store.c:108
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' non é un directorio."
@@ -2603,16 +4059,26 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:180
+#: camel/providers/pop3/camel-pop3-folder.c:145
+#, fuzzy
+msgid "Retrieving POP summary"
+msgstr "Recibindo a mensaxe %d de %d"
+
+#: camel/providers/pop3/camel-pop3-folder.c:188
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:274
+#: camel/providers/pop3/camel-pop3-folder.c:282
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:288
+#: camel/providers/pop3/camel-pop3-folder.c:286
+#, fuzzy, c-format
+msgid "Retrieving POP message %d"
+msgstr "Recibindo a mensaxe %d de %d"
+
+#: camel/providers/pop3/camel-pop3-folder.c:304
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
@@ -2630,7 +4096,22 @@ msgstr ""
 "recibir correo de certos provedores de correo web, e de sistemas de email "
 "propietarios."
 
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Secure POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:56
+#, fuzzy
+msgid ""
+"For connecting to POP servers over an SSL connection. The POP protocol can "
+"also be used to retrieve mail from certain web mail providers and "
+"proprietary email systems."
+msgstr ""
+"Para conectarse a servidores POP. O protocolo POP tamén se pode usar para "
+"recibir correo de certos provedores de correo web, e de sistemas de email "
+"propietarios."
+
+#: camel/providers/pop3/camel-pop3-store.c:147
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -2638,7 +4119,7 @@ msgstr ""
 "Esta opción conectarase ó servidor POP usando un contrasinal sen cifrar. "
 "Esta é a única opción que soportan moitos servidores POP."
 
-#: camel/providers/pop3/camel-pop3-store.c:158
+#: camel/providers/pop3/camel-pop3-store.c:157
 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 "
@@ -2648,28 +4129,28 @@ msgstr ""
 "través do protocolo APOP. Pode que isto non funcione para tódolos usuarios, "
 "mesmo naqueles que indican que o soportan."
 
-#: camel/providers/pop3/camel-pop3-store.c:170
+#: camel/providers/pop3/camel-pop3-store.c:169
 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:215
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, 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
+#: camel/providers/pop3/camel-pop3-store.c:331
 #, 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:375
+#: camel/providers/pop3/camel-pop3-store.c:378
 #, 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:394
+#: camel/providers/pop3/camel-pop3-store.c:397
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -2678,12 +4159,12 @@ msgstr ""
 "Non foi posible conectarse ó servidor POP.\n"
 "Erro enviando o nome de usuario: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:400
+#: camel/providers/pop3/camel-pop3-store.c:437
 msgid "(Unknown)"
 msgstr "(Descoñecido)"
 
-#: camel/providers/pop3/camel-pop3-store.c:424
+#: camel/providers/pop3/camel-pop3-store.c:427
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -2691,7 +4172,7 @@ msgstr ""
 "Non foi posible conectarse ó servidor POP.\n"
 "Non se soporta o mecanismo de autenticación solicitado."
 
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -2700,12 +4181,13 @@ msgstr ""
 "Non foi posible conectarse ó servidor POP.\n"
 "Erro enviando o contrasinal: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:541
+#: camel/providers/pop3/camel-pop3-store.c:543
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Non existe a carpeta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config.glade.h:61
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -2748,29 +4230,161 @@ msgstr "Non foi posible executar %s: correo non enviado."
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "o sendmail saíu con estado %d: correo non enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#, fuzzy
+msgid "Could not find 'From' address in message"
+msgstr "Non foi posible enviar a mensaxe: %s"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:222
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correo a través do programa sendmail"
 
+#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
+msgid "SMTP"
+msgstr "SMTP"
+
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:53
+msgid "Secure SMTP"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:55
+msgid ""
+"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+"connection.\n"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:147
+msgid "Syntax error, command unrecognized"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:149
+msgid "Syntax error in parameters or arguments"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:151
+msgid "Command not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:153
+msgid "Command parameter not implemented"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:155
+msgid "System status, or system help reply"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:157
+#, fuzzy
+msgid "Help message"
+msgstr "Editar Mensaxe"
+
+#: camel/providers/smtp/camel-smtp-transport.c:159
+#, fuzzy
+msgid "Service ready"
+msgstr "Agochar"
+
+#: camel/providers/smtp/camel-smtp-transport.c:161
+msgid "Service closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:163
+msgid "Service not available, closing transmission channel"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:165
+msgid "Requested mail action okay, completed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:167
+msgid "User not local; will forward to <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Requested mail action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:171
+msgid "Requested action not taken: mailbox unavailable"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:173
+msgid "Requested action aborted: error in processing"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:175
+msgid "User not local; please try <forward-path>"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:177
+msgid "Requested action not taken: insufficient system storage"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:179
+msgid "Requested mail action aborted: exceeded storage allocation"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:181
+msgid "Requested action not taken: mailbox name not allowed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:183
+msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:185
+msgid "Transaction failed"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:189
+#, fuzzy
+msgid "A password transition is needed"
+msgstr "Non se indicou un contrasinal."
+
+#: camel/providers/smtp/camel-smtp-transport.c:191
+msgid "Authentication mechanism is too weak"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:193
+#, fuzzy
+msgid "Encryption required for requested authentication mechanism"
+msgstr ""
+"Non foi posible conectarse ó servidor POP.\n"
+"Non se soporta o mecanismo de autenticación solicitado."
+
+#: camel/providers/smtp/camel-smtp-transport.c:195
+#, fuzzy
+msgid "Temporary authentication failure"
+msgstr "Autenticación"
+
+#: camel/providers/smtp/camel-smtp-transport.c:197
+#, fuzzy
+msgid "Authentication required"
+msgstr "Autenticación"
+
+#: camel/providers/smtp/camel-smtp-transport.c:286
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:279
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, fuzzy, c-format
+msgid "%sPlease enter the SMTP password for %s@%s"
+msgstr "%sIntroduza o contrasinal IMAP para %s@%s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy
 msgid "No authentication required"
 msgstr "Autenticación"
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:468
 #, fuzzy
 msgid ""
 "This option will connect to the SMTP server without using any kind of "
@@ -2779,121 +4393,112 @@ msgstr ""
 "Esta opción conectarase ó servidor POP usando un contrasinal sen cifrar. "
 "Esta é a única opción que soportan moitos servidores POP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:290
-#: camel/providers/smtp/camel-smtp-transport.c:295
-msgid "CRAM-MD5"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#, fuzzy
-msgid ""
-"This option will connect to the SMTP server using CRAM-MD5 authentication."
-msgstr ""
-"Esta opción conectarase ó servidor IMAP usando autenticación Kerberos 4."
-
-#: camel/providers/smtp/camel-smtp-transport.c:320
+#: camel/providers/smtp/camel-smtp-transport.c:511
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:322
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, fuzzy, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correo a través do programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:347
+#: camel/providers/smtp/camel-smtp-transport.c:538
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:545
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:368
+#: camel/providers/smtp/camel-smtp-transport.c:559
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:462
+#: camel/providers/smtp/camel-smtp-transport.c:653
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:478
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:719
+#, fuzzy, c-format
+msgid "AUTH request timed out: %s"
+msgstr "Non foi posible executar %s: correo non enviado."
+
+#: camel/providers/smtp/camel-smtp-transport.c:777
+#, fuzzy
+msgid "Bad authentication response from server.\n"
+msgstr "Resposta non agardada do servidor IMAP: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:802
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:821
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:846
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "Non foi posible crear unha canalización para o sendmail: %s: correo non "
 "enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:574
-#, fuzzy
-msgid "RCPT TO response error: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:865
+#, fuzzy, c-format
+msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Non foi posible executar %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:604
+#: camel/providers/smtp/camel-smtp-transport.c:896
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Non foi posible executar %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:620
+#: camel/providers/smtp/camel-smtp-transport.c:915
 #, fuzzy, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Non foi posible facer fork para o sendmail: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:635
-#: camel/providers/smtp/camel-smtp-transport.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:930
+#: camel/providers/smtp/camel-smtp-transport.c:948
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "o sendmail saíu co sinal %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:967
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:693
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:709
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Erro descoñecido: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:732
+#: camel/providers/smtp/camel-smtp-transport.c:1033
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:1052
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: 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:87
 msgid "1 byte"
 msgstr "1 byte"
@@ -2919,19 +4524,15 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
 msgid "attachment"
 msgstr "anexo"
 
 #: composer/e-msg-composer-attachment-bar.c:413
+#: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Incluír un ficheiro"
 
-#: composer/e-msg-composer-attachment-bar.c:460 shell/e-shortcuts-view.c:254
-#: shell/e-shortcuts-view.c:377
-msgid "Remove"
-msgstr "Quitar"
-
 #: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Quitar os elementos seleccionados da lista de anexos"
@@ -2944,40 +4545,80 @@ msgstr "Engadir anexo..."
 msgid "Attach a file to the message"
 msgstr "Incluír un ficheiro como anexo na mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
-#: mail/mail-format.c:624
-msgid "From:"
-msgstr "De:"
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
+#: ui/evolution-mail.xml.h:1
+#, fuzzy
+msgid "Attachment"
+msgstr "anexo"
+
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Attachment properties"
+msgstr "Propiedades do anexo"
+
+#: composer/e-msg-composer-attachment.glade.h:4
+msgid "File name:"
+msgstr "Nome de ficheiro:"
+
+#: composer/e-msg-composer-attachment.glade.h:5
+#, fuzzy
+msgid "Inline attachment"
+msgstr "anexo"
 
-#: composer/e-msg-composer-hdrs.c:257
+#: composer/e-msg-composer-attachment.glade.h:6
+msgid "MIME type:"
+msgstr "Tipo MIME:"
+
+#: composer/e-msg-composer-attachment.glade.h:7
+#, fuzzy
+msgid "Send as:"
+msgstr "Autor"
+
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Click here for the address book"
 msgstr "Prema aquí para o libro de enderezos"
 
-#: composer/e-msg-composer-hdrs.c:313
-msgid "Enter the identity you wish to send this message from"
-msgstr "Introduza a identidade coa que desexa enviar esta mensaxe"
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
+msgid "From:"
+msgstr "De:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+msgid "Reply-To:"
+msgstr "Responder-A:"
 
-#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+msgid "Subject:"
+msgstr "Asunto:"
+
+#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:318
+#: composer/e-msg-composer-hdrs.c:377
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:381
 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:328
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:329
+#: composer/e-msg-composer-hdrs.c:385
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -2985,15 +4626,7 @@ msgstr ""
 "Introduza os enderezos que recibirán unha copia da mensaxe sen apareceren na "
 "lista de destinatarios."
 
-#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
-msgid "Subject:"
-msgstr "Asunto:"
-
-#: composer/e-msg-composer-hdrs.c:336
-msgid "Enter the subject of the mail"
-msgstr "Introduza o asunto da mensaxe"
-
-#: composer/e-msg-composer.c:430
+#: composer/e-msg-composer.c:518
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3002,38 +4635,26 @@ msgstr ""
 "Non foi posible abrir o ficheiro de sinatura %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:598
+#: composer/e-msg-composer.c:706
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: composer/e-msg-composer.c:609
+#: composer/e-msg-composer.c:717
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:629
+#: composer/e-msg-composer.c:737
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:651
-msgid "Saving changes to message..."
-msgstr "Gardando as modificacións da mensaxe..."
-
-#: composer/e-msg-composer.c:653
-msgid "Save changes to message..."
-msgstr "Gardar as modificacións da mensaxe..."
-
-#: composer/e-msg-composer.c:694
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:752 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:758
+#: composer/e-msg-composer.c:824
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3043,27 +4664,27 @@ msgstr ""
 "\n"
 "¿Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:783
+#: composer/e-msg-composer.c:849
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:975
 msgid "That file does not exist."
 msgstr "O ficheiro non existe."
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:985
 msgid "That is not a regular file."
 msgstr "Non é un ficheiro normal."
 
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:995
 msgid "That file exists but is not readable."
 msgstr "O ficheiro existe pero non se pode ler."
 
-#: composer/e-msg-composer.c:939
+#: composer/e-msg-composer.c:1005
 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:961
+#: composer/e-msg-composer.c:1027
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3071,22 +4692,259 @@ msgstr ""
 "O ficheiro é moi longo (máis de 100K).\n"
 "¿Está seguro de querer inserilo?"
 
-#: composer/e-msg-composer.c:982
+#: composer/e-msg-composer.c:1048
 msgid "An error occurred while reading the file."
 msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: composer/e-msg-composer.c:1362
+#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
 msgid "Compose a message"
 msgstr "Compoñer unha mensaxe"
 
-#: composer/e-msg-composer.c:1439
+#: composer/e-msg-composer.c:1765
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:346
+#: composer/evolution-composer.c:352
+msgid ""
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
+msgstr ""
+
+#: composer/evolution-composer.c:367
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
+#: data/evolution.desktop.in.h:2
+#, fuzzy
+msgid "The Evolution groupware suite"
+msgstr "_Atallo da barra do Evolution"
+
+#: data/evolution.keys.in.h:1
+#, fuzzy
+msgid "address card"
+msgstr "Enderezo"
+
+#: data/evolution.keys.in.h:2
+#, fuzzy
+msgid "calendar information"
+msgstr "Sen Información"
+
+#. strptime format for a date.
+#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#. strptime format for a time of day, in 12-hour format.
+#. If it is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+msgid "%I:%M:%S %p%n"
+msgstr "%I:%M:%S %p%n"
+
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+msgid "%H:%M:%S%n"
+msgstr "%H:%M:%S%n"
+
+#. strptime format for time of day, without seconds, 12-hour format.
+#. If it is is not appropriate in the locale set to an empty string.
+#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+msgid "%I:%M %p%n"
+msgstr "%I:%M %p%n"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+msgid "%H:%M%n"
+msgstr "%H:%M%n"
+
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:267
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:272
+#, fuzzy
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:281
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the Evolution executive summary component."
+msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
+
+#: executive-summary/component/component-factory.c:152
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Non se pode inicializar o compoñente de correo de Evolution."
+
+#: executive-summary/component/e-summary-callbacks.c:290
+msgid ""
+"You can select a different HTML page for the background of the Executive "
+"Summary.\n"
+"\n"
+"Just leave it blank for the default"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
+#, c-format
+msgid "Open %s with the default GNOME application"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:70
+#, c-format
+msgid "Open %s with the default GNOME web browser"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:71
+#, fuzzy, c-format
+msgid "Send an email to %s"
+msgstr "Recibindo correo de %s"
+
+#: executive-summary/component/e-summary-url.c:72
+#, c-format
+msgid "Change the view to %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:73
+#, c-format
+msgid "Run %s"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:75
+#, fuzzy, c-format
+msgid "Close %s"
+msgstr "Pechar"
+
+#: executive-summary/component/e-summary-url.c:76
+#, fuzzy, c-format
+msgid "Move %s to the left"
+msgstr "Mover para a Carpeta"
+
+#: executive-summary/component/e-summary-url.c:77
+#, c-format
+msgid "Move %s to the right"
+msgstr ""
+
+#: executive-summary/component/e-summary-url.c:78
+#, fuzzy, c-format
+msgid "Move %s into the previous row"
+msgstr "Ir ó elemento anterior"
+
+#: executive-summary/component/e-summary-url.c:79
+#, fuzzy, c-format
+msgid "Move %s into the next row"
+msgstr "Ir ó elemento seguinte"
+
+#: executive-summary/component/e-summary-url.c:80
+#, fuzzy, c-format
+msgid "Configure %s"
+msgstr "_Configurar Carpeta"
+
+#: executive-summary/component/e-summary.c:918
+#, fuzzy, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"Non foi posible abrir o ficheiro %s:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:932
+#, fuzzy, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr "Erro lendo o ficheiro de correo: %s"
+
+#: executive-summary/component/e-summary.c:950
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/executive-summary-config.glade.h:1
+msgid "Appearance"
+msgstr ""
+
+#: executive-summary/component/executive-summary-config.glade.h:2
+msgid "Background:"
+msgstr ""
+
+#: executive-summary/component/main.c:60
+msgid ""
+"Executive summary component could not initialize Bonobo.\n"
+"If there was a warning message about the RootPOA, it probably means\n"
+"you compiled Bonobo against GOAD instead of OAF."
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
+msgid "Factory for the RDF summary."
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
+#, fuzzy
+msgid "RDF Summary"
+msgstr "_Resume"
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
+#, fuzzy
+msgid "Factory for the test bonobo component."
+msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the test component."
+msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
+msgid "Test bonobo service"
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
+msgid "Test service"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:509
+#: executive-summary/test-service/rdf-summary.c:546
+#: executive-summary/test-service/rdf-summary.c:591
+#: widgets/misc/e-messagebox.c:155
+#, fuzzy
+msgid "Error"
+msgstr "Sen erro"
+
+#: executive-summary/test-service/rdf-summary.c:765
+msgid "Update automatically"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update now"
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:785
+msgid "Update every "
+msgstr ""
+
+#: executive-summary/test-service/rdf-summary.c:793
+#: filter/filter-datespec.c:67
+msgid "minutes"
+msgstr "minutos"
+
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "ano"
@@ -3127,10 +4985,6 @@ msgstr "horas"
 msgid "minute"
 msgstr "minuto"
 
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "minutos"
-
 #: filter/filter-datespec.c:68
 msgid "second"
 msgstr "segundo"
@@ -3193,41 +5047,20 @@ msgstr "agora"
 msgid "<click here to select a date>"
 msgstr "<prema aquí para seleccionar unha data>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
-#: mail/mail-autofilter.c:335
-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:433
-msgid "incoming"
-msgstr ""
-
-#. "demand",
-#: filter/filter-editor.c:435
-#, fuzzy
-msgid "outgoing"
-msgstr ""
-"Entrante\n"
-"Saínte\n"
-
-#: filter/filter-editor.c:456
-msgid "Edit Filters"
-msgstr "Editar Filtros"
+#: filter/filter-editor.c:126 filter/filter.glade.h:6
+msgid "Filter Rules"
+msgstr "Reglas de Filtrado"
 
 #. and now for the action area
-#: filter/filter-filter.c:401
+#: filter/filter-filter.c:424
 msgid "Then"
 msgstr "Entón"
 
-#: filter/filter-filter.c:414
+#: filter/filter-filter.c:437
 msgid "Add action"
 msgstr "Engadir acción"
 
-#: filter/filter-filter.c:420
+#: filter/filter-filter.c:443
 msgid "Remove action"
 msgstr "Eliminar acción"
 
@@ -3237,7 +5070,7 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
 msgid "Select Folder"
 msgstr "Seleccionar Carpeta"
 
@@ -3249,7 +5082,7 @@ msgstr "Introduza o URI da carpeta"
 msgid "<click here to select a folder>"
 msgstr "<prema aquí para seleccionar unha carpeta>"
 
-#: filter/filter-input.c:185
+#: filter/filter-input.c:189
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3258,418 +5091,532 @@ msgstr ""
 "Erro na expresión regular '%s':\n"
 "%s"
 
-#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
-#, c-format
-msgid "Failed to perform regex search on message header: %s"
-msgstr ""
-
 #: filter/filter-part.c:467
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:597
 msgid "Rule name: "
 msgstr "Nome da regra: "
 
-#: filter/filter-rule.c:534
+#: filter/filter-rule.c:601
 msgid "Untitled"
 msgstr "Sen_título"
 
-#: filter/filter-rule.c:550
+#: filter/filter-rule.c:617
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:634
 msgid "Execute actions"
 msgstr "Executar accións"
 
-#: filter/filter-rule.c:571
+#: filter/filter-rule.c:638
 msgid "if all criteria are met"
 msgstr "se se cumpren tódolos criterios"
 
-#: filter/filter-rule.c:576
+#: filter/filter-rule.c:643
 msgid "if any criteria are met"
 msgstr "se se cumpre algún criterio"
 
-#: filter/filter-rule.c:587
+#: filter/filter-rule.c:654
 msgid "Add criterion"
 msgstr "Engadir criterio"
 
-#: filter/filter-rule.c:593
+#: filter/filter-rule.c:660
 msgid "Remove criterion"
 msgstr "Eliminar criterio"
 
-#: filter/filter-system-flag.c:63
+#: filter/filter-system-flag.c:67
 #, fuzzy
 msgid "Replied to"
 msgstr "Responder a Todos"
 
-#. { _("Deleted"), "Deleted" },
-#. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
+#. { N_("Deleted"), "Deleted" },
+#. { N_("Draft"), "Draft" },
+#: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr ""
 
-#: filter/filter-system-flag.c:67
+#: filter/filter-system-flag.c:71
 #, fuzzy
 msgid "Read"
 msgstr "Refacer"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "Editar Filtros"
+
+#: filter/filter.glade.h:5
+#, fuzzy
+msgid "Edit VFolders"
+msgstr "Editar Filtros"
+
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid "Incoming"
+msgstr ""
+"Entrante\n"
+"Saínte\n"
+
+#: filter/filter.glade.h:8
+#, fuzzy
+msgid "Outgoing"
+msgstr ""
+"Entrante\n"
+"Saínte\n"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+msgid "Virtual Folders"
+msgstr "Carpetas Virtuais"
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid "specific folders only"
+msgstr "Non se atopou a carpeta especificada"
+
+#: filter/filter.glade.h:12
+#, fuzzy
+msgid "vFolder Sources"
+msgstr "Fontes de Correo"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: filter/filter.glade.h:15
+#, fuzzy
+msgid "with all local folders"
+msgstr "Crear unha nova carpeta"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Asignar Cor"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Asignar Puntuación"
 
-#: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
-msgstr "Copiar á Carpeta"
-
 #: filter/libfilter-i18n.h:5
-msgid "Date received"
-msgstr "Data de recepción"
+#, fuzzy
+msgid "Attachments"
+msgstr "anexo"
 
-#: filter/libfilter-i18n.h:6
-msgid "Date sent"
-msgstr "Data de envío"
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "contén"
 
 #: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Expresión"
+msgid "Copy to Folder"
+msgstr "Copiar á Carpeta"
 
 #: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Reenviar ó Enderezo"
+msgid "Date received"
+msgstr "Data de recepción"
 
 #: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Corpo da Mensaxe"
-
-#: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "Corpo da Mensaxe"
+msgid "Date sent"
+msgstr "Data de envío"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr ""
+msgid "does not contain"
+msgstr "non contén"
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr ""
+msgid "does not end with"
+msgstr "non termina en"
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Mover para a Carpeta"
+msgid "does not exist"
+msgstr "non existe"
 
 #: filter/libfilter-i18n.h:15
-msgid "Recipients"
-msgstr "Destinatarios"
+msgid "does not sound like"
+msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "Regex Match"
-msgstr ""
+msgid "does not start with"
+msgstr "non empeza por"
 
-#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1109
-msgid "Score"
-msgstr "Puntuación"
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Do Not Exist"
+msgstr "non existe"
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Autor"
+msgid "ends with"
+msgstr "termina en"
 
 #: filter/libfilter-i18n.h:19
 #, fuzzy
-msgid "Set Status"
-msgstr "_Estado:"
+msgid "Exist"
+msgstr "_Saír"
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr ""
+msgid "exists"
+msgstr "existe"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr ""
+msgid "Expression"
+msgstr "Expresión"
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1109
-#, fuzzy
-msgid "Status"
-msgstr "_Estado:"
+#: filter/libfilter-i18n.h:22
+msgid "Forward to Address"
+msgstr "Reenviar ó Enderezo"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr ""
+msgid "is"
+msgstr "é"
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1110
-msgid "Subject"
-msgstr "Asunto"
+#: filter/libfilter-i18n.h:24
+msgid "is greater than"
+msgstr "é maior que"
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr ""
+msgid "is less than"
+msgstr "é menor que"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr ""
+msgid "is not"
+msgstr "non é"
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "contén"
+#, fuzzy
+msgid "Mailing list"
+msgstr "lista de correo %s"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "non contén"
+msgid "Message Body"
+msgstr "Corpo da Mensaxe"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "non termina en"
+#, fuzzy
+msgid "Message Header"
+msgstr "Corpo da Mensaxe"
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "non existe"
+msgid "Message was received"
+msgstr ""
 
 #: filter/libfilter-i18n.h:31
-msgid "does not sound like"
+msgid "Message was sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "non empeza por"
+msgid "Move to Folder"
+msgstr "Mover para a Carpeta"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "termina en"
+msgid "on or after"
+msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "existe"
+msgid "on or before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "é maior que"
+msgid "Recipients"
+msgstr "Destinatarios"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "é menor que"
-
-#: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "non é"
+msgid "Regex Match"
+msgstr ""
 
-#: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "é"
+#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1171
+msgid "Score"
+msgstr "Puntuación"
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr ""
+#, fuzzy
+msgid "Set Status"
+msgstr "_Estado:"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
+msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
-msgid "sounds like"
+#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
+msgid "Source"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:45
+msgid "Stop Processing"
+msgstr ""
+
+#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
+msgid "Subject"
+msgstr "Asunto"
+
+#: filter/libfilter-i18n.h:47
 msgid "was after"
 msgstr "foi posterior a"
 
-#: filter/libfilter-i18n.h:44
+#: 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 ""
-
-#: filter/vfolder-editor.c:155
-msgid "Add VFolder Rule"
-msgstr ""
-
-#: filter/vfolder-editor.c:204
-msgid "Edit VFolder Rule"
-msgstr ""
+#: filter/score-editor.c:126
+#, fuzzy
+msgid "Score Rules"
+msgstr "Puntuación"
 
-#: mail/component-factory.c:284
+#: mail/component-factory.c:306
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compoñente de correo de Evolution."
 
-#: mail/component-factory.c:320
+#: mail/component-factory.c:379
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:225
+#: mail/folder-browser-factory.c:237
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "Propiedades"
+
+#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
+msgstr "Propiedades"
+
+#: mail/folder-browser.c:219
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "Seleccionar Carpeta"
 
-#: mail/folder-browser.c:238
-msgid "Body or subject contains"
-msgstr "O corpo ou o asunto conteñen"
-
-#: mail/folder-browser.c:239
-msgid "Body contains"
-msgstr "O corpo contén"
-
-#: mail/folder-browser.c:240
-msgid "Subject contains"
-msgstr "O asunto contén"
-
-#: mail/folder-browser.c:241
-msgid "Body does not contain"
-msgstr "O corpo non contén"
-
-#: mail/folder-browser.c:242
-msgid "Subject does not contain"
-msgstr "O asunto non contén"
-
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:509
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:646
+#: mail/folder-browser.c:512
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:515
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:518 mail/folder-browser.c:702
+msgid "VFolder on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:524
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:650
+#: mail/folder-browser.c:527
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:651
+#: mail/folder-browser.c:530
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:652 mail/folder-browser.c:766
+#: mail/folder-browser.c:533 mail/folder-browser.c:701
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:658
-#, fuzzy
-msgid "Open"
-msgstr "_Abrir"
-
-#: mail/folder-browser.c:659
-msgid "Edit"
-msgstr "Editar"
-
-#: mail/folder-browser.c:660
+#: mail/folder-browser.c:544
 #, fuzzy
 msgid "Save As..."
 msgstr "Gardar _Como..."
 
-#: mail/folder-browser.c:661 mail/mail-view.c:148
+#: mail/folder-browser.c:546 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Imprimir"
 
-#: mail/folder-browser.c:663
+#: mail/folder-browser.c:551
 msgid "Reply to Sender"
 msgstr "Responder ó Autor"
 
-#: mail/folder-browser.c:664 mail/mail-view.c:141
+#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
-#: mail/folder-browser.c:665 mail/mail-view.c:144
+#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
 msgid "Forward"
 msgstr "Re-enviar"
 
-#: mail/folder-browser.c:666
+#: mail/folder-browser.c:557
 #, fuzzy
 msgid "Forward inline"
 msgstr "Ir para diante no tempo"
 
-#: mail/folder-browser.c:668
+#: mail/folder-browser.c:560
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:669
+#: mail/folder-browser.c:562
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:671
+#: mail/folder-browser.c:567
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Mover para a Carpeta"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:569
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Copiar á Carpeta"
 
-#: mail/folder-browser.c:674
+#: mail/folder-browser.c:573
 #, fuzzy
 msgid "Undelete"
 msgstr "Eliminar"
 
-#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
-#. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:678
+#. { _("Add Sender to Address Book"),  NULL,
+#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
+#. { "",                               NULL,
+#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
+#: mail/folder-browser.c:583
 msgid "Apply Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:587
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:704
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:683 mail/mail-account-editor.c:685
-#: mail/mail-account-editor.c:734 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:844 shell/e-shell-view.c:1093
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
+#: mail/folder-browser.c:705
+#, c-format
+msgid "VFolder on Mailing List (%s)"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "Non se pode inicializar o compoñente de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "Non se pode inicializar o compoñente de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Mail Summary component."
+msgstr "Utilidade de configuración para o conducto de axenda de evolution.\n"
+
+#: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Current store format:"
+msgstr "Non foi posible iniciar wombat"
+
+#: mail/local-config.glade.h:2
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "Formato"
+
+#: mail/local-config.glade.h:3
+#, fuzzy
+msgid "New store format:"
+msgstr "Tipo de fonte de Novas:"
+
+#: mail/local-config.glade.h:4
+msgid ""
+"Note: When converting between mailbox formats, a failure\n"
+"(such as lack of disk space) may not be automatically\n"
+"recoverable.  Please use this feature with care."
 msgstr ""
 
-#: mail/mail-accounts.c:115
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "maildir"
+msgstr "Correo Electrónico 2"
+
+#: mail/local-config.glade.h:8
+msgid "mbox"
+msgstr ""
+
+#: mail/local-config.glade.h:9
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
+#: mail/mail-accounts.c:116
 #, fuzzy
 msgid " (default)"
 msgstr "Eliminar"
 
+#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#, fuzzy
+msgid "Are you sure you want to delete this account?"
+msgstr ""
+"¿Está seguro de que quere\n"
+"borrar este contacto?"
+
+#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+#, fuzzy
+msgid "Are you sure you want to delete this news account?"
+msgstr ""
+"¿Está seguro de que quere\n"
+"borrar este contacto?"
+
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:347
+#: mail/mail-accounts.c:423
 #, fuzzy
 msgid "Evolution Account Manager"
 msgstr "Xestión e Contas"
 
-#: mail/mail-account-editor.c:274
+#: mail/mail-account-editor.c:307
 msgid ""
 "One or more of your servers are not configured correctly.\n"
 "Do you wish to save anyway?"
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:634
+#: mail/mail-account-editor.c:706
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Instalación de Evolution"
 
+#: mail/mail-account-editor.c:727
+msgid "Unspecified"
+msgstr ""
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -3685,12 +5632,16 @@ msgstr "O asunto é %s"
 msgid "Mail from %s"
 msgstr "Enviar dende %s"
 
-#: mail/mail-autofilter.c:331
+#: mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: mail/mail-callbacks.c:83
+#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+msgid "Add Filter Rule"
+msgstr "Engadir Regra de Filtrado"
+
+#: mail/mail-callbacks.c:85
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3698,7 +5649,7 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:136
+#: mail/mail-callbacks.c:138
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -3706,21 +5657,17 @@ msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:223
+#: mail/mail-callbacks.c:194
 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:232
-msgid "You have no Outbox configured"
-msgstr ""
-
-#: mail/mail-callbacks.c:279
+#: mail/mail-callbacks.c:227
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -3728,31 +5675,36 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "¿Enviar realmente?"
 
-#: mail/mail-callbacks.c:345
+#: mail/mail-callbacks.c:294
 #, fuzzy
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: mail/mail-callbacks.c:365
+#: mail/mail-callbacks.c:316
 msgid "You must specify recipients in order to send this message."
 msgstr "Ten que especificar destinatarios para poder enviar esta mensaxe."
 
-#: mail/mail-callbacks.c:594
+#: mail/mail-callbacks.c:579
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-callbacks.c:761
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-callbacks.c:675
+#: mail/mail-callbacks.c:864
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:677
+#: mail/mail-callbacks.c:866
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:812
+#: mail/mail-callbacks.c:1007
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -3760,11 +5712,11 @@ msgstr ""
 "Só pode editar mensaxes gardados\n"
 "na carpeta de Borrador."
 
-#: mail/mail-callbacks.c:845 mail/mail-display.c:79
+#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
 msgid "Overwrite file?"
 msgstr "¿Sobrescribir ficheiro?"
 
-#: mail/mail-callbacks.c:849 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3772,17 +5724,17 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "¿Sobrescribilo?"
 
-#: mail/mail-callbacks.c:893
+#: mail/mail-callbacks.c:1088
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Gardar como..."
 
-#: mail/mail-callbacks.c:895
+#: mail/mail-callbacks.c:1090
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Gardar como..."
 
-#: mail/mail-callbacks.c:979
+#: mail/mail-callbacks.c:1204
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -3791,22 +5743,308 @@ msgstr ""
 "Erro cargando a información do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1028
+#: mail/mail-callbacks.c:1253
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:1075
+#: mail/mail-callbacks.c:1300
 msgid "Printing of message failed"
 msgstr "A impresión da mensaxe fallou"
 
-#: mail/mail-config-druid.c:363
+#: mail/mail-config.glade.h:1
+#, fuzzy
+msgid "Account"
+msgstr "Contas"
+
+#: mail/mail-config.glade.h:2
+msgid "Account Information"
+msgstr "Información de Contas"
+
+#: mail/mail-config.glade.h:3
+#, fuzzy
+msgid "Account Management"
+msgstr "Xestión e Contas"
+
+#: mail/mail-config.glade.h:5
+msgid "Advanced"
+msgstr ""
+
+#: mail/mail-config.glade.h:6
+msgid "Authentication"
+msgstr "Autenticación"
+
+#: mail/mail-config.glade.h:7
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "Autenticación:"
+
+#: mail/mail-config.glade.h:9
+msgid "Automatically check mail every"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Check settings"
+msgstr "Probar Configuración"
+
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Finish\" to save your settings."
+msgstr ""
+"A configuración do correo electrónico está completa.\n"
+"Prema \"Finalizar\" para gardar a nova configuración"
+
+#: mail/mail-config.glade.h:19
+#, fuzzy
+msgid "De_fault"
+msgstr "Eliminar"
+
+#: mail/mail-config.glade.h:21
+#, fuzzy
+msgid "Done"
+msgstr "mes"
+
+#: mail/mail-config.glade.h:23
+msgid "Email Address:"
+msgstr "Enderezo de Email:"
+
+#: mail/mail-config.glade.h:24
+msgid "Email address:"
+msgstr "Enderezo de email:"
+
+#: mail/mail-config.glade.h:25
+msgid "Evolution Mail Configuration"
+msgstr "Configuración de Correo do Evolution"
+
+#: mail/mail-config.glade.h:26
+msgid "Full Name:"
+msgstr "Nome Completo:"
+
+#: mail/mail-config.glade.h:29
+#, fuzzy
+msgid "Hostname:"
+msgstr "Nome de usuario:"
+
+#: mail/mail-config.glade.h:30
+msgid "IMAP"
+msgstr "IMAP"
+
+#: mail/mail-config.glade.h:31
+msgid "Identity"
+msgstr "Identidade"
+
+#: mail/mail-config.glade.h:32
+msgid "Include this account when receiving mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "Keep mail on server"
+msgstr "Non borrar as mensaxes do servidor"
+
+#: mail/mail-config.glade.h:34
+#, fuzzy
+msgid "Kerberos"
+msgstr "Kerberos 4"
+
+#: mail/mail-config.glade.h:35
+msgid "Mail"
+msgstr "Correo"
+
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Mail Account"
+msgstr "Contas"
+
+#: mail/mail-config.glade.h:37
+msgid "Mail Configuration"
+msgstr "Configuración do Correo"
+
+#: mail/mail-config.glade.h:38
+msgid "Mail Configuration Druid"
+msgstr "Axudante da Configuración do Correo"
+
+#: mail/mail-config.glade.h:39
+msgid "Make this my default account"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
+#, fuzzy
+msgid "Mark messages as \"Read\" after:"
+msgstr "Marcar mensaxe como lida [ms]: "
+
+#: mail/mail-config.glade.h:42
+msgid "News"
+msgstr "Novas"
+
+#: mail/mail-config.glade.h:44
+msgid "Optional"
+msgstr "Opcional"
+
+#: mail/mail-config.glade.h:45
+msgid "Organization:"
+msgstr "Organización:"
+
+#: mail/mail-config.glade.h:47
+msgid "PGP binary path:"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+msgid "Password:"
+msgstr "Contrasinal:"
+
+#: mail/mail-config.glade.h:50
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Receiving Email"
+msgstr "Enviando Correo"
+
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Remember my password"
+msgstr "Gardar como VCard"
+
+#: mail/mail-config.glade.h:53
+#, fuzzy
+msgid "Reply address:"
+msgstr "Enderezo de email:"
+
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Required"
+msgstr "Persoas _Requiridas"
+
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Save password"
+msgstr "Gardar como VCard"
+
+#: mail/mail-config.glade.h:57
+msgid "Select PGP binary"
+msgstr ""
+
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Select signature file"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Send mail in HTML format by default."
+msgstr "Enviar mensaxes en formato HTML"
+
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Sending Email"
+msgstr "Enviando Correo"
+
+#: mail/mail-config.glade.h:62
+msgid "Server Configuration"
+msgstr "Configuración do Servidor"
+
+#: mail/mail-config.glade.h:63
+msgid "Server Type: "
+msgstr "Tipo de Servidor: "
+
+#: mail/mail-config.glade.h:64
+#, fuzzy
+msgid "Server requires authentication"
+msgstr "O servidor SMTP require autenticación"
+
+#: mail/mail-config.glade.h:65
+#, fuzzy
+msgid "Server type:"
+msgstr "Tipo de Servidor: "
+
+#: mail/mail-config.glade.h:66
+msgid "Signature file:"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Signature:"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-config.glade.h:69
+msgid "Sources"
+msgstr "Fontes"
+
+#: mail/mail-config.glade.h:70
+#, fuzzy
+msgid "This server requires a secure connection (SSL)"
+msgstr "O servidor SMTP require autenticación"
+
+#: mail/mail-config.glade.h:71
+#, fuzzy
+msgid "Transport"
+msgstr "Transparente"
+
+#: mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Transport Authentication"
+msgstr "Autenticación"
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Type"
+msgstr "Tipo:"
+
+#: mail/mail-config.glade.h:74
+msgid ""
+"Type the name by which you would like to refer to these servers. For "
+"example: \"Work\" or \"Home\"."
+msgstr ""
+
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "User Information"
+msgstr "Sen Información"
+
+#: mail/mail-config.glade.h:76
+msgid "Username:"
+msgstr "Nome de usuario:"
+
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid ""
+"Welcome to the Evolution Mail Configuration Druid.\n"
+"\n"
+"Click \"Next\" to begin. "
+msgstr "¡Benvido ó axudante da Configuración de Correo do Evolution!"
+
+#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+msgid "_Edit"
+msgstr "_Editar"
+
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "minutes."
+msgstr "minutos"
+
+#: mail/mail-config-druid.c:421
 #, c-format
 msgid ""
 "Failed to verify the incoming mail configuration.\n"
 "You may experience problems retrieving your mail from %s"
 msgstr ""
 
-#: mail/mail-config-druid.c:629
+#: mail/mail-config-druid.c:515
+#, fuzzy
+msgid "Namespace:"
+msgstr "Nome:"
+
+#: mail/mail-config-druid.c:708
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -3814,173 +6052,155 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:949
+#: mail/mail-config-druid.c:1215
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-display.c:98
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"Non foi posible abrir o ficheiro %s:\n"
-"%s"
-
-#: mail/mail-display.c:131
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Non foi posible escribir os datos: %s"
-
-#: mail/mail-display.c:229
+#: mail/mail-display.c:189
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:269
+#: mail/mail-display.c:229
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Non foi posible crear o directorio temporal: %s"
 
-#: mail/mail-display.c:311
+#: mail/mail-display.c:290
 msgid "Save to Disk..."
 msgstr "Gardar ó Disco..."
 
-#: mail/mail-display.c:313
+#: mail/mail-display.c:292
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:315
+#: mail/mail-display.c:294
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:342
+#: mail/mail-display.c:323
 msgid "External Viewer"
 msgstr "Visualizador Externo"
 
-#: mail/mail-display.c:365
+#: mail/mail-display.c:346
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:369
+#: mail/mail-display.c:350
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-format.c:504
+#: mail/mail-format.c:506
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:626
-msgid "Reply-To:"
-msgstr "Responder-A:"
+#: mail/mail-format.c:704
+#, fuzzy
+msgid "Loading message content"
+msgstr "Reenviando mensaxes \"%s\""
 
-#: mail/mail-format.c:856
+#: mail/mail-format.c:993
 msgid "Encrypted message not displayed"
 msgstr "Mensaxe cifrada non visualizada"
 
-#: mail/mail-format.c:862
+#: mail/mail-format.c:999
 msgid "Encrypted message"
 msgstr "Mensaxe cifrada"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:1000
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1438
+#: mail/mail-format.c:1069 mail/mail-format.c:1456
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1077 mail/mail-format.c:1464
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+
+#: mail/mail-format.c:1677
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1689
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1454
+#: mail/mail-format.c:1693
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1488
+#: mail/mail-format.c:1727
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1493
+#: mail/mail-format.c:1732
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1663
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr ""
+#: mail/mail-local.c:335
+#, fuzzy, c-format
+msgid "No such folder %s"
+msgstr "Non existe a carpeta `%s'."
 
-#: mail/mail-local.c:204
+#: mail/mail-local.c:508
+#, fuzzy, c-format
+msgid "Opening '%s'"
+msgstr "Abrir en %s..."
+
+#: mail/mail-local.c:786
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando a carpeta \"%s\" ó formato \"%s\""
 
-#: mail/mail-local.c:208
+#: mail/mail-local.c:790
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Cambiar carpeta \"%s\" ó formato \"%s\""
 
-#: mail/mail-local.c:251
+#: mail/mail-local.c:814
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Configurar Carpeta"
 
-#: mail/mail-local.c:269
+#. first, 'close' the old folder
+#: mail/mail-local.c:843
 msgid "Closing current folder"
 msgstr "Pechando a carpeta actual"
 
-#: mail/mail-local.c:295
+#: mail/mail-local.c:875
 msgid "Renaming old folder and opening"
 msgstr "Renomeando a carpeta antiga e abrindo"
 
-#: mail/mail-local.c:313
+#: mail/mail-local.c:893
 msgid "Creating new folder"
 msgstr "Creando unha nova carpeta"
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:907
 msgid "Copying messages"
 msgstr "Copiando as mensaxes"
 
-#: mail/mail-local.c:348
+#: mail/mail-local.c:928
 #, 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:379
+#: mail/mail-local.c:967
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:787
-#, fuzzy
-msgid "Registering local folder"
-msgstr "Creando unha nova carpeta"
-
-#: mail/mail-local.c:789
-#, fuzzy
-msgid "Register local folder"
-msgstr "Crear unha nova carpeta"
-
-#: mail/mail-local.c:893
-#, fuzzy, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"Non foi posible crear a carpeta `%s':\n"
-"%s"
-
-#: mail/mail-mt.c:85
+#: mail/mail-mt.c:177
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -3989,7 +6209,7 @@ msgstr ""
 "Erro na expresión regular '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:87
+#: mail/mail-mt.c:179
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -3998,471 +6218,523 @@ msgstr ""
 "Erro cargando a información do filtro:\n"
 "%s"
 
-#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
 #, fuzzy
 msgid "Working"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:107
-#, c-format
-msgid "Fetching email from %s"
-msgstr "Recibindo correo de %s"
-
-#: mail/mail-ops.c:109
-#, c-format
-msgid "Fetch email from %s"
-msgstr "Recibir correo de %s"
-
-#: mail/mail-ops.c:359
-#, c-format
-msgid "There is no new mail at %s."
-msgstr "Non hai novo correo en %s."
-
-#: mail/mail-ops.c:430
-msgid "Filtering email on demand"
+#: mail/mail-mt.c:666 mail/session.c:91
+msgid "Do you accept?"
 msgstr ""
 
-#: mail/mail-ops.c:432
-msgid "Filter email on demand"
-msgstr ""
+#: mail/mail-mt.c:860
+#, fuzzy
+msgid "Evolution progress"
+msgstr "Evolution"
 
-#: mail/mail-ops.c:563
+#: mail/mail-ops.c:516
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:565
+#: mail/mail-ops.c:518
 #, fuzzy
 msgid "Sending message"
 msgstr "Borrar esta mensaxe"
 
-#: mail/mail-ops.c:682
-msgid "Sending queue"
-msgstr ""
-
-#: mail/mail-ops.c:684
-msgid "Send queue"
-msgstr ""
-
-#: mail/mail-ops.c:819 mail/mail-ops.c:826
-#, c-format
-msgid "Appending \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:823 mail/mail-ops.c:829
-msgid "Appending a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:912
-#, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "Movendo mensaxes de \"%s\" a \"%s\""
-
-#: mail/mail-ops.c:914
-#, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Copiando mensaxes de \"%s\" a \"%s\""
+#: mail/mail-ops.c:752
+#, fuzzy
+msgid "Saving message to folder"
+msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
-#: mail/mail-ops.c:917
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Mover mensaxes de \"%s\" a \"%s\""
+#: mail/mail-ops.c:825
+#, fuzzy, c-format
+msgid "Moving messages to %s"
+msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-ops.c:919
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Copiar mensaxes de \"%s\" a \"%s\""
+#: mail/mail-ops.c:825
+#, fuzzy, c-format
+msgid "Copying messages to %s"
+msgstr "Copiando as mensaxes"
 
-#: mail/mail-ops.c:950
+#: mail/mail-ops.c:842
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:953
+#: mail/mail-ops.c:845
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:973
+#: mail/mail-ops.c:856
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s mensaxe %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1048
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1114 mail/subscribe-dialog.c:347
-msgid "(No description)"
-msgstr "(Sen descrición)"
-
-#: mail/mail-ops.c:1179
+#: mail/mail-ops.c:1085
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-ops.c:1220 mail/mail-ops.c:1289
+#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1351
-#, fuzzy
-msgid "Synchronising folder"
-msgstr "Sincronizando \"%s\""
+#: mail/mail-ops.c:1193
+#, fuzzy, c-format
+msgid "Opening store %s"
+msgstr "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1401
+#: mail/mail-ops.c:1380
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1450
+#: mail/mail-ops.c:1429
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/mail-ops.c:1517
+#: mail/mail-ops.c:1496
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/mail-ops.c:1527
+#: mail/mail-ops.c:1506
 #, 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:1675
-#, fuzzy, c-format
-msgid "Loading %s Folder for %s"
-msgstr "Cargando a Carpeta %s"
-
-#: mail/mail-ops.c:1677
-#, fuzzy, c-format
-msgid "Load %s Folder for %s"
-msgstr "Cargando a Carpeta %s"
-
-#: mail/mail-ops.c:1843
+#: mail/mail-ops.c:1580
 #, fuzzy
 msgid "Saving messages"
 msgstr "Copiando as mensaxes"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1659
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
 
-#: mail/mail-ops.c:1935
+#: mail/mail-ops.c:1672
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Recibindo a mensaxe %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:1686
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: mail/mail-search-dialogue.c:104
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
-msgid "Incomplete message written on pipe!"
-msgstr ""
+#: mail/mail-ops.c:1760
+#, fuzzy
+msgid "Saving attachment"
+msgstr "Gardar Anexo"
 
-#: mail/mail-threads.c:302
-#, c-format
+#: mail/mail-ops.c:1775
+#, fuzzy, c-format
 msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
+"Cannot create output file: %s:\n"
+" %s"
+msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
 
-#: mail/mail-threads.c:676
+#: mail/mail-ops.c:1803
 #, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr ""
+msgid "Could not write data: %s"
+msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr ""
+#: mail/mail-search-dialogue.c:107
+#, fuzzy
+msgid "_Search"
+msgstr "Buscar"
 
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr "Non foi posible crear a caixa de diálogo."
+#: mail/mail-send-recv.c:136
+#, fuzzy
+msgid "Cancelling ..."
+msgstr "Cancelar"
 
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr "O usuario cancelou a consulta."
+#: mail/mail-send-recv.c:231
+#, fuzzy
+msgid "Send & Receive mail"
+msgstr "Enviando Correo"
 
-#: mail/mail-tools.c:189
-#, c-format
-msgid "Couldn't create temporary mbox `%s': %s"
-msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
+#: mail/mail-send-recv.c:234
+#, fuzzy
+msgid "Receiving"
+msgstr "Data de recepción"
 
-#. Get all uids of source
-#: mail/mail-tools.c:241
-#, c-format
-msgid "Examining %s"
-msgstr "Examinando %s"
+#: mail/mail-send-recv.c:283
+msgid "Updating ..."
+msgstr ""
 
-#: mail/mail-tools.c:271
-#, c-format
-msgid ""
-"Could not read UID cache file \"%s\". You may receive duplicate messages."
+#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+msgid "Waiting ..."
 msgstr ""
 
-#: mail/mail-tools.c:300
-#, c-format
-msgid "Retrieving message %d of %d"
-msgstr "Recibindo a mensaxe %d de %d"
+#: mail/mail-send-recv.c:304
+#, fuzzy
+msgid "Sending"
+msgstr "Enviando \"%s\""
 
-#. Append it to dest
-#: mail/mail-tools.c:315
-#, c-format
-msgid "Writing message %d of %d"
-msgstr "Escribindo a mensaxe %d de %d"
+#: mail/mail-send-recv.c:469
+#, fuzzy
+msgid "Cancelled."
+msgstr "Cancelar"
 
-#: mail/mail-tools.c:347
+#: mail/mail-send-recv.c:473
+#, fuzzy
+msgid "Complete."
+msgstr "% Comp_leta:"
+
+#: mail/mail-summary.c:111
+msgid "Incomplete message written on pipe!"
+msgstr ""
+
+#: mail/mail-tools.c:138
 #, c-format
-msgid "Saving changes to %s"
-msgstr "Gardando as modificacións de %s"
+msgid "Couldn't create temporary mbox `%s': %s"
+msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
 
-#: mail/mail-tools.c:381
+#: mail/mail-tools.c:185
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (mensaxe reenviada)"
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:195
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (sen asunto)"
 
-#: mail/mail-tools.c:427
+#: mail/mail-tools.c:212
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:214
 msgid "Forwarded message (no subject)"
 msgstr "Mensaxe reenviada (sen asunto)"
 
-#: mail/mail-tools.c:530
+#: mail/mail-tools.c:411
 #, c-format
 msgid ""
-"Cannot open location `%s':\n"
-"%s"
+"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
+"%s<br><b>Subject:</b> %s<br>"
 msgstr ""
-"Non se pode abrir a localizaión `%s':\n"
-"%s"
 
-#: mail/mail-vfolder.c:149
+#: mail/mail-vfolder.c:248
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:298
+#: mail/mail-vfolder.c:426
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/mail-view.c:138
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Responder ó autor desta mensaxe"
 
-#: mail/mail-view.c:141
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Responder a tódolos destinatarios desta mensaxe"
 
-#: mail/mail-view.c:144
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward this message"
 msgstr "Re-enviar esta mensaxe"
 
-#: mail/mail-view.c:148
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
 msgid "Print the selected message"
 msgstr "Imprimir a mensaxe seleccionada"
 
-#: mail/mail-view.c:150
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
 msgid "Delete this message"
 msgstr "Borrar esta mensaxe"
 
-#: mail/message-list.c:599
+#: mail/message-list.c:618
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:602
+#: mail/message-list.c:621
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:605
+#: mail/message-list.c:624
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:890
+#: mail/message-list.c:627
+#, fuzzy
+msgid "Multiple Unseen Messages"
+msgstr "Non foi posible enviar a mensaxe: %s"
+
+#: mail/message-list.c:630
+#, fuzzy
+msgid "Multiple Messages"
+msgstr "Editar Mensaxe"
+
+#: mail/message-list.c:952
 #, c-format
 msgid "[ %s ]"
 msgstr ""
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:902 mail/message-list.c:918
+#: mail/message-list.c:964 mail/message-list.c:980
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:905 mail/message-list.c:921
+#: mail/message-list.c:967 mail/message-list.c:983
 #, fuzzy
 msgid "<unknown>"
 msgstr "Descoñecido"
 
-#: mail/message-list.c:973
+#: mail/message-list.c:1035
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:980
+#: mail/message-list.c:1042
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:989
+#: mail/message-list.c:1051
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1063
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1009
+#: mail/message-list.c:1071
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1011
+#: mail/message-list.c:1073
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d de %Y"
 
-#: mail/message-list.c:1109
+#: mail/message-list.c:1171
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1109
-#, fuzzy
-msgid "Attachment"
-msgstr "anexo"
-
-#: mail/message-list.c:1110
+#: mail/message-list.c:1172
 #, fuzzy
 msgid "From"
 msgstr "De:"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1172
 #, fuzzy
 msgid "Date"
 msgstr "Pegar"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1172
 #, fuzzy
 msgid "Received"
 msgstr "Data de recepción"
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1173
 #, fuzzy
 msgid "To"
 msgstr "A:"
 
-#: mail/message-list.c:1111
+#: mail/message-list.c:1173
 #, fuzzy
 msgid "Size"
 msgstr "Tamaño:"
 
-#: mail/openpgp-utils.c:78
+#: mail/openpgp-utils.c:89
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Introduza o seu contrasinal de PGP/GPG."
 
-#: mail/openpgp-utils.c:81
+#: mail/openpgp-utils.c:92
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Introduza o seu contrasinal de PGP/GPG."
 
-#: mail/openpgp-utils.c:435 mail/openpgp-utils.c:538 mail/openpgp-utils.c:742
-#: mail/openpgp-utils.c:891 mail/openpgp-utils.c:1048
+#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
+#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
 msgid "No GPG/PGP program available."
 msgstr "O programa GPG/PGP non está dispoñible."
 
-#: mail/openpgp-utils.c:442 mail/openpgp-utils.c:547 mail/openpgp-utils.c:749
-#: mail/openpgp-utils.c:898
+#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
+#: mail/openpgp-utils.c:920
 msgid "No password provided."
 msgstr "Non se indicou un contrasinal."
 
-#: mail/openpgp-utils.c:448 mail/openpgp-utils.c:555 mail/openpgp-utils.c:756
-#: mail/openpgp-utils.c:905 mail/openpgp-utils.c:1054
+#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
+#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Non foi posible crear unha canalización co GPG/PGP: %s"
 
-#: mail/openpgp-utils.c:566 mail/openpgp-utils.c:611 mail/openpgp-utils.c:650
+#: mail/openpgp-utils.c:588
 msgid "No recipients specified"
 msgstr ""
 
-#: mail/openpgp-utils.c:1065
+#: mail/openpgp-utils.c:1088
 #, fuzzy, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Non foi posible crear unha canalización: %s"
 
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
 #, fuzzy
 msgid "Folder"
 msgstr "Carpetas"
 
-#: mail/subscribe-dialog.c:63
+#: mail/subscribe-dialog.c:65
 #, fuzzy
 msgid "Store"
 msgstr "Puntuación"
 
-#: mail/subscribe-dialog.c:145
+#: mail/subscribe-dialog.c:147
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:178
+#: mail/subscribe-dialog.c:177
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:181
+#: mail/subscribe-dialog.c:280
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:282
+#, fuzzy, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr "Abrindo as mensaxes da carpeta \"%s\""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+msgid "Folder name:"
+msgstr "Nome de ficheiro:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+msgid "Folder type:"
+msgstr "Carpetas"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Specify where to create the folder:"
+msgstr "Non hai espacio dabondo para crear a carpeta"
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/importer/importer.c:157
 #, c-format
-msgid "Get store for \"%s\""
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
 msgstr ""
 
-#: mail/subscribe-dialog.c:289
+#: shell/importer/importer.c:175 shell/importer/importer.c:202
 #, c-format
-msgid "Subscribing to folder \"%s\""
+msgid ""
+"Importing %s\n"
+"Importing item %d."
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
+#: shell/importer/importer.c:309
 #, fuzzy, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "Abrindo as mensaxes da carpeta \"%s\""
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr "Non hai novo correo en %s."
+
+#: shell/importer/importer.c:319
+#, fuzzy
+msgid "Importing"
+msgstr "Movendo"
 
-#: mail/subscribe-dialog.c:297
+#: shell/importer/importer.c:327
 #, c-format
-msgid "Subscribe to folder \"%s\""
+msgid ""
+"Importing %s.\n"
+"Starting %s"
 msgstr ""
 
-#: mail/subscribe-dialog.c:300
+#: shell/importer/importer.c:342
 #, fuzzy, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "Abrindo as mensaxes da carpeta \"%s\""
+msgid "Error loading %s"
+msgstr "Erro cargando o ficheiro: %s"
+
+#: shell/importer/importer.c:357
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/importer/importer.c:428
+msgid "Automatic"
+msgstr ""
+
+#: shell/importer/importer.c:478
+#, fuzzy
+msgid "Filename:"
+msgstr "Nome de ficheiro:"
+
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+#, fuzzy
+msgid "Select a file"
+msgstr "Ficheiro de sinatura:"
+
+#: shell/importer/importer.c:493
+#, fuzzy
+msgid "File type:"
+msgstr "Nome de ficheiro:"
+
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+msgid "Import"
+msgstr ""
+
+#: shell/importer/importer.c:609
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: shell/importer/import.glade.h:2
+#, fuzzy
+msgid "Evolution Import Utility"
+msgstr "Instalación de Evolution"
+
+#: shell/importer/import.glade.h:3
+#, fuzzy
+msgid "Evolution Importer Utility"
+msgstr "Instalación de Evolution"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
 
 #: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
@@ -4490,7 +6762,8 @@ msgid "Evolution files successfully installed."
 msgstr "Ficheiros de Evolution instalados con éxito."
 
 #: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
+#, fuzzy
+msgid "This seems to be the first time you are running Evolution."
 msgstr "Semella que é a primeira vez que executa Evolution."
 
 #: shell/e-setup.c:190
@@ -4540,7 +6813,7 @@ msgstr ""
 "directorio de Evolution. Móvao para poder\n"
 "instalar os ficheiros de usuario de Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:82
+#: shell/e-shell-folder-creation-dialog.c:96
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -4549,11 +6822,11 @@ msgstr ""
 "Non se pode crear a carpeta indicada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:134
+#: shell/e-shell-folder-creation-dialog.c:153
 msgid "The specified folder name is not valid."
 msgstr "O nome de carpeta indicado non é válido."
 
-#: shell/e-shell-folder-creation-dialog.c:225
+#: shell/e-shell-folder-creation-dialog.c:245
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear unha nova carpeta"
 
@@ -4565,7 +6838,7 @@ msgstr ""
 "O tipo da carpeta seleccionada non é válido para\n"
 "a operación solicitada."
 
-#: shell/e-shell-folder-selection-dialog.c:297
+#: shell/e-shell-folder-selection-dialog.c:318
 msgid "New..."
 msgstr "Nova..."
 
@@ -4573,20 +6846,20 @@ msgstr "Nova..."
 msgid "(Untitled)"
 msgstr "(Sen_título)"
 
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:159
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy non foi atopado no seu $PATH."
 
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy could not be run."
 msgstr "Non se puido executar Bug buddy."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:194
 #, fuzzy
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:196
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -4596,24 +6869,24 @@ msgstr ""
 "en grupo para xestión de correo, axenda e contactos\n"
 "dentro do ambiente de escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:334
+#: shell/e-shell-view-menu.c:360
 msgid "Go to folder..."
 msgstr "Ir á carpeta..."
 
-#: shell/e-shell-view.c:140
+#: shell/e-shell-view.c:143
 msgid "(No folder displayed)"
 msgstr "(Ningunha carpeta visualizada)"
 
-#: shell/e-shell-view.c:468
+#: shell/e-shell-view.c:474
 msgid "Folders"
 msgstr "Carpetas"
 
-#: shell/e-shell-view.c:1098
+#: shell/e-shell-view.c:1124
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1100
+#: shell/e-shell-view.c:1126
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
@@ -4623,7 +6896,7 @@ msgstr "Evolution - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr "Non se pode activar o almacenamento local -- %s"
 
-#: shell/e-shell.c:1212
+#: shell/e-shell.c:1242
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -4707,89 +6980,95 @@ msgstr "Activar este atallo"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
-#: shell/e-shortcuts.c:358
+#: shell/e-shortcuts.c:375
 msgid "Error saving shortcuts."
 msgstr "Erro gardando atallos."
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
 msgid "_View"
 msgstr "_Vista"
 
-#: shell/e-storage-set-view.c:338
+#: shell/e-storage-set-view.c:468
 msgid "View the selected folder"
 msgstr "Ver carpeta seleccionada"
 
-#: shell/e-storage.c:138
+#: shell/e-storage.c:178
 msgid "(No name)"
 msgstr "(Sen nome)"
 
-#: shell/e-storage.c:389
+#: shell/e-storage.c:429
 msgid "No error"
 msgstr "Sen erro"
 
-#: shell/e-storage.c:391
+#: shell/e-storage.c:431
 msgid "Generic error"
 msgstr "Erro xenérico"
 
-#: shell/e-storage.c:393
+#: shell/e-storage.c:433
 msgid "A folder with the same name already exists"
 msgstr "Xa existe unha carpeta co mesmo nome"
 
-#: shell/e-storage.c:395
+#: shell/e-storage.c:435
 msgid "The specified folder type is not valid"
 msgstr "O tipo da carpeta especificada non é válido"
 
-#: shell/e-storage.c:397
+#: shell/e-storage.c:437
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:399
+#: shell/e-storage.c:439
 msgid "Not enough space to create the folder"
 msgstr "Non hai espacio dabondo para crear a carpeta"
 
-#: shell/e-storage.c:401
+#: shell/e-storage.c:441
 msgid "The specified folder was not found"
 msgstr "Non se atopou a carpeta especificada"
 
-#: shell/e-storage.c:403
+#: shell/e-storage.c:443
 msgid "Function not implemented in this storage"
 msgstr "Función non implementada neste almacenamento"
 
-#: shell/e-storage.c:405
+#: shell/e-storage.c:445
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: shell/e-storage.c:407
+#: shell/e-storage.c:447
 msgid "Operation not supported"
 msgstr "Operación non soportada"
 
-#: shell/e-storage.c:409
+#: shell/e-storage.c:449
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado non está soportado neste almacenamento"
 
-#: shell/main.c:74
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "Non se pode inicializar a shell de Evolution."
+
+#: shell/main.c:73
+#, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
+"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the time since the past release, our focus has been on making\n"
-"Evolution usable.  Many of the Evolution developers are now using\n"
-"Evolution to read their mail full time. You could too. (Just\n"
-"be sure to keep a backup.)\n"
+"Evolution is not yet complete. It's getting close, but there are\n"
+"places where features are either missing or only half working. If\n"
+"you can't figure out how to do something, it's probably because\n"
+"there's no way to do it yet! :-)\n"
 "\n"
-"But while we have fixed many bugs affecting its stability and\n"
-"security, you still get the disclaimer:  Evolution will: crash,\n"
-"lose your mail when you don't want it to, refuse to delete your\n"
-"mail when you do want it to, leave stray processes running,\n"
-"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
-"lists, and embarass you in front of your friends and co-workers.\n"
-"Use only as directed.\n"
+"We hope Evolution will be usable for you, but we still feel the\n"
+"need to warn you that it may: crash, lose your mail, leave stray\n"
+"processes running, consume 100% of your CPU, send non-\n"
+"compliant commands to your servers, and generally embarass you\n"
+"in front of your friends and co-workers. Use only as directed.\n"
 "\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:101
+#: shell/main.c:98
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -4797,1790 +7076,2112 @@ msgstr ""
 "Graciñas\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:132
+#: shell/main.c:129
 msgid "Cannot initialize the Evolution shell."
 msgstr "Non se pode inicializar a shell de Evolution."
 
-#: shell/main.c:178
+#: shell/main.c:175
 msgid "Disable."
 msgstr "Desactivar."
 
-#: shell/main.c:198
+#: shell/main.c:195
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Non se pode inicializar o sistema de compoñentes de Bonobo"
 
-#: ui/evolution-contact-editor.xml:7
+#: ui/evolution-addressbook.xml.h:2
 #, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "FIXME: _Nova Cita"
-
-#: ui/evolution-contact-editor.xml:8
-#, fuzzy
-msgid "FIXME: Meeting Re_quest"
-msgstr "FIXME: Solicitude de _Tarefa"
-
-#: ui/evolution-contact-editor.xml:10
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: Enviar _Mensaxe"
-
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Contacto"
-
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr "FIXME: _Tarefa"
-
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
-msgstr "FIXME: Solicitude de _Tarefa"
-
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: Entrada de _Xornal"
+msgid "Create new contact"
+msgstr "Crear un novo contacto"
 
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
-msgstr "FIXME: _Nota"
+#: ui/evolution-addressbook.xml.h:4
+msgid "Delete a contact"
+msgstr "Borrar un contacto"
 
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Es_colla un Formulario..."
+#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
+msgid "Find"
+msgstr "Buscar"
 
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
-msgstr ""
+#: ui/evolution-addressbook.xml.h:6
+msgid "Find a contact"
+msgstr "Buscar un contacto"
 
-#: ui/evolution-contact-editor.xml:24
+#: ui/evolution-addressbook.xml.h:7
 #, fuzzy
-msgid "FIXME: Define Print _Styles..."
-msgstr "FIXME: Definir E_stilos de Impresión"
-
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr "FIXME: _Enviar"
+msgid "New contact"
+msgstr "Ver tódolos contactos"
 
-#: ui/evolution-contact-editor.xml:35
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Gardar Ane_xos..."
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail.xml.h:30
+msgid "Previews the message to be printed"
+msgstr "Previsualiza a mensaxe que se vai imprimir"
 
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: _Mover para a Carpeta..."
+#: ui/evolution-addressbook.xml.h:11
+msgid "Print contacts"
+msgstr "Imprimir contactos"
 
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Cop_iar á Carpeta..."
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
+msgid "Stop"
+msgstr "Parar"
 
-#: ui/evolution-contact-editor.xml:41
-#, fuzzy
-msgid "Page Set_up"
-msgstr "Configuración da Páxina:"
+#: ui/evolution-addressbook.xml.h:13
+msgid "Stop Loading"
+msgstr "Parar a Carga"
 
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Pre_visualización da Impresión"
+#: ui/evolution-addressbook.xml.h:14
+msgid "View All"
+msgstr "Ver Todos"
 
-#: ui/evolution-contact-editor.xml:63
-#, fuzzy
-msgid "FIXME: Paste _Special..."
-msgstr "FIXME: Pegar _Especial..."
+#: ui/evolution-addressbook.xml.h:15
+msgid "View all contacts"
+msgstr "Ver tódolos contactos"
 
-#: ui/evolution-contact-editor.xml:68
+#: ui/evolution-addressbook.xml.h:16
 #, fuzzy
-msgid "FIXME: Mark as U_nread"
-msgstr "Marcar como _non Lida"
-
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
-msgstr "_Obxecto"
-
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
-msgstr "FIXME: _Elemento"
-
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: Elemento _non Lido"
+msgid "_Addressbook Sources..."
+msgstr "Engadir Fonte"
 
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: Pri_meiro elemento na Carpeta"
-
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _Derradeiro Elemento na Carpeta"
-
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
-msgstr "FIXME: _Estándar"
-
-#: ui/evolution-contact-editor.xml:93
+#: ui/evolution-addressbook.xml.h:17
 #, fuzzy
-msgid "FIXME: __Formatting"
-msgstr "FIXME: Fo_rmato"
-
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Personalizar..."
+msgid "_Contact"
+msgstr "_Contactos..."
 
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
-msgstr "An_terior"
-
-#: ui/evolution-contact-editor.xml:102
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15
 #, fuzzy
-msgid "Ne_xt"
-msgstr "Seguinte"
-
-#: ui/evolution-contact-editor.xml:104
-msgid "_Toolbars"
-msgstr "_Barras de ferramentas"
-
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
-msgstr "FIXME: _Ficheiro..."
-
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
-msgstr "FIXME: _Elemento..."
-
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Obxecto..."
+msgid "_Print..."
+msgstr "Imprimir..."
 
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Fonte..."
+#: ui/evolution-addressbook.xml.h:19
+msgid "_Search for contacts"
+msgstr "_Buscar contactos"
 
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: _Parágrafo..."
-
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Deseñar este _Formulario"
-
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: _Deseñar un Formulario..."
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
+msgid "_Tools"
+msgstr "_Ferramentas"
 
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Publicar _Formulario..."
+#: ui/evolution-calendar.xml.h:1
+msgid "5 Days"
+msgstr "5 Días"
 
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: Pu_blicar Formulario Como..."
+#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
+#, fuzzy
+msgid "Alter preferences"
+msgstr "Preferencias da Axenda"
 
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: _Depurador de Script"
+#: ui/evolution-calendar.xml.h:4
+msgid "Create a new appointment"
+msgstr "Crear unha nova cita"
 
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _Ortografía..."
+#: ui/evolution-calendar.xml.h:5
+msgid "Create a new calendar"
+msgstr "Crear unha nova axenda"
 
-#: ui/evolution-contact-editor.xml:137
-msgid "_Forms"
-msgstr "_Formularios"
+#: ui/evolution-calendar.xml.h:6
+msgid "Day"
+msgstr "Día"
 
-#: ui/evolution-contact-editor.xml:142
+#: ui/evolution-calendar.xml.h:7
 #, fuzzy
-msgid "FIXME: _New Contact"
-msgstr "FIXME: _Contacto"
+msgid "Go To"
+msgstr "Ir para"
 
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
-msgstr ""
+#: ui/evolution-calendar.xml.h:8
+msgid "Go back in time"
+msgstr "Ir para atrás no tempo"
 
-#: ui/evolution-contact-editor.xml:145
-#, fuzzy
-msgid "FIXME: New _Letter to Contact"
-msgstr "FIXME: _Contacto"
+#: ui/evolution-calendar.xml.h:9
+msgid "Go forward in time"
+msgstr "Ir para diante no tempo"
 
-#: ui/evolution-contact-editor.xml:146
-#, fuzzy
-msgid "FIXME: New _Message to Contact"
-msgstr "Enviar unha mensaxe sen asunto"
+#: ui/evolution-calendar.xml.h:10
+msgid "Go to a specific date"
+msgstr "Ir para a data especificada"
 
-#: ui/evolution-contact-editor.xml:147
+#: ui/evolution-calendar.xml.h:11
 #, fuzzy
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "FIXME: _Contacto"
+msgid "Go to present time"
+msgstr "Ir ó elemento seguinte"
+
+#: ui/evolution-calendar.xml.h:12
+msgid "Month"
+msgstr "Mes"
 
-#: ui/evolution-contact-editor.xml:148
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
-msgid "FIXME: _Plan a Meeting..."
-msgstr "FIXME: _Ortografía..."
+msgid "New Appointment"
+msgstr "Nova cita..."
 
-#: ui/evolution-contact-editor.xml:149
+#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:32
 #, fuzzy
-msgid "FIXME: New _Task for Contact"
-msgstr "FIXME: _Contacto"
+msgid "Next"
+msgstr "Seguinte"
 
-#: ui/evolution-contact-editor.xml:150
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "FIXME: Entrada de _Xornal"
+msgid "Open Calendar"
+msgstr "_Abrir axenda"
 
-#: ui/evolution-contact-editor.xml:152
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
-msgid "FIXME: _Flag for Follow Up..."
-msgstr "FIXME: Cop_iar á Carpeta..."
+msgid "Prev"
+msgstr "Previsualización:"
 
-#: ui/evolution-contact-editor.xml:153
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
-msgid "FIXME: _Display Map of Address"
-msgstr "FIXME: Enviar _Mensaxe"
+msgid "Print calendar"
+msgstr "Imprimir axenda"
 
-#: ui/evolution-contact-editor.xml:154
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
-msgid "FIXME: _Open Web Page"
-msgstr "FIXME: Enviar _Mensaxe"
+msgid "Print this Calendar"
+msgstr "Imprimir esta axenda"
 
-#: ui/evolution-contact-editor.xml:156
+#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
 #, fuzzy
-msgid "FIXME: Forward as _vCard"
-msgstr "FIXME: Reenviar como v_Calendar"
+msgid "Save As"
+msgstr "Gardar _Como"
 
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
-msgstr "FIXME: _Reenviar"
+#: ui/evolution-calendar.xml.h:24
+msgid "Save calendar as something else"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
-msgstr "_Inserir"
+#: ui/evolution-calendar.xml.h:26
+msgid "Show 1 day"
+msgstr "Amosar un día"
 
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
-msgstr "_Formatar"
+#: ui/evolution-calendar.xml.h:27
+msgid "Show 1 month"
+msgstr "Amosar un mes"
 
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
-msgstr "_Ferramentas"
+#: ui/evolution-calendar.xml.h:28
+msgid "Show 1 week"
+msgstr "Amosar unha semana"
 
-#: ui/evolution-contact-editor.xml:172
-msgid "Actio_ns"
-msgstr "Acció_ns"
+#: ui/evolution-calendar.xml.h:29
+msgid "Show the working week"
+msgstr "Amosar a semana laboral"
 
-#: ui/evolution-contact-editor.xml:246
-#, fuzzy
-msgid "FIXME: Previous"
-msgstr "Anterior"
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
+#: widgets/misc/e-dateedit.c:413
+msgid "Today"
+msgstr "Hoxe"
 
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
-msgstr "Ir ó elemento anterior"
+#: ui/evolution-calendar.xml.h:31
+msgid "Week"
+msgstr "Semana"
 
-#: ui/evolution-contact-editor.xml:249
+#: ui/evolution-calendar.xml.h:32
 #, fuzzy
-msgid "FIXME: Next"
-msgstr "FIXME: _Nota"
+msgid "_Appointment"
+msgstr "Citas:"
 
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
-msgstr "Ir ó elemento seguinte"
+#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
+msgid "_New"
+msgstr "_Novo"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
+#: ui/evolution-calendar.xml.h:34
+msgid "_Open Calendar"
+msgstr "_Abrir axenda"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr ""
+#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-tasks.xml.h:8
+#, fuzzy
+msgid "_Save As..."
+msgstr "Gardar _Como..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Ocupado"
+#: ui/evolution-contact-editor.xml.h:2
+msgid "Delete this item"
+msgstr "Borrar este elemento"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Fóra da Oficina"
+#: ui/evolution-contact-editor.xml.h:3
+#, fuzzy
+msgid "Delete..."
+msgstr "Eliminar"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Sen Información"
+#: ui/evolution-contact-editor.xml.h:4
+msgid "Help"
+msgstr "Axuda"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr ""
+#: ui/evolution-contact-editor.xml.h:5
+#, fuzzy
+msgid "Print En_velope..."
+msgstr "_Configuración da Impresión..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Opcións"
+#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
+#: ui/evolution-task-editor-dialog.xml.h:40
+msgid "Print this item"
+msgstr "Imprimir este elemento"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Amosar _Só as Horas de Traballo"
+#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
+#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
+msgid "Print..."
+msgstr "Imprimir..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr ""
+#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-task-editor-dialog.xml.h:51
+msgid "Save _As..."
+msgstr "Gardar _Como..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr ""
+#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:52
+msgid "Save and Close"
+msgstr "Gardar e Pechar"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#: ui/evolution-contact-editor.xml.h:10
+msgid "Save the contact and close the dialog box"
+msgstr "Gardar o contacto e pechar a caixa de diálogo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
+#: ui/evolution-contact-editor.xml.h:11
+msgid "Se_nd contact to other..."
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#: ui/evolution-contact-editor.xml.h:12
+msgid "See online help"
+msgstr "Ver a axuda online"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Tódalas Persoas e Recursos"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Tódalas _Persoas e Un Recurso"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "Persoas _Requiridas"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "Persoas Requiridas e _Un Recurso"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Hora do _inicio da reunión:"
+#: ui/evolution-contact-editor.xml.h:13
+#, fuzzy
+msgid "Send _message to contact..."
+msgstr "Enviar unha mensaxe sen asunto"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Hora do _final da reunión:"
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
+#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
+msgid "_File"
+msgstr "_Ficheiro"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr ""
+#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-task-editor-dialog.xml.h:85
+msgid "_Save"
+msgstr "_Gardar"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:421
-msgid "MTWTFSS"
-msgstr "LMMXVSD"
+#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
+msgid "About this application"
+msgstr "Acerca desta aplicación"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
-msgid "%B %Y"
-msgstr "%B de %Y"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
+msgid "About..."
+msgstr "Acerca de..."
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
+msgid "Actio_ns"
+msgstr "Acció_ns"
 
-#: widgets/misc/e-dateedit.c:407
-msgid "Now"
-msgstr "Agora"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
+#, fuzzy
+msgid "Address _Book... (FIXME)"
+msgstr "FIXME: _Libro de enderezos..."
 
-#: widgets/misc/e-dateedit.c:413
-msgid "Today"
-msgstr "Hoxe"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
+msgid "C_lear"
+msgstr "_Limpar"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
+#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
+msgid "C_ut"
+msgstr "Co_rtar"
 
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#: widgets/misc/e-search-bar.c:176
+#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
 #, fuzzy
-msgid "Sear_ch"
-msgstr "Buscar"
+msgid "Chec_k Names (FIXME)"
+msgstr "_Tarefa (FIXME)"
 
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Grupo %i"
-
-#~ msgid "Delete Contact?"
-#~ msgstr "¿Borrar Contacto?"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
+msgid "Clear"
+msgstr "Limpar"
 
-#~ msgid "Address _2:"
-#~ msgstr "Enderezo _2:"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
+msgid "Clear the selection"
+msgstr "Limpar a selección"
 
-#~ msgid "Canada"
-#~ msgstr "Canadá"
+#: ui/evolution-event-editor.xml.h:11
+msgid "Close this appointment"
+msgstr "Pechar esta cita"
 
-#~ msgid "Countr_y:"
-#~ msgstr "_País:"
+#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
+#, fuzzy
+msgid "Cop_y to Folder... (FIXME)"
+msgstr "Copiar á Carpeta"
 
-#~ msgid "Finland"
-#~ msgstr "Finlandia"
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
+#: ui/evolution-task-editor-dialog.xml.h:14
+msgid "Copy"
+msgstr "Copiar"
 
-#~ msgid "USA"
-#~ msgstr "Estados Unidos"
+#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
+msgid "Copy the selection"
+msgstr "Copiar a selección"
 
-#~ msgid "_Address:"
-#~ msgstr "_Enderezo:"
+#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
+msgid "Cut"
+msgstr "Cortar"
 
-#~ msgid "_City:"
-#~ msgstr "_Cidade:"
+#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
+msgid "Cut the selection"
+msgstr "Cortar a selección"
 
-#~ msgid "_PO Box:"
-#~ msgstr "_Apdo. de Correos:"
+#: ui/evolution-event-editor.xml.h:18
+msgid "Delete this appointment"
+msgstr "Borrar esta cita"
 
-#~ msgid "_State/Province:"
-#~ msgstr "E_stado/Provincia:"
+#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
+msgid "Dump XML"
+msgstr "Envorcar XML"
 
-#~ msgid "_ZIP Code:"
-#~ msgstr "Código _Postal:"
+#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
+msgid "Dump the UI Xml description"
+msgstr "Envorcar a descrición Xml da Interface"
 
+#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
 #, fuzzy
-#~ msgid "Addressbook Sources"
-#~ msgstr "Engadir Fonte"
-
-#~ msgid "Find..."
-#~ msgstr "Buscar..."
+msgid "Fi_rst Item in Folder (FIXME)"
+msgstr "FIXME: Pri_meiro elemento na Carpeta"
 
+#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
 #, fuzzy
-#~ msgid "Select name from:"
-#~ msgstr "Seleccionar un nome da Lista:"
-
-#~ msgid "123"
-#~ msgstr "123"
-
-#~ msgid "a"
-#~ msgstr "a"
-
-#~ msgid "b"
-#~ msgstr "b"
-
-#~ msgid "c"
-#~ msgstr "c"
+msgid "For_ward (FIXME)"
+msgstr "_Tarefa (FIXME)"
 
-#~ msgid "d"
-#~ msgstr "d"
-
-#~ msgid "e"
-#~ msgstr "e"
+#: ui/evolution-event-editor.xml.h:23
+msgid "Forward as v_Calendar (FIXME)"
+msgstr ""
 
-#~ msgid "f"
-#~ msgstr "f"
+#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
+msgid "Go to the next item"
+msgstr "Ir ó elemento seguinte"
 
-#~ msgid "g"
-#~ msgstr "g"
+#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
+msgid "Go to the previous item"
+msgstr "Ir ó elemento anterior"
 
-#~ msgid "h"
-#~ msgstr "h"
+#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
+#, fuzzy
+msgid "In_complete Task (FIXME)"
+msgstr "_Tarefa (FIXME)"
 
-#~ msgid "i"
-#~ msgstr "i"
+#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
+msgid "Modify the file's properties"
+msgstr "Modificar as propiedades do ficheiro"
 
-#~ msgid "j"
-#~ msgstr "j"
+#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
+msgid "N_ext"
+msgstr "Se_guinte"
 
-#~ msgid "k"
-#~ msgstr "k"
+#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
+#, fuzzy
+msgid "Paste"
+msgstr "_Pegar"
 
-#~ msgid "l"
-#~ msgstr "l"
+#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
+msgid "Paste the clipboard"
+msgstr "Pegar o contido do cartafol"
 
-#~ msgid "m"
-#~ msgstr "m"
+#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
+msgid "Pre_vious"
+msgstr "An_terior"
 
-#~ msgid "n"
-#~ msgstr "n"
+#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
+#, fuzzy
+msgid "Previous"
+msgstr "An_terior"
 
-#~ msgid "o"
-#~ msgstr "o"
+#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
+#, fuzzy
+msgid "Print Pre_view"
+msgstr "Previsualizar da Impresión"
 
-#~ msgid "p"
-#~ msgstr "p"
+#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
+msgid "Print S_etup..."
+msgstr "_Configuración da Impresión..."
 
-#~ msgid "q"
-#~ msgstr "q"
+#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
+msgid "Print Setup"
+msgstr "Configuración da Impresión"
 
-#~ msgid "r"
-#~ msgstr "r"
+#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
+msgid "Save"
+msgstr "Gardar"
 
-#~ msgid "s"
-#~ msgstr "s"
+#: ui/evolution-event-editor.xml.h:43
+msgid "Save the appointment and close the dialog box"
+msgstr "Gardar a cita e pechar a caixa de diálogo"
 
-#~ msgid "t"
-#~ msgstr "t"
+#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
+#: ui/evolution-task-editor-dialog.xml.h:53
+msgid "Save the current file"
+msgstr "Gardar o ficheiro actual"
 
-#~ msgid "u"
-#~ msgstr "u"
+#: ui/evolution-event-editor.xml.h:46
+#, fuzzy
+msgid "Schedule _Meeting"
+msgstr "FIXME: _Programar Reunión"
 
-#~ msgid "v"
-#~ msgstr "v"
+#: ui/evolution-event-editor.xml.h:47
+#, fuzzy
+msgid "Schedule some sort of a meeting"
+msgstr "FIXME: Programar Reunión"
 
-#~ msgid "w"
-#~ msgstr "w"
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+#, fuzzy
+msgid "Select All"
+msgstr "Seleccionar _Todo"
 
-#~ msgid "x"
-#~ msgstr "x"
+#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+msgid "Select everything"
+msgstr "Seleccionar todo"
 
-#~ msgid "y"
-#~ msgstr "y"
+#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
+msgid "Setup the page settings for your current printer"
+msgstr "Configurar as opcións de páxina para a impresora actual"
 
-#~ msgid "z"
-#~ msgstr "z"
+#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+#, fuzzy
+msgid "Task _Request (FIXME)"
+msgstr "_Tarefa (FIXME)"
 
-#~ msgid "10 pt. Tahoma"
-#~ msgstr "10 ptos. Tahoma"
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
+#: ui/evolution-task-editor-dialog.xml.h:63
+msgid "_About..."
+msgstr "_Acerca de..."
 
-#~ msgid "8 pt. Tahoma"
-#~ msgstr "8 ptos. Tahoma"
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
+msgid "_Close"
+msgstr "_Pechar"
 
-#~ msgid "Body"
-#~ msgstr "Corpo"
+#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
+#: ui/evolution.xml.h:27
+msgid "_Contact (FIXME)"
+msgstr "_Contacto (FIXME)"
 
-#~ msgid "Bottom:"
-#~ msgstr "Inferior:"
+#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
+msgid "_Copy"
+msgstr "_Copiar"
 
-#~ msgid "Dimensions:"
-#~ msgstr "Dimensións:"
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:68
+msgid "_Debug"
+msgstr "_Depuración"
 
-#~ msgid "Font..."
-#~ msgstr "Fonte..."
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
+msgid "_Help"
+msgstr "A_xuda"
 
-#~ msgid "Fonts"
-#~ msgstr "Fontes"
+#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
+#, fuzzy
+msgid "_Item (FIXME)"
+msgstr "_Tarefa (FIXME)"
 
-#~ msgid "Format"
-#~ msgstr "Formato"
+#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
+#, fuzzy
+msgid "_Journal Entry (FIXME)"
+msgstr "_Contacto (FIXME)"
 
-#~ msgid "Headings"
-#~ msgstr "Cabeceiras"
+#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
+#, fuzzy
+msgid "_Last Item in Folder (FIXME)"
+msgstr "FIXME: _Derradeiro Elemento na Carpeta"
 
-#~ msgid "Height:"
-#~ msgstr "Altura:"
+#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
+#, fuzzy
+msgid "_Mail Message (FIXME)"
+msgstr "_Tarefa (FIXME)"
 
-#~ msgid "Landscape"
-#~ msgstr "Horizontal"
+#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
+#, fuzzy
+msgid "_Move to Folder... (FIXME)"
+msgstr "_Mover para a Carpeta"
 
-#~ msgid "Left:"
-#~ msgstr "Esquerda:"
+#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
+#, fuzzy
+msgid "_Note (FIXME)"
+msgstr "_Contacto (FIXME)"
 
-#~ msgid "Letter tabs on side"
-#~ msgstr "Pestanas coas letras no lateral"
+#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
+msgid "_Paste"
+msgstr "_Pegar"
 
-#~ msgid "Margins"
-#~ msgstr "Marxes"
+#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
+#: ui/evolution-tasks.xml.h:7
+msgid "_Print"
+msgstr "_Imprimir"
 
-#~ msgid "Number of columns:"
-#~ msgstr "Número de columnas:"
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-task-editor-dialog.xml.h:83
+msgid "_Properties..."
+msgstr "_Propiedades..."
 
-#~ msgid "Options"
-#~ msgstr "Opcións"
+#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
+#, fuzzy
+msgid "_Select All"
+msgstr "Seleccionar _Todo"
 
-#~ msgid "Orientation"
-#~ msgstr "Orientación"
+#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
+#: ui/evolution.xml.h:40
+msgid "_Task (FIXME)"
+msgstr "_Tarefa (FIXME)"
 
-#~ msgid "Page"
-#~ msgstr "Páxina"
+#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+#, fuzzy
+msgid "_Unread Item (FIXME)"
+msgstr "_Contacto (FIXME)"
 
-#~ msgid "Paper"
-#~ msgstr "Papel"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Add Service"
+msgstr "Engadir Fonte"
 
-#~ msgid "Paper source:"
-#~ msgstr "Orixe do papel:"
+#: ui/evolution-executive-summary.xml.h:2
+msgid "Add a new service to the Executive Summary"
+msgstr ""
 
-#~ msgid "Portrait"
-#~ msgstr "Vertical"
+#: ui/evolution-executive-summary.xml.h:3
+#, fuzzy
+msgid "Create a new email"
+msgstr "Crear un novo contacto"
 
-#~ msgid "Preview:"
-#~ msgstr "Previsualización:"
+#: ui/evolution-executive-summary.xml.h:4
+msgid "Executive Summary Settings..."
+msgstr ""
 
-#~ msgid "Print using gray shading"
-#~ msgstr "Imprimir usando sombreado gris"
+#: ui/evolution-executive-summary.xml.h:5
+#, fuzzy
+msgid "New Mail"
+msgstr "Recibir Correo"
 
-#~ msgid "Reverse on even pages"
-#~ msgstr "Invertir nas páxinas pares"
+#: ui/evolution-mail.xml.h:2
+msgid "Compose"
+msgstr "Redactar"
 
-#~ msgid "Right:"
-#~ msgstr "Dereita:"
+#: ui/evolution-mail.xml.h:3
+msgid "Compose a new message"
+msgstr "Redactar unha nova mensaxe"
 
-#~ msgid "Sections:"
-#~ msgstr "Seccións:"
+#: ui/evolution-mail.xml.h:5
+msgid "Copy message to a new folder"
+msgstr "Copiar a mensaxe nunha nova carpeta"
 
-#~ msgid "Shading"
-#~ msgstr "Sombreado"
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Create _Virtual Folder From Message"
+msgstr "Carpetas Virtuais"
 
-#~ msgid "Start on a new page"
-#~ msgstr "Iniciar nunha nova páxina"
+#: ui/evolution-mail.xml.h:9
+msgid "Display all of the message headers"
+msgstr ""
 
-#~ msgid "Style name:"
-#~ msgstr "Nome do estilo:"
+#: ui/evolution-mail.xml.h:10
+#, fuzzy
+msgid "Empty Trash"
+msgstr "Días baleiros:"
 
-#~ msgid "Top:"
-#~ msgstr "Superior:"
+#: ui/evolution-mail.xml.h:11
+#, fuzzy
+msgid "Filter on Se_nder"
+msgstr "Responder ó Autor"
 
-#~ msgid "Type:"
-#~ msgstr "Tipo:"
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Filter on _Recipients"
+msgstr "Destinatarios"
 
-#~ msgid "Width:"
-#~ msgstr "Largura:"
+#: ui/evolution-mail.xml.h:13
+#, fuzzy
+msgid "Filter on _Subject"
+msgstr "Asunto"
 
-#~ msgid "label26"
-#~ msgstr "label26"
+#: ui/evolution-mail.xml.h:14
+msgid "Forget _Passwords"
+msgstr "Esquecer _Contrasinais"
 
+#: ui/evolution-mail.xml.h:16
 #, fuzzy
-#~ msgid "Calendar Server"
-#~ msgstr "Axenda"
+msgid "Forward As"
+msgstr "Re-enviar"
 
+#: ui/evolution-mail.xml.h:18
 #, fuzzy
-#~ msgid "Evolution calendar iTip/iMip viewer"
-#~ msgstr "Conducto de Axenda de Evolution"
+msgid "Full Headers"
+msgstr "Nome Completo:"
 
+#: ui/evolution-mail.xml.h:19
 #, fuzzy
-#~ msgid "Factory for the Evolution calendar component."
-#~ msgstr ""
-#~ "Utilidade de configuración para o conducto de axenda de evolution.\n"
-
-#~ msgid "Edit appointment"
-#~ msgstr "Editar cita"
+msgid "Hide S_elected Messages"
+msgstr "Imprimir a mensaxe seleccionada"
 
-#~ msgid "Snooze time (minutes)"
-#~ msgstr "Tempo de adiamento (minutos)"
+#: ui/evolution-mail.xml.h:20
+#, fuzzy
+msgid "Hide _Deleted Messages"
+msgstr "Borrar Mensaxe"
 
-#~ msgid "05 minutes"
-#~ msgstr "05 minutos"
+#: ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "Mensaxe reenviada - %s"
 
-#~ msgid "10 minutes"
-#~ msgstr "10 minutos"
+#: ui/evolution-mail.xml.h:22
+msgid "Inline"
+msgstr ""
 
-#~ msgid "12 hour (am/pm)"
-#~ msgstr "12 horas (am/pm)"
+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Manage _Subscriptions..."
+msgstr "Descrición:"
 
-#~ msgid "15 minutes"
-#~ msgstr "15 minutos"
+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Mar_k as Read"
+msgstr "Marcar como _Lida"
 
-#~ msgid "24 hour"
-#~ msgstr "24 horas"
+#: ui/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Mark All as R_ead"
+msgstr "Marcar como _Lida"
 
-#~ msgid "30 minutes"
-#~ msgstr "30 minutos"
+#: ui/evolution-mail.xml.h:26
+#, fuzzy
+msgid "Mark as U_nread"
+msgstr "Marcar como _non Lida"
 
-#~ msgid "60 minutes"
-#~ msgstr "60 minutos"
+#: ui/evolution-mail.xml.h:27
+#, fuzzy
+msgid "Message _Display"
+msgstr "Corpo da Mensaxe"
 
-#~ msgid "Audio Alarms"
-#~ msgstr "Alarmas Sonoras"
+#: ui/evolution-mail.xml.h:28
+msgid "Move"
+msgstr "Mover"
 
-#~ msgid "Calendar"
-#~ msgstr "Axenda"
+#: ui/evolution-mail.xml.h:29
+msgid "Move message to a new folder"
+msgstr "Mover mensaxe a unha nova carpeta"
 
-#~ msgid "Calendar Preferences"
-#~ msgstr "Preferencias da Axenda"
+#: ui/evolution-mail.xml.h:33
+msgid "Print message to the printer"
+msgstr "Imprimir mensaxe na impresora"
 
-#~ msgid "Colors"
-#~ msgstr "Cores"
+#: ui/evolution-mail.xml.h:36
+#, fuzzy
+msgid "Quoted"
+msgstr "No_tas:"
 
-#~ msgid "End of day:"
-#~ msgstr "Final do día:"
+#: ui/evolution-mail.xml.h:37
+msgid "Redirect (FIXME: implement me)"
+msgstr ""
 
-#~ msgid "First day of week:"
-#~ msgstr "Primeiro día da semana:"
+#: ui/evolution-mail.xml.h:40
+msgid "Reply to _All"
+msgstr "Responder a _Todos"
 
-#~ msgid "Show week numbers"
-#~ msgstr "Amosar números de semana"
+#: ui/evolution-mail.xml.h:43
+#, fuzzy
+msgid "S_ource"
+msgstr "Fontes"
 
-#~ msgid "Start of day:"
-#~ msgstr "Inicio do día:"
+#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
+msgid "Select _All"
+msgstr "Seleccionar _Todo"
 
-#~ msgid "Time format:"
-#~ msgstr "Formato da hora:"
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Select _Thread"
+msgstr "Seleccionar _Todo"
 
-#~ msgid "Visual Alarms"
-#~ msgstr "Alarmas Visuais"
+#: ui/evolution-mail.xml.h:46
+msgid "Send and Receive"
+msgstr ""
 
-#~ msgid "seconds."
-#~ msgstr "segundos."
+#: ui/evolution-mail.xml.h:47
+msgid "Send queued mail and retrieve new mail"
+msgstr "Enviar o correo na cola e recibir o correo novo"
 
-#~ msgid "% Comp_lete:"
-#~ msgstr "% Comp_leta:"
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Show _All"
+msgstr "Ver Todos"
 
-#~ msgid "C_lassification:"
-#~ msgstr "C_lasificación:"
+#: ui/evolution-mail.xml.h:50
+#, fuzzy
+msgid "Threaded Message list"
+msgstr "Mensaxe reenviada - %s"
 
-#~ msgid "High"
-#~ msgstr "Alta"
+#: ui/evolution-mail.xml.h:51
+#, fuzzy
+msgid "VFolder on Se_nder"
+msgstr "Responder ó Autor"
 
-#~ msgid "In Progress"
-#~ msgstr "En Progreso"
+#: ui/evolution-mail.xml.h:52
+#, fuzzy
+msgid "VFolder on _Recipients"
+msgstr "Destinatarios"
 
-#~ msgid "Low"
-#~ msgstr "Baixa"
+#: ui/evolution-mail.xml.h:53
+#, fuzzy
+msgid "VFolder on _Subject"
+msgstr "Asunto"
 
-#~ msgid "Normal"
-#~ msgstr "Normal"
+#: ui/evolution-mail.xml.h:54
+msgid "View Raw Message Source"
+msgstr ""
 
-#~ msgid "Not Started"
-#~ msgstr "Non Iniciada"
+#: ui/evolution-mail.xml.h:55
+#, fuzzy
+msgid "Virtual Folder _Editor..."
+msgstr "Carpetas Virtuais"
 
-#~ msgid "Task"
-#~ msgstr "Tarefa"
+#: ui/evolution-mail.xml.h:56
+msgid "_Actions"
+msgstr "_Accións"
 
-#~ msgid "_Contacts..."
-#~ msgstr "_Contactos..."
+#: ui/evolution-mail.xml.h:57
+msgid "_Apply Filters"
+msgstr "_Aplicar Filtros"
 
-#~ msgid "_Priority:"
-#~ msgstr "_Prioridade:"
+#: ui/evolution-mail.xml.h:58
+#, fuzzy
+msgid "_Compose"
+msgstr "Redactar"
 
-#~ msgid "_Status:"
-#~ msgstr "_Estado:"
+#: ui/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Copy to Folder..."
+msgstr "_Copiar á Carpeta"
 
-#~ msgid "task-editor-dialog"
-#~ msgstr "diálogo-editor-tarefas"
+#: ui/evolution-mail.xml.h:60
+msgid "_Create Filter From Message"
+msgstr ""
 
-#~ msgid "A_ll day event"
-#~ msgstr "Evento de día _completo"
+#: ui/evolution-mail.xml.h:62
+msgid "_Expunge"
+msgstr ""
 
-#~ msgid "Days"
-#~ msgstr "Días"
+#: ui/evolution-mail.xml.h:63
+#, fuzzy
+msgid "_Filters..."
+msgstr "_Filtros de Correo..."
 
-#~ msgid "Every"
-#~ msgstr "Cada"
+#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+msgid "_Folder"
+msgstr "_Carpeta"
 
-#~ msgid "Exceptions"
-#~ msgstr "Excepcións"
+#: ui/evolution-mail.xml.h:65
+msgid "_Forward"
+msgstr "_Reenviar"
 
-#~ msgid "Hours"
-#~ msgstr "Horas"
+#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Inverter Selección"
 
-#~ msgid "Mail _to:"
-#~ msgstr "Enviar _a:"
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "_Mail Message"
+msgstr "FIXME: Enviar _Mensaxe"
 
-#~ msgid "Minutes"
-#~ msgstr "Minutos"
+#: ui/evolution-mail.xml.h:68
+#, fuzzy
+msgid "_Mail Settings..."
+msgstr "_Configuración"
 
+#: ui/evolution-mail.xml.h:69
 #, fuzzy
-#~ msgid "Preview"
-#~ msgstr "Previsualización:"
+msgid "_Message Hiding"
+msgstr "_Mensaxe"
 
-#~ msgid "Pri_vate"
-#~ msgstr "Pri_vado"
+#: ui/evolution-mail.xml.h:70
+#, fuzzy
+msgid "_Move to Folder..."
+msgstr "_Mover para a Carpeta"
 
-#~ msgid "Pu_blic"
-#~ msgstr "Pú_blico"
+#: ui/evolution-mail.xml.h:71
+#, fuzzy
+msgid "_Open Selected Items"
+msgstr "Abrir a tarefa"
 
-#~ msgid "Su_mmary:"
-#~ msgstr "_Resume:"
+#: ui/evolution-mail.xml.h:74
+msgid "_Send and Receive"
+msgstr ""
 
-#~ msgid "Time"
-#~ msgstr "Hora"
+#: ui/evolution-mail.xml.h:75
+msgid "_Threaded"
+msgstr ""
 
-#~ msgid "_Audio"
-#~ msgstr "_Audio"
+#: ui/evolution-mail.xml.h:77
+#, fuzzy
+msgid "_Undelete"
+msgstr "_Borrar"
 
-#~ msgid "_Confidential"
-#~ msgstr "_Confidencial"
+#: ui/evolution-message-composer.xml.h:1
+#, fuzzy
+msgid "Attach"
+msgstr "Incluír un ficheiro"
 
-#~ msgid "_Mail"
-#~ msgstr "_Correo"
+#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-task-editor-dialog.xml.h:12
+#, fuzzy
+msgid "Close the current file"
+msgstr "Gardar o ficheiro actual"
 
-#~ msgid "_Program"
-#~ msgstr "_Programa"
+#: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "Mensaxe cifrada"
 
-#~ msgid "_Run program:"
-#~ msgstr "_Executar programa:"
+#: ui/evolution-message-composer.xml.h:6
+msgid "F_ormat"
+msgstr "_Formatar"
 
-#~ msgid "_Start time:"
-#~ msgstr "Hora de _comezo:"
+#: ui/evolution-message-composer.xml.h:7
+msgid "HTML"
+msgstr ""
 
-#~ msgid "_Starting date:"
-#~ msgstr "Data de _comezo:"
+#: ui/evolution-message-composer.xml.h:8
+#, fuzzy
+msgid "Insert a file as text into the message"
+msgstr "Incluír un ficheiro como anexo na mensaxe"
 
-#~ msgid "day(s)"
-#~ msgstr "día(s)"
+#: ui/evolution-message-composer.xml.h:9
+msgid "Insert text file..."
+msgstr ""
 
-#~ msgid "event-editor-dialog"
-#~ msgstr "diálogo-editor-eventos"
+#: ui/evolution-message-composer.xml.h:11
+#, fuzzy
+msgid "Open a file"
+msgstr "Abrir ficheiro"
 
-#~ msgid "label21"
-#~ msgstr "label21"
+#: ui/evolution-message-composer.xml.h:12
+msgid "PGP Encrypt"
+msgstr ""
 
-#~ msgid "month(s)"
-#~ msgstr "mes(es)"
+#: ui/evolution-message-composer.xml.h:13
+msgid "PGP Sign"
+msgstr ""
 
-#~ msgid "week(s)"
-#~ msgstr "semana(s)"
+#: ui/evolution-message-composer.xml.h:17
+msgid "Save _Draft"
+msgstr ""
 
-#~ msgid "year(s)"
-#~ msgstr "ano(s)"
+#: ui/evolution-message-composer.xml.h:18
+#, fuzzy
+msgid "Save in _folder... (FIXME)"
+msgstr "Ir á carpeta..."
 
-#~ msgid "Could not create a calendar in `%s'"
-#~ msgstr "Non foi posible crear un calendario en `%s'"
+#: ui/evolution-message-composer.xml.h:19
+#, fuzzy
+msgid "Save in folder..."
+msgstr "Ir á carpeta..."
 
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
-#~ msgid "April"
-#~ msgstr "abril"
+msgid "Save the current file with a different name"
+msgstr "Gardar o ficheiro actual"
 
+#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
-#~ msgid "August"
-#~ msgstr "agosto"
+msgid "Save the message in a specified folder"
+msgstr "Mover mensaxe a unha nova carpeta"
 
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
-#~ msgid "December"
-#~ msgstr "decembro"
+msgid "Send"
+msgstr "Autor"
 
+#: ui/evolution-message-composer.xml.h:24
 #, fuzzy
-#~ msgid "February"
-#~ msgstr "febreiro"
+msgid "Send _Later"
+msgstr "Autor"
 
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
-#~ msgid "Go To Date"
-#~ msgstr "Ir á data"
+msgid "Send _later"
+msgstr "Autor"
 
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
-#~ msgid "Go To Today"
-#~ msgstr "Ir a hoxe"
+msgid "Send the mail in HTML format"
+msgstr "Enviar mensaxes en formato HTML"
 
+#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
-#~ msgid "January"
-#~ msgstr "xaneiro"
+msgid "Send the message later"
+msgstr "Previsualiza a mensaxe que se vai imprimir"
 
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
-#~ msgid "July"
-#~ msgstr "xullo"
+msgid "Send the message now"
+msgstr "Enviar mensaxes en formato HTML"
 
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
-#~ msgid "June"
-#~ msgstr "xuño"
+msgid "Send this message now"
+msgstr "Borrar esta mensaxe"
 
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
-#~ msgid "March"
-#~ msgstr "marzo"
+msgid "Show / hide attachments"
+msgstr "Gardar Anexo"
 
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
-#~ msgid "May"
-#~ msgstr "Luns"
+msgid "Show _attachments"
+msgstr "anexo"
 
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
-#~ msgid "November"
-#~ msgstr "novembro"
+msgid "Show attachments"
+msgstr "anexo"
 
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
-#~ msgid "October"
-#~ msgstr "outubro"
+msgid "Sign this message with your PGP key"
+msgstr "Enviando unha mensaxe sen asunto"
 
+#: ui/evolution-message-composer.xml.h:34
+msgid "Toggles whether the BCC field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:35
+msgid "Toggles whether the CC field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
-#~ msgid "September"
-#~ msgstr "setembro"
+msgid "Toggles whether the From chooser is displayed"
+msgstr "O URI que amosará o navegador de carpetas"
+
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
 
-#~ msgid "SMTP"
-#~ msgstr "SMTP"
+#: ui/evolution-message-composer.xml.h:39
+msgid "_Bcc Field"
+msgstr ""
 
-#~ msgid "Attachment properties"
-#~ msgstr "Propiedades do anexo"
+#: ui/evolution-message-composer.xml.h:40
+msgid "_Cc Field"
+msgstr ""
 
-#~ msgid "File name:"
-#~ msgstr "Nome de ficheiro:"
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr ""
 
-#~ msgid "MIME type:"
-#~ msgstr "Tipo MIME:"
+#: ui/evolution-message-composer.xml.h:47
+msgid "_Insert"
+msgstr "_Inserir"
 
-#~ msgid "Filter Rules"
-#~ msgstr "Reglas de Filtrado"
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Insert text file... (FIXME)"
+msgstr ""
 
+#: ui/evolution-message-composer.xml.h:49
 #, fuzzy
-#~ msgid "Incoming"
-#~ msgstr ""
-#~ "Entrante\n"
-#~ "Saínte\n"
+msgid "_Open..."
+msgstr "Abrir..."
 
+#: ui/evolution-message-composer.xml.h:50
 #, fuzzy
-#~ msgid "Outgoing"
-#~ msgstr ""
-#~ "Entrante\n"
-#~ "Saínte\n"
+msgid "_Reply-To Field"
+msgstr "Responder-A:"
 
-#~ msgid "Virtual Folders"
-#~ msgstr "Carpetas Virtuais"
+#: ui/evolution-message-composer.xml.h:52
+msgid "_Security"
+msgstr ""
 
-#~ msgid "Save"
-#~ msgstr "Gardar"
+#: ui/evolution-subscribe.xml.h:1
+msgid "Add folder to your list of subscribed folders"
+msgstr "Engadir a carpeta á súa lista de carpetas subscritas"
 
-#, fuzzy
-#~ msgid "Show all hidden"
-#~ msgstr "Ver Todos"
+#: ui/evolution-subscribe.xml.h:3
+msgid "F_older"
+msgstr "_Carpeta"
 
-#, fuzzy
-#~ msgid "Hide read"
-#~ msgstr "Agochar"
+#: ui/evolution-subscribe.xml.h:4
+msgid "Refresh List"
+msgstr "Actualizar Lista"
 
-#, fuzzy
-#~ msgid "Hide deleted"
-#~ msgstr "Eliminar"
+#: ui/evolution-subscribe.xml.h:5
+msgid "Refresh List of Folders"
+msgstr "Actualizar Lista de Carpetas"
 
-#, fuzzy
-#~ msgid "Hide Subject"
-#~ msgstr "Asunto"
+#: ui/evolution-subscribe.xml.h:6
+msgid "Remove folder from your list of subscribed folders"
+msgstr "Eliminar a carpeta da súa lista de carpetas subscritas"
 
-#, fuzzy
-#~ msgid "Hide from Sender"
-#~ msgstr "Responder ó Autor"
+#: ui/evolution-subscribe.xml.h:8
+msgid "Subscribe"
+msgstr "Subscribir"
 
-#, fuzzy
-#~ msgid "Hide Messages"
-#~ msgstr "Editar Mensaxe"
+#: ui/evolution-subscribe.xml.h:9
+msgid "Unsubscribe"
+msgstr "Desubscribir"
 
+#: ui/evolution-task-editor-dialog.xml.h:5
 #, fuzzy
-#~ msgid "Hide Subject \"%s\""
-#~ msgstr "O asunto é %s"
+msgid "Assig_n Task (FIXME)"
+msgstr "_Tarefa (FIXME)"
 
-#, fuzzy
-#~ msgid "Current store format:"
-#~ msgstr "Non foi posible iniciar wombat"
+#: ui/evolution-task-editor-dialog.xml.h:24
+msgid "Find Again"
+msgstr "Buscar Novamente"
 
+#: ui/evolution-task-editor-dialog.xml.h:29
 #, fuzzy
-#~ msgid "Mailbox Format"
-#~ msgstr "Formato"
+msgid "Meeting Re_quest (FIXME)"
+msgstr "FIXME: Solicitude de _Tarefa"
 
+#: ui/evolution-task-editor-dialog.xml.h:43
+msgid "Redo"
+msgstr "Refacer"
+
+#: ui/evolution-task-editor-dialog.xml.h:44
+msgid "Redo the undone action"
+msgstr "Refacer a acción desfeita"
+
+#: ui/evolution-task-editor-dialog.xml.h:45
+msgid "Replace"
+msgstr "Substituír"
+
+#: ui/evolution-task-editor-dialog.xml.h:46
+msgid "Replace a string"
+msgstr "Substituír unha cadea"
+
+#: ui/evolution-task-editor-dialog.xml.h:47
 #, fuzzy
-#~ msgid "New store format:"
-#~ msgstr "Tipo de fonte de Novas:"
+msgid "Reply to A_ll (FIXME)"
+msgstr "Responder a Todos"
 
+#: ui/evolution-task-editor-dialog.xml.h:48
 #, fuzzy
-#~ msgid "mh"
-#~ msgstr "h"
+msgid "S_end Status Report (FIXME)"
+msgstr "_Contacto (FIXME)"
 
-#~ msgid "You have no mail sources configured"
-#~ msgstr "Non ten ningunha fonte de correo configurada"
+#: ui/evolution-task-editor-dialog.xml.h:49
+msgid "S_kip Occurrence (FIXME)"
+msgstr ""
 
+#: ui/evolution-task-editor-dialog.xml.h:54
 #, fuzzy
-#~ msgid "Account"
-#~ msgstr "Contas"
+msgid "Save the task and close the dialog box"
+msgstr "Gardar o contacto e pechar a caixa de diálogo"
 
-#~ msgid "Account Information"
-#~ msgstr "Información de Contas"
+#: ui/evolution-task-editor-dialog.xml.h:55
+msgid "Search again for the same string"
+msgstr "Buscar novamente a mesma cadea"
 
-#, fuzzy
-#~ msgid "Account Properties"
-#~ msgstr "Propiedades do anexo"
+#: ui/evolution-task-editor-dialog.xml.h:56
+msgid "Search for a string"
+msgstr "Buscar unha cadea"
 
-#~ msgid "Authentication"
-#~ msgstr "Autenticación"
+#: ui/evolution-task-editor-dialog.xml.h:61
+msgid "Undo"
+msgstr "Desfacer"
 
-#, fuzzy
-#~ msgid "Authentication Type:"
-#~ msgstr "Autenticación:"
+#: ui/evolution-task-editor-dialog.xml.h:62
+msgid "Undo the last action"
+msgstr "Desfacer a última acción"
+
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
+msgid "_Appointment (FIXME)"
+msgstr "_Cita (FIXME)"
 
+#: ui/evolution-task-editor-dialog.xml.h:77
 #, fuzzy
-#~ msgid "Congratulations, your mail configuration is complete.\n"
-#~ msgstr "Noraboa, a configuración do correo está completa."
+msgid "_Mark Complete (FIXME)"
+msgstr "Marcar como Completa"
 
+#: ui/evolution-task-editor-dialog.xml.h:84
 #, fuzzy
-#~ msgid "Delete mail from server"
-#~ msgstr "Non borrar as mensaxes do servidor"
+msgid "_Reply (FIXME)"
+msgstr "_Tarefa (FIXME)"
 
+#: ui/evolution-tasks.xml.h:2
 #, fuzzy
-#~ msgid "Done"
-#~ msgstr "mes"
+msgid "Create a new task"
+msgstr "Crear un novo contacto"
 
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
-#~ msgid "E-Mail Address:"
-#~ msgstr "Enderezo de Email:"
+msgid "New Task"
+msgstr "Tarefa"
 
-#~ msgid "Email Address:"
-#~ msgstr "Enderezo de Email:"
+#: ui/evolution-tasks.xml.h:5
+msgid "Save task as something else"
+msgstr ""
 
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Configuración de Correo do Evolution"
+#: ui/evolution-tasks.xml.h:6
+#, fuzzy
+msgid "Tasks Preferences..."
+msgstr "Preferencias da Axenda..."
 
-#~ msgid "Full Name:"
-#~ msgstr "Nome Completo:"
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "_Task"
+msgstr "Tarefa"
 
+#: ui/evolution.xml.h:1
 #, fuzzy
-#~ msgid "Hostname:"
-#~ msgstr "Nome de usuario:"
+msgid "About Evolution..."
+msgstr "_Acerca do Evolution..."
 
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Close this window"
+msgstr "Pechar esta cita"
 
-#~ msgid "Identity"
-#~ msgstr "Identidade"
+#: ui/evolution.xml.h:4
+msgid "Customi_ze Toolbars..."
+msgstr ""
 
+#: ui/evolution.xml.h:5
 #, fuzzy
-#~ msgid "Kerberos"
-#~ msgstr "Kerberos 4"
+msgid "Customize"
+msgstr "FIXME: _Personalizar..."
 
-#~ msgid "Mail"
-#~ msgstr "Correo"
+#: ui/evolution.xml.h:6
+msgid "Customize toolbars"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Mail Account"
-#~ msgstr "Contas"
+#: ui/evolution.xml.h:7
+msgid "Display a different folder"
+msgstr "Visualizar unha carpeta diferente"
 
-#~ msgid "Mail Configuration"
-#~ msgstr "Configuración do Correo"
+#: ui/evolution.xml.h:8
+msgid "E_xit"
+msgstr "_Saír"
 
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Axudante da Configuración do Correo"
+#: ui/evolution.xml.h:9
+msgid "Evolution bar _shortcut"
+msgstr "_Atallo da barra do Evolution"
 
-#~ msgid "News"
-#~ msgstr "Novas"
+#: ui/evolution.xml.h:10
+msgid "Exit the program"
+msgstr "Saír do programa"
 
-#~ msgid "Optional"
-#~ msgstr "Opcional"
+#: ui/evolution.xml.h:11
+msgid "Getting _Started"
+msgstr "_Iniciación"
 
-#~ msgid "Organization:"
-#~ msgstr "Organización:"
+#: ui/evolution.xml.h:12
+msgid "Import an external file format"
+msgstr ""
 
-#~ msgid "Password:"
-#~ msgstr "Contrasinal:"
+#: ui/evolution.xml.h:13
+msgid "Main toolbar"
+msgstr ""
 
-#~ msgid "Reply-to:"
-#~ msgstr "Responder-a:"
+#: ui/evolution.xml.h:14
+msgid "Show information about Evolution"
+msgstr "Amosar información sobre o Evolution"
 
+#: ui/evolution.xml.h:15
 #, fuzzy
-#~ msgid "Required"
-#~ msgstr "Persoas _Requiridas"
+msgid "Submit Bug Report"
+msgstr "_Enviar un Informe de Erro"
 
+#: ui/evolution.xml.h:16
 #, fuzzy
-#~ msgid "Save password"
-#~ msgstr "Gardar como VCard"
+msgid "Submit _Bug Report"
+msgstr "_Enviar un Informe de Erro"
 
+#: ui/evolution.xml.h:17
 #, fuzzy
-#~ msgid "Select signature file"
-#~ msgstr "Ficheiro de sinatura:"
+msgid "Submit bug report using Bug Buddy."
+msgstr "Enviar un informe de erro usando o Bug Buddy"
+
+#: ui/evolution.xml.h:18
+msgid "Toggle whether to show the folder bar"
+msgstr ""
 
+#: ui/evolution.xml.h:19
 #, fuzzy
-#~ msgid "Sending Email"
-#~ msgstr "Enviando Correo"
+msgid "Toggle whether to show the shortcut bar"
+msgstr "Eliminar este atallo da barra de atallos"
 
-#~ msgid "Server Configuration"
-#~ msgstr "Configuración do Servidor"
+#: ui/evolution.xml.h:20
+msgid "Using the C_ontact Manager"
+msgstr "Uso do Xestor de Co_ntactos"
 
-#, fuzzy
-#~ msgid "Server Timeouts"
-#~ msgstr "Tipo de Servidor: "
+#: ui/evolution.xml.h:21
+msgid "Using the _Calendar"
+msgstr "Uso da _Axenda"
 
-#~ msgid "Server Type: "
-#~ msgstr "Tipo de Servidor: "
+#: ui/evolution.xml.h:22
+msgid "Using the _Mailer"
+msgstr "Uso do Cliente de _Correo"
 
+#: ui/evolution.xml.h:23
 #, fuzzy
-#~ msgid "Server requires authentication"
-#~ msgstr "O servidor SMTP require autenticación"
+msgid "Work Offline"
+msgstr "Movendo"
+
+#: ui/evolution.xml.h:24
+msgid "_About Evolution..."
+msgstr "_Acerca do Evolution..."
 
+#: ui/evolution.xml.h:31
 #, fuzzy
-#~ msgid "Servers"
-#~ msgstr "Servidor:"
+msgid "_Folder Bar"
+msgstr "_Carpeta"
 
-#~ msgid "Signature file:"
-#~ msgstr "Ficheiro de sinatura:"
+#: ui/evolution.xml.h:32
+msgid "_Go to Folder..."
+msgstr "_Ir para a Carpeta..."
 
+#: ui/evolution.xml.h:34
 #, fuzzy
-#~ msgid "Signature:"
-#~ msgstr "Ficheiro de sinatura:"
+msgid "_Import file..."
+msgstr "_Propiedades..."
 
-#~ msgid "Sources"
-#~ msgstr "Fontes"
+#: ui/evolution.xml.h:35
+msgid "_Index"
+msgstr "Í_ndice"
 
+#: ui/evolution.xml.h:36
 #, fuzzy
-#~ msgid "This server requires a secure connection (SSL)"
-#~ msgstr "O servidor SMTP require autenticación"
+msgid "_Mail message"
+msgstr "_Mensaxe"
 
+#: ui/evolution.xml.h:38
 #, fuzzy
-#~ msgid "Type"
-#~ msgstr "Tipo:"
+msgid "_New Folder"
+msgstr "Nova VFolder"
 
+#: ui/evolution.xml.h:39
 #, fuzzy
-#~ msgid "User Information"
-#~ msgstr "Sen Información"
+msgid "_Shortcut Bar"
+msgstr "Amosar a Barra de _Atallos"
 
-#~ msgid "Username:"
-#~ msgstr "Nome de usuario:"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B de %Y"
 
-#, fuzzy
-#~ msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-#~ msgstr "¡Benvido ó axudante da Configuración de Correo do Evolution!"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Ocupado"
 
-#, fuzzy
-#~ msgid "minute(s)"
-#~ msgstr "minutos"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "Fóra da Oficina"
 
-#~ msgid "Full name:"
-#~ msgstr "Nome completo:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Sen Información"
 
-#~ msgid "Email address:"
-#~ msgstr "Enderezo de email:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr ""
 
-#~ msgid "Signature File"
-#~ msgstr "Ficheiro de Sinatura"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Opcións"
 
-#~ msgid "Server:"
-#~ msgstr "Servidor:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Amosar _Só as Horas de Traballo"
 
-#~ msgid "Detect supported types..."
-#~ msgstr "Detectar tipos soportados..."
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr ""
 
-#~ msgid "Don't delete messages from server"
-#~ msgstr "Non borrar as mensaxes do servidor"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr ""
 
-#~ msgid "Test Settings"
-#~ msgstr "Probar Configuración"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr "_<<"
 
-#~ msgid "Mail source type:"
-#~ msgstr "Tipo de fonte de correo:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
+msgstr ""
 
-#~ msgid "News source type:"
-#~ msgstr "Tipo de fonte de Novas:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ">_>"
 
-#~ msgid "Mail transport type:"
-#~ msgstr "Tipo de transporte de correo:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
+msgstr "_Tódalas Persoas e Recursos"
 
-#~ msgid "Add Identity"
-#~ msgstr "Engadir Identidade"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "Tódalas _Persoas e Un Recurso"
 
-#~ msgid "Edit Identity"
-#~ msgstr "Editar Identidade"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "Persoas _Requiridas"
 
-#~ msgid "Add Source"
-#~ msgstr "Engadir Fonte"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "Persoas Requiridas e _Un Recurso"
 
-#~ msgid "Edit Source"
-#~ msgstr "Editar Fonte"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "Hora do _inicio da reunión:"
 
-#~ msgid "Add News Server"
-#~ msgstr "Engadir Servidor de News"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "Hora do _final da reunión:"
 
-#~ msgid "Edit News Server"
-#~ msgstr "Editar Servidor de News"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr ""
 
-#~ msgid "Testing \"%s\""
-#~ msgstr "Probando \"%s\""
+#: widgets/menus/gal-view-menus.c:171
+#, fuzzy
+msgid "_Current View"
+msgstr "a hora actual"
 
-#~ msgid "The connection was successful!"
-#~ msgstr "¡A conexión foi correcta!"
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "LMMXVSD"
 
-#~ msgid "Address"
-#~ msgstr "Enderezo"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
+msgid "%B %Y"
+msgstr "%B de %Y"
 
-#~ msgid "Identities"
-#~ msgstr "Identidades"
+#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+msgid "Now"
+msgstr "Agora"
 
-#~ msgid "Mail Sources"
-#~ msgstr "Fontes de Correo"
+#: widgets/misc/e-cell-date-edit.c:239
+msgid "OK"
+msgstr ""
 
-#~ msgid "Mail Transport"
-#~ msgstr "Transporte do Correo"
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#~ msgid "Mark message as seen [ms]: "
-#~ msgstr "Marcar mensaxe como lida [ms]: "
+#. strftime format of a time in 24-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:460
+#, fuzzy
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S%n"
 
-#~ msgid "News Servers"
-#~ msgstr "Servidores de News"
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#~ msgid "News Sources"
-#~ msgstr "Fontes de Novas"
+#. strftime format of a time in 12-hour format.
+#.
+#: widgets/misc/e-cell-date-edit.c:469
+#, fuzzy
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p%n"
 
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Enviar mensaxes en formato HTML"
+#. FIXME: Better message needed.
+#: widgets/misc/e-cell-date-edit.c:736
+msgid "The time is invalid"
+msgstr ""
 
-#~ msgid "No GPG/PGP support available in this copy of Evolution."
-#~ msgstr "Non hai soporte de GPG/PGP dispoñible nesta copia do Evolution."
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
 
-#~ msgid "Delete a contact"
-#~ msgstr "Borrar un contacto"
+#: widgets/misc/e-filter-bar.c:160
+#, fuzzy
+msgid "Save Search"
+msgstr "Buscar"
 
-#~ msgid "Find"
-#~ msgstr "Buscar"
+#: widgets/misc/e-filter-bar.c:231
+msgid "Advanced Search"
+msgstr ""
 
-#~ msgid "Find a contact"
-#~ msgstr "Buscar un contacto"
+#: widgets/misc/e-filter-bar.c:311
+msgid "Advanced ..."
+msgstr ""
 
-#~ msgid "Print contacts"
-#~ msgstr "Imprimir contactos"
+#: widgets/misc/e-messagebox.c:141
+#, fuzzy
+msgid "Information"
+msgstr "Sen Información"
 
-#~ msgid "Stop"
-#~ msgstr "Parar"
+#: widgets/misc/e-messagebox.c:148
+#, fuzzy
+msgid "Warning"
+msgstr "Movendo"
 
-#~ msgid "Stop Loading"
-#~ msgstr "Parar a Carga"
+#: widgets/misc/e-messagebox.c:162
+#, fuzzy
+msgid "Question"
+msgstr "Descrición:"
 
-#~ msgid "View All"
-#~ msgstr "Ver Todos"
+#: widgets/misc/e-messagebox.c:169
+#, fuzzy
+msgid "Message"
+msgstr "_Mensaxe"
 
-#~ msgid "View all contacts"
-#~ msgstr "Ver tódolos contactos"
+#. Add the "Don't show this message again." checkbox
+#: widgets/misc/e-messagebox.c:213
+#, fuzzy
+msgid "Don't show this message again."
+msgstr "Borrar esta mensaxe"
 
+#: widgets/misc/e-search-bar.c:140
 #, fuzzy
-#~ msgid "_Addressbook Configuration..."
-#~ msgstr "Configuración do _Correo..."
+msgid "Sear_ch"
+msgstr "Buscar"
 
-#~ msgid "_Print Contacts..."
-#~ msgstr "_Imprimir Contactos..."
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+#, fuzzy
+msgid "The Personal Addressbook Server"
+msgstr "Engadir Fonte"
 
-#~ msgid "_Search for contacts"
-#~ msgstr "_Buscar contactos"
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr ""
 
-#~ msgid "5 Days"
-#~ msgstr "5 Días"
+#: wombat/wombat.c:153
+#, fuzzy
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "Non foi posible inicializar Bonobo"
 
+#: wombat/wombat.c:165
 #, fuzzy
-#~ msgid "Ca_lendar"
-#~ msgstr "Axenda"
+msgid "init_corba(): could not initialize GNOME"
+msgstr "Non foi posible inicializar Bonobo"
 
-#~ msgid "Calendar Preferences..."
-#~ msgstr "Preferencias da Axenda..."
+#: wombat/wombat.c:178
+#, fuzzy
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "Non foi posible inicializar Bonobo"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Crear unha nova cita"
+#, fuzzy
+#~ msgid "Copyright (C) 2000, Helix Code, Inc."
+#~ msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#~ msgid "Create a new calendar"
-#~ msgstr "Crear unha nova axenda"
+#, fuzzy
+#~ msgid "Connect to server"
+#~ msgstr "Non foi posible conectarse ó servidor POP en %s."
 
-#~ msgid "Day"
-#~ msgstr "Día"
+#~ msgid "New"
+#~ msgstr "Novo"
 
-#~ msgid "Go back in time"
-#~ msgstr "Ir para atrás no tempo"
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgstr "Non se pode inicializar o compoñente de correo de Evolution."
 
-#~ msgid "Go forward in time"
-#~ msgstr "Ir para diante no tempo"
+#, fuzzy
+#~ msgid "Notes Component: Could not initialize bonobo"
+#~ msgstr "Non foi posible inicializar Bonobo"
 
-#~ msgid "Go to"
-#~ msgstr "Ir para"
+#~ msgid "Disabled"
+#~ msgstr "Desactivado"
 
-#~ msgid "Go to a specific date"
-#~ msgstr "Ir para a data especificada"
+#~ msgid "Synchronize"
+#~ msgstr "Sincronizar"
 
-#~ msgid "Month"
-#~ msgstr "Mes"
+#~ msgid "Copy From Pilot"
+#~ msgstr "Copiar do Pilot"
 
-#~ msgid "Open a calendar"
-#~ msgstr "Abrir unha axenda"
+#~ msgid "Copy To Pilot"
+#~ msgstr "Copiar ó Pilot"
 
-#~ msgid "Print this calendar"
-#~ msgstr "Imprimir esta axenda"
+#~ msgid "Merge From Pilot"
+#~ msgstr "Mesturar do Pilot"
 
-#~ msgid "Show 1 day"
-#~ msgstr "Amosar un día"
+#~ msgid "Merge To Pilot"
+#~ msgstr "Mesturar ó Pilot"
 
-#~ msgid "Show 1 month"
-#~ msgstr "Amosar un mes"
+#~ msgid "JP Rosevear <jpr@helixcode.com>"
+#~ msgstr "JP Rosevear <jpr@helixcode.com>"
 
-#~ msgid "Show 1 week"
-#~ msgstr "Amosar unha semana"
+#~ msgid "Original Author:"
+#~ msgstr "Autor Orixinal:"
 
-#~ msgid "Show the working week"
-#~ msgstr "Amosar a semana laboral"
+#~ msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#~ msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
-#~ msgid "Week"
-#~ msgstr "Semana"
+#~ msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+#~ msgstr "(C) 1998-2000 a Free Software Foundation e Helix Code"
 
-#~ msgid "_New"
-#~ msgstr "_Novo"
+#~ msgid "gnome-unknown.xpm"
+#~ msgstr "gnome-unknown.xpm"
 
-#~ msgid "_Open Calendar"
-#~ msgstr "_Abrir axenda"
+#~ msgid "Synchronize Action"
+#~ msgstr "Sincronizar Acción"
 
-#~ msgid "_Print this calendar"
-#~ msgstr "_Imprimir esta axenda"
+#~ msgid "Conduit state"
+#~ msgstr "Estado do conducto"
 
-#, fuzzy
-#~ msgid "_Save As..."
-#~ msgstr "Gardar _Como..."
+#~ msgid ""
+#~ "No pilot configured, please choose the\n"
+#~ "'Pilot Link Properties' capplet first."
+#~ msgstr ""
+#~ "Non hai ningún pilot configurado, escolla\n"
+#~ "primeiro a capplet 'Propiedades da Ligazón co Pilot'."
 
-#~ msgid "Delete this item"
-#~ msgstr "Borrar este elemento"
+#~ msgid "Not connected to the gnome-pilot daemon"
+#~ msgstr "Non conectado ó demo gnome-pilot"
+
+#~ msgid ""
+#~ "An error occured when trying to fetch\n"
+#~ "pilot list from the gnome-pilot daemon"
+#~ msgstr ""
+#~ "Ocorreu un erro ó obter a lista de\n"
+#~ "pilots do demo gnome-pilot"
 
 #, fuzzy
-#~ msgid "Delete..."
-#~ msgstr "Eliminar"
+#~ msgid ""
+#~ "\n"
+#~ "Mr.\n"
+#~ "Mrs.\n"
+#~ "Ms.\n"
+#~ "Miss\n"
+#~ "Dr.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Sra.\n"
+#~ "Srta.\n"
+#~ "D.\n"
+#~ "Dª.\n"
+#~ "Dr.\n"
+#~ "Dra.\n"
+#~ "Prof.\n"
 
-#~ msgid "Help"
-#~ msgstr "Axuda"
+#~ msgid ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+
+#~ msgid "Evolution Calendar Conduit"
+#~ msgstr "Conducto de Axenda de Evolution"
 
-#, fuzzy
-#~ msgid "Print En_velope..."
-#~ msgstr "_Configuración da Impresión..."
+#~ msgid "Configuration utility for the evolution calendar conduit.\n"
+#~ msgstr ""
+#~ "Utilidade de configuración para o conducto de axenda de evolution.\n"
+
+#~ msgid "Configuration utility for the evolution todo conduit.\n"
+#~ msgstr "Utilidade de configuración para o conducto a-facer de evolution.\n"
 
-#~ msgid "Print this item"
-#~ msgstr "Imprimir este elemento"
+#~ msgid "The priority must be between 1 and 9, inclusive"
+#~ msgstr "A prioridade ten que estar entre 1 e 9, inclusive"
 
-#~ msgid "Print..."
-#~ msgstr "Imprimir..."
+#~ msgid "Open..."
+#~ msgstr "Abrir..."
 
-#~ msgid "Save _As..."
-#~ msgstr "Gardar _Como..."
+#~ msgid "Enter the identity you wish to send this message from"
+#~ msgstr "Introduza a identidade coa que desexa enviar esta mensaxe"
 
-#~ msgid "Save and Close"
-#~ msgstr "Gardar e Pechar"
+#~ msgid "Enter the subject of the mail"
+#~ msgstr "Introduza o asunto da mensaxe"
 
-#~ msgid "Save the contact and close the dialog box"
-#~ msgstr "Gardar o contacto e pechar a caixa de diálogo"
+#~ msgid "Saving changes to message..."
+#~ msgstr "Gardando as modificacións da mensaxe..."
 
-#~ msgid "See online help"
-#~ msgstr "Ver a axuda online"
+#~ msgid "Save changes to message..."
+#~ msgstr "Gardar as modificacións da mensaxe..."
 
-#~ msgid "_File"
-#~ msgstr "_Ficheiro"
+#~ msgid "Edit Filter Rule"
+#~ msgstr "Editar Regra de Filtrado"
 
 #, fuzzy
-#~ msgid "_Print..."
-#~ msgstr "Imprimir..."
-
-#~ msgid "_Save"
-#~ msgstr "_Gardar"
+#~ msgid "outgoing"
+#~ msgstr ""
+#~ "Entrante\n"
+#~ "Saínte\n"
 
-#~ msgid "About this application"
-#~ msgstr "Acerca desta aplicación"
+#~ msgid "Add Rule"
+#~ msgstr "Engadir Regra"
 
-#~ msgid "About..."
-#~ msgstr "Acerca de..."
+#~ msgid "Body or subject contains"
+#~ msgstr "O corpo ou o asunto conteñen"
 
-#~ msgid "C_lear"
-#~ msgstr "_Limpar"
+#~ msgid "Body contains"
+#~ msgstr "O corpo contén"
 
-#~ msgid "C_ut"
-#~ msgstr "Co_rtar"
+#~ msgid "Subject contains"
+#~ msgstr "O asunto contén"
 
-#~ msgid "Clear"
-#~ msgstr "Limpar"
+#~ msgid "Body does not contain"
+#~ msgstr "O corpo non contén"
 
-#~ msgid "Clear the selection"
-#~ msgstr "Limpar a selección"
+#~ msgid "Subject does not contain"
+#~ msgstr "O asunto non contén"
 
-#~ msgid "Close this appointment"
-#~ msgstr "Pechar esta cita"
+#~ msgid ""
+#~ "Could not open file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible abrir o ficheiro %s:\n"
+#~ "%s"
 
-#~ msgid "Copy"
-#~ msgstr "Copiar"
+#, fuzzy
+#~ msgid "Registering local folder"
+#~ msgstr "Creando unha nova carpeta"
 
-#~ msgid "Copy the selection"
-#~ msgstr "Copiar a selección"
+#, fuzzy
+#~ msgid ""
+#~ "Unable to register folder '%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non foi posible crear a carpeta `%s':\n"
+#~ "%s"
 
-#~ msgid "Cut"
-#~ msgstr "Cortar"
+#~ msgid "Fetching email from %s"
+#~ msgstr "Recibindo correo de %s"
 
-#~ msgid "Cut the selection"
-#~ msgstr "Cortar a selección"
+#~ msgid "Fetch email from %s"
+#~ msgstr "Recibir correo de %s"
 
-#~ msgid "Dump XML"
-#~ msgstr "Envorcar XML"
+#~ msgid "Moving messages from \"%s\" into \"%s\""
+#~ msgstr "Movendo mensaxes de \"%s\" a \"%s\""
 
-#~ msgid "Dump the UI Xml description"
-#~ msgstr "Envorcar a descrición Xml da Interface"
+#~ msgid "Copying messages from \"%s\" into \"%s\""
+#~ msgstr "Copiando mensaxes de \"%s\" a \"%s\""
 
-#~ msgid "FIXME: Address _Book..."
-#~ msgstr "FIXME: _Libro de enderezos..."
+#~ msgid "Move messages from \"%s\" into \"%s\""
+#~ msgstr "Mover mensaxes de \"%s\" a \"%s\""
 
-#~ msgid "FIXME: Chec_k Names"
-#~ msgstr "FIXME: Veri_ficar Nomes"
+#~ msgid "Copy messages from \"%s\" into \"%s\""
+#~ msgstr "Copiar mensaxes de \"%s\" a \"%s\""
 
-#~ msgid "FIXME: Help"
-#~ msgstr "FIXME: Axuda"
+#~ msgid "(No description)"
+#~ msgstr "(Sen descrición)"
 
-#~ msgid "FIXME: In_complete Task"
-#~ msgstr "FIXME: Tarefa in_completa"
+#, fuzzy
+#~ msgid "Loading %s Folder for %s"
+#~ msgstr "Cargando a Carpeta %s"
 
-#~ msgid "FIXME: Insert File"
-#~ msgstr "FIXME: Inserir Ficheiro"
+#, fuzzy
+#~ msgid "Load %s Folder for %s"
+#~ msgstr "Cargando a Carpeta %s"
 
-#~ msgid "Find Again"
-#~ msgstr "Buscar Novamente"
+#~ msgid "Could not create dialog box."
+#~ msgstr "Non foi posible crear a caixa de diálogo."
 
-#~ msgid "Find _Again"
-#~ msgstr "Buscar _Novamente"
+#~ msgid "User cancelled query."
+#~ msgstr "O usuario cancelou a consulta."
 
-#~ msgid "Modify the file's properties"
-#~ msgstr "Modificar as propiedades do ficheiro"
+#~ msgid "Examining %s"
+#~ msgstr "Examinando %s"
 
-#~ msgid "N_ext"
-#~ msgstr "Se_guinte"
+#~ msgid "Retrieving message %d of %d"
+#~ msgstr "Recibindo a mensaxe %d de %d"
 
-#~ msgid "Paste the clipboard"
-#~ msgstr "Pegar o contido do cartafol"
+#~ msgid "Writing message %d of %d"
+#~ msgstr "Escribindo a mensaxe %d de %d"
 
-#~ msgid "Print S_etup..."
-#~ msgstr "_Configuración da Impresión..."
+#~ msgid "Saving changes to %s"
+#~ msgstr "Gardando as modificacións de %s"
 
-#~ msgid "Print Setup"
-#~ msgstr "Configuración da Impresión"
+#~ msgid ""
+#~ "Cannot open location `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non se pode abrir a localizaión `%s':\n"
+#~ "%s"
 
-#~ msgid "Properties"
-#~ msgstr "Propiedades"
+#, fuzzy
+#~ msgid "Unsubscribe from folder \"%s\""
+#~ msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
-#~ msgid "Redo"
-#~ msgstr "Refacer"
+#, fuzzy
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "FIXME: _Nova Cita"
 
-#~ msgid "Redo the undone action"
-#~ msgstr "Refacer a acción desfeita"
+#~ msgid "FIXME: _Contact"
+#~ msgstr "FIXME: _Contacto"
 
-#~ msgid "Replace"
-#~ msgstr "Substituír"
+#~ msgid "FIXME: _Task"
+#~ msgstr "FIXME: _Tarefa"
 
-#~ msgid "Replace a string"
-#~ msgstr "Substituír unha cadea"
+#~ msgid "FIXME: Task _Request"
+#~ msgstr "FIXME: Solicitude de _Tarefa"
 
-#~ msgid "Save the appointment and close the dialog box"
-#~ msgstr "Gardar a cita e pechar a caixa de diálogo"
+#~ msgid "FIXME: _Journal Entry"
+#~ msgstr "FIXME: Entrada de _Xornal"
 
-#~ msgid "Save the current file"
-#~ msgstr "Gardar o ficheiro actual"
+#~ msgid "FIXME: _Note"
+#~ msgstr "FIXME: _Nota"
 
-#, fuzzy
-#~ msgid "Schedule Meeting"
-#~ msgstr "FIXME: Programar Reunión"
+#~ msgid "FIXME: Ch_oose Form..."
+#~ msgstr "FIXME: Es_colla un Formulario..."
 
 #, fuzzy
-#~ msgid "Schedule _Meeting"
-#~ msgstr "FIXME: _Programar Reunión"
-
-#~ msgid "Search again for the same string"
-#~ msgstr "Buscar novamente a mesma cadea"
+#~ msgid "FIXME: Define Print _Styles..."
+#~ msgstr "FIXME: Definir E_stilos de Impresión"
 
-#~ msgid "Search for a string"
-#~ msgstr "Buscar unha cadea"
+#~ msgid "FIXME: S_end"
+#~ msgstr "FIXME: _Enviar"
 
-#~ msgid "Select everything"
-#~ msgstr "Seleccionar todo"
+#~ msgid "FIXME: Save Attac_hments..."
+#~ msgstr "FIXME: Gardar Ane_xos..."
 
-#~ msgid "Setup the page settings for your current printer"
-#~ msgstr "Configurar as opcións de páxina para a impresora actual"
+#~ msgid "FIXME: _Move to Folder..."
+#~ msgstr "FIXME: _Mover para a Carpeta..."
 
-#~ msgid "Undo"
-#~ msgstr "Desfacer"
+#~ msgid "FIXME: Cop_y to Folder..."
+#~ msgstr "FIXME: Cop_iar á Carpeta..."
 
-#~ msgid "Undo the last action"
-#~ msgstr "Desfacer a última acción"
+#~ msgid "FIXME: Print Pre_view"
+#~ msgstr "FIXME: Pre_visualización da Impresión"
 
-#~ msgid "_About..."
-#~ msgstr "_Acerca de..."
+#, fuzzy
+#~ msgid "FIXME: Paste _Special..."
+#~ msgstr "FIXME: Pegar _Especial..."
 
-#~ msgid "_Close"
-#~ msgstr "_Pechar"
+#~ msgid "_Object"
+#~ msgstr "_Obxecto"
 
-#~ msgid "_Copy"
-#~ msgstr "_Copiar"
+#~ msgid "FIXME: _Item"
+#~ msgstr "FIXME: _Elemento"
 
-#~ msgid "_Debug"
-#~ msgstr "_Depuración"
+#~ msgid "FIXME: _Unread Item"
+#~ msgstr "FIXME: Elemento _non Lido"
 
-#~ msgid "_Edit"
-#~ msgstr "_Editar"
+#~ msgid "FIXME: _Standard"
+#~ msgstr "FIXME: _Estándar"
 
-#~ msgid "_Find..."
-#~ msgstr "_Buscar..."
+#, fuzzy
+#~ msgid "FIXME: __Formatting"
+#~ msgstr "FIXME: Fo_rmato"
 
-#~ msgid "_Help"
-#~ msgstr "A_xuda"
+#~ msgid "_Toolbars"
+#~ msgstr "_Barras de ferramentas"
 
-#~ msgid "_Paste"
-#~ msgstr "_Pegar"
+#~ msgid "FIXME: _File..."
+#~ msgstr "FIXME: _Ficheiro..."
 
-#~ msgid "_Print"
-#~ msgstr "_Imprimir"
+#~ msgid "FIXME: It_em..."
+#~ msgstr "FIXME: _Elemento..."
 
-#~ msgid "_Properties..."
-#~ msgstr "_Propiedades..."
+#~ msgid "FIXME: _Object..."
+#~ msgstr "FIXME: _Obxecto..."
 
-#~ msgid "_Redo"
-#~ msgstr "_Refacer"
+#~ msgid "FIXME: _Font..."
+#~ msgstr "FIXME: _Fonte..."
 
-#~ msgid "_Replace..."
-#~ msgstr "_Substituír..."
+#~ msgid "FIXME: _Paragraph..."
+#~ msgstr "FIXME: _Parágrafo..."
 
-#~ msgid "_Undo"
-#~ msgstr "_Desfacer"
+#~ msgid "FIXME: Desi_gn This Form"
+#~ msgstr "FIXME: Deseñar este _Formulario"
 
-#~ msgid "Compose"
-#~ msgstr "Redactar"
+#~ msgid "FIXME: D_esign a Form..."
+#~ msgstr "FIXME: _Deseñar un Formulario..."
 
-#~ msgid "Compose a new message"
-#~ msgstr "Redactar unha nova mensaxe"
+#~ msgid "FIXME: Publish _Form..."
+#~ msgstr "FIXME: Publicar _Formulario..."
 
-#~ msgid "Copy message to a new folder"
-#~ msgstr "Copiar a mensaxe nunha nova carpeta"
+#~ msgid "FIXME: Pu_blish Form As..."
+#~ msgstr "FIXME: Pu_blicar Formulario Como..."
 
-#~ msgid "F_older"
-#~ msgstr "_Carpeta"
+#~ msgid "FIXME: Script _Debugger"
+#~ msgstr "FIXME: _Depurador de Script"
 
-#~ msgid "Forget _Passwords"
-#~ msgstr "Esquecer _Contrasinais"
+#~ msgid "FIXME: _Spelling..."
+#~ msgstr "FIXME: _Ortografía..."
 
-#~ msgid "Get Mail"
-#~ msgstr "Recibir Correo"
+#~ msgid "_Forms"
+#~ msgstr "_Formularios"
 
 #, fuzzy
-#~ msgid "Hide _Deleted messages"
-#~ msgstr "Borrar Mensaxe"
+#~ msgid "FIXME: _New Contact"
+#~ msgstr "FIXME: _Contacto"
 
 #, fuzzy
-#~ msgid "Hide _Read messages"
-#~ msgstr "Mensaxe reenviada - %s"
+#~ msgid "FIXME: New _Letter to Contact"
+#~ msgstr "FIXME: _Contacto"
 
 #, fuzzy
-#~ msgid "Hide _Selected messages"
-#~ msgstr "Imprimir a mensaxe seleccionada"
+#~ msgid "FIXME: New Meetin_g with Contact"
+#~ msgstr "FIXME: _Contacto"
 
 #, fuzzy
-#~ msgid "Mail _Filters..."
-#~ msgstr "_Filtros de Correo..."
+#~ msgid "FIXME: _Plan a Meeting..."
+#~ msgstr "FIXME: _Ortografía..."
 
 #, fuzzy
-#~ msgid "Manage Subscriptions..."
-#~ msgstr "Descrición:"
+#~ msgid "FIXME: New _Task for Contact"
+#~ msgstr "FIXME: _Contacto"
 
-#~ msgid "Mar_k As Read"
-#~ msgstr "Marcar como _Lida"
+#, fuzzy
+#~ msgid "FIXME: New _Journal Entry for Contact"
+#~ msgstr "FIXME: Entrada de _Xornal"
 
-#~ msgid "Move"
-#~ msgstr "Mover"
+#, fuzzy
+#~ msgid "FIXME: _Flag for Follow Up..."
+#~ msgstr "FIXME: Cop_iar á Carpeta..."
 
-#~ msgid "Move message to a new folder"
-#~ msgstr "Mover mensaxe a unha nova carpeta"
+#, fuzzy
+#~ msgid "FIXME: _Display Map of Address"
+#~ msgstr "FIXME: Enviar _Mensaxe"
 
-#~ msgid "Previews the message to be printed"
-#~ msgstr "Previsualiza a mensaxe que se vai imprimir"
+#, fuzzy
+#~ msgid "FIXME: _Open Web Page"
+#~ msgstr "FIXME: Enviar _Mensaxe"
 
-#~ msgid "Print Preview of message..."
-#~ msgstr "Previsualización da Impresión da mensaxe..."
+#, fuzzy
+#~ msgid "FIXME: Forward as _vCard"
+#~ msgstr "FIXME: Reenviar como v_Calendar"
 
-#~ msgid "Print message to the printer"
-#~ msgstr "Imprimir mensaxe na impresora"
+#~ msgid "FIXME: For_ward"
+#~ msgstr "FIXME: _Reenviar"
 
-#~ msgid "Print message..."
-#~ msgstr "Imprimir mensaxe..."
+#, fuzzy
+#~ msgid "FIXME: Previous"
+#~ msgstr "Anterior"
 
-#~ msgid "Reply to _All"
-#~ msgstr "Responder a _Todos"
+#, fuzzy
+#~ msgid "FIXME: Next"
+#~ msgstr "FIXME: _Nota"
 
-#~ msgid "Reply to _Sender"
-#~ msgstr "Responder ó _Autor"
+#~ msgid "Group %i"
+#~ msgstr "Grupo %i"
 
-#~ msgid "Select _All"
-#~ msgstr "Seleccionar _Todo"
+#~ msgid "label26"
+#~ msgstr "label26"
 
-#~ msgid "Send queued mail and retrieve new mail"
-#~ msgstr "Enviar o correo na cola e recibir o correo novo"
+#~ msgid "C_lassification:"
+#~ msgstr "C_lasificación:"
 
-#, fuzzy
-#~ msgid "Show _All messages"
-#~ msgstr "Ver Todos"
+#~ msgid "task-editor-dialog"
+#~ msgstr "diálogo-editor-tarefas"
 
-#~ msgid "_Apply Filters"
-#~ msgstr "_Aplicar Filtros"
+#~ msgid "Days"
+#~ msgstr "Días"
 
-#, fuzzy
-#~ msgid "_Copy to Folder..."
-#~ msgstr "_Copiar á Carpeta"
+#~ msgid "Hours"
+#~ msgstr "Horas"
 
-#~ msgid "_Edit Message"
-#~ msgstr "_Editar Mensaxe"
+#~ msgid "Mail _to:"
+#~ msgstr "Enviar _a:"
 
-#~ msgid "_Forward"
-#~ msgstr "_Reenviar"
+#~ msgid "Minutes"
+#~ msgstr "Minutos"
 
-#~ msgid "_Invert Selection"
-#~ msgstr "_Inverter Selección"
+#~ msgid "Time"
+#~ msgstr "Hora"
 
-#~ msgid "_Mail Configuration..."
-#~ msgstr "Configuración do _Correo..."
+#~ msgid "_Audio"
+#~ msgstr "_Audio"
 
-#~ msgid "_Message"
-#~ msgstr "_Mensaxe"
+#~ msgid "_Mail"
+#~ msgstr "_Correo"
 
-#, fuzzy
-#~ msgid "_Move to Folder..."
-#~ msgstr "_Mover para a Carpeta"
+#~ msgid "_Program"
+#~ msgstr "_Programa"
 
-#~ msgid "_Open in New Window"
-#~ msgstr "_Abrir nunha Nova Fiestra"
+#~ msgid "event-editor-dialog"
+#~ msgstr "diálogo-editor-eventos"
 
-#~ msgid "_Print Message"
-#~ msgstr "_Imprimir Mensaxe"
+#~ msgid "label21"
+#~ msgstr "label21"
 
 #, fuzzy
-#~ msgid "_Save Message As..."
-#~ msgstr "Gardar como..."
+#~ msgid "Show all hidden"
+#~ msgstr "Ver Todos"
 
 #, fuzzy
-#~ msgid "_Source"
-#~ msgstr "Fontes"
+#~ msgid "Hide deleted"
+#~ msgstr "Eliminar"
 
 #, fuzzy
-#~ msgid "_Undelete"
-#~ msgstr "_Borrar"
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "O asunto é %s"
 
-#, fuzzy
-#~ msgid "_Virtual Folder Editor..."
-#~ msgstr "Carpetas Virtuais"
+#~ msgid "You have no mail sources configured"
+#~ msgstr "Non ten ningunha fonte de correo configurada"
 
 #, fuzzy
-#~ msgid "Attach"
-#~ msgstr "Incluír un ficheiro"
+#~ msgid "Account Properties"
+#~ msgstr "Propiedades do anexo"
 
 #, fuzzy
-#~ msgid "Close the current file"
-#~ msgstr "Gardar o ficheiro actual"
+#~ msgid "Congratulations, your mail configuration is complete.\n"
+#~ msgstr "Noraboa, a configuración do correo está completa."
 
 #, fuzzy
-#~ msgid "Encrypt this message with PGP"
-#~ msgstr "Mensaxe cifrada"
+#~ msgid "E-Mail Address:"
+#~ msgstr "Enderezo de Email:"
 
-#, fuzzy
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Incluír un ficheiro como anexo na mensaxe"
+#~ msgid "Reply-to:"
+#~ msgstr "Responder-a:"
 
 #, fuzzy
-#~ msgid "Open a file"
-#~ msgstr "Abrir ficheiro"
+#~ msgid "Server Timeouts"
+#~ msgstr "Tipo de Servidor: "
 
 #, fuzzy
-#~ msgid "Save As"
-#~ msgstr "Gardar _Como"
+#~ msgid "Servers"
+#~ msgstr "Servidor:"
 
-#, fuzzy
-#~ msgid "Save in folder..."
-#~ msgstr "Ir á carpeta..."
+#~ msgid "Full name:"
+#~ msgstr "Nome completo:"
 
-#, fuzzy
-#~ msgid "Save the current file with a different name"
-#~ msgstr "Gardar o ficheiro actual"
+#~ msgid "Signature File"
+#~ msgstr "Ficheiro de Sinatura"
 
-#, fuzzy
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Mover mensaxe a unha nova carpeta"
+#~ msgid "Server:"
+#~ msgstr "Servidor:"
 
-#, fuzzy
-#~ msgid "Send"
-#~ msgstr "Autor"
+#~ msgid "Detect supported types..."
+#~ msgstr "Detectar tipos soportados..."
 
-#, fuzzy
-#~ msgid "Send _Later"
-#~ msgstr "Autor"
+#~ msgid "Don't delete messages from server"
+#~ msgstr "Non borrar as mensaxes do servidor"
 
-#, fuzzy
-#~ msgid "Send _later"
-#~ msgstr "Autor"
+#~ msgid "Mail source type:"
+#~ msgstr "Tipo de fonte de correo:"
 
-#, fuzzy
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Enviar mensaxes en formato HTML"
+#~ msgid "News source type:"
+#~ msgstr "Tipo de fonte de Novas:"
 
-#, fuzzy
-#~ msgid "Send the message later"
-#~ msgstr "Previsualiza a mensaxe que se vai imprimir"
+#~ msgid "Mail transport type:"
+#~ msgstr "Tipo de transporte de correo:"
 
-#, fuzzy
-#~ msgid "Send the message now"
-#~ msgstr "Enviar mensaxes en formato HTML"
+#~ msgid "Add Identity"
+#~ msgstr "Engadir Identidade"
 
-#, fuzzy
-#~ msgid "Send this message now"
-#~ msgstr "Borrar esta mensaxe"
+#~ msgid "Edit Identity"
+#~ msgstr "Editar Identidade"
 
-#, fuzzy
-#~ msgid "Show / hide attachments"
-#~ msgstr "Gardar Anexo"
+#~ msgid "Edit Source"
+#~ msgstr "Editar Fonte"
 
-#, fuzzy
-#~ msgid "Show _attachments"
-#~ msgstr "anexo"
+#~ msgid "Add News Server"
+#~ msgstr "Engadir Servidor de News"
 
-#, fuzzy
-#~ msgid "Sign this message with your PGP key"
-#~ msgstr "Enviando unha mensaxe sen asunto"
+#~ msgid "Edit News Server"
+#~ msgstr "Editar Servidor de News"
 
-#, fuzzy
-#~ msgid "_Open..."
-#~ msgstr "Abrir..."
+#~ msgid "Testing \"%s\""
+#~ msgstr "Probando \"%s\""
 
-#~ msgid "Add folder to your list of subscribed folders"
-#~ msgstr "Engadir a carpeta á súa lista de carpetas subscritas"
+#~ msgid "The connection was successful!"
+#~ msgstr "¡A conexión foi correcta!"
 
-#~ msgid "Refresh List"
-#~ msgstr "Actualizar Lista"
+#~ msgid "Identities"
+#~ msgstr "Identidades"
 
-#~ msgid "Refresh List of Folders"
-#~ msgstr "Actualizar Lista de Carpetas"
+#~ msgid "Mail Transport"
+#~ msgstr "Transporte do Correo"
 
-#~ msgid "Remove folder from your list of subscribed folders"
-#~ msgstr "Eliminar a carpeta da súa lista de carpetas subscritas"
+#~ msgid "News Servers"
+#~ msgstr "Servidores de News"
+
+#~ msgid "News Sources"
+#~ msgstr "Fontes de Novas"
+
+#~ msgid "Send messages in HTML format"
+#~ msgstr "Enviar mensaxes en formato HTML"
+
+#~ msgid "No GPG/PGP support available in this copy of Evolution."
+#~ msgstr "Non hai soporte de GPG/PGP dispoñible nesta copia do Evolution."
 
-#~ msgid "Subscribe"
-#~ msgstr "Subscribir"
+#, fuzzy
+#~ msgid "_Addressbook Configuration..."
+#~ msgstr "Configuración do _Correo..."
 
-#~ msgid "Unsubscribe"
-#~ msgstr "Desubscribir"
+#~ msgid "_Print Contacts..."
+#~ msgstr "_Imprimir Contactos..."
 
-#~ msgid "Display a different folder"
-#~ msgstr "Visualizar unha carpeta diferente"
+#, fuzzy
+#~ msgid "Ca_lendar"
+#~ msgstr "Axenda"
 
-#~ msgid "E_xit"
-#~ msgstr "_Saír"
+#~ msgid "Open a calendar"
+#~ msgstr "Abrir unha axenda"
 
-#~ msgid "Evolution bar _shortcut"
-#~ msgstr "_Atallo da barra do Evolution"
+#~ msgid "_Print this calendar"
+#~ msgstr "_Imprimir esta axenda"
 
-#~ msgid "Exit the program"
-#~ msgstr "Saír do programa"
+#~ msgid "FIXME: Chec_k Names"
+#~ msgstr "FIXME: Veri_ficar Nomes"
 
-#~ msgid "Getting _Started"
-#~ msgstr "_Iniciación"
+#~ msgid "FIXME: Help"
+#~ msgstr "FIXME: Axuda"
 
-#~ msgid "Show information about Evolution"
-#~ msgstr "Amosar información sobre o Evolution"
+#~ msgid "FIXME: In_complete Task"
+#~ msgstr "FIXME: Tarefa in_completa"
 
-#~ msgid "Show the _Folder Bar"
-#~ msgstr "Amosar a Barra de _Carpetas"
+#~ msgid "FIXME: Insert File"
+#~ msgstr "FIXME: Inserir Ficheiro"
 
-#, fuzzy
-#~ msgid "Submit _Bug Report"
-#~ msgstr "_Enviar un Informe de Erro"
+#~ msgid "Find _Again"
+#~ msgstr "Buscar _Novamente"
 
-#, fuzzy
-#~ msgid "Submit bug report using Bug Buddy."
-#~ msgstr "Enviar un informe de erro usando o Bug Buddy"
+#~ msgid "_Find..."
+#~ msgstr "_Buscar..."
 
-#~ msgid "Using the C_ontact Manager"
-#~ msgstr "Uso do Xestor de Co_ntactos"
+#~ msgid "_Redo"
+#~ msgstr "_Refacer"
 
-#~ msgid "Using the _Calendar"
-#~ msgstr "Uso da _Axenda"
+#~ msgid "_Replace..."
+#~ msgstr "_Substituír..."
 
-#~ msgid "Using the _Mailer"
-#~ msgstr "Uso do Cliente de _Correo"
+#~ msgid "_Undo"
+#~ msgstr "_Desfacer"
 
-#~ msgid "_About Evolution..."
-#~ msgstr "_Acerca do Evolution..."
+#~ msgid "Print Preview of message..."
+#~ msgstr "Previsualización da Impresión da mensaxe..."
 
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "_Cita (FIXME)"
+#~ msgid "Print message..."
+#~ msgstr "Imprimir mensaxe..."
 
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "_Contacto (FIXME)"
+#~ msgid "Reply to _Sender"
+#~ msgstr "Responder ó _Autor"
+
+#, fuzzy
+#~ msgid "Show _All messages"
+#~ msgstr "Ver Todos"
+
+#~ msgid "_Edit Message"
+#~ msgstr "_Editar Mensaxe"
 
-#~ msgid "_Folder"
-#~ msgstr "_Carpeta"
+#~ msgid "_Mail Configuration..."
+#~ msgstr "Configuración do _Correo..."
 
-#~ msgid "_Go to Folder..."
-#~ msgstr "_Ir para a Carpeta..."
+#~ msgid "_Open in New Window"
+#~ msgstr "_Abrir nunha Nova Fiestra"
 
-#~ msgid "_Index"
-#~ msgstr "Í_ndice"
+#~ msgid "_Print Message"
+#~ msgstr "_Imprimir Mensaxe"
 
-#~ msgid "_Settings"
-#~ msgstr "_Configuración"
+#, fuzzy
+#~ msgid "_Save Message As..."
+#~ msgstr "Gardar como..."
 
-#~ msgid "_Task (FIXME)"
-#~ msgstr "_Tarefa (FIXME)"
+#, fuzzy
+#~ msgid "_Source"
+#~ msgstr "Fontes"
 
-#~ msgid "Item(s) belong to these categories:"
-#~ msgstr "Elemento(s) pertencentes a estas categorías:"
+#~ msgid "Show the _Folder Bar"
+#~ msgstr "Amosar a Barra de _Carpetas"
 
 #~ msgid "Available Categories:"
 #~ msgstr "Categorías Dispoñibles:"
@@ -6591,15 +9192,6 @@ msgstr "Grupo %i"
 #~ msgid "Port Number:"
 #~ msgstr "Número de Porto:"
 
-#~ msgid "Empty days:"
-#~ msgstr "Días baleiros:"
-
-#~ msgid "Appointments:"
-#~ msgstr "Citas:"
-
-#~ msgid "Highlighted day:"
-#~ msgstr "Día salientado:"
-
 #~ msgid "Day numbers:"
 #~ msgstr "Números dos días:"
 
@@ -6669,9 +9261,6 @@ msgstr "Grupo %i"
 #~ msgid "third"
 #~ msgstr "terceiro"
 
-#~ msgid "fourth"
-#~ msgstr "cuarto"
-
 #~ msgid "fifth"
 #~ msgstr "quinto"
 
@@ -6710,13 +9299,6 @@ msgstr "Grupo %i"
 #~ msgid "Mail Source"
 #~ msgstr "Fonte de Correo"
 
-#~ msgid ""
-#~ "Your email configuration is now complete.\n"
-#~ "Click \"Finish\" to save your new settings"
-#~ msgstr ""
-#~ "A configuración do correo electrónico está completa.\n"
-#~ "Prema \"Finalizar\" para gardar a nova configuración"
-
 #~ msgid "Send a message without a subject"
 #~ msgstr "Enviar unha mensaxe sen asunto"
 
@@ -6729,9 +9311,6 @@ msgstr "Grupo %i"
 #~ msgid "Marking message %d of %d"
 #~ msgstr "Marcando a mensaxe %d de %d"
 
-#~ msgid "Forwarding messages \"%s\""
-#~ msgstr "Reenviando mensaxes \"%s\""
-
 #~ msgid "Forwarding a message without a subject"
 #~ msgstr "Reenviando unha mensaxe sen asunto"
 
@@ -6757,19 +9336,12 @@ msgstr "Grupo %i"
 #~ msgstr "Recibindo a mensaxe %d de %d (uid \"%s\")"
 
 #, fuzzy
-#~ msgid "Saving messages from folder \"%s\""
-#~ msgstr "Abrindo as mensaxes da carpeta \"%s\""
-
-#, fuzzy
 #~ msgid "Save messages from folder \"%s\""
 #~ msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
 #~ msgid "N_ew Directory Server"
 #~ msgstr "Novo Servidor de _Directorio"
 
-#~ msgid "_Actions"
-#~ msgstr "_Accións"
-
 #~ msgid "_Save Calendar As"
 #~ msgstr "_Gardar Axenda Como"
 
@@ -6798,12 +9370,6 @@ msgstr "Grupo %i"
 #~ msgid "Alarm Properties"
 #~ msgstr "Propiedades da Alarma"
 
-#~ msgid "Audio alarms timeout after"
-#~ msgstr "As alarmas sonoras expiran tras"
-
-#~ msgid " seconds"
-#~ msgstr " segundos"
-
 #~ msgid "Could not rename folder %s to %s: destination exists"
 #~ msgstr "Non foi posible renomear a carpeta %s a %s: o destino xa existe"
 
@@ -6831,9 +9397,6 @@ msgstr "Grupo %i"
 #~ msgid "Browse..."
 #~ msgstr "Explorar..."
 
-#~ msgid "Optional Information"
-#~ msgstr "Información Opcional"
-
 #~ msgid "Couldn't create pipe to %s: %s"
 #~ msgstr "Non foi posible crear unha canalización con %s: %s"
author	Pablo Saratxaga <pablo@src.gnome.org>	2001-03-15 18:42:18 +0800
committer	Pablo Saratxaga <pablo@src.gnome.org>	2001-03-15 18:42:18 +0800
commit	9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7 (patch)
tree	957874003612aaafdb3b6bdbc748c99979eb0715 /po/gl.po
parent	ed1060cbfb536be02c0122135d66b71c3f5fb228 (diff)
download	gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.gz gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.bz2 gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.lz gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.xz gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.tar.zst gsoc2013-evolution-9bc0a195109e3151b1e6e2cb4ea2b226bffe19b7.zip