Updated Galician translation

svn path=/trunk/; revision=5060

1 files changed, 2203 insertions, 793 deletions

diff --git a/po/gl.po b/po/gl.po
index b4d3873184..674b7a1da6 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,19 +10,158 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 0.0.2\n"
-"POT-Creation-Date: 2000-08-02 16:39+0200\n"
-"PO-Revision-Date: 2000-07-16 19:19+0200\n"
+"POT-Creation-Date: 2000-08-25 23:18+0200\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:41
 #: addressbook/backend/ebook/load-pine-addressbook.c:41
-#: addressbook/gui/component/addressbook-factory.c:59 calendar/gui/main.c:68
+#: addressbook/backend/ebook/test-client-list.c:29
+#: addressbook/backend/ebook/test-client.c:54
+#: addressbook/conduit/address-conduit.c:1215
+#: addressbook/demo/addressbook-factory.c:32
+#: addressbook/gui/component/addressbook-factory.c:59
+#: addressbook/gui/minicard/test-minicard-view.c:45
+#: calendar/conduits/calendar/calendar-conduit.c:1669
+#: calendar/conduits/todo/todo-conduit.c:1298 calendar/gui/main.c:69
 msgid "Could not initialize Bonobo"
 msgstr "Non se puido inicializar Bonobo"
 
+#. 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:54
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:55
+#: calendar/conduits/todo/todo-conduit-control-applet.c:55
+msgid "Disabled"
+msgstr "Desactivado"
+
+#: addressbook/conduit/address-conduit-control-applet.c:55
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:56
+#: calendar/conduits/todo/todo-conduit-control-applet.c:56
+msgid "Synchronize"
+msgstr "Sincronizar"
+
+#: addressbook/conduit/address-conduit-control-applet.c:56
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:57
+#: calendar/conduits/todo/todo-conduit-control-applet.c:57
+msgid "Copy From Pilot"
+msgstr "Copiar do Pilot"
+
+#: addressbook/conduit/address-conduit-control-applet.c:57
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:58
+#: calendar/conduits/todo/todo-conduit-control-applet.c:58
+msgid "Copy To Pilot"
+msgstr "Copiar ó Pilot"
+
+#: addressbook/conduit/address-conduit-control-applet.c:58
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:59
+#: calendar/conduits/todo/todo-conduit-control-applet.c:59
+msgid "Merge From Pilot"
+msgstr "Mesturar do Pilot"
+
+#: addressbook/conduit/address-conduit-control-applet.c:59
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:60
+#: calendar/conduits/todo/todo-conduit-control-applet.c:60
+msgid "Merge To Pilot"
+msgstr "Mesturar ó Pilot"
+
+#: addressbook/conduit/address-conduit-control-applet.c:143
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:144
+#: calendar/conduits/todo/todo-conduit-control-applet.c:144
+msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
+
+#: addressbook/conduit/address-conduit-control-applet.c:145
+msgid "Gpilotd address conduit"
+msgstr "Conducto de enderezos para Gpilotd"
+
+#: addressbook/conduit/address-conduit-control-applet.c:146
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:147
+#: calendar/conduits/todo/todo-conduit-control-applet.c:147
+msgid "(C) 1998 the Free Software Foundation"
+msgstr "(C) 1998 a Free Software Foundation"
+
+#: addressbook/conduit/address-conduit-control-applet.c:148
+msgid "Configuration utility for the address conduit.\n"
+msgstr "Utilidade de configuración do conducto de enderezos.\n"
+
+#: addressbook/conduit/address-conduit-control-applet.c:149
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:150
+#: calendar/conduits/todo/todo-conduit-control-applet.c:150
+msgid "gnome-unknown.xpm"
+msgstr "gnome-unknown.xpm"
+
+#: addressbook/conduit/address-conduit-control-applet.c:190
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:191
+#: calendar/conduits/todo/todo-conduit-control-applet.c:191
+msgid "Synchronize Action"
+msgstr "Sincronizar Acción"
+
+#: addressbook/conduit/address-conduit-control-applet.c:261
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:262
+#: calendar/conduits/todo/todo-conduit-control-applet.c:262
+msgid "Conduit state"
+msgstr "Estado do conducto"
+
+#: addressbook/conduit/address-conduit-control-applet.c:315
+#: addressbook/conduit/address-conduit-control-applet.c:328
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:316
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:329
+#: calendar/conduits/todo/todo-conduit-control-applet.c:316
+#: calendar/conduits/todo/todo-conduit-control-applet.c:329
+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:334
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:335
+#: calendar/conduits/todo/todo-conduit-control-applet.c:335
+msgid "Not connected to the gnome-pilot daemon"
+msgstr "Non conectado ó demo gnome-pilot"
+
+#: addressbook/conduit/address-conduit-control-applet.c:339
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:340
+#: calendar/conduits/todo/todo-conduit-control-applet.c:340
+msgid ""
+"An error occured when trying to fetch\n"
+"pilot list from the gnome-pilot daemon"
+msgstr ""
+"Ocorreu un erro ó obte-la lista de\n"
+"pilots do demo gnome-pilot"
+
+#: addressbook/conduit/address-conduit.c:127
+#: addressbook/conduit/address-conduit.c:141
+msgid "BLARG\n"
+msgstr "BLARG\n"
+
+#: addressbook/conduit/address-conduit.c:471
+#, c-format
+msgid "Address holds %ld address entries"
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:497
+#: addressbook/conduit/address-conduit.c:499
+msgid "Could not start addressbook server"
+msgstr "Non se puido inicia-lo servidor de libro de enderezos"
+
+#: addressbook/conduit/address-conduit.c:512
+#: addressbook/conduit/address-conduit.c:515
+msgid "Could not read pilot's Address application block"
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:853
+msgid "Error while communicating with address server"
+msgstr "Erro ó comunicarse co servidor de enderezos"
+
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -40,457 +179,473 @@ msgstr "Elemento(s) pertencentes a estas categorías:"
 msgid "Available Categories:"
 msgstr "Categorías Dispoñibles:"
 
-#: addressbook/contact-editor/e-contact-editor.c:643
-#: calendar/gui/event-editor.c:1168
+#: addressbook/contact-editor/e-contact-editor.c:665
+#: calendar/gui/dialogs/task-editor.c:217 calendar/gui/event-editor.c:1172
 msgid "FIXME: _Appointment"
 msgstr "FIXME: _Cita"
 
-#: addressbook/contact-editor/e-contact-editor.c:644
-#: calendar/gui/event-editor.c:1169
+#: addressbook/contact-editor/e-contact-editor.c:666
+#: calendar/gui/dialogs/task-editor.c:218 calendar/gui/event-editor.c:1173
 msgid "FIXME: Meeting Re_quest"
 msgstr "FIXME: _Solicitude de Reunión"
 
-#: addressbook/contact-editor/e-contact-editor.c:646
-#: calendar/gui/event-editor.c:1171
+#: addressbook/contact-editor/e-contact-editor.c:668
+#: calendar/gui/dialogs/task-editor.c:216 calendar/gui/event-editor.c:1175
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: Enviar _Mensaxe"
 
-#: addressbook/contact-editor/e-contact-editor.c:647
-#: calendar/gui/event-editor.c:1172
+#: addressbook/contact-editor/e-contact-editor.c:669
+#: calendar/gui/dialogs/task-editor.c:219 calendar/gui/event-editor.c:1176
 msgid "FIXME: _Contact"
 msgstr "FIXME: _Contacto"
 
-#: addressbook/contact-editor/e-contact-editor.c:648
-#: calendar/gui/event-editor.c:1173
+#: addressbook/contact-editor/e-contact-editor.c:670
+#: calendar/gui/dialogs/task-editor.c:213
+#: calendar/gui/dialogs/task-editor.c:220 calendar/gui/event-editor.c:1177
 msgid "FIXME: _Task"
 msgstr "FIXME: _Tarefa"
 
-#: addressbook/contact-editor/e-contact-editor.c:649
-#: calendar/gui/event-editor.c:1174
+#: addressbook/contact-editor/e-contact-editor.c:671
+#: calendar/gui/dialogs/task-editor.c:214
+#: calendar/gui/dialogs/task-editor.c:221 calendar/gui/event-editor.c:1178
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Solicitude de _Tarefa"
 
-#: addressbook/contact-editor/e-contact-editor.c:650
-#: calendar/gui/event-editor.c:1175
+#: addressbook/contact-editor/e-contact-editor.c:672
+#: calendar/gui/dialogs/task-editor.c:222 calendar/gui/event-editor.c:1179
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: Entrada de _Xornal"
 
-#: addressbook/contact-editor/e-contact-editor.c:651
-#: calendar/gui/event-editor.c:1176
+#: addressbook/contact-editor/e-contact-editor.c:673
+#: calendar/gui/dialogs/task-editor.c:223 calendar/gui/event-editor.c:1180
 msgid "FIXME: _Note"
 msgstr "FIXME: _Nota"
 
-#: addressbook/contact-editor/e-contact-editor.c:653
-#: addressbook/contact-editor/e-contact-editor.c:758
-#: calendar/gui/event-editor.c:1178 calendar/gui/event-editor.c:1285
+#: addressbook/contact-editor/e-contact-editor.c:675
+#: addressbook/contact-editor/e-contact-editor.c:780
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:332 calendar/gui/event-editor.c:1182
+#: calendar/gui/event-editor.c:1289
 msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:658
-#: calendar/gui/event-editor.c:1183
+#: addressbook/contact-editor/e-contact-editor.c:680
+#: calendar/gui/dialogs/task-editor.c:230 calendar/gui/event-editor.c:1187
 msgid "FIXME: _Memo Style"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:660
-#: calendar/gui/event-editor.c:1185
+#: addressbook/contact-editor/e-contact-editor.c:682
+#: calendar/gui/dialogs/task-editor.c:232 calendar/gui/event-editor.c:1189
 msgid "FIXME: Define Print _Styles..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:667
-#: calendar/gui/event-editor.c:1192
+#: addressbook/contact-editor/e-contact-editor.c:689
+#: calendar/gui/dialogs/task-editor.c:239 calendar/gui/event-editor.c:1196
 msgid "FIXME: S_end"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:671
-#: calendar/gui/event-editor.c:1196
+#: addressbook/contact-editor/e-contact-editor.c:693
+#: calendar/gui/dialogs/task-editor.c:243 calendar/gui/event-editor.c:1200
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Gardar Ad_xuntos..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: addressbook/contact-editor/e-contact-editor.c:673
+#: addressbook/contact-editor/e-contact-editor.c:695
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: addressbook/contact-editor/e-contact-editor.c:674
-#: calendar/gui/event-editor.c:1199
+#: addressbook/contact-editor/e-contact-editor.c:696
+#: calendar/gui/dialogs/task-editor.c:246 calendar/gui/event-editor.c:1203
 msgid "FIXME: _Move to Folder..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:675
-#: calendar/gui/event-editor.c:1200
+#: addressbook/contact-editor/e-contact-editor.c:697
+#: calendar/gui/dialogs/task-editor.c:247 calendar/gui/event-editor.c:1204
 msgid "FIXME: Cop_y to Folder..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:677
-#: calendar/gui/event-editor.c:1202
+#: addressbook/contact-editor/e-contact-editor.c:699
+#: calendar/gui/dialogs/task-editor.c:249 calendar/gui/event-editor.c:1206
 msgid "Page Set_up"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:678
-#: calendar/gui/event-editor.c:1203
+#: addressbook/contact-editor/e-contact-editor.c:700
+#: calendar/gui/dialogs/task-editor.c:250 calendar/gui/event-editor.c:1207
 msgid "FIXME: Print Pre_view"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:699
-#: calendar/gui/event-editor.c:1224
+#: addressbook/contact-editor/e-contact-editor.c:721
+#: calendar/gui/dialogs/task-editor.c:271 calendar/gui/event-editor.c:1228
 msgid "FIXME: Paste _Special..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:704
-#: calendar/gui/event-editor.c:1229
+#: addressbook/contact-editor/e-contact-editor.c:726
+#: calendar/gui/dialogs/task-editor.c:276 calendar/gui/event-editor.c:1233
 msgid "FIXME: Mark as U_nread"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:708
-#: calendar/gui/event-editor.c:1233
+#: addressbook/contact-editor/e-contact-editor.c:730
+#: calendar/gui/dialogs/task-editor.c:280 calendar/gui/event-editor.c:1237
 msgid "_Object"
 msgstr "_Obxecto"
 
-#: addressbook/contact-editor/e-contact-editor.c:713
-#: addressbook/contact-editor/e-contact-editor.c:720
-#: calendar/gui/event-editor.c:1238 calendar/gui/event-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:735
+#: addressbook/contact-editor/e-contact-editor.c:742
+#: calendar/gui/dialogs/task-editor.c:285
+#: calendar/gui/dialogs/task-editor.c:293 calendar/gui/event-editor.c:1242
+#: calendar/gui/event-editor.c:1249
 msgid "FIXME: _Item"
 msgstr "FIXME: _Elemento"
 
-#: addressbook/contact-editor/e-contact-editor.c:714
-#: addressbook/contact-editor/e-contact-editor.c:721
-#: calendar/gui/event-editor.c:1239 calendar/gui/event-editor.c:1246
+#: addressbook/contact-editor/e-contact-editor.c:736
+#: addressbook/contact-editor/e-contact-editor.c:743
+#: calendar/gui/dialogs/task-editor.c:286
+#: calendar/gui/dialogs/task-editor.c:294 calendar/gui/event-editor.c:1243
+#: calendar/gui/event-editor.c:1250
 msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:715
-#: calendar/gui/event-editor.c:1240
+#: addressbook/contact-editor/e-contact-editor.c:737
+#: calendar/gui/dialogs/task-editor.c:288 calendar/gui/event-editor.c:1244
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:722
-#: calendar/gui/event-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:744
+#: calendar/gui/dialogs/task-editor.c:296 calendar/gui/event-editor.c:1251
 msgid "FIXME: _Last Item in Folder"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:727
-#: calendar/gui/event-editor.c:1252
+#: addressbook/contact-editor/e-contact-editor.c:749
+#: calendar/gui/dialogs/task-editor.c:301 calendar/gui/event-editor.c:1256
 msgid "FIXME: _Standard"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:729
-#: calendar/gui/event-editor.c:1254
+#: addressbook/contact-editor/e-contact-editor.c:751
+#: calendar/gui/dialogs/task-editor.c:303 calendar/gui/event-editor.c:1258
 msgid "FIXME: __Formatting"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:732
-#: calendar/gui/event-editor.c:1257
+#: addressbook/contact-editor/e-contact-editor.c:754
+#: calendar/gui/dialogs/task-editor.c:306 calendar/gui/event-editor.c:1261
 msgid "FIXME: _Customize..."
 msgstr "FIXME: _Personalizar..."
 
-#: addressbook/contact-editor/e-contact-editor.c:737
-#: calendar/gui/event-editor.c:1262
+#: addressbook/contact-editor/e-contact-editor.c:759
+#: calendar/gui/dialogs/task-editor.c:311 calendar/gui/event-editor.c:1266
 msgid "Pre_vious"
 msgstr "An_terior"
 
-#: addressbook/contact-editor/e-contact-editor.c:738
-#: calendar/gui/event-editor.c:1263
+#: addressbook/contact-editor/e-contact-editor.c:760
+#: calendar/gui/dialogs/task-editor.c:312 calendar/gui/event-editor.c:1267
 msgid "Ne_xt"
 msgstr "Se_guinte"
 
-#: addressbook/contact-editor/e-contact-editor.c:740
-#: calendar/gui/event-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:762
+#: calendar/gui/dialogs/task-editor.c:314 calendar/gui/event-editor.c:1271
 msgid "_Toolbars"
 msgstr "_Barras de ferramentas"
 
-#: addressbook/contact-editor/e-contact-editor.c:745
-#: calendar/gui/event-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:767
+#: calendar/gui/dialogs/task-editor.c:319 calendar/gui/event-editor.c:1276
 msgid "FIXME: _File..."
 msgstr "FIXME: _Ficheiro..."
 
-#: addressbook/contact-editor/e-contact-editor.c:746
-#: calendar/gui/event-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:768
+#: calendar/gui/dialogs/task-editor.c:320 calendar/gui/event-editor.c:1277
 msgid "FIXME: It_em..."
 msgstr "FIXME: _Elemento..."
 
-#: addressbook/contact-editor/e-contact-editor.c:747
-#: calendar/gui/event-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:769
+#: calendar/gui/dialogs/task-editor.c:321 calendar/gui/event-editor.c:1278
 msgid "FIXME: _Object..."
 msgstr "FIXME: _Obxecto..."
 
-#: addressbook/contact-editor/e-contact-editor.c:752
-#: calendar/gui/event-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:774
+#: calendar/gui/dialogs/task-editor.c:326 calendar/gui/event-editor.c:1283
 msgid "FIXME: _Font..."
 msgstr "FIXME: _Fonte..."
 
-#: addressbook/contact-editor/e-contact-editor.c:753
-#: calendar/gui/event-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:775
+#: calendar/gui/dialogs/task-editor.c:327 calendar/gui/event-editor.c:1284
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: _Parágrafo..."
 
-#: addressbook/contact-editor/e-contact-editor.c:760
-#: calendar/gui/event-editor.c:1287
+#: addressbook/contact-editor/e-contact-editor.c:782
+#: calendar/gui/dialogs/task-editor.c:334 calendar/gui/event-editor.c:1291
 msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:761
-#: calendar/gui/event-editor.c:1288
+#: addressbook/contact-editor/e-contact-editor.c:783
+#: calendar/gui/dialogs/task-editor.c:335 calendar/gui/event-editor.c:1292
 msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:763
-#: calendar/gui/event-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:785
+#: calendar/gui/dialogs/task-editor.c:337 calendar/gui/event-editor.c:1294
 msgid "FIXME: Publish _Form..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:764
-#: calendar/gui/event-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:786
+#: calendar/gui/dialogs/task-editor.c:338 calendar/gui/event-editor.c:1295
 msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:766
-#: calendar/gui/event-editor.c:1293
+#: addressbook/contact-editor/e-contact-editor.c:788
+#: calendar/gui/dialogs/task-editor.c:340 calendar/gui/event-editor.c:1297
 msgid "FIXME: Script _Debugger"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:771
-#: calendar/gui/event-editor.c:1298
+#: addressbook/contact-editor/e-contact-editor.c:793
+#: calendar/gui/dialogs/task-editor.c:345 calendar/gui/event-editor.c:1302
 msgid "FIXME: _Spelling..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:773
-#: calendar/gui/event-editor.c:1303
+#: addressbook/contact-editor/e-contact-editor.c:795
+#: calendar/gui/dialogs/task-editor.c:350 calendar/gui/event-editor.c:1307
 msgid "_Forms"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:778
+#: addressbook/contact-editor/e-contact-editor.c:800
 msgid "FIXME: _New Contact"
 msgstr "FIXME: _Novo Contacto"
 
-#: addressbook/contact-editor/e-contact-editor.c:779
+#: addressbook/contact-editor/e-contact-editor.c:801
 msgid "FIXME: New _Contact from Same Company"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:781
+#: addressbook/contact-editor/e-contact-editor.c:803
 msgid "FIXME: New _Letter to Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:782
+#: addressbook/contact-editor/e-contact-editor.c:804
 msgid "FIXME: New _Message to Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:783
+#: addressbook/contact-editor/e-contact-editor.c:805
 msgid "FIXME: New Meetin_g with Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:784
+#: addressbook/contact-editor/e-contact-editor.c:806
 msgid "FIXME: _Plan a Meeting..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:785
+#: addressbook/contact-editor/e-contact-editor.c:807
 msgid "FIXME: New _Task for Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:786
+#: addressbook/contact-editor/e-contact-editor.c:808
 msgid "FIXME: New _Journal Entry for Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:788
+#: addressbook/contact-editor/e-contact-editor.c:810
 msgid "FIXME: _Flag for Follow Up..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:789
+#: addressbook/contact-editor/e-contact-editor.c:811
 msgid "FIXME: _Display Map of Address"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:790
+#: addressbook/contact-editor/e-contact-editor.c:812
 msgid "FIXME: _Open Web Page"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:792
+#: addressbook/contact-editor/e-contact-editor.c:814
 msgid "FIXME: Forward as _vCard"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:793
-#: calendar/gui/event-editor.c:1316
+#: addressbook/contact-editor/e-contact-editor.c:815
+#: calendar/gui/dialogs/task-editor.c:367 calendar/gui/event-editor.c:1320
 msgid "FIXME: For_ward"
 msgstr "FIXME: _Reenviar"
 
-#: addressbook/contact-editor/e-contact-editor.c:805
-#: calendar/gui/event-editor.c:1329
+#: addressbook/contact-editor/e-contact-editor.c:827
+#: calendar/gui/dialogs/task-editor.c:380 calendar/gui/event-editor.c:1333
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: addressbook/contact-editor/e-contact-editor.c:806
-#: calendar/gui/event-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:828
+#: calendar/gui/dialogs/task-editor.c:381 calendar/gui/event-editor.c:1334
 msgid "F_ormat"
 msgstr "_Formatar"
 
-#: addressbook/contact-editor/e-contact-editor.c:807
-#: calendar/gui/event-editor.c:1331 shell/e-shell-view-menu.c:515
+#: addressbook/contact-editor/e-contact-editor.c:829
+#: addressbook/gui/component/addressbook.c:548
+#: calendar/gui/dialogs/task-editor.c:382 calendar/gui/event-editor.c:1335
 msgid "_Tools"
 msgstr "_Utilidades"
 
-#: addressbook/contact-editor/e-contact-editor.c:808
-#: calendar/gui/event-editor.c:1332
+#: addressbook/contact-editor/e-contact-editor.c:830
+#: calendar/gui/dialogs/task-editor.c:383 calendar/gui/event-editor.c:1336
 msgid "Actio_ns"
 msgstr "Acció_ns"
 
-#: addressbook/contact-editor/e-contact-editor.c:839
+#: addressbook/contact-editor/e-contact-editor.c:861
 msgid "Save and Close"
 msgstr "Gardar e Pechar"
 
-#: addressbook/contact-editor/e-contact-editor.c:840
-#: calendar/gui/event-editor.c:1371
+#: addressbook/contact-editor/e-contact-editor.c:862
+#: calendar/gui/event-editor.c:1375
 msgid "Save the appointment and close the dialog box"
 msgstr "Garda-la cita e pecha-la caixa de diálogo"
 
-#: addressbook/contact-editor/e-contact-editor.c:844
-#: calendar/gui/calendar-commands.c:673
+#: addressbook/contact-editor/e-contact-editor.c:866
+#: calendar/gui/calendar-commands.c:656
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: addressbook/contact-editor/e-contact-editor.c:845
-#: calendar/gui/event-editor.c:1376
+#: addressbook/contact-editor/e-contact-editor.c:867
+#: calendar/gui/dialogs/task-editor.c:415 calendar/gui/event-editor.c:1380
 msgid "Print this item"
 msgstr "Imprimir este elemento"
 
-#: addressbook/contact-editor/e-contact-editor.c:848
-#: calendar/gui/event-editor.c:1377
+#: addressbook/contact-editor/e-contact-editor.c:870
+#: calendar/gui/dialogs/task-editor.c:416 calendar/gui/event-editor.c:1381
 msgid "FIXME: Insert File..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:849
-#: calendar/gui/event-editor.c:1378
+#: addressbook/contact-editor/e-contact-editor.c:871
+#: calendar/gui/dialogs/task-editor.c:417 calendar/gui/event-editor.c:1382
 msgid "Insert a file as an attachment"
 msgstr "Inserir un ficheiro como adxunto"
 
 #. Delete
-#: addressbook/contact-editor/e-contact-editor.c:852
-#: addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:508
-#: mail/folder-browser-factory.c:39
+#: addressbook/contact-editor/e-contact-editor.c:874
+#: addressbook/demo/addressbook.c:84
+#: addressbook/gui/component/addressbook.c:446
+#: calendar/gui/e-calendar-table.c:325
+#: calendar/gui/event-editor-dialog.glade.h:92 calendar/gui/gncal-todo.c:550
+#: mail/folder-browser-factory.c:50 mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
+#: mail/mail-view.c:147
 msgid "Delete"
 msgstr "Borrar"
 
-#: addressbook/contact-editor/e-contact-editor.c:853
-#: calendar/gui/event-editor.c:1387 calendar/gui/gncal-todo.c:336
+#: addressbook/contact-editor/e-contact-editor.c:875
+#: calendar/gui/dialogs/task-editor.c:426 calendar/gui/event-editor.c:1391
+#: calendar/gui/gncal-todo.c:378
 msgid "Delete this item"
 msgstr "Borrar este elemento"
 
-#: addressbook/contact-editor/e-contact-editor.c:856
-#: calendar/gui/event-editor.c:1389
+#: addressbook/contact-editor/e-contact-editor.c:879
+#: calendar/gui/dialogs/task-editor.c:428 calendar/gui/event-editor.c:1393
 msgid "FIXME: Previous"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:857
-#: calendar/gui/event-editor.c:1390
+#: addressbook/contact-editor/e-contact-editor.c:880
+#: calendar/gui/dialogs/task-editor.c:429 calendar/gui/event-editor.c:1394
 msgid "Go to the previous item"
 msgstr "Ir ó elemento anterior"
 
-#: addressbook/contact-editor/e-contact-editor.c:859
-#: calendar/gui/event-editor.c:1391
+#: addressbook/contact-editor/e-contact-editor.c:882
+#: calendar/gui/dialogs/task-editor.c:430 calendar/gui/event-editor.c:1395
 msgid "FIXME: Next"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:860
-#: calendar/gui/event-editor.c:1392
+#: addressbook/contact-editor/e-contact-editor.c:883
+#: calendar/gui/dialogs/task-editor.c:431 calendar/gui/event-editor.c:1396
 msgid "Go to the next item"
 msgstr "Ir ó elemento seguinte"
 
-#: addressbook/contact-editor/e-contact-editor.c:862
-#: calendar/gui/event-editor.c:1393
+#: addressbook/contact-editor/e-contact-editor.c:886
+#: calendar/gui/dialogs/task-editor.c:432 calendar/gui/event-editor.c:1397
 msgid "FIXME: Help"
 msgstr "FIXME: Axuda"
 
-#: addressbook/contact-editor/e-contact-editor.c:863
-#: calendar/gui/event-editor.c:1394
+#: addressbook/contact-editor/e-contact-editor.c:887
+#: calendar/gui/dialogs/task-editor.c:433 calendar/gui/event-editor.c:1398
 msgid "See online help"
 msgstr "Ve-la axuda online"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1343
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/contact-editor/e-contact-editor.c:1383
+#: addressbook/contact-editor/e-contact-editor.c:1344
+#: addressbook/contact-editor/e-contact-editor.c:1448
 msgid "Business"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1345
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1346
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1347
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1348
 msgid "Car"
-msgstr ""
+msgstr "Coche"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/contact-editor/e-contact-editor.c:1349
 msgid "Company"
 msgstr "Compañía"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/contact-editor/e-contact-editor.c:1384
+#: addressbook/contact-editor/e-contact-editor.c:1350
+#: addressbook/contact-editor/e-contact-editor.c:1449
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/contact-editor/e-contact-editor.c:1351
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/contact-editor/e-contact-editor.c:1352
 msgid "Home Fax"
 msgstr "Fax de Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/contact-editor/e-contact-editor.c:1353
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/contact-editor/e-contact-editor.c:1354
 msgid "Mobile"
 msgstr "Móbil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
-#: addressbook/contact-editor/e-contact-editor.c:1385
+#: addressbook/contact-editor/e-contact-editor.c:1355
+#: addressbook/contact-editor/e-contact-editor.c:1450
+#: mail/mail-config.glade.h:28
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:1356
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/contact-editor/e-contact-editor.c:1357
 msgid "Pager"
-msgstr ""
+msgstr "Pager"
 
-#: addressbook/contact-editor/e-contact-editor.c:1293
+#: addressbook/contact-editor/e-contact-editor.c:1358
 msgid "Primary"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1294
+#: addressbook/contact-editor/e-contact-editor.c:1359
 msgid "Radio"
-msgstr ""
+msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1295
+#: addressbook/contact-editor/e-contact-editor.c:1360
 msgid "Telex"
-msgstr ""
+msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1296
+#: addressbook/contact-editor/e-contact-editor.c:1361
 msgid "TTY/TDD"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
-#: addressbook/contact-editor/e-contact-editor.c:1340
+#: addressbook/contact-editor/e-contact-editor.c:1405
 msgid "Primary Email"
 msgstr "Email Principal"
 
-#: addressbook/contact-editor/e-contact-editor.c:1341
+#: addressbook/contact-editor/e-contact-editor.c:1406
 msgid "Email 2"
 msgstr "Email 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1342
+#: addressbook/contact-editor/e-contact-editor.c:1407
 msgid "Email 3"
 msgstr "Email 3"
 
@@ -499,6 +654,23 @@ msgstr "Email 3"
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
 #.
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"¿Está seguro de que quere\n"
+"borrar este contacto?"
+
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
+msgid "Delete Contact?"
+msgstr "¿Borrar Contacto?"
+
+#.
+#. * 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"
@@ -513,6 +685,8 @@ msgid "New phone type"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
+#: calendar/gui/event-editor-dialog.glade.h:90 mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:16 mail/mail-config.glade.h:22
 msgid "Add"
 msgstr "Engadir"
 
@@ -569,6 +743,7 @@ msgid "C_ontacts..."
 msgstr "C_ontactos..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
 msgid "Ca_tegories..."
 msgstr "Ca_tegorías..."
 
@@ -581,6 +756,7 @@ msgid "_Company:"
 msgstr "_Compañía:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
+#: calendar/gui/event-editor-dialog.glade.h:17
 msgid "General"
 msgstr "Xeral"
 
@@ -625,6 +801,7 @@ msgid "No_tes:"
 msgstr "No_tas:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:33
 msgid "Details"
 msgstr "Detalles"
 
@@ -639,7 +816,7 @@ msgstr ""
 
 #: addressbook/contact-editor/fullname-strings.h:8
 msgid "_Title:"
-msgstr ""
+msgstr "_Trato:"
 
 #: addressbook/contact-editor/fullname-strings.h:9
 msgid "_First:"
@@ -655,7 +832,7 @@ msgstr "_Apelido(s):"
 
 #: addressbook/contact-editor/fullname-strings.h:12
 msgid "_Suffix:"
-msgstr ""
+msgstr "_Sufixo:"
 
 #: addressbook/contact-editor/fullname-strings.h:13
 msgid ""
@@ -664,6 +841,12 @@ msgid ""
 "Mrs.\n"
 "Dr.\n"
 msgstr ""
+"\n"
+"Sr.\n"
+"Sra.\n"
+"Don\n"
+"Dona\n"
+"Dr.\n"
 
 #: addressbook/contact-editor/fullname-strings.h:18
 msgid ""
@@ -676,55 +859,71 @@ msgid ""
 "Esq.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:420
-#: calendar/gui/calendar-commands.c:544
+#: addressbook/demo/addressbook.c:78
+#: addressbook/gui/component/addressbook.c:440
+#: calendar/gui/calendar-commands.c:513 notes/component-factory.c:27
 msgid "New"
 msgstr "Novo"
 
-#: addressbook/gui/component/addressbook.c:420
+#: addressbook/demo/addressbook.c:78
+#: addressbook/gui/component/addressbook.c:440
 msgid "Create a new contact"
 msgstr "Crear un novo contacto"
 
-#: addressbook/gui/component/addressbook.c:424
+#: addressbook/demo/addressbook.c:82
+#: addressbook/gui/component/addressbook.c:444
 msgid "Find"
 msgstr "Buscar"
 
-#: addressbook/gui/component/addressbook.c:424
+#: addressbook/demo/addressbook.c:82
+#: addressbook/gui/component/addressbook.c:444
 msgid "Find a contact"
 msgstr "Buscar un contacto"
 
-#: addressbook/gui/component/addressbook.c:425
-#: addressbook/gui/component/addressbook.c:492
-#: calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:37
+#: addressbook/demo/addressbook.c:83
+#: addressbook/gui/component/addressbook.c:445
+#: calendar/gui/calendar-commands.c:518 mail/folder-browser-factory.c:48
+#: mail/mail-view.c:145
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/demo/addressbook.c:83
+#: addressbook/gui/component/addressbook.c:445
 msgid "Print contacts"
-msgstr ""
+msgstr "Imprimir contactos"
 
-#: addressbook/gui/component/addressbook.c:426
+#: addressbook/demo/addressbook.c:84
+#: addressbook/gui/component/addressbook.c:446
 msgid "Delete a contact"
 msgstr "Borrar un contacto"
 
-#: addressbook/gui/component/addressbook.c:499
-#: addressbook/gui/component/addressbook.c:1034
-msgid "As _Table"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:506
+#: addressbook/demo/addressbook.c:103
+#: addressbook/gui/component/addressbook.c:532
 msgid "_New Contact"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/addressbook.c:514
+#: addressbook/gui/component/addressbook.c:515
+msgid "_Print Contacts..."
+msgstr "_Imprimir Contactos..."
+
+#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:1055
+msgid "As _Table"
+msgstr "Como unha _Táboa"
+
+#: addressbook/gui/component/addressbook.c:540
 msgid "N_ew Directory Server"
 msgstr "N_ovo Servidor de Directorio"
 
-#: addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:554
+msgid "_Search for contacts"
+msgstr "_Buscar contactos"
+
+#: addressbook/gui/component/addressbook.c:636
 msgid "Unable to open addressbook"
 msgstr "Non se pode abri-lo libro de enderezos"
 
-#: addressbook/gui/component/addressbook.c:598
+#: addressbook/gui/component/addressbook.c:641
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -736,20 +935,20 @@ msgid ""
 "OpenLDAP and recompile and install evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:938
-#: addressbook/gui/minicard/e-minicard.c:330
+#: addressbook/gui/component/addressbook.c:924
+#: addressbook/gui/minicard/e-minicard.c:332
 msgid "Save as VCard"
 msgstr "Gardar como VCard"
 
-#: addressbook/gui/component/addressbook.c:1005
+#: addressbook/gui/component/addressbook.c:1026
 msgid "* Click here to add a contact *"
 msgstr "* Prema aquí para engadir un contacto *"
 
-#: addressbook/gui/component/addressbook.c:1041
+#: addressbook/gui/component/addressbook.c:1062
 msgid "As _Minicards"
-msgstr ""
+msgstr "Como _Minitarxetas"
 
-#: addressbook/gui/component/addressbook.c:1092
+#: addressbook/gui/component/addressbook.c:1113
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que amosará o navegador de carpetas"
 
@@ -871,6 +1070,10 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
+#: addressbook/gui/component/e-ldap-storage.c:88
+msgid "External Directories"
+msgstr "Directorios Externos"
+
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -898,6 +1101,31 @@ msgstr ""
 msgid "Name:"
 msgstr "Nome:"
 
+#.
+#. * 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/gui/component/select-names/select-names.glade.h:7
+msgid "Select Names"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+msgid "Find..."
+msgstr "Buscar..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:9
+msgid "Select name from List:"
+msgstr "Seleccionar un nome da Lista:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:10
+msgid "Message Recipients"
+msgstr ""
+
+#: addressbook/gui/minicard/e-minicard-control.c:278
+msgid "Save in addressbook"
+msgstr "Gardar no libro de enderezos"
+
 #: addressbook/gui/minicard/e-minicard-view.c:110
 msgid ""
 "\n"
@@ -907,6 +1135,24 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
+#: addressbook/gui/minicard/test-minicard-view.c:100
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/minicard/test-minicard-view.c:101
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright (C) 2000, Helix Code, Inc."
+
+#: addressbook/gui/minicard/test-minicard-view.c:103
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#. gtk_signal_connect(fb->search_entry, "changed", search_activate, fb);
+#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: mail/folder-browser.c:370
+msgid "Search"
+msgstr "Buscar"
+
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -914,15 +1160,15 @@ msgstr ""
 #.
 #: addressbook/printing/e-contact-print.glade.h:7
 msgid "Page Setup:"
-msgstr ""
+msgstr "Configuración da Páxina:"
 
 #: addressbook/printing/e-contact-print.glade.h:8
 msgid "Style name:"
-msgstr ""
+msgstr "Nome do estilo:"
 
 #: addressbook/printing/e-contact-print.glade.h:9
 msgid "Preview:"
-msgstr ""
+msgstr "Previsualización:"
 
 #: addressbook/printing/e-contact-print.glade.h:10
 msgid "Options"
@@ -973,27 +1219,27 @@ msgstr "Fonte..."
 
 #: addressbook/printing/e-contact-print.glade.h:22
 msgid "Headings"
-msgstr ""
+msgstr "Cabeceiras"
 
 #: addressbook/printing/e-contact-print.glade.h:23
 msgid "10 pt. Tahoma"
-msgstr ""
+msgstr "10 ptos. Tahoma"
 
 #: addressbook/printing/e-contact-print.glade.h:24
 msgid "Body"
-msgstr ""
+msgstr "Corpo"
 
 #: addressbook/printing/e-contact-print.glade.h:25
 msgid "8 pt. Tahoma"
-msgstr ""
+msgstr "8 ptos. Tahoma"
 
 #: addressbook/printing/e-contact-print.glade.h:26
 msgid "Shading"
-msgstr ""
+msgstr "Sombreado"
 
 #: addressbook/printing/e-contact-print.glade.h:27
 msgid "Print using gray shading"
-msgstr ""
+msgstr "Imprimir usando sombreado gris"
 
 #: addressbook/printing/e-contact-print.glade.h:28
 msgid "Format"
@@ -1010,6 +1256,7 @@ msgstr "Tipo:"
 
 #: addressbook/printing/e-contact-print.glade.h:31
 #: addressbook/printing/e-contact-print.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:80
 msgid "label26"
 msgstr "label26"
 
@@ -1088,51 +1335,91 @@ msgstr ""
 msgid "Header/Footer"
 msgstr ""
 
-#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:544
+#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:596
 msgid "am"
 msgstr "am"
 
-#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:543
+#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:595
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/calendar-commands.c:56
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:146
+msgid "Gpilotd calendar conduit"
+msgstr "Conducto de axenda do Gpilotd"
+
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:149
+msgid "Configuration utility for the calendar conduit.\n"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:399
+#: calendar/conduits/calendar/calendar-conduit.c:1109
+#: calendar/conduits/todo/todo-conduit.c:443
+#: calendar/conduits/todo/todo-conduit.c:1025
+msgid "Error while communicating with calendar server"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:776
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:707
+#: calendar/conduits/todo/todo-conduit.c:709
+msgid "Could not start gnomecal server"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:806
+#: calendar/conduits/calendar/calendar-conduit.c:809
+msgid "Could not read pilot's DateBook application block"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:146
+msgid "Gpilotd todo conduit"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:149
+msgid "Configuration utility for the todo conduit.\n"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit.c:737
+#: calendar/conduits/todo/todo-conduit.c:740
+msgid "Could not read pilot's ToDo application block"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:59
 msgid "Outline:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:57
+#: calendar/gui/calendar-commands.c:60
 msgid "Headings:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:58
+#: calendar/gui/calendar-commands.c:61
 msgid "Empty days:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:59
+#: calendar/gui/calendar-commands.c:62
 msgid "Appointments:"
 msgstr "Citas:"
 
-#: calendar/gui/calendar-commands.c:60
+#: calendar/gui/calendar-commands.c:63
 msgid "Highlighted day:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:61
+#: calendar/gui/calendar-commands.c:64
 msgid "Day numbers:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:62
+#: calendar/gui/calendar-commands.c:65
 msgid "Current day's number:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:63
+#: calendar/gui/calendar-commands.c:66
 msgid "To-Do item that is not yet due:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:64
+#: calendar/gui/calendar-commands.c:67
 msgid "To-Do item that is due today:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:65
+#: calendar/gui/calendar-commands.c:68
 msgid "To-Do item that is overdue:"
 msgstr ""
 
@@ -1144,164 +1431,231 @@ msgstr "Axenda de Gnome"
 msgid "The GNOME personal calendar and schedule manager."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:434
+#: calendar/gui/calendar-commands.c:401 tests/ui-tests/message-browser.c:676
 msgid "File not found"
 msgstr "Ficheiro non atopado"
 
-#: calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:425
 msgid "Open calendar"
 msgstr "Abrir axenda"
 
-#: calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:464
 msgid "Save calendar"
 msgstr "Gardar axenda"
 
-#: calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:722
-#: calendar/gui/gncal-todo.c:726
+#: calendar/gui/calendar-commands.c:491 calendar/gui/gncal-todo.c:765
+#: calendar/gui/gncal-todo.c:769
 msgid "Day"
 msgstr "Día"
 
-#: calendar/gui/calendar-commands.c:522
+#: calendar/gui/calendar-commands.c:491
 msgid "Show 1 day"
 msgstr "Amosar un día"
 
-#: calendar/gui/calendar-commands.c:525
+#: calendar/gui/calendar-commands.c:494
 msgid "5 Days"
 msgstr "5 Días"
 
-#: calendar/gui/calendar-commands.c:525
+#: calendar/gui/calendar-commands.c:494
 msgid "Show the working week"
 msgstr "Amosa-la semana laboral"
 
-#: calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:721
+#: calendar/gui/calendar-commands.c:497 calendar/gui/gncal-todo.c:764
 msgid "Week"
 msgstr "Semana"
 
-#: calendar/gui/calendar-commands.c:528
+#: calendar/gui/calendar-commands.c:497
 msgid "Show 1 week"
 msgstr "Amosar unha semana"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:500
 msgid "Month"
 msgstr "Mes"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:500
 msgid "Show 1 month"
 msgstr "Amosar un mes"
 
-#: calendar/gui/calendar-commands.c:535
+#: calendar/gui/calendar-commands.c:504
 msgid "Year"
 msgstr "Ano"
 
-#: calendar/gui/calendar-commands.c:535
+#: calendar/gui/calendar-commands.c:504
 msgid "Show 1 year"
 msgstr "Amosar un ano"
 
-#: calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
+#: calendar/gui/calendar-commands.c:513 calendar/gui/calendar-commands.c:665
 msgid "Create a new appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674
+#: calendar/gui/calendar-commands.c:518 calendar/gui/calendar-commands.c:657
 msgid "Print this calendar"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:552
+#: calendar/gui/calendar-commands.c:522
 msgid "Prev"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:552
+#: calendar/gui/calendar-commands.c:522
 msgid "Go back in time"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:553
+#: calendar/gui/calendar-commands.c:523
 msgid "Today"
 msgstr "Hoxe"
 
-#: calendar/gui/calendar-commands.c:553
+#: calendar/gui/calendar-commands.c:523
 msgid "Go to present time"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:554
+#: calendar/gui/calendar-commands.c:524
 msgid "Next"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:554
+#: calendar/gui/calendar-commands.c:524
 msgid "Go forward in time"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:558
+#: calendar/gui/calendar-commands.c:528
 msgid "Go to"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:558
+#: calendar/gui/calendar-commands.c:528
 msgid "Go to a specific date"
 msgstr ""
 
 #. file menu
-#: calendar/gui/calendar-commands.c:659
+#: calendar/gui/calendar-commands.c:642
 msgid "New Ca_lendar"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:660
+#: calendar/gui/calendar-commands.c:643
 msgid "Create a new calendar"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:663
+#: calendar/gui/calendar-commands.c:646
 msgid "Open Ca_lendar"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:664
+#: calendar/gui/calendar-commands.c:647
 msgid "Open a calendar"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669
+#: calendar/gui/calendar-commands.c:651 calendar/gui/calendar-commands.c:652
 msgid "Save Calendar As"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:682
+#: calendar/gui/calendar-commands.c:665
 msgid "_New appointment..."
 msgstr "_Nova cita..."
 
-#: calendar/gui/calendar-commands.c:687
-msgid "New appointment for _today..."
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:688
-msgid "Create a new appointment for today"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
+#: calendar/gui/calendar-commands.c:673 calendar/gui/prop.c:718
 msgid "Preferences"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:703 calendar/gui/calendar-commands.c:704
+#: calendar/gui/calendar-commands.c:680 calendar/gui/calendar-commands.c:681
 msgid "About Calendar"
 msgstr ""
 
 #. i18n: This "%s%s" indicates possession. Languages where the order is
 #. * the inverse should translate it to "%2$s%1$s".
 #.
-#: calendar/gui/calendar-commands.c:746
+#: calendar/gui/calendar-commands.c:723
 #, c-format
 msgid "%s%s"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:746
+#: calendar/gui/calendar-commands.c:723
 msgid "'s calendar"
 msgstr ""
 
-#: calendar/gui/control-factory.c:136
+#: calendar/gui/calendar-model.c:327
+msgid "Public"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:330
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+msgid "Private"
+msgstr "Privado"
+
+#: calendar/gui/calendar-model.c:333
+msgid "Confidential"
+msgstr "Confidencial"
+
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:503
+msgid "Unknown"
+msgstr "Descoñecido"
+
+#: calendar/gui/calendar-model.c:423
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/calendar-model.c:423
+msgid "S"
+msgstr "S"
+
+# ??? E ou L?
+#: calendar/gui/calendar-model.c:425
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/calendar-model.c:425
+msgid "W"
+msgstr "O"
+
+#: calendar/gui/calendar-model.c:497
+msgid "Transparent"
+msgstr "Transparente"
+
+#: calendar/gui/calendar-model.c:500
+msgid "Opaque"
+msgstr "Opaco"
+
+#: calendar/gui/calendar-model.c:737
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"A data ten que ser introducida no formato: \n"
+"\n"
+"%s"
+
+#: calendar/gui/calendar-model.c:914
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"A posición xeográfica ten que ser introducida no formato: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/calendar-model.c:954
+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:988
+msgid "The priority must be between 1 and 9, inclusive"
+msgstr "A prioridade ten que estar entre 1 e 9, inclusive"
+
+#: calendar/gui/control-factory.c:132
 msgid "The URI that the calendar will display"
-msgstr "O URI que amosará o calendario"
+msgstr "O URI que amosará a axenda"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:181
+#: calendar/gui/dialogs/alarm-notify-dialog.c:183
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:188
+#: calendar/gui/dialogs/alarm-notify-dialog.c:190
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr ""
 
+#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+msgid "No summary available."
+msgstr ""
+
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -1311,7 +1665,7 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1070
+#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1086
 msgid "Snooze"
 msgstr ""
 
@@ -1323,133 +1677,587 @@ msgstr "Editar cita"
 msgid "Snooze time (minutes)"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:391
+#: calendar/gui/dialogs/task-editor.c:245 calendar/gui/event-editor.c:1202
+msgid "FIXME: _Delete"
+msgstr "FIXME: _Borrar"
+
+#: calendar/gui/dialogs/task-editor.c:287
+#: calendar/gui/dialogs/task-editor.c:295
+msgid "FIXME: In_complete Task"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:347 calendar/gui/event-editor.c:1304
+msgid "FIXME: Chec_k Names"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:348 calendar/gui/event-editor.c:1305
+msgid "FIXME: Address _Book..."
+msgstr "FIXME: _Libro de enderezos..."
+
+#: calendar/gui/dialogs/task-editor.c:355
+msgid "FIXME: _New Task"
+msgstr "FIXME: _Nova Tarefa"
+
+#: calendar/gui/dialogs/task-editor.c:357
+msgid "FIXME: S_end Status Report"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:358
+msgid "FIXME: _Mark Complete"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:360 calendar/gui/event-editor.c:1314
+msgid "FIXME: Rec_urrence..."
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:361
+msgid "FIXME: S_kip Occurrence"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:363
+msgid "FIXME: Assig_n Task"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:365
+msgid "FIXME: _Reply"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:366
+msgid "FIXME: Reply to A_ll"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:409 calendar/gui/event-editor.c:1374
+msgid "FIXME: Save and Close"
+msgstr "FIXME: Gardar e Pechar"
+
+#: calendar/gui/dialogs/task-editor.c:410
+msgid "Save the task and close the dialog box"
+msgstr "Garda-la tarefa e pecha-la caixa de diálogo"
+
+#: calendar/gui/dialogs/task-editor.c:414 calendar/gui/event-editor.c:1379
+msgid "FIXME: Print..."
+msgstr "FIXME: Imprimir..."
+
+#: calendar/gui/dialogs/task-editor.c:419 calendar/gui/event-editor.c:1384
+msgid "FIXME: Recurrence..."
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:420 calendar/gui/event-editor.c:1385
+msgid "Configure recurrence rules"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:422
+msgid "FIXME: Assign Task..."
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:423
+msgid "Assign the task to someone"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:425 calendar/gui/event-editor.c:1390
+msgid "FIXME: Delete"
+msgstr "FIXME: Borrar"
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+msgid "S_ubject:"
+msgstr "_Asunto:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+msgid "Owner:"
+msgstr "Dono:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+msgid "Sta_rt Date:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+msgid "_Due Date:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+msgid "_Status:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Cancelled\n"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+msgid "Not Started"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+msgid "_Priority:"
+msgstr "_Prioridade:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+msgstr ""
+"Alta\n"
+"Normal\n"
+"Baixa\n"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+msgid "High"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+msgid "% Comp_lete:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+msgid "_Contacts..."
+msgstr "_Contactos..."
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
+msgid "Task"
+msgstr "Tarefa"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
+msgid "Date Completed:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
+msgid "Location:"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:32
+msgid "Resources:"
+msgstr "Recursos:"
+
+#. Create the header columns
+#: calendar/gui/e-calendar-table.c:197
+msgid "Categories"
+msgstr "Categorías"
+
+#: calendar/gui/e-calendar-table.c:198
+#: calendar/gui/event-editor-dialog.glade.h:13
+msgid "Classification"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:199
+msgid "Completion date"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:200
+msgid "End date"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:201
+msgid "Start date"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:202
+msgid "Due date"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:203
+msgid "Geographical position"
+msgstr "Posición xeográfica"
+
+#: calendar/gui/e-calendar-table.c:204
+msgid "Percent complete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:205 calendar/gui/gncal-todo.c:478
+#: calendar/gui/prop.c:611 mail/message-list.c:508
+msgid "Priority"
+msgstr "Prioridade"
+
+#: calendar/gui/e-calendar-table.c:213 calendar/gui/e-calendar-table.c:217
+#: calendar/gui/gncal-todo.c:476
+msgid "Summary"
+msgstr "Resume"
+
+#: calendar/gui/e-calendar-table.c:218
+msgid "Transparency"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:219
+msgid "URL"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:319
+msgid "Open..."
+msgstr "Abrir..."
+
+#: calendar/gui/e-calendar-table.c:320
+msgid "Open the task"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:322
+msgid "Mark Complete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:323
+msgid "Mark the task complete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:326
+msgid "Delete the task"
+msgstr "Borra-la tarefa"
+
+#: calendar/gui/e-day-view-time-item.c:393
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2317 calendar/gui/e-day-view.c:2324
-#: calendar/gui/e-day-view.c:2333 calendar/gui/e-week-view.c:2643
-#: calendar/gui/e-week-view.c:2650 calendar/gui/e-week-view.c:2659
+#: calendar/gui/e-day-view.c:2334 calendar/gui/e-day-view.c:2341
+#: calendar/gui/e-day-view.c:2350 calendar/gui/e-week-view.c:2681
+#: calendar/gui/e-week-view.c:2688 calendar/gui/e-week-view.c:2697
 msgid "New appointment..."
 msgstr "Nova cita..."
 
-#: calendar/gui/e-day-view.c:2321 calendar/gui/e-day-view.c:2328
-#: calendar/gui/e-week-view.c:2647 calendar/gui/e-week-view.c:2654
+#: calendar/gui/e-day-view.c:2338 calendar/gui/e-day-view.c:2345
+#: calendar/gui/e-week-view.c:2685 calendar/gui/e-week-view.c:2692
 msgid "Edit this appointment..."
 msgstr "Editar esta cita..."
 
-#: calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
+#: calendar/gui/e-day-view.c:2339 calendar/gui/e-week-view.c:2686
 msgid "Delete this appointment"
 msgstr "Borrar esta cita"
 
-#: calendar/gui/e-day-view.c:2329 calendar/gui/e-week-view.c:2655
+#: calendar/gui/e-day-view.c:2346 calendar/gui/e-week-view.c:2693
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2330 calendar/gui/e-week-view.c:2656
+#: calendar/gui/e-day-view.c:2347 calendar/gui/e-week-view.c:2694
 msgid "Delete this occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657
+#: calendar/gui/e-day-view.c:2348 calendar/gui/e-week-view.c:2695
 msgid "Delete all occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:291
+#: calendar/gui/event-editor.c:293
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/event-editor.c:296
+#: calendar/gui/event-editor.c:299
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/event-editor.c:300
+#: calendar/gui/event-editor.c:305
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/event-editor.c:303
+#: calendar/gui/event-editor.c:308
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/event-editor.c:306
+#: calendar/gui/event-editor.c:311
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#. Owner, summary
-#: calendar/gui/event-editor.c:622 calendar/gui/event-editor.c:718
-msgid "?"
+#: calendar/gui/event-editor.c:1269
+msgid "FIXME: Ca_lendar..."
+msgstr "FIXME: A_xenda..."
+
+#: calendar/gui/event-editor.c:1312
+msgid "FIXME: _New Appointment"
+msgstr "FIXME: _Nova Cita"
+
+#: calendar/gui/event-editor.c:1316
+msgid "FIXME: Invite _Attendees..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1198
-msgid "FIXME: _Delete"
-msgstr "FIXME: _Borrar"
+#: calendar/gui/event-editor.c:1317
+msgid "FIXME: C_ancel Invitation..."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1265
-msgid "FIXME: Ca_lendar..."
-msgstr "FIXME: A_xenda..."
+#: calendar/gui/event-editor.c:1319
+msgid "FIXME: Forward as v_Calendar"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1300
-msgid "FIXME: Chec_k Names"
+#: calendar/gui/event-editor.c:1387
+msgid "FIXME: Invite Attendees..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1301
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: _Libro de enderezos..."
+#: calendar/gui/event-editor.c:1388
+msgid "Invite attendees to a meeting"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1308
-msgid "FIXME: _New Appointment"
-msgstr "FIXME: _Nova Cita"
+#: calendar/gui/event-editor.c:1831
+msgid "%a %b %d %Y"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1310
-msgid "FIXME: Rec_urrence..."
+#. todo
+#.
+#. build some of the recur stuff by hand to take into account
+#. the start-on-monday preference?
+#.
+#. get the apply button to work right
+#.
+#. make the properties stuff unglobal
+#.
+#. figure out why alarm units aren't sticking between edits
+#.
+#. closing the dialog window with the wm caused a crash
+#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
+#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
+#.
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: calendar/gui/event-editor-dialog.glade.h:7
+msgid "event-editor-dialog"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1312
-#, fuzzy
-msgid "FIXME: Invite _Attendees..."
-msgstr "FIXME: Gardar Ad_xuntos..."
+#: calendar/gui/event-editor-dialog.glade.h:8
+msgid "_Summary:"
+msgstr "_Resume:"
 
-#: calendar/gui/event-editor.c:1313
-msgid "FIXME: C_ancel Invitation..."
+#: calendar/gui/event-editor-dialog.glade.h:9
+msgid "Time"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1315
-msgid "FIXME: Forward as v_Calendar"
+#: calendar/gui/event-editor-dialog.glade.h:10
+msgid "Start time:"
+msgstr "Hora de _comezo:"
+
+#: calendar/gui/event-editor-dialog.glade.h:11
+msgid "End time:"
+msgstr "Hora de remate:"
+
+#: calendar/gui/event-editor-dialog.glade.h:12
+msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1370
-msgid "FIXME: Save and Close"
-msgstr "FIXME: Gardar e Pechar"
+#: calendar/gui/event-editor-dialog.glade.h:14
+msgid "Pu_blic"
+msgstr "Pú_blico"
 
-#: calendar/gui/event-editor.c:1375
-msgid "FIXME: Print..."
-msgstr "FIXME: Imprimir..."
+#: calendar/gui/event-editor-dialog.glade.h:15
+msgid "Pri_vate"
+msgstr "Pri_vado"
 
-#: calendar/gui/event-editor.c:1380
-msgid "FIXME: Recurrence..."
+#: calendar/gui/event-editor-dialog.glade.h:16
+msgid "_Confidential"
+msgstr "_Confidencial"
+
+#: calendar/gui/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:30
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days\n"
 msgstr ""
+"Minutos\n"
+"Horas\n"
+"Días\n"
 
-#: calendar/gui/event-editor.c:1381
-msgid "Configure recurrence rules"
+#: calendar/gui/event-editor-dialog.glade.h:34
+msgid "_Display"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1383
-msgid "FIXME: Invite Attendees..."
+#: calendar/gui/event-editor-dialog.glade.h:35
+msgid "_Audio"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1384
-msgid "Invite attendees to a meeting"
+#: calendar/gui/event-editor-dialog.glade.h:36
+msgid "_Program"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1386
-msgid "FIXME: Delete"
-msgstr "FIXME: Borrar"
+#: calendar/gui/event-editor-dialog.glade.h:37
+msgid "_Mail"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1828
-msgid "%a %b %d %Y"
+#: calendar/gui/event-editor-dialog.glade.h:38
+msgid "Mail _to:"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:39
+msgid "_Run program:"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:40
+msgid "Reminder"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:41
+msgid "Recurrence rule"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:877
+msgid "None"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:43
+msgid "Daily"
+msgstr "Diariamente"
+
+#: calendar/gui/event-editor-dialog.glade.h:44
+msgid "Weekly"
+msgstr "Semanalmente"
+
+#: calendar/gui/event-editor-dialog.glade.h:45
+msgid "Monthly"
+msgstr "Mensualmente"
+
+#: calendar/gui/event-editor-dialog.glade.h:46
+msgid "Yearly"
+msgstr "Anualmente"
+
+#: calendar/gui/event-editor-dialog.glade.h:47
+msgid "label23"
+msgstr "label23"
+
+#: calendar/gui/event-editor-dialog.glade.h:48
+#: calendar/gui/event-editor-dialog.glade.h:51
+#: calendar/gui/event-editor-dialog.glade.h:81
+msgid "Every "
+msgstr "Cada "
+
+#: calendar/gui/event-editor-dialog.glade.h:49
+msgid "day(s)"
+msgstr "día(s)"
+
+#: calendar/gui/event-editor-dialog.glade.h:50
+msgid "label24"
+msgstr "label24"
+
+#: calendar/gui/event-editor-dialog.glade.h:52
+msgid "week(s)"
+msgstr "semana(s)"
+
+#: calendar/gui/event-editor-dialog.glade.h:53
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Lun"
+
+#: calendar/gui/event-editor-dialog.glade.h:54
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Mar"
+
+#: calendar/gui/event-editor-dialog.glade.h:55
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Mér"
+
+#: calendar/gui/event-editor-dialog.glade.h:56
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Xov"
+
+#: calendar/gui/event-editor-dialog.glade.h:57
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Ven"
+
+#: calendar/gui/event-editor-dialog.glade.h:58
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Sáb"
+
+#. Initialize by default to three-letter day names
+#: calendar/gui/event-editor-dialog.glade.h:59
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Dom"
+
+#: calendar/gui/event-editor-dialog.glade.h:60
+msgid "label25"
+msgstr "label25"
+
+#: calendar/gui/event-editor-dialog.glade.h:61
+#: calendar/gui/event-editor-dialog.glade.h:62
+msgid "Recur on the"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:63
+msgid "th day of the month"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:64
+msgid ""
+"1st\n"
+"2nd\n"
+"3rd\n"
+"4th\n"
+"5th\n"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:70
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday\n"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:78
+msgid "Every"
+msgstr "Cada"
+
+#: calendar/gui/event-editor-dialog.glade.h:79
+msgid "month(s)"
+msgstr "mes(es)"
+
+#: calendar/gui/event-editor-dialog.glade.h:82
+msgid "year(s)"
+msgstr "ano(s)"
+
+#: calendar/gui/event-editor-dialog.glade.h:83
+msgid "label27"
+msgstr "label27"
+
+#: calendar/gui/event-editor-dialog.glade.h:84
+msgid "Ending date"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:85
+msgid "Repeat forever"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:86
+msgid "End on "
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:87
+msgid "End after"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:88
+msgid "occurrence(s)"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:89
+msgid "Exceptions"
+msgstr "Excepcións"
+
+#: calendar/gui/event-editor-dialog.glade.h:91
+msgid "Change"
+msgstr ""
+
+#: calendar/gui/event-editor-dialog.glade.h:93
+msgid "Recurrence"
 msgstr ""
 
 #: calendar/gui/getdate.y:391
@@ -1548,11 +2356,11 @@ msgstr "venres"
 msgid "saturday"
 msgstr "sábado"
 
-#: calendar/gui/getdate.y:420
+#: calendar/gui/getdate.y:420 filter/filter-datespec.c:61
 msgid "year"
 msgstr "ano"
 
-#: calendar/gui/getdate.y:421
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:62
 msgid "month"
 msgstr "mes"
 
@@ -1560,19 +2368,19 @@ msgstr "mes"
 msgid "fortnight"
 msgstr "quincena"
 
-#: calendar/gui/getdate.y:423
+#: calendar/gui/getdate.y:423 filter/filter-datespec.c:63
 msgid "week"
 msgstr "semana"
 
-#: calendar/gui/getdate.y:424
+#: calendar/gui/getdate.y:424 filter/filter-datespec.c:64
 msgid "day"
 msgstr "día"
 
-#: calendar/gui/getdate.y:425
+#: calendar/gui/getdate.y:425 filter/filter-datespec.c:65
 msgid "hour"
 msgstr "hora"
 
-#: calendar/gui/getdate.y:426
+#: calendar/gui/getdate.y:426 filter/filter-datespec.c:66
 msgid "minute"
 msgstr "minuto"
 
@@ -1580,7 +2388,7 @@ msgstr "minuto"
 msgid "min"
 msgstr "min"
 
-#: calendar/gui/getdate.y:428
+#: calendar/gui/getdate.y:428 filter/filter-datespec.c:67
 msgid "second"
 msgstr "segundo"
 
@@ -1600,7 +2408,8 @@ msgstr "onte"
 msgid "today"
 msgstr "hoxe"
 
-#: calendar/gui/getdate.y:438
+#: calendar/gui/getdate.y:438 filter/filter-datespec.c:504
+#: filter/filter-datespec.c:664
 msgid "now"
 msgstr "agora"
 
@@ -1665,142 +2474,104 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:140
+#: calendar/gui/gncal-todo.c:167
 msgid "Create to-do item"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:140
+#: calendar/gui/gncal-todo.c:167
 msgid "Edit to-do item"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:176
+#: calendar/gui/gncal-todo.c:203
 msgid "Summary:"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:186
+#: calendar/gui/gncal-todo.c:214
 msgid "Due Date:"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:195
+#: calendar/gui/gncal-todo.c:225
 msgid "Priority:"
 msgstr "Prioridade:"
 
-#: calendar/gui/gncal-todo.c:212
+#: calendar/gui/gncal-todo.c:243
 msgid "Item Comments:"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:334
+#: calendar/gui/gncal-todo.c:376
 msgid "Add to-do item..."
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:335
+#: calendar/gui/gncal-todo.c:377
 msgid "Edit this item..."
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:434
-msgid "Summary"
-msgstr "Resume"
-
-#: calendar/gui/gncal-todo.c:435 calendar/gui/prop.c:604
+#: calendar/gui/gncal-todo.c:477 calendar/gui/prop.c:610
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:436 calendar/gui/prop.c:605
-#: mail/message-list.c:474
-msgid "Priority"
-msgstr "Prioridade"
-
-#: calendar/gui/gncal-todo.c:437
+#: calendar/gui/gncal-todo.c:479
 msgid "Time Left"
 msgstr ""
 
 #. Label
-#: calendar/gui/gncal-todo.c:449
+#: calendar/gui/gncal-todo.c:491
 msgid "To-do list"
 msgstr ""
 
 #. Add
-#: calendar/gui/gncal-todo.c:488
+#: calendar/gui/gncal-todo.c:530
 #: composer/e-msg-composer-address-dialog.glade.h:13
 msgid "Add..."
 msgstr "Engadir..."
 
 #. Edit
-#: calendar/gui/gncal-todo.c:497
+#: calendar/gui/gncal-todo.c:539
 msgid "Edit..."
 msgstr "Editar..."
 
-#: calendar/gui/gncal-todo.c:721
+#: calendar/gui/gncal-todo.c:764
 msgid "Weeks"
 msgstr "Semanas"
 
-#: calendar/gui/gncal-todo.c:722 calendar/gui/gncal-todo.c:726
+#: calendar/gui/gncal-todo.c:765 calendar/gui/gncal-todo.c:769
 msgid "Days"
 msgstr "Días"
 
-#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
+#: calendar/gui/gncal-todo.c:770 calendar/gui/gncal-todo.c:774
 msgid "Hours"
 msgstr "Horas"
 
-#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
+#: calendar/gui/gncal-todo.c:770 calendar/gui/gncal-todo.c:774
 msgid "Hour"
 msgstr "Hora"
 
-#: calendar/gui/gncal-todo.c:732 calendar/gui/gncal-todo.c:736
+#: calendar/gui/gncal-todo.c:775 calendar/gui/gncal-todo.c:779
 msgid "Minutes"
 msgstr "Minutos"
 
-#: calendar/gui/gncal-todo.c:732 calendar/gui/gncal-todo.c:736
+#: calendar/gui/gncal-todo.c:775 calendar/gui/gncal-todo.c:779
 msgid "Minute"
 msgstr "Minuto"
 
-#: calendar/gui/gncal-todo.c:737 calendar/gui/gncal-todo.c:741
+#: calendar/gui/gncal-todo.c:780 calendar/gui/gncal-todo.c:784
 msgid "Seconds"
 msgstr "Segundos"
 
-#: calendar/gui/gncal-todo.c:737 calendar/gui/gncal-todo.c:741
+#: calendar/gui/gncal-todo.c:780 calendar/gui/gncal-todo.c:784
 msgid "Second"
 msgstr "Segundo"
 
-#: calendar/gui/gnome-cal.c:461 calendar/gui/gnome-cal.c:1078
-#: calendar/gui/gnome-cal.c:1134
+#: calendar/gui/gnome-cal.c:458 calendar/gui/gnome-cal.c:1094
+#: calendar/gui/gnome-cal.c:1150
 msgid "Reminder of your appointment at "
 msgstr ""
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1083 calendar/gui/gnome-cal.c:1138
+#: calendar/gui/gnome-cal.c:1099 calendar/gui/gnome-cal.c:1154
 msgid "Ok"
 msgstr ""
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Dom"
-
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Lun"
-
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Mar"
-
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Mér"
-
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Xov"
-
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Ven"
-
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Sáb"
-
 #: calendar/gui/goto.c:82
 msgid "Year:"
 msgstr "Ano:"
@@ -1821,246 +2592,246 @@ msgstr ""
 msgid "Go to today"
 msgstr ""
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:271
+#: calendar/gui/print.c:294
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "Th"
 msgstr "Xo"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:349
 msgid "Sa"
 msgstr "Sa"
 
-#: calendar/gui/print.c:868
+#: calendar/gui/print.c:937
 msgid "TODO Items"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:980
+#: calendar/gui/print.c:1038
 msgid "Current day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1000 calendar/gui/print.c:1014
-#: calendar/gui/print.c:1015
+#: calendar/gui/print.c:1058 calendar/gui/print.c:1072
+#: calendar/gui/print.c:1073
 msgid "%a"
 msgstr ""
 
-#: calendar/gui/print.c:1001 calendar/gui/print.c:1002
-#: calendar/gui/print.c:1016 calendar/gui/print.c:1017
+#: calendar/gui/print.c:1059 calendar/gui/print.c:1060
+#: calendar/gui/print.c:1074 calendar/gui/print.c:1075
 msgid "%b"
 msgstr ""
 
-#: calendar/gui/print.c:1004
+#: calendar/gui/print.c:1062
 #, c-format
 msgid "Current week (%s %s %d - %s %d %d)"
 msgstr ""
 
-#: calendar/gui/print.c:1021
+#: calendar/gui/print.c:1079
 #, c-format
 msgid "Current week (%s %s %d - %s %s %d %d)"
 msgstr ""
 
-#: calendar/gui/print.c:1027
+#: calendar/gui/print.c:1085
 #, c-format
 msgid "Current week (%s %s %d %d - %s %s %d %d)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1040
+#: calendar/gui/print.c:1098
 msgid "Current month (%a %Y)"
 msgstr "Mes actual (%a %Y)"
 
 #. Year
-#: calendar/gui/print.c:1047
+#: calendar/gui/print.c:1105
 msgid "Current year (%Y)"
 msgstr "Ano actual (%Y)"
 
-#: calendar/gui/print.c:1084
+#: calendar/gui/print.c:1142
 msgid "Print Calendar"
 msgstr "Imprimir axenda"
 
-#: calendar/gui/print.c:1249
+#: calendar/gui/print.c:1307
 msgid "Print Preview"
 msgstr "Previsualizar da Impresión"
 
-#: calendar/gui/prop.c:330
+#: calendar/gui/prop.c:336
 msgid "Time display"
 msgstr ""
 
 #. Time format
-#: calendar/gui/prop.c:334
+#: calendar/gui/prop.c:340
 msgid "Time format"
 msgstr "Formato da hora"
 
-#: calendar/gui/prop.c:335
+#: calendar/gui/prop.c:341
 msgid "12-hour (AM/PM)"
 msgstr "12 horas (AM/PM)"
 
-#: calendar/gui/prop.c:336
+#: calendar/gui/prop.c:342
 msgid "24-hour"
 msgstr "24 horas"
 
 #. Weeks start on
-#: calendar/gui/prop.c:346
+#: calendar/gui/prop.c:352
 msgid "Weeks start on"
 msgstr "A semana comeza o"
 
-#: calendar/gui/prop.c:347
+#: calendar/gui/prop.c:353
 msgid "Sunday"
 msgstr "Domingo"
 
-#: calendar/gui/prop.c:348
+#: calendar/gui/prop.c:354
 msgid "Monday"
 msgstr "Luns"
 
 #. Day range
-#: calendar/gui/prop.c:358
+#: calendar/gui/prop.c:364
 msgid "Day range"
 msgstr ""
 
-#: calendar/gui/prop.c:369
+#: calendar/gui/prop.c:375
 msgid ""
 "Please select the start and end hours you want\n"
 "to be displayed in the day view and week view.\n"
@@ -2068,111 +2839,112 @@ msgid ""
 "by default."
 msgstr ""
 
-#: calendar/gui/prop.c:385
+#: calendar/gui/prop.c:391
 msgid "Day start:"
 msgstr ""
 
-#: calendar/gui/prop.c:396
+#: calendar/gui/prop.c:402
 msgid "Day end:"
 msgstr ""
 
-#: calendar/gui/prop.c:519
+#: calendar/gui/prop.c:525
 msgid "Colors for display"
 msgstr ""
 
-#: calendar/gui/prop.c:522
+#: calendar/gui/prop.c:528
 msgid "Colors"
 msgstr "Cores"
 
-#: calendar/gui/prop.c:599
+#: calendar/gui/prop.c:605
 msgid "Show on TODO List:"
 msgstr ""
 
-#: calendar/gui/prop.c:606
+#: calendar/gui/prop.c:612
 msgid "Time Until Due"
 msgstr ""
 
-#: calendar/gui/prop.c:637
+#: calendar/gui/prop.c:643
 msgid "To Do List style options:"
 msgstr ""
 
-#: calendar/gui/prop.c:642
+#: calendar/gui/prop.c:648
 msgid "Highlight overdue items"
 msgstr ""
 
-#: calendar/gui/prop.c:645
+#: calendar/gui/prop.c:651
 msgid "Highlight not yet due items"
 msgstr ""
 
-#: calendar/gui/prop.c:648
+#: calendar/gui/prop.c:654
 msgid "Highlight items due today"
 msgstr ""
 
-#: calendar/gui/prop.c:678
+#: calendar/gui/prop.c:684
 msgid "To Do List Properties"
 msgstr ""
 
-#: calendar/gui/prop.c:681
+#: calendar/gui/prop.c:687
 msgid "To Do List"
 msgstr ""
 
-#: calendar/gui/prop.c:780
+#: calendar/gui/prop.c:786
 msgid "Alarms"
 msgstr ""
 
 #. build miscellaneous box
-#: calendar/gui/prop.c:783
+#: calendar/gui/prop.c:789
 msgid "Alarm Properties"
 msgstr ""
 
-#: calendar/gui/prop.c:793
+#: calendar/gui/prop.c:799
 msgid "Beep on display alarms"
 msgstr ""
 
-#: calendar/gui/prop.c:803
+#: calendar/gui/prop.c:809
 msgid "Audio alarms timeout after"
 msgstr ""
 
-#: calendar/gui/prop.c:814 calendar/gui/prop.c:831
+#: calendar/gui/prop.c:820 calendar/gui/prop.c:837
 msgid " seconds"
 msgstr " segundos"
 
-#: calendar/gui/prop.c:820
+#: calendar/gui/prop.c:826
 msgid "Enable snoozing for "
 msgstr ""
 
 #. populate default frame/box
-#: calendar/gui/prop.c:836
+#: calendar/gui/prop.c:842
 msgid "Defaults"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:183
+#: composer/e-msg-composer-address-dialog.c:182
 msgid "Cut"
 msgstr "Cortar"
 
-#: composer/e-msg-composer-address-dialog.c:184
+#: composer/e-msg-composer-address-dialog.c:183
 msgid "Cut selected item into clipboard"
 msgstr "Borrar e copiar o elemento seleccionado ó cartafol"
 
-#: composer/e-msg-composer-address-dialog.c:187
+#: composer/e-msg-composer-address-dialog.c:186
+#: mail/folder-browser-factory.c:46
 msgid "Copy"
 msgstr "Copiar"
 
-#: composer/e-msg-composer-address-dialog.c:188
+#: composer/e-msg-composer-address-dialog.c:187
 msgid "Copy selected item into clipboard"
 msgstr "Copiar o elemento seleccionado ó cartafol"
 
-#: composer/e-msg-composer-address-dialog.c:191
-#: composer/e-msg-composer-address-dialog.c:199
+#: composer/e-msg-composer-address-dialog.c:190
+#: composer/e-msg-composer-address-dialog.c:198
 msgid "Paste"
 msgstr "Pegar"
 
-#: composer/e-msg-composer-address-dialog.c:192
-#: composer/e-msg-composer-address-dialog.c:200
+#: composer/e-msg-composer-address-dialog.c:191
+#: composer/e-msg-composer-address-dialog.c:199
 msgid "Paste item from clipboard"
 msgstr "Pegar elemento do cartafol"
 
-#: composer/e-msg-composer-address-dialog.c:528
+#: composer/e-msg-composer-address-dialog.c:525
 msgid "Select recipients' addresses"
 msgstr "Seleccionar os enderezos dos destinatarios"
 
@@ -2194,6 +2966,7 @@ msgid "Name"
 msgstr "Nome"
 
 #: composer/e-msg-composer-address-dialog.glade.h:11
+#: mail/mail-config.glade.h:8
 msgid "Address"
 msgstr "Enderezo"
 
@@ -2286,31 +3059,39 @@ msgstr "Tipo MIME:"
 msgid "File name:"
 msgstr "Nome de ficheiro:"
 
-#: composer/e-msg-composer-hdrs.c:174
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
+msgid "From:"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:243
 msgid "Click here for the address book"
 msgstr "Prema aquí para o libro de enderezos"
 
-#: composer/e-msg-composer-hdrs.c:216
+#: composer/e-msg-composer-hdrs.c:296
+msgid "Enter the identitiy you wish to send this message from"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:300
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:217
+#: composer/e-msg-composer-hdrs.c:301
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:221
+#: composer/e-msg-composer-hdrs.c:305
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:222
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduza os enderezos que recibirán unha copia da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:227
+#: composer/e-msg-composer-hdrs.c:311
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:228
+#: composer/e-msg-composer-hdrs.c:312
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -2318,53 +3099,68 @@ msgstr ""
 "Introduza os enderezos que recibirán unha copia da mensaxe sen apareceren na "
 "lista de destinatarios."
 
-#: composer/e-msg-composer-hdrs.c:234
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:235
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Enter the subject of the mail"
 msgstr "Introduza o asunto da mensaxe"
 
-#: composer/e-msg-composer.c:444
+#: composer/e-msg-composer.c:451
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: composer/e-msg-composer.c:455
+#: composer/e-msg-composer.c:462
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:475
+#: composer/e-msg-composer.c:482
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:494
-msgid "Discard this message?"
-msgstr "¿Descartar esta mensaxe?"
+#: composer/e-msg-composer.c:504
+msgid "Saving changes to message..."
+msgstr "Gardando os cambios á mensaxe..."
+
+#: composer/e-msg-composer.c:506
+msgid "About to save changes to message..."
+msgstr ""
+
+#: composer/e-msg-composer.c:590 shell/e-shell-view-menu.c:165
+msgid "Evolution"
+msgstr "Evolution"
 
-#: composer/e-msg-composer.c:511
+#: composer/e-msg-composer.c:596
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: composer/e-msg-composer.c:618
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:623
+#: composer/e-msg-composer.c:730
 msgid "That file does not exist."
 msgstr "O ficheiro non existe."
 
-#: composer/e-msg-composer.c:633
+#: composer/e-msg-composer.c:740
 msgid "That is not a regular file."
 msgstr "Non é un ficheiro normal."
 
-#: composer/e-msg-composer.c:643
+#: composer/e-msg-composer.c:750
 msgid "That file exists but is not readable."
 msgstr "O ficheiro existe pero non se pode ler."
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:760
 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:675
+#: composer/e-msg-composer.c:782
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -2372,273 +3168,510 @@ msgstr ""
 "O ficheiro é moi longo (máis de 100K).\n"
 "¿Está seguro de querer inserilo?"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:803
 msgid "An error occurred while reading the file."
 msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: composer/e-msg-composer.c:792 shell/e-shell-view-menu.c:438
-#, fuzzy
+#: composer/e-msg-composer.c:899 shell/e-shell-view-menu.c:434
 msgid "_File"
-msgstr "_Móbil"
+msgstr "_Ficheiro"
 
-#: composer/e-msg-composer.c:798
+#: composer/e-msg-composer.c:905
 msgid "_Open..."
-msgstr ""
+msgstr "_Abrir..."
 
-#: composer/e-msg-composer.c:799
+#: composer/e-msg-composer.c:906
 msgid "Load a previously saved message"
-msgstr ""
+msgstr "Cargar unha mensaxe previamente gardada"
 
-#: composer/e-msg-composer.c:807
-#, fuzzy
+#: composer/e-msg-composer.c:914
 msgid "_Save..."
-msgstr "Gardar como..."
+msgstr "_Gardar..."
 
-#: composer/e-msg-composer.c:808
-#, fuzzy
+#: composer/e-msg-composer.c:915
 msgid "Save message"
-msgstr "Enviar a mensaxe"
+msgstr "Gardar mensaxe"
 
-#: composer/e-msg-composer.c:816
-#, fuzzy
+#: composer/e-msg-composer.c:923
 msgid "_Save as..."
-msgstr "Gardar como..."
+msgstr "_Gardar como..."
 
-#: composer/e-msg-composer.c:817
-#, fuzzy
+#: composer/e-msg-composer.c:924
 msgid "Save message with a different name"
-msgstr "Garda-la mensaxe na carpeta indicada"
+msgstr "Garda-la mensaxe cun nome diferente"
 
-#: composer/e-msg-composer.c:825
+#: composer/e-msg-composer.c:932
 msgid "Save in _folder..."
 msgstr "Gardar en _carpeta..."
 
-#: composer/e-msg-composer.c:826
+#: composer/e-msg-composer.c:933
 msgid "Save the message in a specified folder"
 msgstr "Garda-la mensaxe na carpeta indicada"
 
-#: composer/e-msg-composer.c:835
-#, fuzzy
+#: composer/e-msg-composer.c:942
 msgid "_Insert text file... (FIXME)"
-msgstr "_Inserir Ficheiro de Texto"
+msgstr "_Inserir ficheiro de texto... (FIXME)"
 
-#: composer/e-msg-composer.c:836
+#: composer/e-msg-composer.c:943
 msgid "Insert a file as text into the message"
 msgstr "Inserir un ficheiro como texto na mensaxe"
 
-#: composer/e-msg-composer.c:845
-#, fuzzy
+#: composer/e-msg-composer.c:952
 msgid "_Send"
-msgstr "Enviar"
+msgstr "_Enviar"
 
-#: composer/e-msg-composer.c:846
+#: composer/e-msg-composer.c:953
 msgid "Send the message"
 msgstr "Enviar a mensaxe"
 
-#: composer/e-msg-composer.c:856
+#: composer/e-msg-composer.c:963
 msgid "_Close..."
-msgstr ""
+msgstr "_Pechar..."
 
-#: composer/e-msg-composer.c:857
+#: composer/e-msg-composer.c:964
 msgid "Quit the message composer"
-msgstr ""
+msgstr "Saír do editor de mensaxes"
 
-#: composer/e-msg-composer.c:870 shell/e-shell-view-menu.c:480
-#, fuzzy
+#: composer/e-msg-composer.c:977 shell/e-shell-view-menu.c:478
 msgid "_Edit"
-msgstr "Editar..."
+msgstr "_Editar"
 
-#: composer/e-msg-composer.c:881
-#, fuzzy
+#: composer/e-msg-composer.c:988
 msgid "_Format"
-msgstr "_Formatar"
+msgstr "_Formato"
 
-#: composer/e-msg-composer.c:887
+#: composer/e-msg-composer.c:994
 msgid "HTML"
-msgstr ""
+msgstr "HTML"
 
-#: composer/e-msg-composer.c:888
+#: composer/e-msg-composer.c:995
 msgid "Send the mail in HTML format"
-msgstr ""
+msgstr "Envia-la mensaxe en formato HTML"
 
-#: composer/e-msg-composer.c:901 shell/e-shell-view-menu.c:387
-#: shell/e-shell-view-menu.c:491
-#, fuzzy
+#: composer/e-msg-composer.c:1008 shell/e-shell-view-menu.c:383
+#: shell/e-shell-view-menu.c:489 shell/e-storage-set-view.c:242
 msgid "_View"
-msgstr "_Nova"
+msgstr ""
 
-#: composer/e-msg-composer.c:907
-#, fuzzy
+#: composer/e-msg-composer.c:1014
 msgid "Show _attachments"
-msgstr "Mirar _adxuntos"
+msgstr "Amosar _adxuntos"
 
-#: composer/e-msg-composer.c:908
-#, fuzzy
+#: composer/e-msg-composer.c:1015
 msgid "Show/hide attachments"
-msgstr "Mirar/ocultar adxuntos"
+msgstr "Amosar/agochar adxuntos"
 
-#: composer/e-msg-composer.c:941
+#: composer/e-msg-composer.c:1048
 msgid "Send"
 msgstr "Enviar"
 
-#: composer/e-msg-composer.c:942
+#: composer/e-msg-composer.c:1049
 msgid "Send this message"
 msgstr "Enviar esta mensaxe"
 
-#: composer/e-msg-composer.c:951
+#: composer/e-msg-composer.c:1058
 msgid "Attach"
 msgstr "Adxuntar"
 
-#: composer/e-msg-composer.c:952
+#: composer/e-msg-composer.c:1059
 msgid "Attach a file"
 msgstr "Adxuntar un ficheiro"
 
-#: composer/e-msg-composer.c:1139
+#: composer/e-msg-composer.c:1246
 msgid "Compose a message"
 msgstr "Compoñer unha mensaxe"
 
-#: mail/component-factory.c:188
+#: filter/filter-datespec.c:61
+msgid "years"
+msgstr "anos"
+
+#: filter/filter-datespec.c:62
+msgid "months"
+msgstr "meses"
+
+#: filter/filter-datespec.c:63
+msgid "weeks"
+msgstr "semanas"
+
+#: filter/filter-datespec.c:64
+msgid "days"
+msgstr "días"
+
+#: filter/filter-datespec.c:65
+msgid "hours"
+msgstr "horas"
+
+#: filter/filter-datespec.c:66
+msgid "minutes"
+msgstr "minutos"
+
+#: filter/filter-datespec.c:67
+msgid "seconds"
+msgstr "segundos"
+
+#: filter/filter-datespec.c:232
+msgid ""
+"The message's date will be compared against\n"
+"whatever the time is when the filter is run\n"
+"or vfolder is opened."
+msgstr ""
+
+#: filter/filter-datespec.c:254
+msgid ""
+"The message's date will be compared against\n"
+"the time that you specify here."
+msgstr ""
+
+#: filter/filter-datespec.c:293
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when the filter is run;\n"
+"\"a week ago\", for example."
+msgstr ""
+
+#. keep in sync with FilterDatespec_type!
+#: filter/filter-datespec.c:328
+msgid "the current time"
+msgstr ""
+
+#: filter/filter-datespec.c:328
+msgid "a time you specify"
+msgstr ""
+
+#: filter/filter-datespec.c:329
+msgid "a time relative to the current time"
+msgstr ""
+
+#. The label
+#: filter/filter-datespec.c:387
+msgid "Compare against"
+msgstr ""
+
+#: filter/filter-datespec.c:661
+msgid "<click here to select a date>"
+msgstr "<prema aquí para seleccionar unha data>"
+
+#: filter/filter-editor.c:156 filter/score-editor.c:126
+#: filter/vfolder-editor.c:152
+msgid "Add Rule"
+msgstr "Engadir Regra"
+
+#: filter/filter-editor.c:188
+msgid "Edit Rule"
+msgstr "Editar Regra"
+
+#: filter/filter-filter.c:397 filter/filter-rule.c:534
+msgid "Less"
+msgstr "Menos"
+
+#: filter/filter-filter.c:400 filter/filter-rule.c:537
+msgid "More"
+msgstr "Máis"
+
+#: filter/filter-folder.c:183 filter/vfolder-rule.c:269
+msgid "Select Folder"
+msgstr "Seleccionar Carpeta"
+
+#: filter/filter-folder.c:205
+msgid "Enter folder URI"
+msgstr ""
+
+#: filter/filter-folder.c:247
+msgid "<click here to select a folder>"
+msgstr ""
+
+#: filter/filter-part.c:420
+msgid "Test"
+msgstr ""
+
+#: filter/score-editor.c:160
+msgid "Edit Score Rule"
+msgstr ""
+
+#: filter/vfolder-editor.c:186
+msgid "Edit VFolder Rule"
+msgstr ""
+
+#: mail/component-factory.c:187
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializa-lo compoñente de correo de Evolution."
 
-#: mail/folder-browser-factory.c:23
+#: mail/folder-browser-factory.c:33
 msgid "Get mail"
 msgstr "Baixar correo"
 
-#: mail/folder-browser-factory.c:23
+#: mail/folder-browser-factory.c:33
 msgid "Check for new mail"
 msgstr "Comprobar o novo correo"
 
-#: mail/folder-browser-factory.c:24
+#: mail/folder-browser-factory.c:34
 msgid "Compose"
 msgstr "Compoñer"
 
-#: mail/folder-browser-factory.c:24
+#: mail/folder-browser-factory.c:34
 msgid "Compose a new message"
 msgstr "Compoñer unha nova mensaxe"
 
-#: mail/folder-browser-factory.c:28
+#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
+#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
+#: mail/folder-browser-factory.c:38 mail/mail-view.c:135
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/folder-browser-factory.c:28
+#: mail/folder-browser-factory.c:38 mail/mail-view.c:135
 msgid "Reply to the sender of this message"
 msgstr "Responder ó autor desta mensaxe"
 
-#: mail/folder-browser-factory.c:29
+#: mail/folder-browser-factory.c:39 mail/mail-view.c:138
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
-#: mail/folder-browser-factory.c:29
+#: mail/folder-browser-factory.c:39 mail/mail-view.c:138
 msgid "Reply to all recipients of this message"
 msgstr "Responder a tódolos destinatarios desta mensaxe"
 
-#: mail/folder-browser-factory.c:31
+#: mail/folder-browser-factory.c:41 mail/mail-view.c:141
 msgid "Forward"
 msgstr "Re-enviar"
 
-#: mail/folder-browser-factory.c:31
+#: mail/folder-browser-factory.c:41 mail/mail-view.c:141
 msgid "Forward this message"
 msgstr "Re-enviar esta mensaxe"
 
-#: mail/folder-browser-factory.c:35
-#, fuzzy
+#: mail/folder-browser-factory.c:45
 msgid "Move"
-msgstr "Lu"
+msgstr "Mover"
 
-#: mail/folder-browser-factory.c:35
+#: mail/folder-browser-factory.c:45
 msgid "Move message to a new folder"
 msgstr "Mover mensaxe a unha nova carpeta"
 
-#: mail/folder-browser-factory.c:37
+#: mail/folder-browser-factory.c:46
+msgid "Copy message to a new folder"
+msgstr "Copiar mensaxe a unha nova carpeta"
+
+#: mail/folder-browser-factory.c:48 mail/mail-view.c:145
 msgid "Print the selected message"
 msgstr "Imprimir a mensaxe seleccionada"
 
-#: mail/folder-browser-factory.c:39
+#: mail/folder-browser-factory.c:50 mail/mail-view.c:147
 msgid "Delete this message"
 msgstr "Borrar esta mensaxe"
 
-#: mail/folder-browser-factory.c:59
+#: mail/folder-browser-factory.c:71
+#, c-format
+msgid "Run filter \"%s\""
+msgstr "Executar filtro \"%s\""
+
+#: mail/folder-browser-factory.c:129 mail/folder-browser-factory.c:187
+msgid "_Print Message"
+msgstr "_Imprimir Mensaxe"
+
+#: mail/folder-browser-factory.c:139
 msgid "_Threaded Message List"
 msgstr ""
 
-#: mail/folder-browser-factory.c:72
-msgid "_Mark all messages seen"
+#: mail/folder-browser-factory.c:150
+msgid "Mail _Filters..."
+msgstr "_Filtros de Correo..."
+
+#: mail/folder-browser-factory.c:155
+msgid "_Virtual Folder Editor..."
+msgstr ""
+
+#: mail/folder-browser-factory.c:160
+msgid "_Mail Configuration..."
+msgstr "Configuración do _Correo..."
+
+#: mail/folder-browser-factory.c:165
+msgid "Forget _Passwords"
+msgstr "Esquecer _Contrasinais"
+
+#: mail/folder-browser-factory.c:173
+msgid "_Message"
+msgstr "_Mensaxe"
+
+#: mail/folder-browser-factory.c:177
+msgid "_Open in New Window"
+msgstr "_Abrir nunha Nova Fiestra"
+
+#: mail/folder-browser-factory.c:182
+msgid "_Edit Message"
+msgstr "_Editar Mensaxe"
+
+#: mail/folder-browser-factory.c:194
+msgid "Reply to _Sender"
+msgstr "Responder ó _Autor"
+
+#: mail/folder-browser-factory.c:199
+msgid "Reply to _All"
+msgstr "Responder a _Todos"
+
+#: mail/folder-browser-factory.c:204
+msgid "_Forward"
+msgstr "_Reenviar"
+
+#: mail/folder-browser-factory.c:211
+msgid "_Delete Message"
+msgstr "_Borrar Mensaxe"
+
+#: mail/folder-browser-factory.c:216
+msgid "_Move Message"
+msgstr "_Mover Mensaxe"
+
+#: mail/folder-browser-factory.c:221
+msgid "_Copy Message"
+msgstr "_Copiar Mensaxe"
+
+#: mail/folder-browser-factory.c:228
+msgid "_VFolder on Subject"
+msgstr ""
+
+#: mail/folder-browser-factory.c:233
+msgid "VFolder on Se_nder"
+msgstr ""
+
+#: mail/folder-browser-factory.c:238
+msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser-factory.c:78
+#: mail/folder-browser-factory.c:245
+msgid "_Filter on Subject"
+msgstr ""
+
+#: mail/folder-browser-factory.c:250
+msgid "Fi_lter on Sender"
+msgstr ""
+
+#: mail/folder-browser-factory.c:255
+msgid "Filter on Rec_ipients"
+msgstr ""
+
+#: mail/folder-browser-factory.c:262
+msgid "F_older"
+msgstr "_Carpeta"
+
+#: mail/folder-browser-factory.c:266
+msgid "_Mark all as Read"
+msgstr "_Marcar todos como lidos"
+
+#: mail/folder-browser-factory.c:271
 msgid "_Expunge"
 msgstr "_Eliminar"
 
-#: mail/folder-browser-factory.c:84
-#, fuzzy
-msgid "Mail _Filters ..."
-msgstr "FIXME: _Ficheiro..."
+#: mail/folder-browser-factory.c:276
+msgid "_Configure Folder"
+msgstr ""
+
+#: mail/folder-browser.c:373
+msgid "Save"
+msgstr "Gardar"
+
+#: mail/mail-callbacks.c:83
+msgid ""
+"You need to configure the mail client\n"
+"before you can compose mail."
+msgstr ""
 
-#: mail/folder-browser-factory.c:90
-msgid "_vFolder Editor ..."
+#: mail/mail-callbacks.c:96
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
 msgstr ""
 
-#: mail/folder-browser-factory.c:96
-msgid "_Mail Configuration ..."
+#: mail/mail-callbacks.c:110
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
 msgstr ""
 
-#: mail/folder-browser-factory.c:102
-msgid "Forget _Passwords"
-msgstr "Esquecer _Contrasinais"
+#: mail/mail-callbacks.c:184
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Esta mensaxe non ten asunto.\n"
+"¿Enviar realmente?"
+
+#: mail/mail-callbacks.c:417
+msgid "Move message(s) to"
+msgstr "Mover mensaxe(s) a"
+
+#: mail/mail-callbacks.c:419
+msgid "Copy message(s) to"
+msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-config.c:688
+#: mail/mail-callbacks.c:474
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+
+#: mail/mail-callbacks.c:564
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+"Erro cargando a información do filtro:\n"
+"%s"
+
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
 "read your signature from."
 msgstr ""
 
-#: mail/mail-config.c:701
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "Nome completo:"
 
-#: mail/mail-config.c:725
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "Enderezo de email:"
 
-#: mail/mail-config.c:740
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "Organización:"
 
-#: mail/mail-config.c:751
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "Ficheiro de sinatura:"
 
-#: mail/mail-config.c:756
+#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:10
 msgid "Signature File"
 msgstr "Ficheiro de Sinatura"
 
-#: mail/mail-config.c:1167
+#: mail/mail-config-gui.c:901
 msgid "Server:"
 msgstr "Servidor:"
 
-#: mail/mail-config.c:1173
+#: mail/mail-config-gui.c:907
 msgid "Username:"
 msgstr "Nome de usuario:"
 
-#: mail/mail-config.c:1179
+#: mail/mail-config-gui.c:913
 msgid "Path:"
 msgstr "Camiño:"
 
-#: mail/mail-config.c:1187
+#: mail/mail-config-gui.c:921
 msgid "Authentication:"
 msgstr "Autenticación:"
 
-#: mail/mail-config.c:1199
+#: mail/mail-config-gui.c:933
 msgid "Detect supported types..."
 msgstr "Detectar tipos soportados..."
 
-#: mail/mail-config.c:1222
+#: mail/mail-config-gui.c:958
+msgid "Don't delete messages from server"
+msgstr "Non borra-las mensaxes do servidor"
+
+#: mail/mail-config-gui.c:970
 msgid "Test Settings"
 msgstr ""
 
-#: mail/mail-config.c:1344 mail/mail-config.c:1392
+#: mail/mail-config-gui.c:1102 mail/mail-config-gui.c:1150
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -2647,7 +3680,7 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config.c:1368
+#: mail/mail-config-gui.c:1126
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -2656,99 +3689,471 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config.c:1434
-msgid "Edit Identity"
+#: mail/mail-config-gui.c:1145
+msgid "Mail transport type:"
 msgstr ""
 
-#: mail/mail-config.c:1436
+#: mail/mail-config-gui.c:1200
 msgid "Add Identity"
 msgstr ""
 
-#: mail/mail-config.c:1515
-msgid "Edit Source"
+#: mail/mail-config-gui.c:1202
+msgid "Edit Identity"
 msgstr ""
 
-#: mail/mail-config.c:1517
+#: mail/mail-config-gui.c:1294
 msgid "Add Source"
 msgstr ""
 
-#: mail/mail-config.c:1598
-msgid "Edit News Server"
-msgstr "Editar Servidor de News"
+#: mail/mail-config-gui.c:1296
+msgid "Edit Source"
+msgstr ""
 
-#: mail/mail-config.c:1600
+#: mail/mail-config-gui.c:1391
 msgid "Add News Server"
 msgstr "Engadir Servidor de News"
 
-#: mail/mail-ops.c:393
-msgid "Fetching mail"
-msgstr "Baixando correo"
+#: mail/mail-config-gui.c:1393
+msgid "Edit News Server"
+msgstr "Editar Servidor de News"
+
+#: mail/mail-config-gui.c:2254
+msgid "The connection was successful!"
+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.
+#.
+#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
+msgid "Identities"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
+msgid "Organization"
+msgstr "Organización"
+
+#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:23
+msgid "Edit"
+msgstr "Editar"
+
+#: mail/mail-config.glade.h:15
+msgid "Sources"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+msgid "Mail Sources"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
+msgid "Mail Transport"
+msgstr ""
+
+#: mail/mail-config.glade.h:21
+msgid "News Servers"
+msgstr "Servidores de News"
+
+#: mail/mail-config.glade.h:25
+msgid "News Sources"
+msgstr ""
+
+#: mail/mail-config.glade.h:26
+msgid "Send messages in HTML format"
+msgstr "Enviar mensaxes en formato HTML"
+
+#: mail/mail-config.glade.h:27
+msgid "Mark message as seen [ms]: "
+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.
+#.
+#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
+#: mail/mail-config-druid.glade.h:16
+msgid "Mail Configuration"
+msgstr "Configuración do Correo"
 
-#: mail/mail-ops.c:405
+#: mail/mail-config-druid.glade.h:9
 msgid ""
-"This message has no subject.\n"
-"Really send?"
+"Welcome to the Evolution Mail configuration wizard!\n"
+"By filling in some information about your email\n"
+"settings, you can start sending and receiving email\n"
+"right away. Click Next to continue."
 msgstr ""
-"Esta mensaxe non ten asunto.\n"
-"¿Enviar realmente?"
 
-#: mail/mail-ops.c:791
-#, fuzzy
-msgid "Move message(s) to"
-msgstr "Mover mensaxe a unha nova carpeta"
+#: mail/mail-config-druid.glade.h:13
+msgid "Identity"
+msgstr "Identidade"
+
+#: mail/mail-config-druid.glade.h:14
+msgid "Mail Source"
+msgstr ""
 
-#: mail/mail-threads.c:483
-msgid "Currently pending operations:"
+#: mail/mail-config-druid.glade.h:17
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+
+#: mail/mail-crypto.c:338 mail/mail-crypto.c:418
+msgid "Please enter your PGP/GPG passphrase."
+msgstr ""
+
+#: mail/mail-crypto.c:342 mail/mail-crypto.c:422
+msgid "No password provided."
+msgstr "Non se indicou un contrasinal."
+
+#: mail/mail-crypto.c:348 mail/mail-crypto.c:428
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: mail/mail-threads.c:621
+#: mail/mail-local.c:257
+#, c-format
+msgid "Changing folder \"%s\" to \"%s\" format"
+msgstr "Cambiando a carpeta \"%s\" ó formato \"%s\""
+
+#: mail/mail-local.c:261
+#, c-format
+msgid "Change folder \"%s\" to \"%s\" format"
+msgstr "Cambiar carpeta \"%s\" ó formato \"%s\""
+
+#: mail/mail-ops.c:74
+#, c-format
+msgid "Fetching email from %s"
+msgstr "Recibindo correo de %s"
+
+#: mail/mail-ops.c:76
+#, c-format
+msgid "Fetch email from %s"
+msgstr "Recibir correo de %s"
+
+#: mail/mail-ops.c:87
+msgid "You have no remote mail source configured to fetch mail from."
+msgstr ""
+
+#: mail/mail-ops.c:97
+msgid "Bad folder passed to fetch_mail"
+msgstr ""
+
+#: mail/mail-ops.c:166
+#, c-format
+msgid "There is no new mail at %s."
+msgstr ""
+
+#: mail/mail-ops.c:238
+#, c-format
+msgid "Sending \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:243
+msgid "Sending a message without a subject"
+msgstr ""
+
+#: mail/mail-ops.c:246
+#, c-format
+msgid "Send \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:249
+msgid "Send a message without a subject"
+msgstr ""
+
+#: mail/mail-ops.c:414
+#, c-format
+msgid "Expunging \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:416
+#, c-format
+msgid "Expunge \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:488
+#, c-format
+msgid "Moving messages from \"%s\" into \"%s\""
+msgstr "Movendo mensaxes de \"%s\" a \"%s\""
+
+#: mail/mail-ops.c:490
+#, c-format
+msgid "Copying messages from \"%s\" into \"%s\""
+msgstr "Copiando mensaxes de \"%s\" a \"%s\""
+
+#: mail/mail-ops.c:493
+#, c-format
+msgid "Move messages from \"%s\" into \"%s\""
+msgstr "Mover mensaxes de \"%s\" a \"%s\""
+
+#: mail/mail-ops.c:495
+#, c-format
+msgid "Copy messages from \"%s\" into \"%s\""
+msgstr "Copiar mensaxes de \"%s\" a \"%s\""
+
+#: mail/mail-ops.c:642
+#, c-format
+msgid "Marking messages in folder \"%s\""
+msgstr "Marcando mensaxes na carpeta \"%s\""
+
+#: mail/mail-ops.c:645
+#, c-format
+msgid "Mark messages in folder \"%s\""
+msgstr "Marcar mensaxes na carpeta \"%s\""
+
+#: mail/mail-ops.c:801
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:804
+#, c-format
+msgid "Scan folders in \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:891
+msgid "(No description)"
+msgstr "(Sen descrición)"
+
+#: mail/mail-ops.c:954
+#, c-format
+msgid "Attaching messages from folder \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:957
+#, c-format
+msgid "Attach messages from \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1083
+#, c-format
+msgid "Forwarding messages \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1088
+msgid "Forwarding a message without a subject"
+msgstr ""
+
+#: mail/mail-ops.c:1091
+#, c-format
+msgid "Forward message \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1096
+msgid "Forward a message without a subject"
+msgstr ""
+
+#: mail/mail-ops.c:1161
+msgid ""
+"Failed to generate mime part from message while generating forwarded message."
+msgstr ""
+
+#: mail/mail-ops.c:1250
+#, c-format
+msgid "Loading \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1252
+#, c-format
+msgid "Load \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1371
+#, c-format
+msgid "Creating \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1373
+#, c-format
+msgid "Create \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1444
+msgid "Exception while reporting result to shell component listener."
+msgstr ""
+
+#: mail/mail-ops.c:1497
+#, c-format
+msgid "Synchronizing \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1499
+#, c-format
+msgid "Synchronize \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1575
+#, c-format
+msgid "Displaying message UID \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1578
+msgid "Clearing message display"
+msgstr ""
+
+#: mail/mail-ops.c:1581
+#, c-format
+msgid "Display message UID \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1584
+msgid "Clear message display"
+msgstr ""
+
+#: mail/mail-ops.c:1711
+#, c-format
+msgid "Opening messages from folder \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1714
+#, c-format
+msgid "Open messages from \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1826
+msgid "Loading Draftbox"
+msgstr ""
+
+#: mail/mail-ops.c:1828
+msgid "Load Draftbox"
+msgstr ""
+
+#: mail/mail-ops.c:1896
+#, c-format
+msgid "Viewing messages from folder \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1899
+#, c-format
+msgid "View messages from \"%s\""
+msgstr ""
+
+#: mail/mail-threads.c:274
+#, c-format
+msgid ""
+"Error while preparing to %s:\n"
+"%s"
+msgstr ""
+
+#: mail/mail-threads.c:694
+#, c-format
+msgid ""
+"Error while `%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-threads.c:747
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-threads.c:623
+#: mail/mail-threads.c:751
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:712
+#: mail/mail-threads.c:816
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:814
+#: mail/mail-threads.c:927
 msgid "Could not create dialog box."
 msgstr ""
 
-#: mail/mail-threads.c:849
+#: mail/mail-threads.c:936
 msgid "User cancelled query."
 msgstr ""
 
-#: mail/message-list.c:456
+#: mail/mail-tools.c:206
+#, c-format
+msgid "Couldn't create temporary mbox `%s': %s"
+msgstr ""
+
+#: mail/mail-tools.c:293
+#, c-format
+msgid ""
+"Could not read UID cache file \"%s\". You may receive duplicate messages."
+msgstr ""
+
+#: mail/mail-tools.c:385
+#, c-format
+msgid "[%s] %s"
+msgstr ""
+
+#: mail/mail-tools.c:387
+#, c-format
+msgid "[%s] (forwarded message)"
+msgstr ""
+
+#: mail/mail-tools.c:396
+msgid "Fwd: (no subject)"
+msgstr ""
+
+#: mail/mail-tools.c:433
+#, c-format
+msgid "Forwarded message - %s"
+msgstr ""
+
+#: mail/mail-tools.c:435
+msgid "Forwarded message (no subject)"
+msgstr ""
+
+#: mail/mail-tools.c:636
+#, c-format
+msgid "Don't know protocol to open URI `%s'"
+msgstr ""
+
+#: mail/mail-tools.c:665
+#, c-format
+msgid ""
+"Cannot open location `%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-vfolder.c:298
+msgid "New VFolder"
+msgstr ""
+
+#: mail/message-list.c:490
 msgid "Online Status"
 msgstr ""
 
-#: mail/message-list.c:492
+#: mail/message-list.c:526
 msgid "From"
 msgstr "De"
 
-#: mail/message-list.c:499
+#: mail/message-list.c:533
 msgid "Subject"
 msgstr "Asunto"
 
-#: mail/message-list.c:506
+#: mail/message-list.c:540
 msgid "Date"
 msgstr "Data"
 
-#: mail/message-list.c:513
+#: mail/message-list.c:547
 msgid "Received"
 msgstr "Recibido"
 
-#: mail/message-list.c:520
+#: mail/message-list.c:554
 msgid "To"
 msgstr "A"
 
-#: mail/message-list.c:527
+#: mail/message-list.c:561
 msgid "Size"
 msgstr "Tamaño"
 
+#: notes/component-factory.c:27
+msgid "Create a new note"
+msgstr "Crear unha nova nota"
+
+#: notes/component-factory.c:148
+msgid "Cannot initialize Evolution's notes component."
+msgstr "Non se pode inicializa-lo compoñente de notas de Evolution."
+
+#: notes/main.c:30
+msgid "Notes Component: Could not initialize bonobo"
+msgstr "Compoñente de Notas: Non se pode inicializar Bonobo"
+
 #: shell/e-setup.c:47
 msgid "Evolution installation"
 msgstr "Instalación de Evolution"
@@ -2786,17 +4191,28 @@ msgstr ""
 msgid "Evolution files successfully installed."
 msgstr "Ficheiros de Evolution instalados con éxito."
 
-#: shell/e-setup.c:108
+#: shell/e-setup.c:109
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
-"Please remove it in order to allow installation\n"
+"Please move it in order to allow installation\n"
 "of the Evolution user files."
 msgstr ""
 "O ficheiro `%s' non é un directorio.\n"
-"Elimíneo para poder instala-los ficheiros de\n"
+"Móvao para poder instala-los ficheiros de\n"
 "usuario de Evolution."
 
+#: shell/e-setup.c:121
+#, c-format
+msgid ""
+"The directory `%s' exists but is not the\n"
+"Evolution directory.  Please move it in order\n"
+"to allow installation of the Evolution user files."
+msgstr ""
+"O directorio `%s' existe pero non é o\n"
+"directorio de Evolution. Móvao para poder\n"
+"instala-los ficheiros de usuario de Evolution."
+
 #: shell/e-shell-folder-creation-dialog.c:81
 #, c-format
 msgid ""
@@ -2814,17 +4230,17 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crear unha nova carpeta"
 
-#: shell/e-shell-folder-selection-dialog.c:95
+#: shell/e-shell-folder-selection-dialog.c:96
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:236
+#: shell/e-shell-folder-selection-dialog.c:272
 msgid "New..."
 msgstr ""
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
 msgid "(Untitled)"
 msgstr "(Sen_título)"
 
@@ -2840,156 +4256,138 @@ msgstr "Bug buddy non foi atopado no seu $PATH."
 msgid "Bug buddy could not be run."
 msgstr "Non se puido executar Bug buddy."
 
-#: shell/e-shell-view-menu.c:164
-msgid "Evolution"
-msgstr "Evolution"
-
-#: shell/e-shell-view-menu.c:166
+#: shell/e-shell-view-menu.c:167
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:169
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:324
+#: shell/e-shell-view-menu.c:319
 msgid "Go to folder..."
 msgstr "Ir á carpeta..."
 
-#: shell/e-shell-view-menu.c:381
+#: shell/e-shell-view-menu.c:377
 msgid "_New"
 msgstr "_Nova"
 
-#: shell/e-shell-view-menu.c:393
+#: shell/e-shell-view-menu.c:389
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: shell/e-shell-view-menu.c:399
-#, fuzzy
+#: shell/e-shell-view-menu.c:395
 msgid "Evolution bar _shortcut"
-msgstr "_Barra de Atallos de Evolution"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:408
+#: shell/e-shell-view-menu.c:404
 msgid "_Mail message (FIXME)"
 msgstr "Enviar _Mensaxe (FIXME)"
 
-#: shell/e-shell-view-menu.c:414
+#: shell/e-shell-view-menu.c:410
 msgid "_Appointment (FIXME)"
 msgstr "_Cita (FIXME)"
 
-#: shell/e-shell-view-menu.c:420
+#: shell/e-shell-view-menu.c:416
 msgid "_Contact (FIXME)"
 msgstr "_Contacto (FIXME)"
 
-#: shell/e-shell-view-menu.c:426
+#: shell/e-shell-view-menu.c:422
 msgid "_Task (FIXME)"
 msgstr "_Tarefa (FIXME)"
 
-#: shell/e-shell-view-menu.c:448
-msgid "_Go to folder..."
-msgstr "_Ir á carpeta..."
+#: shell/e-shell-view-menu.c:444
+msgid "_Go to Folder..."
+msgstr "_Ir á Carpeta..."
 
-#: shell/e-shell-view-menu.c:449
+#: shell/e-shell-view-menu.c:445
 msgid "Display a different folder"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:456
-msgid "_Create new folder..."
-msgstr "_Crear unha nova carpeta..."
+#: shell/e-shell-view-menu.c:452
+msgid "_Create New Folder..."
+msgstr "_Crear unha Nova Carpeta..."
 
-#: shell/e-shell-view-menu.c:457 shell/e-shell-view-menu.c:467
+#: shell/e-shell-view-menu.c:453 shell/e-shell-view-menu.c:465
 msgid "Create a new folder"
 msgstr "Crear unha nova carpeta"
 
-#: shell/e-shell-view-menu.c:466
-#, fuzzy
+#: shell/e-shell-view-menu.c:464
 msgid "E_xit..."
-msgstr "Editar..."
+msgstr "_Saír..."
 
-#: shell/e-shell-view-menu.c:497
-msgid "Show _shortcut bar"
-msgstr "Amosar barra de _atallos"
+#: shell/e-shell-view-menu.c:495
+msgid "Show _Shortcut Bar"
+msgstr "Amosar Barra de _Atallos"
 
-#: shell/e-shell-view-menu.c:498
+#: shell/e-shell-view-menu.c:496
 msgid "Show the shortcut bar"
 msgstr "Amosa-la barra de atallos"
 
-#: shell/e-shell-view-menu.c:503
-msgid "Show _folder bar"
-msgstr ""
+#: shell/e-shell-view-menu.c:501
+msgid "Show _Folder Bar"
+msgstr "Amosar Barra de _Carpetas"
 
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:502
 msgid "Show the folder bar"
-msgstr ""
+msgstr "Amosa-la barra de carpetas"
 
-#: shell/e-shell-view-menu.c:526
-msgid "_Actions"
-msgstr "_Accións"
+#: shell/e-shell-view-menu.c:513
+msgid "_Settings"
+msgstr "_Configuración"
 
-#: shell/e-shell-view-menu.c:537
-#, fuzzy
+#: shell/e-shell-view-menu.c:524
 msgid "_Help"
-msgstr "_Casa"
+msgstr "A_xuda"
 
-#: shell/e-shell-view-menu.c:543
-#, fuzzy
-msgid "Help _index"
-msgstr "_Índice da Axuda"
+#: shell/e-shell-view-menu.c:530
+msgid "Help _Index"
+msgstr "Í_ndice da Axuda"
 
-#: shell/e-shell-view-menu.c:550
-#, fuzzy
-msgid "Getting _started"
-msgstr "Hora de _comezo da reunión:"
+#: shell/e-shell-view-menu.c:537
+msgid "Getting _Started"
+msgstr "_Primeiros Pasos"
 
-#: shell/e-shell-view-menu.c:557
-#, fuzzy
-msgid "Using the _mailer"
+#: shell/e-shell-view-menu.c:544
+msgid "Using the _Mailer"
 msgstr "Usando o _Lector"
 
-#: shell/e-shell-view-menu.c:564
-#, fuzzy
-msgid "Using the _calendar"
+#: shell/e-shell-view-menu.c:551
+msgid "Using the _Calendar"
 msgstr "Usando a _Axenda"
 
-#: shell/e-shell-view-menu.c:571
-#, fuzzy
-msgid "Using the c_ontact manager"
+#: shell/e-shell-view-menu.c:558
+msgid "Using the C_ontact Manager"
 msgstr "Usando o Xestor de _Contactos"
 
-#: shell/e-shell-view-menu.c:581
-msgid "_Submit bug report"
-msgstr "_Enviar informe de erro"
+#: shell/e-shell-view-menu.c:568
+msgid "_Submit Bug Report"
+msgstr "_Enviar Informe de Erro"
 
-#: shell/e-shell-view-menu.c:582
-#, fuzzy
+#: shell/e-shell-view-menu.c:569
 msgid "Submit bug report using Bug Buddy"
-msgstr "Enviar un informe de erro con bug-buddy"
+msgstr "Enviar un informe de erro con Bug Buddy"
 
-#: shell/e-shell-view-menu.c:591
-#, fuzzy
+#: shell/e-shell-view-menu.c:578
 msgid "_About Evolution..."
-msgstr "Evolution"
+msgstr "_Acerca de Evolution..."
 
-#: shell/e-shell-view-menu.c:592
+#: shell/e-shell-view-menu.c:579
 msgid "Show information about Evolution"
-msgstr ""
+msgstr "Amosar información acerca de Evolution"
 
-#: shell/e-shell-view.c:114
+#: shell/e-shell-view.c:122
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:342
+#: shell/e-shell-view.c:350
 msgid "Folders"
 msgstr "Carpetas"
 
-#: shell/e-shell-view.c:734
-msgid "None"
-msgstr ""
-
-#: shell/e-shell-view.c:738
+#: shell/e-shell-view.c:881
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
@@ -3083,6 +4481,10 @@ msgstr ""
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
+#: shell/e-storage-set-view.c:242
+msgid "View the selected folder"
+msgstr ""
+
 #: shell/main.c:66
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -3113,18 +4515,33 @@ msgstr ""
 "Graciñas\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:128
+#: shell/main.c:121
 msgid "Cannot initialize the Evolution shell."
 msgstr "Non se pode inicializar a shell de Evolution."
 
-#: shell/main.c:166
-msgid "Cannot initialize the configuration system."
-msgstr "Non se pode inicializa-lo sistema de configuración."
-
-#: shell/main.c:172
+#: shell/main.c:156
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Non se pode inicializar o sistema de compoñentes de Bonobo"
 
+#: tests/ui-tests/message-browser.c:360
+msgid "The component now claims that it doesn't support PersistStream!"
+msgstr ""
+
+#: tests/ui-tests/message-browser.c:378
+msgid ""
+"An exception occured while trying to load data into the component with "
+"PersistStream"
+msgstr ""
+
+#: tests/ui-tests/message-browser.c:471
+#, c-format
+msgid "The %s component doesn't support PersistStream!\n"
+msgstr "¡O compoñente %s non soporta PersistStream!\n"
+
+#: tests/ui-tests/message-browser.c:710
+msgid "Open Mime Message"
+msgstr "Abrir Mensaxe Mime"
+
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -3144,7 +4561,7 @@ msgstr ""
 
 #: widgets/e-table/e-table-config.glade.h:10
 msgid "Filter"
-msgstr ""
+msgstr "Filtro"
 
 #.
 #. * Translatable strings file generated by Glade.
@@ -3152,6 +4569,7 @@ msgstr ""
 #. * DO NOT compile it as part of your application.
 #.
 #: widgets/e-table/e-table-field-chooser.glade.h:7
+#: widgets/e-table/e-table-header-item.c:1164
 msgid "Field Chooser"
 msgstr ""
 
@@ -3194,6 +4612,46 @@ msgstr "Engadir >>"
 msgid "<< Remove"
 msgstr "<< Quitar"
 
+#: widgets/e-table/e-table-header-item.c:1156
+msgid "Sort Ascending"
+msgstr ""
+
+#: widgets/e-table/e-table-header-item.c:1157
+msgid "Sort Descending"
+msgstr ""
+
+#: widgets/e-table/e-table-header-item.c:1158
+msgid "Unsort"
+msgstr ""
+
+#: widgets/e-table/e-table-header-item.c:1160
+msgid "Group By This Field"
+msgstr ""
+
+#: widgets/e-table/e-table-header-item.c:1161
+msgid "Group By Box"
+msgstr ""
+
+#: widgets/e-table/e-table-header-item.c:1163
+msgid "Remove This Column"
+msgstr "Eliminar Esta Columna"
+
+#: widgets/e-table/e-table-header-item.c:1166
+msgid "Alignment"
+msgstr ""
+
+#: widgets/e-table/e-table-header-item.c:1167
+msgid "Best Fit"
+msgstr ""
+
+#: widgets/e-table/e-table-header-item.c:1168
+msgid "Format Columns..."
+msgstr ""
+
+#: widgets/e-table/e-table-header-item.c:1170
+msgid "Customize Current View..."
+msgstr ""
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr ""
@@ -3208,7 +4666,7 @@ msgstr ""
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:389
 msgid "No Information"
-msgstr ""
+msgstr "Sen Informacio"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:405
 msgid "_Invite Others..."
@@ -3270,65 +4728,17 @@ msgstr "Hora de _remate da reunión:"
 msgid "All Attendees"
 msgstr ""
 
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:281
+msgid "MTWTFSS"
+msgstr "LMMXVSD"
+
 #: widgets/misc/e-clipped-label.c:106
 msgid "..."
-msgstr ""
+msgstr "..."
 
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 msgstr "Grupo %i"
-
-#~ msgid "Cut selected region into the clipboard"
-#~ msgstr "Corta-la rexión seleccionada ó cartafol"
-
-#~ msgid "Copy selected region into the clipboard"
-#~ msgstr "Copia-la rexión seleccionada ó cartafol"
-
-#~ msgid "Paste selected region into the clipboard"
-#~ msgstr "Pega-la rexión seleccionada ó cartafol"
-
-#~ msgid "Undo"
-#~ msgstr "Desfacer"
-
-#~ msgid "Undo last operation"
-#~ msgstr "Desface-la última operación"
-
-#~ msgid "Edit Filter"
-#~ msgstr "Editar Filtro"
-
-#~ msgid "Create filter"
-#~ msgstr "Crear filtro"
-
-#~ msgid "Back"
-#~ msgstr "Atrás"
-
-#~ msgid "Finish"
-#~ msgstr "Finalizar"
-
-#~ msgid "Cancel"
-#~ msgstr "Cancelar"
-
-#~ msgid "Apply"
-#~ msgstr "Aplicar"
-
-#~ msgid "Test these values before continuing"
-#~ msgstr "Probe eses valores antes de continuar"
-
-#~ msgid "Mail Configuration"
-#~ msgstr "Configuración do Correo"
-
-#~ msgid "Identity"
-#~ msgstr "Identidade"
-
-#~ msgid "Mail Component: I could not initialize Bonobo"
-#~ msgstr "Compoñente de Correo: Non se pode inicializar Bonobo"
-
-#~ msgid "Composes a new mail message"
-#~ msgstr "Compoñer unha nova mensaxe de correo"
-
-#~ msgid "Task _Request (FIXME)"
-#~ msgstr "Solicitar _Tarefa (FIXME)"
-
-#~ msgid "_Journal Entry (FIXME)"
-#~ msgstr "Entrada de _Xornal (FIXME)"