Do this everywhere, also fixup CLEANFILES

Do this everywhere, also fixup CLEANFILES 2001-04-14 Michael Meeks <michael@ximian.com> * Makefile.am (dist-hook): remove built sources from dist. svn path=/trunk/; revision=9309
author: Michael Meeks <michael@ximian.com> 2001-04-14 16:02:59 +0800
committer: Michael Meeks <michael@src.gnome.org> 2001-04-14 16:02:59 +0800
commit: 04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2 (patch)
tree: b5e5eb3fca54a50b8643bfdf7125fef9b272e6dd /po/ca.po
parent: a5e6e0b5f3e06eee5726edfe276c5d3c65bb155c (diff)
download: gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.gz
gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.zst
gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.zip
1 files changed, 2422 insertions, 1736 deletions
diff --git a/po/ca.po b/po/ca.po
index d4a5c7f138..a2426ff409 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.0.6\n"
-"POT-Creation-Date: 2001-03-15 11:05+0100\n"
+"POT-Creation-Date: 2001-04-14 08:51-0400\n"
 "PO-Revision-Date: 2000-11-01 00:40+0100\n"
 "Last-Translator: Quico Llach <tradgnome@softcatala.org>\n"
 "Language-Team: Catalan <linux@softcatala.org>\n"
@@ -15,208 +15,208 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3209
 #, fuzzy
 msgid "Card: "
 msgstr "Cotxe"
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3211
 #, fuzzy
 msgid ""
 "\n"
 "Name: "
 msgstr "Nom:"
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3212
 msgid ""
 "\n"
 "  Prefix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3057
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3058
+#: addressbook/backend/ebook/e-card.c:3214
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3059
+#: addressbook/backend/ebook/e-card.c:3215
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3060
+#: addressbook/backend/ebook/e-card.c:3216
 #, fuzzy
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr "_Sufix:"
 
-#: addressbook/backend/ebook/e-card.c:3074
+#: addressbook/backend/ebook/e-card.c:3230
 #, fuzzy
 msgid ""
 "\n"
 "Birth Date: "
 msgstr "Data d'ini_ci:"
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3241
 #, fuzzy
 msgid ""
 "\n"
 "Address:"
 msgstr "_Adreça:"
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3243
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3244
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3245
 msgid ""
 "\n"
 "  Street:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3090
+#: addressbook/backend/ebook/e-card.c:3246
 msgid ""
 "\n"
 "  City:        "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3091
+#: addressbook/backend/ebook/e-card.c:3247
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3092
+#: addressbook/backend/ebook/e-card.c:3248
 msgid ""
 "\n"
 "  Postal Code: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3093
+#: addressbook/backend/ebook/e-card.c:3249
 #, fuzzy
 msgid ""
 "\n"
 "  Country:     "
 msgstr "Paí_s:"
 
-#: addressbook/backend/ebook/e-card.c:3106
+#: addressbook/backend/ebook/e-card.c:3262
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3118
+#: addressbook/backend/ebook/e-card.c:3274
 msgid ""
 "\n"
 "Telephones:\n"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3121
+#: addressbook/backend/ebook/e-card.c:3277
 msgid ""
 "\n"
 "Telephone:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3145
+#: addressbook/backend/ebook/e-card.c:3301
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:\n"
 msgstr "Adreça electrònica 2"
 
-#: addressbook/backend/ebook/e-card.c:3148
+#: addressbook/backend/ebook/e-card.c:3304
 #, fuzzy
 msgid ""
 "\n"
 "E-mail:"
 msgstr "Adreça electrònica 2"
 
-#: addressbook/backend/ebook/e-card.c:3167
+#: addressbook/backend/ebook/e-card.c:3323
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3173
+#: addressbook/backend/ebook/e-card.c:3329
 msgid ""
 "\n"
 "Time Zone: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3337
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3185
+#: addressbook/backend/ebook/e-card.c:3341
 #, fuzzy
 msgid ""
 "\n"
 "Business Role: "
 msgstr "Feina 2"
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3353
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3354
 #, fuzzy
 msgid ""
 "\n"
 "  Name:  "
 msgstr "Nom:"
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3355
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3356
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3201
+#: addressbook/backend/ebook/e-card.c:3357
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3358
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3206
+#: addressbook/backend/ebook/e-card.c:3362
 #, fuzzy
 msgid ""
 "\n"
 "Categories: "
 msgstr "categories"
 
-#: addressbook/backend/ebook/e-card.c:3207
+#: addressbook/backend/ebook/e-card.c:3363
 #, fuzzy
 msgid ""
 "\n"
@@ -233,13 +233,13 @@ msgstr "Comentaris sobre l'element:"
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3220
+#: addressbook/backend/ebook/e-card.c:3376
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3223
+#: addressbook/backend/ebook/e-card.c:3379
 #, fuzzy
 msgid ""
 "\n"
@@ -254,15 +254,15 @@ msgstr ""
 msgid "Imports GnomeCard files into Evolution."
 msgstr ""
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:39
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:33
+#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/gui/component/addressbook-factory.c:43
 #: calendar/conduits/calendar/calendar-conduit.c:1151
 #: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
+#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
 msgid "Could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
@@ -274,20 +274,20 @@ msgstr ""
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:651
+#: addressbook/conduit/address-conduit.c:654
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "No s'ha pogut iniciar el servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:652
+#: addressbook/conduit/address-conduit.c:655
 #: calendar/conduits/calendar/calendar-conduit.c:732
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "No s'ha pogut iniciar el wombat"
 
-#: addressbook/conduit/address-conduit.c:684
 #: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:690
 msgid "Could not read pilot's Address application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació d'adreça del Pilot"
 
@@ -295,7 +295,7 @@ msgstr "No s'ha pogut llegir el bloc d'aplicació d'adreça del Pilot"
 #: addressbook/gui/component/addressbook-config.glade.h:1
 #: calendar/gui/e-meeting-dialog.glade.h:1
 #: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "Add"
 msgstr "Afegeix"
 
@@ -336,7 +336,6 @@ msgstr "Arxiva com:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:10
 #: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:27
 msgid "General"
 msgstr "General"
 
@@ -353,7 +352,7 @@ msgid "Phone Types"
 msgstr "Tipus de telèfon"
 
 #: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "Primary Email"
 msgstr "Adreça electrònica principal"
 
@@ -366,7 +365,7 @@ msgid "Web page address:"
 msgstr "Adreça de pàgina web:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:74
 msgid "_Add"
 msgstr "_Afegeix"
 
@@ -391,8 +390,8 @@ msgid "_Company:"
 msgstr "_Empresa:"
 
 #: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
+#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:91 ui/evolution-task-editor-dialog.xml.h:69
 msgid "_Delete"
 msgstr "_Suprimeix"
 
@@ -444,129 +443,125 @@ msgstr "_Aquesta és l'adreça de correu"
 msgid "Delete Contact?"
 msgstr "Voleu suprimir el contacte?"
 
-#: addressbook/contact-editor/e-contact-editor.c:590
+#: addressbook/contact-editor/e-contact-editor.c:603
 #, fuzzy
 msgid "This contact belongs to these categories:"
 msgstr "El(s) element(s) pertanyen a aquestes categories:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/widgets/e-addressbook-view.c:676
 msgid "Assistant"
 msgstr "Assistent"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1297
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1310
 msgid "Business"
 msgstr "Feina"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/contact-editor/e-contact-editor.c:1244
 msgid "Business 2"
 msgstr "Feina 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/widgets/e-addressbook-view.c:656
 msgid "Business Fax"
 msgstr "Fax de la feina"
 
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/contact-editor/e-contact-editor.c:1246
 msgid "Callback"
 msgstr "Crida de retorn"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/contact-editor/e-contact-editor.c:1247
 msgid "Car"
 msgstr "Cotxe"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1248
 msgid "Company"
 msgstr "Empresa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
-#: addressbook/contact-editor/e-contact-editor.c:1298
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1311
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/contact-editor/e-contact-editor.c:1250
 msgid "Home 2"
 msgstr "Particular 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:657
 msgid "Home Fax"
 msgstr "Fax particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "ISDN"
 msgstr "XDSI"
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/contact-editor/e-contact-editor.c:1253
 msgid "Mobile"
 msgstr "Mòbil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/contact-editor/e-contact-editor.c:1299
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
+#: addressbook/contact-editor/e-contact-editor.c:1254
+#: addressbook/contact-editor/e-contact-editor.c:1312
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
 msgid "Other"
 msgstr "Altres"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:662
 msgid "Other Fax"
 msgstr "Un altre fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/widgets/e-addressbook-view.c:663
 msgid "Pager"
 msgstr "Busca"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1257
 msgid "Primary"
 msgstr "Primari"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/gui/widgets/e-addressbook-view.c:664
 msgid "Radio"
 msgstr "Ràdio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/widgets/e-addressbook-view.c:665
 msgid "Telex"
 msgstr "Tèlex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:1260
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
-#: addressbook/gui/widgets/e-addressbook-view.c:593
+#: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:668
 msgid "Email 2"
 msgstr "Adreça electrònica 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/gui/widgets/e-addressbook-view.c:594
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/gui/widgets/e-addressbook-view.c:669
 msgid "Email 3"
 msgstr "Adreça electrònica 3"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:214
+#: addressbook/contact-editor/e-contact-quick-add.c:223
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-quick-add.c:216
+#: addressbook/contact-editor/e-contact-quick-add.c:225
 #, fuzzy
 msgid "Edit Full"
 msgstr "Filtres d'edició"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:253
+#: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/widgets/e-addressbook-view.c:643
 #, fuzzy
 msgid "Full Name"
 msgstr "Nom complet:"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:259
+#: addressbook/contact-editor/e-contact-quick-add.c:268
 #, fuzzy
 msgid "E-mail"
 msgstr "Adreça electrònica 2"
@@ -685,25 +680,25 @@ msgstr "_Sufix:"
 msgid "_Title:"
 msgstr "_Títol:"
 
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:241
 msgid "As _Minicards"
 msgstr "Com a _Minicards"
 
-#: addressbook/gui/component/addressbook.c:243
+#: addressbook/gui/component/addressbook.c:247
 #: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Com a _taula"
 
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:399
 #, fuzzy, c-format
 msgid "Enter password for %s"
 msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
 
-#: addressbook/gui/component/addressbook.c:440
+#: addressbook/gui/component/addressbook.c:427
 msgid "Unable to open addressbook"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook.c:445
+#: addressbook/gui/component/addressbook.c:432
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -724,188 +719,188 @@ msgstr ""
 "voleu poder utilitzar LDAP, necessitareu descarregar i instal·lar\n"
 "l'OpenLDAP i recompilar i instal·lar l'Evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:568
+#: addressbook/gui/component/addressbook.c:555
 #, fuzzy
 msgid "Show All"
 msgstr "Mostra"
 
-#: addressbook/gui/component/addressbook.c:570
+#: addressbook/gui/component/addressbook.c:557
 #, fuzzy
 msgid "Advanced..."
 msgstr "Afegeix..."
 
-#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:587
 #, fuzzy
 msgid "Any field contains"
 msgstr "El cos conté"
 
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:588
 #, fuzzy
 msgid "Name contains"
 msgstr "conté"
 
-#: addressbook/gui/component/addressbook.c:602
+#: addressbook/gui/component/addressbook.c:589
 #, fuzzy
 msgid "Email contains"
 msgstr "conté"
 
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:732
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que mostrarà el navegador de carpetes"
 
-#: addressbook/gui/component/addressbook-storage.c:95
+#: addressbook/gui/component/addressbook-storage.c:99
 #, fuzzy
 msgid "Other Contacts"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/addressbook-config.c:143
+#: addressbook/gui/component/addressbook-config.c:148
 #, fuzzy
 msgid "LDAP Server"
 msgstr "Servidor LDAP:"
 
-#: addressbook/gui/component/addressbook-config.c:145
+#: addressbook/gui/component/addressbook-config.c:150
 #, fuzzy
 msgid "File"
 msgstr "_Fitxer"
 
-#: addressbook/gui/component/addressbook-config.c:148
+#: addressbook/gui/component/addressbook-config.c:153
 #, fuzzy
 msgid "Unknown addressbook type"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook-config.c:158
+#: addressbook/gui/component/addressbook-config.c:163
 msgid "None (anonymous mode)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:261
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:145
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
 msgid "Password"
 msgstr "Contrasenya"
 
-#: addressbook/gui/component/addressbook-config.c:162
+#: addressbook/gui/component/addressbook-config.c:167
 msgid "SASL"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:165
+#: addressbook/gui/component/addressbook-config.c:170
 #, fuzzy
 msgid "Unknown auth type"
 msgstr "Error desconegut"
 
-#: addressbook/gui/component/addressbook-config.c:174
+#: addressbook/gui/component/addressbook-config.c:179
 #, fuzzy
 msgid "Base"
 msgstr "Enganxa"
 
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:178
+#: addressbook/gui/component/addressbook-config.c:183
 #, fuzzy
 msgid "Subtree"
 msgstr "Subscriu-me"
 
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-config.c:186
 msgid "Unknown scope type"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:348
+#: addressbook/gui/component/addressbook-config.c:353
 msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:349
+#: addressbook/gui/component/addressbook-config.c:354
 msgid "FIXME Bind DN Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:351
+#: addressbook/gui/component/addressbook-config.c:356
+#: mail/mail-config.glade.h:50
 msgid "Remember this password"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:401
+#: addressbook/gui/component/addressbook-config.c:406
 #: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "Host:"
 msgstr "Hores"
 
-#: addressbook/gui/component/addressbook-config.c:402
+#: addressbook/gui/component/addressbook-config.c:407
 msgid "FIXME Host help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:404
+#: addressbook/gui/component/addressbook-config.c:409
 #, fuzzy
 msgid "Port:"
 msgstr "Prioritat:"
 
-#: addressbook/gui/component/addressbook-config.c:405
+#: addressbook/gui/component/addressbook-config.c:410
 msgid "FIXME Port help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/component/addressbook-config.c:414
 msgid "Root DN:"
 msgstr "DN arrel:"
 
-#: addressbook/gui/component/addressbook-config.c:410
+#: addressbook/gui/component/addressbook-config.c:415
 msgid "FIXME Root DN help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:430
+#: addressbook/gui/component/addressbook-config.c:435
 #, fuzzy
 msgid "Search Scope:"
 msgstr "Cerca"
 
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:8
+#: addressbook/gui/component/addressbook-config.c:489
 msgid "Authentication:"
 msgstr "Autenticació:"
 
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
+#: addressbook/gui/component/addressbook-config.c:507
+#: mail/mail-config.glade.h:44
 msgid "Path:"
 msgstr "Camí:"
 
-#: addressbook/gui/component/addressbook-config.c:503
+#: addressbook/gui/component/addressbook-config.c:508
 msgid "FIXME Path Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:508
+#: addressbook/gui/component/addressbook-config.c:513
 #, fuzzy
 msgid "Create path if it doesn't exist."
 msgstr "Aquest fitxer no existeix."
 
-#: addressbook/gui/component/addressbook-config.c:642
+#: addressbook/gui/component/addressbook-config.c:647
 #, fuzzy
 msgid "Edit Addressbook"
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook-config.c:644
+#: addressbook/gui/component/addressbook-config.c:649
 #, fuzzy
 msgid "Add Addressbook"
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook-config.c:660
+#: addressbook/gui/component/addressbook-config.c:665
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:41
+#: addressbook/gui/component/addressbook-config.c:671
+#: mail/mail-config.glade.h:35
 msgid "Name:"
 msgstr "Nom:"
 
-#: addressbook/gui/component/addressbook-config.c:667
+#: addressbook/gui/component/addressbook-config.c:672
 msgid "FIXME Name help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:669
+#: addressbook/gui/component/addressbook-config.c:674
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3
 msgid "Description:"
 msgstr "Descripció:"
 
-#: addressbook/gui/component/addressbook-config.c:670
+#: addressbook/gui/component/addressbook-config.c:675
 msgid "FIXME Description help text here"
 msgstr ""
 
@@ -915,23 +910,24 @@ msgid "Addressbook Sources"
 msgstr "Afegeix una font"
 
 #: addressbook/gui/component/addressbook-config.glade.h:3
+#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/gui/widgets/e-minicard.c:673
 #: calendar/gui/e-meeting-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
-#: mail/mail-config.glade.h:20 mail/mail-view.c:150
+#: filter/libfilter-i18n.h:8 mail/folder-browser.c:597
+#: mail/mail-config.glade.h:19 mail/mail-view.c:156
 #: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Suprimeix"
 
 #: addressbook/gui/component/addressbook-config.glade.h:4
 #: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:23
 msgid "Edit"
 msgstr "Edita"
 
 #: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Name"
 msgstr "Nom"
 
@@ -940,51 +936,74 @@ msgstr "Nom"
 msgid "URI"
 msgstr "URL:"
 
-#: addressbook/gui/component/e-address-widget.c:259
-#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#: addressbook/gui/component/e-address-widget.c:365
+#, fuzzy
+msgid "Disable Queries"
+msgstr "Categories disponibles:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:210
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:269
 #, fuzzy
 msgid "Add to Contacts"
 msgstr "Contacte _nou"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for displaying an address."
+msgid "A Bonobo control for an address popup."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A sample Bonobo control which displays an addressbook."
+msgid "A Bonobo control for displaying an address."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
 #, fuzzy
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 "Utilitat de configuració per al conducte de la llibreta d'adreces de "
 "l'Evolution\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #, fuzzy
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Evolution component for handling contacts."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 #, fuzzy
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Factory for the Addressbook's address displayer"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the Addressbook's address popup"
+msgstr "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 #, fuzzy
 msgid "Factory for the Evolution addressbook component."
 msgstr "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 #, fuzzy
 msgid "Factory for the sample Addressbook control"
 msgstr "Feu clic aquí per a la llibreta d'adreces"
@@ -998,21 +1017,18 @@ msgstr "Conducte de la llibreta d'adreces de l'Evolution"
 msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:121
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+#: addressbook/gui/component/select-names/e-select-names-popup.c:131
+#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
 msgid "Remove"
 msgstr "Elimina"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#: addressbook/gui/component/select-names/e-select-names-popup.c:146
 #, fuzzy
 msgid "Remove All"
 msgstr "Elimina"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
-msgid "Edit Contact Info"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Cerca..."
@@ -1030,7 +1046,7 @@ msgstr "Seleccioneu els noms"
 msgid "Select name from:"
 msgstr "Seleccioneu un nom de la llista:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
 msgid "Search"
 msgstr "Cerca"
 
@@ -1142,83 +1158,184 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:481
-#: addressbook/gui/widgets/e-minicard.c:435
+#: addressbook/gui/widgets/e-addressbook-view.c:513
+#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/gui/widgets/e-minicard.c:466
+#: addressbook/gui/widgets/e-minicard.c:668
 msgid "Save as VCard"
 msgstr "Desa com a VCard"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-minicard.c:669
+msgid "Send contact to other"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-minicard.c:670
+#, fuzzy
+msgid "Send message to contact"
+msgstr "FIXME: Nou _missatge per contactar"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
+#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
+#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:50
+#: ui/evolution-tasks.xml.h:4
+msgid "Print"
+msgstr "Imprimeix"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-minicard.c:672
+#, fuzzy
+msgid "Print Envelope"
+msgstr "Imprimeix el missatge..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:641
 #, fuzzy
 msgid "* Click here to add a contact *"
 msgstr "<feu clic aquí per seleccionar una data>"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/gui/widgets/e-addressbook-view.c:642
+#, fuzzy
+msgid "File As"
+msgstr "Arxiva com:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:644
 #, fuzzy
 msgid "Email"
 msgstr "Adreça electrònica 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:645
+#, fuzzy
+msgid "Primary Phone"
+msgstr "Primari"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:646
+#, fuzzy
+msgid "Assistant Phone"
+msgstr "Assistent"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:647
+#, fuzzy
+msgid "Business Phone"
+msgstr "Feina 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:648
+#, fuzzy
+msgid "Callback Phone"
+msgstr "Crida de retorn"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:649
+#, fuzzy
+msgid "Company Phone"
+msgstr "Empresa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:650
+#, fuzzy
+msgid "Home Phone"
+msgstr "Particular 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:651
 msgid "Organization"
 msgstr "Organització"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:595
+#: addressbook/gui/widgets/e-addressbook-view.c:652
+#, fuzzy
+msgid "Business Address"
+msgstr "Feina 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:653
+#, fuzzy
+msgid "Home Address"
+msgstr "Comprova l'adreça"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:654
+#, fuzzy
+msgid "Mobile Phone"
+msgstr "Mòbil"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+msgid "Car Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:658
+#, fuzzy
+msgid "Business Phone 2"
+msgstr "Feina 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:659
+#, fuzzy
+msgid "Home Phone 2"
+msgstr "Particular 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:661
+#, fuzzy
+msgid "Other Phone"
+msgstr "Contacte _nou"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:666
+#, fuzzy
+msgid "TTY"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:667
+#, fuzzy
+msgid "Other Address"
+msgstr "Comprova l'adreça"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:670
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:596
+#: addressbook/gui/widgets/e-addressbook-view.c:671
 #, fuzzy
 msgid "Department"
 msgstr "_Departament:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:597
+#: addressbook/gui/widgets/e-addressbook-view.c:672
 #, fuzzy
 msgid "Office"
 msgstr "_Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:673
 #, fuzzy
 msgid "Title"
 msgstr "_Títol:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:674
 #, fuzzy
 msgid "Profession"
 msgstr "_Professió:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:600
+#: addressbook/gui/widgets/e-addressbook-view.c:675
 #, fuzzy
 msgid "Manager"
 msgstr "Busca"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:677
 #, fuzzy
 msgid "Nickname"
 msgstr "_Sobrenom:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-view.c:678
 #, fuzzy
 msgid "Spouse"
 msgstr "_Cònjuge:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: addressbook/gui/widgets/e-addressbook-view.c:679
 #, fuzzy
 msgid "Note"
 msgstr "Cap"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:606
-#, fuzzy
-msgid "Click here to add a contact"
-msgstr "<feu clic aquí per seleccionar una data>"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-minicard-control.c:282
 msgid "Save in addressbook"
 msgstr "Desa a la llibreta d'adreces"
 
-#: addressbook/gui/widgets/e-minicard-view.c:141
+#: addressbook/gui/widgets/e-minicard-view.c:166
 msgid ""
 "\n"
 "\n"
@@ -1232,7 +1349,7 @@ msgstr ""
 "\n"
 "Feu doble clic aquí per crear un nou contacte."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #, fuzzy
 msgid "Card View"
 msgstr "Cotxe"
@@ -1417,126 +1534,127 @@ msgstr "No s'ha pogut llegir el bloc d'aplicació d'agenda del Pilot"
 msgid "Could not read pilot's ToDo application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació de coses per fer del Pilot"
 
-#: calendar/gui/calendar-commands.c:233
+#: calendar/gui/calendar-commands.c:266
 msgid "File not found"
 msgstr "No s'ha trobat el fitxer"
 
-#: calendar/gui/calendar-commands.c:257
+#: calendar/gui/calendar-commands.c:290
 msgid "Open calendar"
 msgstr "Obre l'agenda"
 
-#: calendar/gui/calendar-commands.c:299
+#: calendar/gui/calendar-commands.c:332
 msgid "Save calendar"
 msgstr "Desa l'agenda"
 
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:468
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
-#: calendar/gui/e-calendar-table.c:329
+#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
+#: calendar/gui/e-calendar-table.c:330
 msgid "Public"
 msgstr "Públic"
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
+#: calendar/gui/e-calendar-table.c:331
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
+#: calendar/gui/e-calendar-table.c:332
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
-#: calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1592
+#: calendar/gui/event-editor.c:1619
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
 msgid "High"
 msgstr "Alta"
 
-#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
-#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
+#: calendar/gui/calendar-model.c:1569
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
 msgid "Low"
 msgstr "Baixa"
 
-#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
+#: calendar/gui/e-calendar-table.c:406
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
+#: calendar/gui/e-calendar-table.c:405
 msgid "Opaque"
 msgstr "Opac"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:426
 msgid "Not Started"
 msgstr "No iniciat"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:427
 msgid "In Progress"
 msgstr "En procés"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:428
 #, fuzzy
 msgid "Completed"
 msgstr "% comp_let:"
 
-#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
+#: camel/camel-service.c:586
 #, fuzzy
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:285
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:805
+#: calendar/gui/calendar-model.c:799
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1547,24 +1665,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:885
+#: calendar/gui/calendar-model.c:879
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
-#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
-#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
-#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
-#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
-#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
-#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
+#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
+#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
+#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
+#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1129
+#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
+#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
 msgid "None"
 msgstr "Cap"
 
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:967
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1574,40 +1691,40 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1013
+#: calendar/gui/calendar-model.c:1007
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor de percentatge ha d'estar entre 0 i 100, ambdós inclosos"
 
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1048
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/calendar-model.c:1061
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:355
 msgid "Undefined"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1108
+#: calendar/gui/calendar-model.c:1102
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1598
+#: calendar/gui/calendar-model.c:1571
 #, fuzzy
 msgid "Recurring"
 msgstr "Recurrència"
 
-#: calendar/gui/calendar-model.c:1600
+#: calendar/gui/calendar-model.c:1573
 #, fuzzy
 msgid "Assigned"
 msgstr "Assigna una puntuació"
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
 #, fuzzy
 msgid "No"
 msgstr "Ara"
@@ -1680,25 +1797,25 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
 #, fuzzy
 msgid "Could not initialize GNOME"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:73
+#: calendar/gui/alarm-notify/notify-main.c:77
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+#: calendar/gui/dialogs/alarm-notify-dialog.c:189
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "Alarma el %A %d de %b de %Y, a les %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
+#: calendar/gui/dialogs/alarm-notify-dialog.c:196
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "Notificació sobre la vostra cita el %A %d de %b de %Y, a les %H:%M"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
+#: calendar/gui/dialogs/alarm-notify-dialog.c:207
 msgid "No summary available."
 msgstr "No hi ha cap resum disponible."
 
@@ -1788,7 +1905,7 @@ msgid "Display options"
 msgstr "Opcions de visualització"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:162
 msgid "Due Date"
 msgstr "Data de venciment"
 
@@ -1809,7 +1926,7 @@ msgid "Fri"
 msgstr "dv."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
 msgid "Friday"
 msgstr "Divendres"
 
@@ -1838,7 +1955,7 @@ msgid "Mon"
 msgstr "dl."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
 msgid "Monday"
 msgstr "Dilluns"
 
@@ -1851,11 +1968,12 @@ msgid "Overdue Items:"
 msgstr "Elements que ja han vençut:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: mail/mail-config.glade.h:45
 msgid "Pick a color"
 msgstr "Agafa un color"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:165
 msgid "Priority"
 msgstr "Prioritat"
 
@@ -1873,7 +1991,7 @@ msgid "Sat"
 msgstr "ds."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:482
 msgid "Saturday"
 msgstr "Dissabte"
 
@@ -1899,7 +2017,7 @@ msgid "Sun"
 msgstr "dg."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:483
 msgid "Sunday"
 msgstr "Diumenge"
 
@@ -1912,7 +2030,7 @@ msgid "Thu"
 msgstr "dj."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
 msgid "Thursday"
 msgstr "Dijous"
 
@@ -1933,7 +2051,7 @@ msgid "Tue"
 msgstr "dm."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
 msgid "Tuesday"
 msgstr "Dimarts"
 
@@ -1946,7 +2064,7 @@ msgid "Wed"
 msgstr "dc."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
 msgid "Wednesday"
 msgstr "Dimecres"
 
@@ -1959,46 +2077,46 @@ msgid "minutes before they occur."
 msgstr "minuts abans que es produeixin."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:78
 msgid "seconds."
 msgstr "segons."
 
-#: calendar/gui/dialogs/delete-comp.c:68
+#: calendar/gui/dialogs/delete-comp.c:70
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:73
 #, fuzzy
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:77
+#: calendar/gui/dialogs/delete-comp.c:79
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:82
 #, fuzzy
 msgid "Are you sure you want to delete this untitled task?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:86
+#: calendar/gui/dialogs/delete-comp.c:88
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/delete-comp.c:89
+#: calendar/gui/dialogs/delete-comp.c:91
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr ""
@@ -2015,7 +2133,7 @@ msgid "% Comp_lete:"
 msgstr "% comp_let:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:158
 #: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Classification"
 msgstr "Classificació"
@@ -2086,318 +2204,332 @@ msgstr "_Prioritat:"
 msgid "_Status:"
 msgstr "_Estat:"
 
-#: calendar/gui/dialogs/task-editor.c:689
+#: calendar/gui/dialogs/task-editor.c:697
 msgid "Edit Task"
 msgstr "Edita la tasca"
 
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
+#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
 msgid "No summary"
 msgstr "Sense resum"
 
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
+#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
 #, c-format
 msgid "Task - %s"
 msgstr "Tasca - %s"
 
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
+#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada al diari - %s"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:157
 #, fuzzy
 msgid "Categories"
 msgstr "categories"
 
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:159
 #, fuzzy
 msgid "Completion Date"
 msgstr "Completat"
 
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:160
 #, fuzzy
 msgid "End Date"
 msgstr "Hora de _finalització:"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:161
 #, fuzzy
 msgid "Start Date"
 msgstr "Data d'ini_ci:"
 
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:163
 msgid "Geographical Position"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:164
 #, fuzzy
 msgid "Percent complete"
 msgstr "Marca la tasca com a completa"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:166
 #, fuzzy
 msgid "Summary"
 msgstr "R_esum"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:167
 #, fuzzy
 msgid "Transparency"
 msgstr "Transparent"
 
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:168
 #, fuzzy
 msgid "URL"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/e-calendar-table.c:169
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.c:169
+#: calendar/gui/e-calendar-table.c:170
 #, fuzzy
 msgid "Click here to add a task"
 msgstr "Feu clic aquí per a la llibreta d'adreces"
 
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:374
 #, c-format
 msgid "0%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:375
 #, c-format
 msgid "10%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:376
 #, c-format
 msgid "20%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:377
 #, c-format
 msgid "30%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:378
 #, c-format
 msgid "40%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:379
 #, c-format
 msgid "50%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:380
 #, c-format
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:381
 #, c-format
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:382
 #, c-format
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:383
 #, c-format
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:384
 #, c-format
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:550
+#: calendar/gui/e-calendar-table.c:551
 msgid "Mark Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:551
+#: calendar/gui/e-calendar-table.c:552
 msgid "Mark the task complete"
 msgstr "Marca la tasca com a completa"
 
-#: calendar/gui/e-calendar-table.c:556
+#: calendar/gui/e-calendar-table.c:557
 #, fuzzy
 msgid "Edit this task..."
 msgstr "Edita aquest element..."
 
-#: calendar/gui/e-calendar-table.c:557
+#: calendar/gui/e-calendar-table.c:558
 #, fuzzy
 msgid "Edit the task"
 msgstr "Edita la tasca"
 
-#: calendar/gui/e-calendar-table.c:559
+#: calendar/gui/e-calendar-table.c:560
 #: ui/evolution-task-editor-dialog.xml.h:19
 #, fuzzy
 msgid "Delete this task"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-calendar-table.c:560
+#: calendar/gui/e-calendar-table.c:561
 msgid "Delete the task"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:519
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisions de minut"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
-#: calendar/gui/e-week-view-main-item.c:321
+#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
+#: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1288
-#: calendar/gui/e-week-view-main-item.c:330
+#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
+#: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
-#: calendar/gui/e-week-view-main-item.c:344
+#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:613
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:617
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
-#: calendar/gui/print.c:612
+#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
+#: calendar/gui/print.c:616
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
-#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
+#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
 #, fuzzy
-msgid "New Appointment..."
+msgid "New Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
-#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
+#, fuzzy
+msgid "New All Day Event"
+msgstr "Esdeveniment per a _tot el dia"
+
+#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
+#, fuzzy
+msgid "Go to Today"
+msgstr "Vés a avui"
+
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#, fuzzy
+msgid "Go to Date..."
+msgstr "Vés a una data"
+
+#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
+#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
 #: ui/evolution-message-composer.xml.h:10
 #, fuzzy
 msgid "Open"
 msgstr "_Obre"
 
-#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
 #, fuzzy
 msgid "Delete this Appointment"
 msgstr "Suprimeix aquesta cita"
 
-#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
 #: ui/evolution-event-editor.xml.h:45
 #, fuzzy
 msgid "Schedule Meeting"
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
 #, fuzzy
 msgid "Make this Occurrence Movable"
 msgstr "Fes aquesta cita movible"
 
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "Suprimeix-ne aquesta aparició"
 
-#: calendar/gui/e-day-view.c:3047
+#: calendar/gui/e-day-view.c:3179
 #, fuzzy
 msgid "Delete all Occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
 
-#: calendar/gui/e-itip-control.c:153
+#: calendar/gui/e-itip-control.c:161
 #, fuzzy
 msgid "I couldn't update your calendar file!\n"
 msgstr "No s'ha pogut crear una agenda a `%s'"
 
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
+#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
 #, fuzzy
 msgid "Component successfully updated."
 msgstr "Els fitxers de l'Evolution s'han instal·lat amb èxit."
 
-#: calendar/gui/e-itip-control.c:165
+#: calendar/gui/e-itip-control.c:173
 msgid "There was an error loading the calendar file."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:189
+#: calendar/gui/e-itip-control.c:197
 msgid "I couldn't open your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
+#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
 msgid "I couldn't load your calendar file!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:462
+#: calendar/gui/e-itip-control.c:470
 #, fuzzy
 msgid "I couldn't read your calendar file!\n"
 msgstr "No s'ha pogut crear una agenda a `%s'"
 
-#: calendar/gui/e-itip-control.c:475
+#: calendar/gui/e-itip-control.c:483
 msgid "This is a reply from someone who was uninvited!"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:491
+#: calendar/gui/e-itip-control.c:499
 #, fuzzy
 msgid "I couldn't update your calendar store."
 msgstr "No s'ha pogut crear una agenda a `%s'"
 
-#: calendar/gui/e-itip-control.c:532
+#: calendar/gui/e-itip-control.c:540
 msgid "I couldn't delete the calendar component!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:542
+#: calendar/gui/e-itip-control.c:550
 #, fuzzy
 msgid "Component successfully deleted."
 msgstr "Els fitxers de l'Evolution s'han instal·lat amb èxit."
 
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:694
 #, fuzzy
 msgid "I don't recognize this type of calendar component."
 msgstr "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
 
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:780
 #, fuzzy
 msgid "Add to Calendar"
 msgstr "Sobre l'agenda"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:814
 #, fuzzy
-msgid "Accept"
+msgid " Accept "
 msgstr "set"
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:815
 #, fuzzy
-msgid "Decline"
+msgid " Decline "
 msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
+#: calendar/gui/e-itip-control.c:816
+#, fuzzy
+msgid " Tentative "
 msgstr "Tentatiu"
 
-#: calendar/gui/e-itip-control.c:852
+#: calendar/gui/e-itip-control.c:860
 #, fuzzy
 msgid "Update Calendar"
 msgstr "_Obre una agenda"
 
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:883
 #, fuzzy
 msgid "Cancel Meeting"
 msgstr "Cancel·lat"
@@ -2416,7 +2548,7 @@ msgstr ""
 msgid "Calendar Message"
 msgstr "Agenda"
 
-#: calendar/gui/e-itip-control.glade.h:5
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
 #, fuzzy
 msgid "Date:"
 msgstr "Data de venciment"
@@ -2431,9 +2563,10 @@ msgstr "Imprimeix l'agenda"
 msgid "Organizer:"
 msgstr "Organització:"
 
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
-msgid "Sender"
-msgstr "Remitent"
+#: calendar/gui/e-itip-control.glade.h:10
+#, fuzzy
+msgid "Server Message:"
+msgstr "Anomena i desa..."
 
 #: calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
@@ -2525,28 +2658,28 @@ msgid ""
 "Time"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
-#: mail/message-list.c:1171
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
+#: mail/message-list.c:1052
 #, fuzzy
 msgid "Status"
 msgstr "_Estat:"
 
-#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
-#: calendar/gui/e-tasks.c:501
+#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
+#: calendar/gui/e-tasks.c:502
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:154
+#: calendar/gui/e-tasks.c:155
 #, fuzzy
 msgid "Category:"
 msgstr "categories"
 
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:298
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No s'ha pogut carregar l'agenda en `%s'"
 
-#: calendar/gui/e-tasks.c:309
+#: calendar/gui/e-tasks.c:310
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El mètode necessari per carregar `%s' no està suportat"
@@ -2554,11 +2687,16 @@ msgstr "El mètode necessari per carregar `%s' no està suportat"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
+#: calendar/gui/e-week-view-main-item.c:342
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/e-week-view.c:3255
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+#, fuzzy
+msgid "New Appointment..."
+msgstr "Nova cita..."
+
+#: calendar/gui/e-week-view.c:3314
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
@@ -2597,7 +2735,7 @@ msgid "No recurrence"
 msgstr "Sense recurrència"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1577
+#: calendar/gui/event-editor.c:1579
 msgid "Play a sound"
 msgstr ""
 
@@ -2619,24 +2757,24 @@ msgid "Reminder"
 msgstr "Recordatori"
 
 #: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1586
+#: calendar/gui/event-editor.c:1588
 #, fuzzy
 msgid "Run a program"
 msgstr "_Executa el programa:"
 
 #: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1583
+#: calendar/gui/event-editor.c:1585
 #, fuzzy
 msgid "Send an email"
 msgstr "S'està recollint el correu des de %s"
 
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
 #, fuzzy
 msgid "Settings..."
 msgstr "_Paràmetres"
 
 #: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1580
+#: calendar/gui/event-editor.c:1582
 #, fuzzy
 msgid "Show a dialog"
 msgstr "Mostra 1 dia"
@@ -2658,12 +2796,11 @@ msgstr "Hora d'_inici:"
 msgid "_Starting date:"
 msgstr "Data d'_inici:"
 
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
 msgid "after"
 msgstr "després de"
 
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
 msgid "before"
 msgstr "abans de"
 
@@ -2689,7 +2826,7 @@ msgstr "per sempre"
 msgid "hour(s)"
 msgstr "hores"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40 mail/mail-config.glade.h:77
 #, fuzzy
 msgid "minute(s)"
 msgstr "minuts"
@@ -2715,109 +2852,109 @@ msgstr "setmana(es)"
 msgid "year(s)"
 msgstr "any(s)"
 
-#: calendar/gui/event-editor.c:371
+#: calendar/gui/event-editor.c:373
 msgid "Edit Appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/event-editor.c:449
+#: calendar/gui/event-editor.c:451
 msgid "on"
 msgstr "el"
 
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
 msgid "day"
 msgstr "dia"
 
-#: calendar/gui/event-editor.c:601
+#: calendar/gui/event-editor.c:603
 #, fuzzy
 msgid "on the"
 msgstr "mes"
 
-#: calendar/gui/event-editor.c:608
+#: calendar/gui/event-editor.c:610
 #, fuzzy
 msgid "th"
 msgstr "4"
 
-#: calendar/gui/event-editor.c:754
+#: calendar/gui/event-editor.c:756
 #, fuzzy
 msgid "occurrences"
 msgstr "aparicions"
 
-#: calendar/gui/event-editor.c:871
+#: calendar/gui/event-editor.c:873
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1532
+#: calendar/gui/event-editor.c:1534
 #, fuzzy, c-format
 msgid " %d days"
 msgstr "dies"
 
-#: calendar/gui/event-editor.c:1534
+#: calendar/gui/event-editor.c:1536
 #, fuzzy
 msgid " 1 day"
 msgstr "Mostra 1 dia"
 
-#: calendar/gui/event-editor.c:1537
+#: calendar/gui/event-editor.c:1539
 #, fuzzy, c-format
 msgid " %d weeks"
 msgstr "setmanes"
 
-#: calendar/gui/event-editor.c:1539
+#: calendar/gui/event-editor.c:1541
 #, fuzzy
 msgid " 1 week"
 msgstr "Mostra 1 setmana"
 
-#: calendar/gui/event-editor.c:1542
+#: calendar/gui/event-editor.c:1544
 #, fuzzy, c-format
 msgid " %d hours"
 msgstr "hores"
 
-#: calendar/gui/event-editor.c:1544
+#: calendar/gui/event-editor.c:1546
 #, fuzzy
 msgid " 1 hour"
 msgstr "hora"
 
-#: calendar/gui/event-editor.c:1547
+#: calendar/gui/event-editor.c:1549
 #, fuzzy, c-format
 msgid " %d minutes"
 msgstr "minuts"
 
-#: calendar/gui/event-editor.c:1549
+#: calendar/gui/event-editor.c:1551
 #, fuzzy
 msgid " 1 minute"
 msgstr "10 minuts"
 
-#: calendar/gui/event-editor.c:1552
+#: calendar/gui/event-editor.c:1554
 #, fuzzy, c-format
 msgid " %d seconds"
 msgstr " segons"
 
-#: calendar/gui/event-editor.c:1554
+#: calendar/gui/event-editor.c:1556
 #, fuzzy
 msgid " 1 second"
 msgstr " segons"
 
-#: calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1603
 #, fuzzy
 msgid " before start of appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/event-editor.c:1603
+#: calendar/gui/event-editor.c:1605
 #, fuzzy
 msgid " after start of appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/event-editor.c:1611
+#: calendar/gui/event-editor.c:1613
 #, fuzzy
 msgid " before end of appointment"
 msgstr "Recorda'm totes les cites"
 
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/event-editor.c:1615
 #, fuzzy
 msgid " after end of appointment"
 msgstr "Crea una nova cita"
 
-#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
-#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
+#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
+#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
 msgid "%a %b %d %Y"
 msgstr "%a, %d de %b de %Y"
 
@@ -2860,14 +2997,14 @@ msgstr "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
 msgid "Factory for the sample Calendar control"
 msgstr "Utilitat de configuració per al conducte de l'agenda de l'Evolution.\n"
 
-#: calendar/gui/gnome-cal.c:695
+#: calendar/gui/gnome-cal.c:700
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/gnome-cal.c:706
+#: calendar/gui/gnome-cal.c:711
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "El mètode necessari per carregar `%s' no està suportat"
@@ -2942,201 +3079,201 @@ msgstr "octubre"
 msgid "September"
 msgstr "setembre"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:306
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Su"
 msgstr "Dg"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Mo"
 msgstr "Dl"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Tu"
 msgstr "Dm"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "We"
 msgstr "Dc"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Th"
 msgstr "Dj"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Fr"
 msgstr "Dv"
 
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
 msgid "Sa"
 msgstr "Ds"
 
-#: calendar/gui/print.c:944
+#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Tasques"
 
 #. Day
-#: calendar/gui/print.c:1074
+#: calendar/gui/print.c:1078
 msgid "Current day (%a %b %d %Y)"
 msgstr "Avui (%a, %d de %b de %Y)"
 
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
 
-#: calendar/gui/print.c:1089
+#: calendar/gui/print.c:1093
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1104
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Aquesta setmana (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1108
+#: calendar/gui/print.c:1112
 msgid "Current month (%b %Y)"
 msgstr "Aquest mes (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1115
+#: calendar/gui/print.c:1119
 msgid "Current year (%Y)"
 msgstr "Enguany (%Y)"
 
-#: calendar/gui/print.c:1152
+#: calendar/gui/print.c:1156
 msgid "Print Calendar"
 msgstr "Imprimeix l'agenda"
 
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:32
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1342
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
+#: ui/evolution-mail.xml.h:52
 msgid "Print Preview"
 msgstr "Previsualització d'impressió"
 
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/tasks-control.c:108
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrarà l'agenda"
@@ -3169,27 +3306,102 @@ msgid ""
 "calendar folder will be migrated to the tasks folder."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
+#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
 #, fuzzy
 msgid "SMTWTFS"
 msgstr "DDDDDDD"
 
-#: camel/camel-filter-driver.c:790
+#: camel/camel-cipher-context.c:169
+#, fuzzy
+msgid "Signing is not supported by this cipher"
+msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
+
+#: camel/camel-cipher-context.c:207
+#, fuzzy
+msgid "Clearsigning is not supported by this cipher"
+msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
+
+#: camel/camel-cipher-context.c:245
+#, fuzzy
+msgid "Verifying is not supported by this cipher"
+msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
+
+#: camel/camel-cipher-context.c:286
+#, fuzzy
+msgid "Encryption is not supported by this cipher"
+msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
+
+#: camel/camel-cipher-context.c:326
+#, fuzzy
+msgid "Decryption is not supported by this cipher"
+msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
+
+#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#, fuzzy
+msgid "Syncing folders"
+msgstr "S'està sincronitzant \"%s\""
+
+#: camel/camel-filter-driver.c:643
+#, fuzzy
+msgid "Unable to open spool folder"
+msgstr "No es pot obrir la llibreta d'adreces"
+
+#: camel/camel-filter-driver.c:652
+#, fuzzy
+msgid "Unable to process spool folder"
+msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
+
+#: camel/camel-filter-driver.c:666
+#, fuzzy
+msgid "Getting message %d (%d%%)"
+msgstr "S'està escrivint el missatge %d de %d"
+
+#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#, fuzzy, c-format
+msgid "Failed message %d"
+msgstr "Missatge de _correu (FIXME)"
+
+#: camel/camel-filter-driver.c:671
+#, fuzzy
+msgid "Cannot open message"
+msgstr "No es pot recuperar el missatge: %s"
+
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#, fuzzy
+msgid "Syncing folder"
+msgstr "S'està sincronitzant \"%s\""
+
+#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
+#, fuzzy
+msgid "Complete"
+msgstr "% comp_let:"
+
+#: camel/camel-filter-driver.c:748
+#, fuzzy, c-format
+msgid "Getting message %d of %d"
+msgstr "S'està escrivint el missatge %d de %d"
+
+#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#, fuzzy, c-format
+msgid "Failed at message %d of %d"
+msgstr "S'està escrivint el missatge %d de %d"
+
+#: camel/camel-filter-driver.c:866
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:795
+#: camel/camel-filter-driver.c:871
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-folder-search.c:323
+#: camel/camel-folder-search.c:328
 #, fuzzy, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -3198,7 +3410,7 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:338
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -3207,158 +3419,230 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
+#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:554
+#: camel/camel-folder-search.c:559
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
+#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
+#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
+#: camel/camel-movemail.c:185
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "No s'ha pogut crear el fitxer de blocatge per a %s: %s"
 
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151 camel/camel-movemail.c:219
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "S'ha excedit el temps màxim en intentar recuperar el fitxer de blocatge en "
 "%s. Torneu-ho a provar més tard."
 
-#: camel/camel-lock.c:199
+#: camel/camel-lock.c:201
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:253
+#: camel/camel-lock.c:255
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:99
+#: camel/camel-movemail.c:101
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "No s'ha pogut comprovar el fitxer de correu %s: %s"
 
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:148
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "No s'ha pogut obrir el fitxer de correu %s: %s"
 
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:158
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "No s'ha pogut obrir el fitxer temporal de correu %s: %s"
 
-#: camel/camel-movemail.c:197
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr "No s'ha pogut comprovar el fitxer de blocatge per a %s: %s"
 
-#: camel/camel-movemail.c:243
+#: camel/camel-movemail.c:245
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Error en llegir el fitxer de correu: %s"
 
-#: camel/camel-movemail.c:254
+#: camel/camel-movemail.c:256
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Error en escriure el fitxer temporal de correu: %s"
 
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:274
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "No s'ha pogut emmagatzemar el correu en el fitxer temporal %s: %s"
 
-#: camel/camel-movemail.c:304
+#: camel/camel-movemail.c:306
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:318
 #, c-format
 msgid "Could not fork: %s"
 msgstr "No s'ha pogut bifurcar: %s"
 
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:356
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "El programa Movemail ha fallat: %s"
 
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:357
 msgid "(Unknown error)"
 msgstr "(Error desconegut)"
 
-#: camel/camel-provider.c:137
+#: camel/camel-movemail.c:587
+#, fuzzy, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "Error en escriure el fitxer temporal de correu: %s"
+
+#: camel/camel-pgp-context.c:186
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Si us plau, introduïu la vostra contrasenya PGP/GPG."
+
+#: camel/camel-pgp-context.c:189
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Si us plau, introduïu la vostra contrasenya PGP/GPG."
+
+#: camel/camel-pgp-context.c:509
+msgid "No plaintext to sign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
+#: camel/camel-pgp-context.c:1021 camel/camel-pgp-context.c:1235
+msgid "No password provided."
+msgstr "No s'ha indicat cap contrasenya."
+
+#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
+#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1028
+#: camel/camel-pgp-context.c:1242
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
+
+#: camel/camel-pgp-context.c:681
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:871
+msgid "No plaintext to verify."
+msgstr ""
+
+#: camel/camel-pgp-context.c:888
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "No s'ha pogut crear el conducte: %s"
+
+#: camel/camel-pgp-context.c:1011
+msgid "No plaintext to encrypt."
+msgstr ""
+
+#: camel/camel-pgp-context.c:1037
+msgid "No recipients specified"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1227
+msgid "No ciphertext to decrypt."
+msgstr ""
+
+#: camel/camel-provider.c:131
+#, c-format
+msgid "Could not load %s: Module loading not supported on this system."
+msgstr ""
+
+#: camel/camel-provider.c:140
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "No s'ha pogut carregar %s: %s"
 
-#: camel/camel-provider.c:145
+#: camel/camel-provider.c:148
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 "No s'ha pogut carregar %s: el mòdul no conté cap codi d'inicialització."
 
-#: camel/camel-remote-store.c:181
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s server %s"
 msgstr "Servidor %s %s"
 
-#: camel/camel-remote-store.c:185
+#: camel/camel-remote-store.c:190
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "Servei %s per a %s en %s"
 
-#: camel/camel-remote-store.c:232
+#: camel/camel-remote-store.c:240
 #, fuzzy
 msgid "Connection cancelled"
 msgstr "Cancel·lat"
 
-#: camel/camel-remote-store.c:235
-#: camel/providers/smtp/camel-smtp-transport.c:244
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:261
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No s'ha pogut connectar a %s (port %d): %s"
 
-#: camel/camel-remote-store.c:236
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(ordinador central desconegut)"
 
-#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
-#: camel/camel-remote-store.c:448
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
+#: camel/camel-remote-store.c:458
+#: camel/providers/imap/camel-imap-command.c:264
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Obre l'agenda"
 
-#: camel/camel-remote-store.c:453
+#: camel/camel-remote-store.c:464
 #, fuzzy
 msgid "Server unexpectedly disconnected"
 msgstr "El servidor ha rebutjat el nom d'usuari"
 
-#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#: camel/camel-sasl-anonymous.c:33
+msgid "Anonymous"
+msgstr ""
+
+#: camel/camel-sasl-anonymous.c:35
+#, fuzzy
+msgid "This option will connect to the server using an anonymous login."
+msgstr ""
+"Aquesta opció es connectarà al servidor IMAP mitjançant una contrasenya de "
+"text net."
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Autenticació:"
 
-#: camel/camel-sasl-anonymous.c:106
+#: camel/camel-sasl-anonymous.c:119
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-anonymous.c:118
+#: camel/camel-sasl-anonymous.c:131
 #, fuzzy, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -3367,7 +3651,7 @@ msgstr ""
 "Error en carregar la informació del filtre:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:130
+#: camel/camel-sasl-anonymous.c:143
 #, fuzzy, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -3376,11 +3660,11 @@ msgstr ""
 "Error en carregar la informació del filtre:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+#: camel/camel-sasl-cram-md5.c:35
 msgid "CRAM-MD5"
 msgstr ""
 
-#: camel/camel-sasl-cram-md5.c:34
+#: camel/camel-sasl-cram-md5.c:37
 #, fuzzy
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
@@ -3389,11 +3673,11 @@ msgstr ""
 "Això us connectarà al servidor POP i utilitzarà el Kerberos 4 per "
 "autenticar-vos-hi."
 
-#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+#: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:39
+#: camel/camel-sasl-digest-md5.c:45
 #, fuzzy
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
@@ -3402,113 +3686,117 @@ msgstr ""
 "Aquesta opció es connectarà al servidor IMAP mitjançant una contrasenya de "
 "text net."
 
-#: camel/camel-sasl-digest-md5.c:761
+#: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:770
+#: camel/camel-sasl-digest-md5.c:819
 msgid "Server challenge invalid\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:776
+#: camel/camel-sasl-digest-md5.c:825
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:798
+#: camel/camel-sasl-digest-md5.c:847
 #, fuzzy
 msgid "Server response did not contain authorization data\n"
 msgstr "La resposta del servidor IMAP no contenia la informació %s"
 
-#: camel/camel-sasl-digest-md5.c:816
+#: camel/camel-sasl-digest-md5.c:865
 msgid "Server response contained incomplete authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:826
+#: camel/camel-sasl-digest-md5.c:875
 #, fuzzy
 msgid "Server response does not match\n"
 msgstr "La resposta del servidor IMAP no contenia la informació %s"
 
-#: camel/camel-sasl-kerberos4.c:38
+#: camel/camel-sasl-kerberos4.c:40
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-kerberos4.c:42
 #, fuzzy
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "Això us connectarà al servidor POP i utilitzarà el Kerberos 4 per "
 "autenticar-vos-hi."
 
-#: camel/camel-sasl-kerberos4.c:158
+#: camel/camel-sasl-kerberos4.c:161
 #, fuzzy, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:381
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:417
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/camel-sasl-plain.c:29
-msgid "PLAIN"
-msgstr ""
-
-#: camel/camel-sasl-plain.c:31
+#: camel/camel-sasl-plain.c:34
 #, fuzzy
-msgid ""
-"This option will connect to the server using a the PLAIN SASL mechanism if "
-"the server supports it."
+msgid "This option will connect to the server using a simple password."
 msgstr ""
 "Aquesta opció es connectarà al servidor IMAP mitjançant una contrasenya de "
 "text net."
 
-#: camel/camel-search-private.c:105
+#: camel/camel-search-private.c:110
 #, fuzzy, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Error en escriure a la bústia de correu temporal: %s"
 
-#: camel/camel-service.c:142
+#: camel/camel-service.c:152
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL '%s' necessita un component de nom d'usuari"
 
-#: camel/camel-service.c:151
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL '%s' necessita un component d'ordinador central"
 
-#: camel/camel-service.c:160
+#: camel/camel-service.c:168
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL '%s' necessita un component de camí"
 
-#: camel/camel-service.c:512
+#: camel/camel-service.c:554
+#, fuzzy, c-format
+msgid "Resolving: %s"
+msgstr "S'està comprovant \"%s\""
+
+#: camel/camel-service.c:581
 #, c-format
-msgid "No such host %s."
-msgstr "L'ordinador central %s no existeix."
+msgid "Failure in name lookup: %s"
+msgstr ""
 
-#: camel/camel-service.c:515
+#: camel/camel-service.c:606
 #, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Temporalment no es pot cercar el nom d'ordinador central %s."
+msgid "Host lookup failed: %s: host not found"
+msgstr ""
+
+#: camel/camel-service.c:608
+#, c-format
+msgid "Host lookup failed: %s: unknown reason"
+msgstr ""
 
-#: camel/camel-session.c:54
+#: camel/camel-session.c:57
 msgid "Virtual folder email provider"
 msgstr "Proveïdor de correu de la carpeta virtual"
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:59
 msgid "For reading mail as a query of another set of folders"
 msgstr "Per llegir correu com a consulta d'un altre joc de carpetes"
 
-#: camel/camel-session.c:322
+#: camel/camel-session.c:274 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No hi ha cap proveïdor disponible per al protocol `%s'"
 
-#: camel/camel-session.c:417
+#: camel/camel-session.c:462
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3518,124 +3806,151 @@ msgstr ""
 "%s"
 
 #. Fill in the new fields
-#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
-#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
+#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
 #, fuzzy
 msgid "Trash"
 msgstr "Tasca"
 
-#: camel/camel-url.c:77
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "La cadena d'URL `%s' no conté cap protocol"
-
-#: camel/camel-url.c:92
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "La cadena d'URL `%s' conté un protocol incorrecte"
+#: camel/camel-url.c:289
+#, fuzzy, c-format
+msgid "Could not parse URL `%s'"
+msgstr ""
+"No s'ha pogut obrir el fitxer `%s':\n"
+"%s"
 
-#: camel/camel-url.c:152
-#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "El número de port de l'URL `%s' no és numèric"
+#: camel/camel-vee-folder.c:451
+#, fuzzy, c-format
+msgid "No such message %s in %s"
+msgstr "L'ordinador central %s no existeix."
 
-#: camel/camel-vee-folder.c:960
+#: camel/camel-vee-folder.c:545
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:209
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:217
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "L'ordre IMAP ha fallat: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
+#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
 msgid "Unknown error"
 msgstr "Error desconegut"
 
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:272
 #, fuzzy
 msgid "Server response ended too soon."
 msgstr "La resposta del servidor IMAP no contenia la informació %s"
 
-#: camel/providers/imap/camel-imap-command.c:433
+#: camel/providers/imap/camel-imap-command.c:456
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La resposta del servidor IMAP no contenia la informació %s"
 
-#: camel/providers/imap/camel-imap-command.c:469
+#: camel/providers/imap/camel-imap-command.c:490
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta D'acord inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:172
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No s'ha pogut carregar el resum per a %s"
 
-#: camel/providers/imap/camel-imap-folder.c:329
+#: camel/providers/imap/camel-imap-folder.c:351
 #, fuzzy
 msgid "Scanning IMAP folder"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: camel/providers/imap/camel-imap-folder.c:837
-#: camel/providers/imap/camel-imap-folder.c:999
+#: camel/providers/imap/camel-imap-folder.c:986
+#: camel/providers/imap/camel-imap-folder.c:1197
+#, fuzzy
+msgid "This message is not currently available"
+msgstr ""
+"Aquest missatge no té cap assumpte.\n"
+"Voleu que l'enviï igualment?"
+
+#: camel/providers/imap/camel-imap-folder.c:1016
+#: camel/providers/imap/camel-imap-folder.c:1231
 msgid "Could not find message body in FETCH response."
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 
-#: camel/providers/imap/camel-imap-provider.c:39
-msgid "IMAPv4"
-msgstr "IMAPv4"
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#, fuzzy
+msgid "Checking for new mail"
+msgstr "Comprova si hi ha nou correu"
 
-#: camel/providers/imap/camel-imap-provider.c:41
-msgid "For reading and storing mail on IMAP servers."
-msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Check for new messages in all folders"
+msgstr "Comprova si hi ha nou correu"
+
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+msgid "Folders"
+msgstr "Carpetes"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:50
 #, fuzzy
-msgid "Secure IMAPv4"
-msgstr "IMAPv4"
+msgid "Show only subscribed folders"
+msgstr "Escaneja les carpetes de \"%s\""
+
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Override server-supplied folder namespace"
+msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap/camel-imap-provider.c:54
 #, fuzzy
-msgid "For reading and storing mail on IMAP servers over an SSL connection."
+msgid "Namespace"
+msgstr "Nom:"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Apply filters to new messages in INBOX on this server"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:63
+msgid "IMAPv4"
+msgstr "IMAPv4"
+
+#: camel/providers/imap/camel-imap-provider.c:65
+msgid "For reading and storing mail on IMAP servers."
 msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:263
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Aquesta opció es connectarà al servidor IMAP mitjançant una contrasenya de "
 "text net."
 
-#: camel/providers/imap/camel-imap-store.c:415
+#: camel/providers/imap/camel-imap-store.c:440
 #, fuzzy, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticació sol·licitat."
 
-#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap/camel-imap-store.c:450
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autenticació:"
 
-#: camel/providers/imap/camel-imap-store.c:454
+#: camel/providers/imap/camel-imap-store.c:475
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sSi us plau, introduïu la contrasenya IMAP per a %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:469
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:403
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:498
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: camel/providers/imap/camel-imap-store.c:518
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3646,92 +3961,101 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:772
+#: camel/providers/imap/camel-imap-store.c:865
+#, fuzzy, c-format
+msgid "%s is not a selectable folder"
+msgstr "Visualitza la carpeta seleccionada"
+
+#: camel/providers/imap/camel-imap-store.c:879
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
 
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/imap/camel-imap-store.c:1382
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:39
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "Directoris de correu en format MH d'UNIX"
 
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:40
 msgid "For storing local mail in MH-like mail directories"
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:49
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:50
 #, fuzzy
 msgid "For storing local mail in standard mbox format"
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/local/camel-local-provider.c:58
+#: camel/providers/local/camel-local-provider.c:59
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 #, fuzzy
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/local/camel-local-store.c:128
+#: camel/providers/local/camel-local-store.c:129
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:135
+#: camel/providers/local/camel-local-store.c:136
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "`%s' no és un fitxer habitual."
 
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:144
+#: camel/providers/local/camel-local-store.c:160
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:175
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fitxer de correu local %s"
 
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:241
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:283
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:293
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
+#: camel/providers/local/camel-maildir-folder.c:150
+#: camel/providers/local/camel-maildir-folder.c:158
+#: camel/providers/local/camel-maildir-folder.c:169
 #, fuzzy, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:197
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:217
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-mh-folder.c:194
+#: camel/providers/local/camel-mh-folder.c:202
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3740,20 +4064,20 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:197
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
 #, fuzzy
 msgid "No such message"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:203
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
+#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -3762,15 +4086,15 @@ msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
+#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3779,36 +4103,41 @@ msgstr ""
 "No s'ha pogut crear la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:120
+#: camel/providers/local/camel-maildir-store.c:122
 #, fuzzy, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "`%s' no és un directori."
 
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
+#: camel/providers/local/camel-maildir-store.c:151
+#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:150
+#: camel/providers/local/camel-maildir-store.c:152
 #, fuzzy
 msgid "not a maildir directory"
 msgstr "Directori de correu local %s"
 
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:152
+#, fuzzy, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "No es pot bifurcar %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:203
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "No es pot obrir la bústia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "No es pot afegir el missatge al fitxer mbox: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:335
+#: camel/providers/local/camel-mbox-folder.c:367
+#: camel/providers/local/camel-mbox-folder.c:380
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3817,15 +4146,15 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:368
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:381
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:92
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -3834,7 +4163,7 @@ msgstr ""
 "No s'ha pogut obrir el fitxer `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -3843,14 +4172,14 @@ msgstr ""
 "No s'ha pogut crear el fitxer `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' no és un fitxer habitual."
 
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3859,116 +4188,116 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:151
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La carpeta `%s' no és buida. No s'ha suprimit."
 
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:240
+#: camel/providers/local/camel-mbox-summary.c:248
 #, fuzzy
 msgid "Summarising folder"
 msgstr "S'està sincronitzant \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:245
+#: camel/providers/local/camel-mbox-summary.c:253
 #, fuzzy, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
 
-#: camel/providers/local/camel-mbox-summary.c:287
+#: camel/providers/local/camel-mbox-summary.c:295
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:362
+#: camel/providers/local/camel-mbox-summary.c:370
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
+#: camel/providers/local/camel-mbox-summary.c:501
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "S'està sincronitzant \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:506
+#: camel/providers/local/camel-mbox-summary.c:707
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:523
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "No es pot obrir la bústia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
 #: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:556
 #: camel/providers/local/camel-mbox-summary.c:745
+#: camel/providers/local/camel-mbox-summary.c:753
 #, fuzzy
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Incongruència del resum, s'està interrompent la sincronització"
 
-#: camel/providers/local/camel-mbox-summary.c:591
+#: camel/providers/local/camel-mbox-summary.c:599
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error en escriure a la bústia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:608
+#: camel/providers/local/camel-mbox-summary.c:616
 #, fuzzy, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Error en escriure a la bústia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
+#: camel/providers/local/camel-mbox-summary.c:634
+#: camel/providers/local/camel-mbox-summary.c:803
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "No s'ha pogut tancar la carpeta font %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:643
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "No es pot tancar la carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:646
+#: camel/providers/local/camel-mbox-summary.c:654
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:870
+#: camel/providers/local/camel-mbox-summary.c:878
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:149
+#: camel/providers/local/camel-mh-folder.c:157
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 
-#: camel/providers/local/camel-mh-store.c:108
+#: camel/providers/local/camel-mh-store.c:110
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' no és un directori."
 
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Si us plau, introduïu la contrasenya NNTP per a %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:62
+#: camel/providers/nntp/camel-nntp-auth.c:66
 msgid "Server rejected username"
 msgstr "El servidor ha rebutjat el nom d'usuari"
 
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:72
 msgid "Failed to send username to server"
 msgstr "No s'ha pogut enviar el nom d'usuari al servidor"
 
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:81
 msgid "Server rejected username/password"
 msgstr "El servidor ha rebutjat el nom d'usuari/la contrasenya"
 
@@ -3992,11 +4321,11 @@ msgstr "No es pot carregar el fitxer de llista de grups per a %s: %s"
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "USENET news"
 msgstr "Notícies d'USENET"
 
-#: camel/providers/nntp/camel-nntp-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:44
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "Proveïdor per llegir i publicar als grups de notícies d'USENET."
 
@@ -4024,35 +4353,50 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "No es pot obrir o crear el fitxer .newsrc per a %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:145
+#: camel/providers/pop3/camel-pop3-folder.c:149
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:188
+#: camel/providers/pop3/camel-pop3-folder.c:192
 msgid "Could not open folder: message listing was incomplete."
 msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
 
-#: camel/providers/pop3/camel-pop3-folder.c:282
+#: camel/providers/pop3/camel-pop3-folder.c:285
 #, c-format
 msgid "No message with uid %s"
 msgstr "No hi ha cap missatge amb l'uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:286
+#: camel/providers/pop3/camel-pop3-folder.c:289
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:304
+#: camel/providers/pop3/camel-pop3-folder.c:307
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
 
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
+#, fuzzy
+msgid "Message storage"
+msgstr "Cos del missatge"
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+#, fuzzy
+msgid "Leave messages on server"
+msgstr "No suprimeixis els missatges del servidor"
+
+#: camel/providers/pop3/camel-pop3-provider.c:41
+#, fuzzy, c-format
+msgid "Delete after %s day(s)"
+msgstr "Suprimeix la tasca"
+
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-provider.c:50
 msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
@@ -4061,22 +4405,7 @@ msgstr ""
 "recuperar correu des de determinats proveïdors de correu web i sistemes "
 "propietaris de correu."
 
-#: camel/providers/pop3/camel-pop3-provider.c:54
-msgid "Secure POP"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:56
-#, fuzzy
-msgid ""
-"For connecting to POP servers over an SSL connection. The POP protocol can "
-"also be used to retrieve mail from certain web mail providers and "
-"proprietary email systems."
-msgstr ""
-"Per connectar als servidors POP. El protocol POP també es pot utilitzar per "
-"recuperar correu des de determinats proveïdors de correu web i sistemes "
-"propietaris de correu."
-
-#: camel/providers/pop3/camel-pop3-store.c:147
+#: camel/providers/pop3/camel-pop3-provider.c:69
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4084,7 +4413,7 @@ msgstr ""
 "Aquesta opció us connectarà al sevidor POP mitjançant una contrasenya en "
 "text net. És l'única suportada per molts servidors POP."
 
-#: camel/providers/pop3/camel-pop3-store.c:157
+#: camel/providers/pop3/camel-pop3-provider.c:79
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4094,29 +4423,29 @@ msgstr ""
 "xifrada mitjançant el protocol APOP. Això no funcionarà per a tots els "
 "usuaris, fins i tot en servidors que diuen que ho suporten."
 
-#: camel/providers/pop3/camel-pop3-store.c:169
+#: camel/providers/pop3/camel-pop3-provider.c:91
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Això us connectarà al servidor POP i utilitzarà el Kerberos 4 per "
 "autenticar-vos-hi."
 
-#: camel/providers/pop3/camel-pop3-store.c:214
+#: camel/providers/pop3/camel-pop3-store.c:207
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "No se us ha pogut autenticar al servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:331
+#: camel/providers/pop3/camel-pop3-store.c:319
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "No s'ha pogut connectar al servidor POP en %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:378
+#: camel/providers/pop3/camel-pop3-store.c:358
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sSi us plau, introduïu la contrasenya POP3 per a %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:377
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4125,12 +4454,12 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar el nom d'usuari: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:400
-#: camel/providers/pop3/camel-pop3-store.c:437
+#: camel/providers/pop3/camel-pop3-store.c:380
+#: camel/providers/pop3/camel-pop3-store.c:417
 msgid "(Unknown)"
 msgstr "(Desconegut)"
 
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:407
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -4138,7 +4467,7 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticació sol·licitat."
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:415
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -4147,17 +4476,17 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar la contrasenya: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:483
 #, c-format
 msgid "No such folder `%s'."
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:57
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -4165,359 +4494,353 @@ msgstr ""
 "Per lliurar correu transferint-lo al programa \"sendmail\" en el sistema "
 "local."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#: camel/providers/sendmail/camel-sendmail-transport.c:107
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "No s'ha pogut crear el conducte al sendmail: %s: no s'ha enviat el correu"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#: camel/providers/sendmail/camel-sendmail-transport.c:124
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "No s'ha pogut bifurcar el sendmail: %s: no s'ha enviat el correu"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#: camel/providers/sendmail/camel-sendmail-transport.c:150
 #, c-format
 msgid "Could not send message: %s"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#: camel/providers/sendmail/camel-sendmail-transport.c:163
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "El sendmail ha acabat amb el senyal %s: no s'ha enviat el correu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#: camel/providers/sendmail/camel-sendmail-transport.c:170
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#: camel/providers/sendmail/camel-sendmail-transport.c:175
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "El sendmail ha acabat amb l'estat %d: no s'ha enviat el correu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
 #, fuzzy
 msgid "Could not find 'From' address in message"
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:245
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:249
 msgid "Mail delivery via the sendmail program"
 msgstr "Lliurament de correu mitjançant el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
 msgid "SMTP"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:36
+#: camel/providers/smtp/camel-smtp-provider.c:40
 #, fuzzy
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Per al lliurament de correu mitjançant la connexió a un concentrador de "
 "correu utilitzant SMTP."
 
-#: camel/providers/smtp/camel-smtp-provider.c:53
-msgid "Secure SMTP"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-provider.c:55
-#, fuzzy
-msgid ""
-"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
-"connection.\n"
-msgstr ""
-"Per al lliurament de correu mitjançant la connexió a un concentrador de "
-"correu utilitzant SMTP."
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:175
 #, fuzzy
 msgid "Help message"
 msgstr "Mou el missatge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:177
 #, fuzzy
 msgid "Service ready"
 msgstr "Amaga"
 
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:207
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "No s'ha indicat cap contrasenya."
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:211
 #, fuzzy
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticació sol·licitat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:213
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "Autenticació:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:215
 #, fuzzy
 msgid "Authentication required"
 msgstr "Autenticació:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:286
+#: camel/providers/smtp/camel-smtp-transport.c:305
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:348
+#, fuzzy, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
+msgstr ""
+"No es pot connectar al servidor POP.\n"
+"No hi ha suport per al mecanisme d'autenticació sol·licitat."
+
+#: camel/providers/smtp/camel-smtp-transport.c:388
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sSi us plau, introduïu la contrasenya IMAP per a %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:466
-#, fuzzy
-msgid "No authentication required"
-msgstr "Autenticació:"
-
-#: camel/providers/smtp/camel-smtp-transport.c:468
-#, fuzzy
+#: camel/providers/smtp/camel-smtp-transport.c:411
+#, fuzzy, c-format
 msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
 msgstr ""
-"Aquesta opció us connectarà al sevidor POP mitjançant una contrasenya en "
-"text net. És l'única suportada per molts servidors POP."
+"No es pot autenticar davant del servidor IMAP.\n"
+"%s\n"
+"\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:511
+#: camel/providers/smtp/camel-smtp-transport.c:527
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Servidor %s %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:529
 #, fuzzy, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Lliurament de correu mitjançant el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:554
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:561
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:559
+#: camel/providers/smtp/camel-smtp-transport.c:575
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:669
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
-#: camel/providers/smtp/camel-smtp-transport.c:719
+#: camel/providers/smtp/camel-smtp-transport.c:721
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:736
+#: camel/providers/smtp/camel-smtp-transport.c:748
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:777
+#: camel/providers/smtp/camel-smtp-transport.c:798
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:824
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:821
+#: camel/providers/smtp/camel-smtp-transport.c:843
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:846
+#: camel/providers/smtp/camel-smtp-transport.c:868
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "No s'ha pogut crear el conducte al sendmail: %s: no s'ha enviat el correu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:865
+#: camel/providers/smtp/camel-smtp-transport.c:887
 #, fuzzy, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:896
+#: camel/providers/smtp/camel-smtp-transport.c:918
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:915
+#: camel/providers/smtp/camel-smtp-transport.c:937
 #, fuzzy, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "No s'ha pogut bifurcar el sendmail: %s: no s'ha enviat el correu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:930
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:952
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "El sendmail ha acabat amb el senyal %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:967
+#: camel/providers/smtp/camel-smtp-transport.c:989
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:1013
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1010
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1033
+#: camel/providers/smtp/camel-smtp-transport.c:1055
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1052
+#: camel/providers/smtp/camel-smtp-transport.c:1074
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:95
 msgid "1 byte"
 msgstr "1 octet"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:97
 #, c-format
 msgid "%u bytes"
 msgstr "%u octets"
 
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:112
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
 msgid "attachment"
 msgstr "adjunció"
 
-#: composer/e-msg-composer-attachment-bar.c:413
+#: composer/e-msg-composer-attachment-bar.c:421
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Adjunta un fitxer"
 
-#: composer/e-msg-composer-attachment-bar.c:461
+#: composer/e-msg-composer-attachment-bar.c:469
 msgid "Remove selected items from the attachment list"
 msgstr "Elimina els elements seleccionats de la llista d'adjuncions"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Add attachment..."
 msgstr "Afegeix una adjunció..."
 
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:501
 msgid "Attach a file to the message"
 msgstr "Adjunta un fitxer al missatge"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
-#: ui/evolution-mail.xml.h:1
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
 #, fuzzy
 msgid "Attachment"
 msgstr "adjunció"
@@ -4544,21 +4867,21 @@ msgstr "Tipus de MIME:"
 msgid "Send as:"
 msgstr "Envia \"%s\""
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:321
 msgid "Click here for the address book"
 msgstr "Feu clic aquí per a la llibreta d'adreces"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
 msgid "From:"
 msgstr "De:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Respon"
@@ -4566,31 +4889,31 @@ msgstr "Respon"
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
 msgid "To:"
 msgstr "Per a:"
 
-#: composer/e-msg-composer-hdrs.c:377
+#: composer/e-msg-composer-hdrs.c:384
 msgid "Enter the recipients of the message"
 msgstr "Introduïu els destinataris del missatge"
 
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:381
+#: composer/e-msg-composer-hdrs.c:388
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Întroduïu les adreces que rebran una còpia del missatge"
 
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:392
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4598,7 +4921,7 @@ msgstr ""
 "introduïu les adreces que rebran una còpia del missatge sense aparèixer a la "
 "llista de destinataris del missatge."
 
-#: composer/e-msg-composer.c:518
+#: composer/e-msg-composer.c:528
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4607,26 +4930,32 @@ msgstr ""
 "No s'ha pogut obrir el fitxer de signatura %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:706
+#: composer/e-msg-composer.c:716
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: composer/e-msg-composer.c:717
+#: composer/e-msg-composer.c:727
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:737
+#: composer/e-msg-composer.c:747
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
+#: composer/e-msg-composer.c:819
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+
+#: composer/e-msg-composer.c:877 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:206
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:824
+#: composer/e-msg-composer.c:883
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4636,27 +4965,27 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: composer/e-msg-composer.c:849
+#: composer/e-msg-composer.c:908
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: composer/e-msg-composer.c:975
+#: composer/e-msg-composer.c:1034
 msgid "That file does not exist."
 msgstr "Aquest fitxer no existeix."
 
-#: composer/e-msg-composer.c:985
+#: composer/e-msg-composer.c:1044
 msgid "That is not a regular file."
 msgstr "Aquest fitxer no és habitual."
 
-#: composer/e-msg-composer.c:995
+#: composer/e-msg-composer.c:1054
 msgid "That file exists but is not readable."
 msgstr "Aquest fitxer existeix però no es pot llegir."
 
-#: composer/e-msg-composer.c:1005
+#: composer/e-msg-composer.c:1064
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Aquest fitxer sembla accessible però n'ha fallat l'obertura(2)."
 
-#: composer/e-msg-composer.c:1027
+#: composer/e-msg-composer.c:1086
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4664,25 +4993,25 @@ msgstr ""
 "El fitxer és molt gran (més de 100 kB).\n"
 "Segur que voleu inserir-lo?"
 
-#: composer/e-msg-composer.c:1048
+#: composer/e-msg-composer.c:1107
 msgid "An error occurred while reading the file."
 msgstr "S'ha produït un error en llegir el fitxer."
 
-#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
+#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
 msgid "Compose a message"
 msgstr "Redacta un missatge"
 
-#: composer/e-msg-composer.c:1765
+#: composer/e-msg-composer.c:1829
 msgid "Could not create composer window."
 msgstr "No s'ha pogut crear la finestra del redactor."
 
-#: composer/evolution-composer.c:352
+#: composer/evolution-composer.c:355
 msgid ""
 "Could not create composer window, because you have not yet\n"
 "configured any identities in the mail component."
 msgstr ""
 
-#: composer/evolution-composer.c:367
+#: composer/evolution-composer.c:370
 #, fuzzy
 msgid "Cannot initialize Evolution's composer."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
@@ -4703,55 +5032,81 @@ msgid "calendar information"
 msgstr "Cap informació"
 
 #. strptime format for a date.
-#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
+#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
 #. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:267
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
+#: e-util/e-time-utils.c:269
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:272
+#: e-util/e-time-utils.c:274
 #, fuzzy
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:283
 #, fuzzy
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
+#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. strftime format of a time in 24-hour format.
+#: e-util/e-time-utils.c:315
+#, fuzzy
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S%n"
+
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
+#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
+#. strftime format of a time in 12-hour format.
+#: e-util/e-time-utils.c:323
+#, fuzzy
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p%n"
+
 #: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
 #, fuzzy
 msgid "Evolution component for the executive summary."
@@ -4833,7 +5188,7 @@ msgstr "Vés a l'element següent"
 msgid "Configure %s"
 msgstr "_Configura la carpeta"
 
-#: executive-summary/component/e-summary.c:918
+#: executive-summary/component/e-summary.c:924
 #, fuzzy, c-format
 msgid ""
 "Cannot open the HTML file:\n"
@@ -4842,14 +5197,14 @@ msgstr ""
 "No s'ha pogut obrir el fitxer %s:\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:932
+#: executive-summary/component/e-summary.c:938
 #, fuzzy, c-format
 msgid ""
 "Error reading data:\n"
 "%s"
 msgstr "Error en llegir el fitxer de correu: %s"
 
-#: executive-summary/component/e-summary.c:950
+#: executive-summary/component/e-summary.c:956
 msgid "File does not have a place for the services.\n"
 msgstr ""
 
@@ -4861,7 +5216,7 @@ msgstr ""
 msgid "Background:"
 msgstr ""
 
-#: executive-summary/component/main.c:60
+#: executive-summary/component/main.c:62
 msgid ""
 "Executive summary component could not initialize Bonobo.\n"
 "If there was a warning message about the RootPOA, it probably means\n"
@@ -4895,89 +5250,89 @@ msgstr ""
 msgid "Test service"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
+#: widgets/misc/e-messagebox.c:166
 #, fuzzy
 msgid "Error"
 msgstr "Cap error"
 
-#: executive-summary/test-service/rdf-summary.c:765
+#: executive-summary/test-service/rdf-summary.c:768
 msgid "Update automatically"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:775
+#: executive-summary/test-service/rdf-summary.c:778
 msgid "Update now"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:785
+#: executive-summary/test-service/rdf-summary.c:788
 #, fuzzy
 msgid "Update every "
 msgstr "_Actualitza lliure/ocupat"
 
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
+#: executive-summary/test-service/rdf-summary.c:796
+#: filter/filter-datespec.c:83
 msgid "minutes"
 msgstr "minuts"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "year"
 msgstr "any"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
 msgid "years"
 msgstr "anys"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "month"
 msgstr "mes"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
 msgid "months"
 msgstr "mesos"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "week"
 msgstr "setmana"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
 msgid "weeks"
 msgstr "setmanes"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:81
 msgid "days"
 msgstr "dies"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hour"
 msgstr "hora"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
 msgid "hours"
 msgstr "hores"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:83
 msgid "minute"
 msgstr "minut"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "second"
 msgstr "segon"
 
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
 msgid "seconds"
 msgstr "segons"
 
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:199
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:201
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:275
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -4987,7 +5342,7 @@ msgstr ""
 "sigui quina sigui, en què s'executi el filtre\n"
 "o s'obri la vfolder."
 
-#: filter/filter-datespec.c:282
+#: filter/filter-datespec.c:298
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -4995,7 +5350,7 @@ msgstr ""
 "La data del missatge es compararà amb l'hora\n"
 "que indiqueu aquí."
 
-#: filter/filter-datespec.c:322
+#: filter/filter-datespec.c:338
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5006,67 +5361,64 @@ msgstr ""
 "\"fa una setmana\", per exemple."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "the current time"
 msgstr "l'hora actual"
 
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
 msgid "a time you specify"
 msgstr "una hora que indiqueu"
 
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:374
 msgid "a time relative to the current time"
 msgstr "una hora relativa a l'actual"
 
 #. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:432
 msgid "Compare against"
 msgstr "Compara-la amb"
 
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
 msgid "now"
 msgstr "ara"
 
-#: filter/filter-datespec.c:690
+#: filter/filter-datespec.c:706
 msgid "<click here to select a date>"
 msgstr "<feu clic aquí per seleccionar una data>"
 
-#: filter/filter-editor.c:126 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "Regles del filtre"
 
 #. and now for the action area
-#: filter/filter-filter.c:424
+#: filter/filter-filter.c:453
 msgid "Then"
 msgstr "Aleshores"
 
-#: filter/filter-filter.c:437
+#: filter/filter-filter.c:467
 msgid "Add action"
 msgstr "Afegeix una acció"
 
-#: filter/filter-filter.c:443
-msgid "Remove action"
-msgstr "Elimina una acció"
-
-#: filter/filter-folder.c:143
+#: filter/filter-folder.c:147
 msgid ""
 "Oops, you forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
+#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
+#: mail/mail-account-gui.c:682
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:247
 msgid "Enter folder URI"
 msgstr "Introduïu l'URI de la carpeta"
 
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:293
 msgid "<click here to select a folder>"
 msgstr "<feu clic aquí per seleccionar una carpeta>"
 
-#: filter/filter-input.c:189
+#: filter/filter-input.c:194
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -5075,58 +5427,38 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: filter/filter-part.c:467
+#: filter/filter-part.c:475
 msgid "Test"
 msgstr "Comprova"
 
-#: filter/filter-rule.c:597
+#: filter/filter-rule.c:626
 msgid "Rule name: "
 msgstr "Nom de la regla: "
 
-#: filter/filter-rule.c:601
+#: filter/filter-rule.c:630
 msgid "Untitled"
 msgstr "Sense títol"
 
-#: filter/filter-rule.c:617
+#: filter/filter-rule.c:646
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:634
+#: filter/filter-rule.c:664
 msgid "Execute actions"
 msgstr "Executa les accions"
 
-#: filter/filter-rule.c:638
+#: filter/filter-rule.c:668
 msgid "if all criteria are met"
 msgstr "si es compleixen tots els criteris"
 
-#: filter/filter-rule.c:643
+#: filter/filter-rule.c:673
 msgid "if any criteria are met"
 msgstr "si es compleix qualsevol criteri"
 
-#: filter/filter-rule.c:654
+#: filter/filter-rule.c:684
 msgid "Add criterion"
 msgstr "Afegeix un criteri"
 
-#: filter/filter-rule.c:660
-msgid "Remove criterion"
-msgstr "Elimina un criteri"
-
-#: filter/filter-system-flag.c:67
-#, fuzzy
-msgid "Replied to"
-msgstr "Respon a tots"
-
-#. { N_("Deleted"), "Deleted" },
-#. { N_("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr ""
-
-#: filter/filter-system-flag.c:71
-#, fuzzy
-msgid "Read"
-msgstr "Ràdio"
-
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Filtres d'edició"
@@ -5147,7 +5479,7 @@ msgstr ""
 msgid "Outgoing"
 msgstr "Contorn:"
 
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Carpetes virtuals"
 
@@ -5173,293 +5505,332 @@ msgstr ""
 msgid "with all local folders"
 msgstr "Crea una carpeta nova"
 
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Assigna un color"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Assigna una puntuació"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 #, fuzzy
 msgid "Attachments"
 msgstr "adjunció"
 
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "conté"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Copy to Folder"
 msgstr "Copia a la carpeta"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date received"
 msgstr "Data de recepció"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
 msgid "Date sent"
 msgstr "Data d'enviament"
 
-#: filter/libfilter-i18n.h:12
-msgid "does not contain"
-msgstr "no conté"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not end with"
-msgstr "no acaba amb "
-
-#: filter/libfilter-i18n.h:14
-msgid "does not exist"
-msgstr "no existeix"
-
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:9
 #, fuzzy
-msgid "does not sound like"
-msgstr "no acaba amb "
-
-#: filter/libfilter-i18n.h:16
-msgid "does not start with"
-msgstr "no comença per"
+msgid "Deleted"
+msgstr "Suprimeix"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:10
 #, fuzzy
 msgid "Do Not Exist"
 msgstr "no existeix"
 
-#: filter/libfilter-i18n.h:18
-msgid "ends with"
-msgstr "acaba amb"
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Draft"
+msgstr "Data de venciment"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Exist"
 msgstr "S_urt"
 
-#: filter/libfilter-i18n.h:20
-msgid "exists"
-msgstr "existeix"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:13
 msgid "Expression"
 msgstr "Expressió"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
 msgid "Forward to Address"
 msgstr "Reenvia-ho a l'adreça"
 
-#: filter/libfilter-i18n.h:23
-msgid "is"
-msgstr "és"
-
-#: filter/libfilter-i18n.h:24
-msgid "is greater than"
-msgstr "és més gran que"
-
-#: filter/libfilter-i18n.h:25
-msgid "is less than"
-msgstr "és més petit que"
+#: filter/libfilter-i18n.h:15
+msgid "Important"
+msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "is not"
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "Is Not"
 msgstr "no és"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "Is"
+msgstr "Si"
+
+#: filter/libfilter-i18n.h:18
 #, fuzzy
 msgid "Mailing list"
 msgstr "Llista de correu %s"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:19
 msgid "Message Body"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:20
 #, fuzzy
 msgid "Message Header"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:21
 msgid "Message was received"
 msgstr "S'ha rebut el missatge"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:22
 msgid "Message was sent"
 msgstr "S'ha enviat el missatge"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:23
 msgid "Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: filter/libfilter-i18n.h:33
-msgid "on or after"
-msgstr "el o després del"
-
-#: filter/libfilter-i18n.h:34
-msgid "on or before"
-msgstr "el o abans del"
+#: filter/libfilter-i18n.h:24
+#, fuzzy
+msgid "Read"
+msgstr "Ràdio"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:25
 msgid "Recipients"
 msgstr "Destinataris"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:26
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1171
+#: filter/libfilter-i18n.h:27
+#, fuzzy
+msgid "Replied to"
+msgstr "Respon a tots"
+
+#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
+#: mail/message-list.c:1052
 msgid "Score"
 msgstr "Puntuació"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:29
+msgid "Sender"
+msgstr "Remitent"
+
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "Set Status"
 msgstr "Estat de la connexió"
 
-#: filter/libfilter-i18n.h:40
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
-msgid "Source"
-msgstr "Font"
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "Source Account"
+msgstr "conté"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:32
 msgid "Specific header"
 msgstr "Especifiqueu la capçalera"
 
-#: filter/libfilter-i18n.h:43
-msgid "starts with"
-msgstr "comença per"
-
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:34
 msgid "Stop Processing"
 msgstr "Atura el processament"
 
-#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
+#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
 msgid "Subject"
 msgstr "Assumpte"
 
+#: filter/libfilter-i18n.h:38
+msgid "contains"
+msgstr "conté"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not contain"
+msgstr "no conté"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not end with"
+msgstr "no acaba amb "
+
+#: filter/libfilter-i18n.h:41
+msgid "does not exist"
+msgstr "no existeix"
+
+#: filter/libfilter-i18n.h:42
+#, fuzzy
+msgid "does not sound like"
+msgstr "no acaba amb "
+
+#: filter/libfilter-i18n.h:43
+msgid "does not start with"
+msgstr "no comença per"
+
+#: filter/libfilter-i18n.h:44
+msgid "ends with"
+msgstr "acaba amb"
+
+#: filter/libfilter-i18n.h:45
+msgid "exists"
+msgstr "existeix"
+
+#: filter/libfilter-i18n.h:46
+msgid "is greater than"
+msgstr "és més gran que"
+
 #: filter/libfilter-i18n.h:47
+msgid "is less than"
+msgstr "és més petit que"
+
+#: filter/libfilter-i18n.h:48
+msgid "is not"
+msgstr "no és"
+
+#: filter/libfilter-i18n.h:49
+msgid "is"
+msgstr "és"
+
+#: filter/libfilter-i18n.h:50
+msgid "on or after"
+msgstr "el o després del"
+
+#: filter/libfilter-i18n.h:51
+msgid "on or before"
+msgstr "el o abans del"
+
+#: filter/libfilter-i18n.h:52
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:53
+msgid "starts with"
+msgstr "comença per"
+
+#: filter/libfilter-i18n.h:54
 msgid "was after"
 msgstr "ha estat després de"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:55
 msgid "was before"
 msgstr "ha estat abans de"
 
-#: filter/score-editor.c:126
+#: filter/score-editor.c:130
 #, fuzzy
 msgid "Score Rules"
 msgstr "Edita la regla de puntuació"
 
-#: mail/component-factory.c:306
+#: mail/component-factory.c:329
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:379
+#: mail/component-factory.c:402
 msgid "Cannot register storage with shell"
 msgstr "No es pot registrar l'emmagatzemament amb l'intèrpret d'ordres"
 
-#: mail/folder-browser-factory.c:237
+#: mail/folder-browser-factory.c:209
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propietats..."
 
-#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:211 ui/evolution-event-editor.xml.h:39
 #: ui/evolution-task-editor-dialog.xml.h:42
 #, fuzzy
 msgid "Properties"
 msgstr "Propietats..."
 
-#: mail/folder-browser.c:219
+#: mail/folder-browser.c:225
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "Seleccioneu una carpeta"
 
-#: mail/folder-browser.c:509
+#: mail/folder-browser.c:533
 msgid "VFolder on Subject"
 msgstr "VFolder sobre l'assumpte"
 
-#: mail/folder-browser.c:512
+#: mail/folder-browser.c:536
 msgid "VFolder on Sender"
 msgstr "VFolder sobre el remitent"
 
-#: mail/folder-browser.c:515
+#: mail/folder-browser.c:539
 msgid "VFolder on Recipients"
 msgstr "VFolder sobre els destinataris"
 
-#: mail/folder-browser.c:518 mail/folder-browser.c:702
+#: mail/folder-browser.c:542 mail/folder-browser.c:733
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:524
+#: mail/folder-browser.c:548
 msgid "Filter on Subject"
 msgstr "Filtre sobre l'assumpte"
 
-#: mail/folder-browser.c:527
+#: mail/folder-browser.c:551
 msgid "Filter on Sender"
 msgstr "Filtre sobre el remitent"
 
-#: mail/folder-browser.c:530
+#: mail/folder-browser.c:554
 msgid "Filter on Recipients"
 msgstr "Filtre sobre els destinataris"
 
-#: mail/folder-browser.c:533 mail/folder-browser.c:701
+#: mail/folder-browser.c:557 mail/folder-browser.c:732
 msgid "Filter on Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:544
+#: mail/folder-browser.c:568
+#, fuzzy
+msgid "Resend"
+msgstr "segon"
+
+#: mail/folder-browser.c:570
 #, fuzzy
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
-#: mail/folder-browser.c:546 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Imprimeix"
-
-#: mail/folder-browser.c:551
+#: mail/folder-browser.c:577
 msgid "Reply to Sender"
 msgstr "Respon al remitent"
 
-#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
+#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:60
 msgid "Reply to All"
 msgstr "Respon a tots"
 
-#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
+#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:24
 msgid "Forward"
 msgstr "Reenvia"
 
-#: mail/folder-browser.c:557
+#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:26
 #, fuzzy
 msgid "Forward inline"
 msgstr "Vés endavant en el temps"
 
-#: mail/folder-browser.c:560
+#: mail/folder-browser.c:586
 #, fuzzy
 msgid "Mark as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: mail/folder-browser.c:562
+#: mail/folder-browser.c:588
 #, fuzzy
 msgid "Mark as Unread"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:567
+#: mail/folder-browser.c:593
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Mou a la carpeta"
 
-#: mail/folder-browser.c:569
+#: mail/folder-browser.c:595
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Copia a la carpeta"
 
-#: mail/folder-browser.c:573
+#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:81
 #, fuzzy
 msgid "Undelete"
 msgstr "Suprimeix"
@@ -5468,21 +5839,21 @@ msgstr "Suprimeix"
 #. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
 #. { "",                               NULL,
 #. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:583
+#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_Aplica els filtres"
 
-#: mail/folder-browser.c:587
+#: mail/folder-browser.c:613
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:735
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/folder-browser.c:705
+#: mail/folder-browser.c:736
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
@@ -5565,19 +5936,28 @@ msgstr ""
 msgid "mh"
 msgstr "h"
 
-#: mail/mail-accounts.c:116
+#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
 #, fuzzy
 msgid " (default)"
 msgstr "Valors predeterminats"
 
-#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#: mail/mail-accounts.c:197
+#, fuzzy
+msgid "Disable"
+msgstr "Inhabilitat"
+
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+msgid "Enable"
+msgstr ""
+
+#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr ""
@@ -5585,52 +5965,45 @@ msgstr ""
 "suprimir aquest contacte?"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:423
+#: mail/mail-accounts.c:536
 msgid "Evolution Account Manager"
 msgstr ""
 
-#: mail/mail-account-editor.c:307
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
+#: mail/mail-account-editor.c:105
+msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:706
+#: mail/mail-account-editor.c:173
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: mail/mail-account-editor.c:727
-#, fuzzy
-msgid "Unspecified"
-msgstr "Especifiqueu la capçalera"
-
-#: mail/mail-autofilter.c:71
+#: mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Correu per a %s"
 
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
 #, fuzzy, c-format
 msgid "Subject is %s"
 msgstr "Assumpte"
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
 #, c-format
 msgid "Mail from %s"
 msgstr "Correu de %s"
 
-#: mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:285
 #, c-format
 msgid "%s mailing list"
 msgstr "Llista de correu %s"
 
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
 msgid "Add Filter Rule"
 msgstr "Afegeix una regla de filtre"
 
-#: mail/mail-callbacks.c:85
+#: mail/mail-callbacks.c:93
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -5642,7 +6015,7 @@ msgstr ""
 "rebre o redactar correu.\n"
 "El voleu configurar ara?"
 
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -5650,7 +6023,7 @@ msgstr ""
 "Cal que configureu una identitat\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:150
+#: mail/mail-callbacks.c:158
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -5658,11 +6031,11 @@ msgstr ""
 "Cal que configureu un transport de correu\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:202
 msgid "You have not set a mail transport method"
 msgstr "No heu definit cap mètode de transport de correu"
 
-#: mail/mail-callbacks.c:227
+#: mail/mail-callbacks.c:235
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -5670,36 +6043,36 @@ msgstr ""
 "Aquest missatge no té cap assumpte.\n"
 "Voleu que l'enviï igualment?"
 
-#: mail/mail-callbacks.c:294
+#: mail/mail-callbacks.c:308
+msgid "You must specify recipients in order to send this message."
+msgstr "Cal que indiqueu els destinataris per poder enviar aquest missatge."
+
+#: mail/mail-callbacks.c:351
 #, fuzzy
 msgid "You must configure an account before you can send this email."
 msgstr ""
 "Cal que configureu una identitat\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:316
-msgid "You must specify recipients in order to send this message."
-msgstr "Cal que indiqueu els destinataris per poder enviar aquest missatge."
-
-#: mail/mail-callbacks.c:579
+#: mail/mail-callbacks.c:591
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:761
+#: mail/mail-callbacks.c:773
 #, fuzzy
 msgid "Forwarded message:\n"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-callbacks.c:864
+#: mail/mail-callbacks.c:876
 msgid "Move message(s) to"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-callbacks.c:866
+#: mail/mail-callbacks.c:878
 msgid "Copy message(s) to"
 msgstr "Copia el(s) missatge(s) a"
 
-#: mail/mail-callbacks.c:1007
+#: mail/mail-callbacks.c:1019
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -5707,11 +6080,20 @@ msgstr ""
 "Només podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1056
+#, fuzzy
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+"Només podeu editar els missatges que s'hagin desat\n"
+"a la carpeta Esborranys."
+
+#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
 msgid "Overwrite file?"
 msgstr "Voleu sobreescriure el fitxer?"
 
-#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -5719,17 +6101,17 @@ msgstr ""
 "Ja existeix una fitxer amb aquest nom.\n"
 "El voleu sobreescriure?"
 
-#: mail/mail-callbacks.c:1088
+#: mail/mail-callbacks.c:1137
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:1090
+#: mail/mail-callbacks.c:1139
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:1204
+#: mail/mail-callbacks.c:1253
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -5738,51 +6120,62 @@ msgstr ""
 "Error en carregar la informació del filtre:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:51
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1349
 msgid "Printing of message failed"
 msgstr "Ha fallat la impressió del missatge"
 
+#: mail/mail-config.c:1043 mail/mail-config.c:1046
+#, fuzzy
+msgid "Connecting to server..."
+msgstr "Connexió de prova a \"%s\""
+
 #: mail/mail-config.glade.h:1
 #, fuzzy
+msgid " Check for supported types "
+msgstr "Detecta els tipus suportats..."
+
+#: mail/mail-config.glade.h:2
+#, fuzzy
+msgid " color"
+msgstr "Colors"
+
+#: mail/mail-config.glade.h:3
+#, fuzzy
 msgid "Account"
 msgstr "conté"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "Account Information"
 msgstr "Cap informació"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
-msgid "Advanced"
-msgstr "Afegeix..."
+msgid "Accounts"
+msgstr "conté"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "Authentication"
 msgstr "Autenticació:"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 #, fuzzy
-msgid "Authentication Type:"
+msgid "Authentication Type: "
 msgstr "Autenticació:"
 
-#: mail/mail-config.glade.h:9
-msgid "Automatically check mail every"
-msgstr ""
-
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 #, fuzzy
-msgid "Check settings"
-msgstr "Paràmetres de prova"
+msgid "Automatically check for new mail every"
+msgstr "Comprova si hi ha nou correu"
 
 #: mail/mail-config.glade.h:12
 #, fuzzy
@@ -5797,404 +6190,391 @@ msgstr ""
 "Ja teniu enllestida la configuració del correu.\n"
 "Feu clic a \"Finalitza\" per desar els nous paràmetres"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "De_fault"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 #, fuzzy
 msgid "Done"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:21
 #, fuzzy
-msgid "Email Address:"
-msgstr "Adreça electrònica:"
+msgid "Drafts"
+msgstr "Data de venciment"
 
-#: mail/mail-config.glade.h:24
-msgid "Email address:"
-msgstr "Adreça electrònica:"
+#: mail/mail-config.glade.h:22
+#, fuzzy
+msgid "Drafts folder:"
+msgstr "Creació d'una nova carpeta"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
-msgid "Evolution Mail Configuration"
-msgstr "Configuració del correu"
+msgid "Email Address:"
+msgstr "Adreça electrònica:"
 
 #: mail/mail-config.glade.h:26
 #, fuzzy
 msgid "Full Name:"
 msgstr "Nom complet:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 #, fuzzy
-msgid "Hostname:"
-msgstr "Nom d'usuari:"
+msgid "Highlight citations with "
+msgstr "Ressalta els elemts que vencen avui"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 #, fuzzy
-msgid "IMAP"
+msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "Identity"
 msgstr "Identitat"
 
-#: mail/mail-config.glade.h:32
-msgid "Include this account when receiving mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:33
-#, fuzzy
-msgid "Keep mail on server"
-msgstr "No suprimeixis els missatges del servidor"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 #, fuzzy
-msgid "Kerberos"
+msgid "Kerberos "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:35
-#, fuzzy
-msgid "Mail"
-msgstr "_Correu"
-
-#: mail/mail-config.glade.h:36
-#, fuzzy
-msgid "Mail Account"
-msgstr "conté"
-
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:32
 msgid "Mail Configuration"
 msgstr "Configuració del correu"
 
-#: mail/mail-config.glade.h:38
-#, fuzzy
-msgid "Mail Configuration Druid"
-msgstr "Configuració del correu"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:34
 #, fuzzy
 msgid "Mark messages as \"Read\" after:"
 msgstr "Marca el missatge com a vist [ms]: "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "News"
 msgstr "Nou"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:38
 #, fuzzy
-msgid "Optional"
-msgstr "Opcions"
+msgid "Optional Information"
+msgstr "Cap informació"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:39
 msgid "Organization:"
 msgstr "Organització:"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:41
 msgid "PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:46
 #, fuzzy
-msgid "Password:"
-msgstr "Contrasenya"
-
-#: mail/mail-config.glade.h:50
-msgid "Plain Text"
-msgstr ""
+msgid "Qmail maildir "
+msgstr "Adreça electrònica 2"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:47
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:48
 #, fuzzy
-msgid "Remember my password"
-msgstr "Desa com a VCard"
+msgid "Receiving Mail"
+msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:49
 #, fuzzy
-msgid "Reply address:"
-msgstr "Adreça electrònica:"
+msgid "Receiving Options"
+msgstr "Data de recepció"
+
+#: mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Required Information"
+msgstr "Cap informació"
+
+#: mail/mail-config.glade.h:53
+msgid "Select PGP binary"
+msgstr ""
 
 #: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "Required"
-msgstr "Persones _requerides"
+msgid "Send mail in HTML format by default."
+msgstr "Envia els missatges en format HTML"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Save password"
-msgstr "Desa com a VCard"
+msgid "Sending Email"
+msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:57
-msgid "Select PGP binary"
-msgstr ""
+#: mail/mail-config.glade.h:56
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Sendmail"
 
 #: mail/mail-config.glade.h:58
 #, fuzzy
-msgid "Select signature file"
-msgstr "Fitxer de signatura:"
+msgid "Sent"
+msgstr "Vist"
 
 #: mail/mail-config.glade.h:59
 #, fuzzy
-msgid "Send mail in HTML format by default."
-msgstr "Envia els missatges en format HTML"
+msgid "Sent and Draft Messages"
+msgstr "Agenda"
 
 #: mail/mail-config.glade.h:60
 #, fuzzy
-msgid "Sending Email"
-msgstr "Sendmail"
+msgid "Sent messages folder:"
+msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Configuració del correu"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Server Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:65
-#, fuzzy
-msgid "Server type:"
-msgstr "Servidor:"
-
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Signature file:"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:67
-#, fuzzy
-msgid "Signature:"
-msgstr "Fitxer de signatura:"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:65
 msgid "Sources"
 msgstr "Fonts"
 
-#: mail/mail-config.glade.h:70
-msgid "This server requires a secure connection (SSL)"
-msgstr ""
-
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:66
 #, fuzzy
-msgid "Transport"
-msgstr "Transparent"
+msgid "Special Folders"
+msgstr "Carpetes virtuals"
 
-#: mail/mail-config.glade.h:72
-#, fuzzy
-msgid "Transport Authentication"
-msgstr "Autenticació:"
+#: mail/mail-config.glade.h:67
+msgid "Standard Unix mbox"
+msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Type"
 msgstr "Tipus:"
 
-#: mail/mail-config.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
+#: mail/mail-config.glade.h:69
+msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
-#, fuzzy
-msgid "User Information"
-msgstr "Cap informació"
-
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:70
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:71
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
 #: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
 msgid "_Edit"
 msgstr "_Edita"
 
-#: mail/mail-config.glade.h:83
-#, fuzzy
-msgid "minutes."
-msgstr "minuts"
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
 
-#: mail/mail-config-druid.c:421
-#, c-format
+#: mail/mail-config-druid.c:101
 msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:515
-#, fuzzy
-msgid "Namespace:"
-msgstr "Nom:"
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
 
-#: mail/mail-config-druid.c:708
-#, c-format
+#: mail/mail-config-druid.c:107
 msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:1215
+#: mail/mail-config-druid.c:445
 msgid "Evolution Account Wizard"
 msgstr ""
 
-#: mail/mail-display.c:189
+#: mail/mail-display.c:194
 msgid "Save Attachment"
 msgstr "Desa l'adjunció"
 
-#: mail/mail-display.c:229
+#: mail/mail-display.c:234
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: mail/mail-display.c:290
+#: mail/mail-display.c:295
 msgid "Save to Disk..."
 msgstr "Desa al disc..."
 
-#: mail/mail-display.c:292
+#: mail/mail-display.c:297
 #, c-format
 msgid "Open in %s..."
 msgstr "Obre a %s..."
 
-#: mail/mail-display.c:294
+#: mail/mail-display.c:299
 msgid "View Inline"
 msgstr "Visualitza en línia"
 
-#: mail/mail-display.c:323
+#: mail/mail-display.c:334
 msgid "External Viewer"
 msgstr "Visualitzador extern"
 
-#: mail/mail-display.c:346
+#: mail/mail-display.c:357
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visualitza en línia (mitjançant %s)"
 
-#: mail/mail-display.c:350
+#: mail/mail-display.c:361
 msgid "Hide"
 msgstr "Amaga"
 
-#: mail/mail-format.c:506
+#: mail/mail-display.c:1102
+#, fuzzy
+msgid "Open link in browser"
+msgstr "Obre'l en una nova finestra"
+
+#: mail/mail-display.c:1104
+#, fuzzy
+msgid "Save as (FIXME)"
+msgstr "_Tasca (FIXME)"
+
+#: mail/mail-display.c:1106
+#, fuzzy
+msgid "Copy location (FIXME)"
+msgstr "_Contacte (FIXME)"
+
+#: mail/mail-format.c:518
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "adjunció"
 
-#: mail/mail-format.c:704
+#: mail/mail-format.c:560
+#, fuzzy
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
+
+#: mail/mail-format.c:742
 #, fuzzy
 msgid "Loading message content"
 msgstr "S'estan reenviant els missatges \"%s\""
 
-#: mail/mail-format.c:993
+#: mail/mail-format.c:1046
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Esborra la visualització del missatge"
 
-#: mail/mail-format.c:999
+#: mail/mail-format.c:1052
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Edita el missatge"
 
-#: mail/mail-format.c:1000
+#: mail/mail-format.c:1053
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1069 mail/mail-format.c:1456
+#: mail/mail-format.c:1137 mail/mail-format.c:1526
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1077 mail/mail-format.c:1464
+#: mail/mail-format.c:1145 mail/mail-format.c:1534
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1677
+#: mail/mail-format.c:1747
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1689
+#: mail/mail-format.c:1759
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1693
+#: mail/mail-format.c:1763
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:1727
+#: mail/mail-format.c:1797
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1732
+#: mail/mail-format.c:1802
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:335
+#: mail/mail-local.c:337
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "La carpeta `%s' no existeix."
 
-#: mail/mail-local.c:508
+#: mail/mail-local.c:509
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "Obre a %s..."
 
-#: mail/mail-local.c:786
+#: mail/mail-local.c:787
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "S'està convertint la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:790
+#: mail/mail-local.c:791
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Canvia la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:814
+#: mail/mail-local.c:815
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Configura la carpeta"
 
 #. first, 'close' the old folder
-#: mail/mail-local.c:843
+#: mail/mail-local.c:844
 msgid "Closing current folder"
 msgstr "S'està tancant la carpeta actual"
 
-#: mail/mail-local.c:875
+#: mail/mail-local.c:876
 msgid "Renaming old folder and opening"
 msgstr "S'està canviant el nom de la carpeta antiga i obrint-la"
 
-#: mail/mail-local.c:893
+#: mail/mail-local.c:894
 msgid "Creating new folder"
 msgstr "Creació d'una nova carpeta"
 
-#: mail/mail-local.c:907
+#: mail/mail-local.c:908
 msgid "Copying messages"
 msgstr "Còpia de missatges"
 
-#: mail/mail-local.c:928
+#: mail/mail-local.c:925
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -6203,7 +6583,7 @@ msgstr ""
 "No es pot desar la informació meta de la carpeta; probablement\n"
 "no la podreu tornar a obrir: %s"
 
-#: mail/mail-local.c:967
+#: mail/mail-local.c:964
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -6211,7 +6591,7 @@ msgstr ""
 "Si ja no podeu obrir aquesta bústia de correu\n"
 "potser us caldrà reparar-la manualment."
 
-#: mail/mail-mt.c:177
+#: mail/mail-mt.c:190
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6220,7 +6600,7 @@ msgstr ""
 "Error en `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:179
+#: mail/mail-mt.c:192
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -6229,408 +6609,388 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
+#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
 #, fuzzy
 msgid "Working"
 msgstr "S'està movent"
 
-#: mail/mail-mt.c:666 mail/session.c:91
+#: mail/mail-mt.c:679 mail/session.c:98
 msgid "Do you accept?"
 msgstr ""
 
-#: mail/mail-mt.c:860
+#: mail/mail-mt.c:873
 #, fuzzy
 msgid "Evolution progress"
 msgstr "Evolution"
 
-#: mail/mail-ops.c:516
+#: mail/mail-ops.c:587
 #, c-format
 msgid "Sending \"%s\""
 msgstr "S'està enviant \"%s\""
 
-#: mail/mail-ops.c:518
+#: mail/mail-ops.c:589
 #, fuzzy
 msgid "Sending message"
 msgstr "Envia aquest missatge"
 
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:704
+#, fuzzy, c-format
+msgid "Sending message %d of %d"
+msgstr "S'està escrivint el missatge %d de %d"
+
+#: mail/mail-ops.c:723
+#, fuzzy, c-format
+msgid "Failed on message %d of %d"
+msgstr "S'està marcant el missatge %d de %d"
+
+#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+#, fuzzy
+msgid "Complete."
+msgstr "% comp_let:"
+
+#: mail/mail-ops.c:811
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Còpia de missatges"
 
-#: mail/mail-ops.c:842
+#: mail/mail-ops.c:900
 msgid "Moving"
 msgstr "S'està movent"
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:903
 msgid "Copying"
 msgstr "S'està copiant"
 
-#: mail/mail-ops.c:856
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s missatge %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:978
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1085
+#: mail/mail-ops.c:1139
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
+#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1193
+#: mail/mail-ops.c:1247
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1380
+#: mail/mail-ops.c:1434
 #, fuzzy
 msgid "Expunging folder"
 msgstr "S'està esborrant \"%s\""
 
-#: mail/mail-ops.c:1429
+#: mail/mail-ops.c:1483
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1496
+#: mail/mail-ops.c:1550
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1560
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "S'està recuperant el missatge número %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1580
+#: mail/mail-ops.c:1634
 #, fuzzy
 msgid "Saving messages"
 msgstr "Còpia de missatges"
 
-#: mail/mail-ops.c:1659
+#: mail/mail-ops.c:1713
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: mail/mail-ops.c:1672
+#: mail/mail-ops.c:1726
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "S'està recuperant el missatge %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1686
+#: mail/mail-ops.c:1740
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: mail/mail-ops.c:1760
+#: mail/mail-ops.c:1814
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Desa l'adjunció"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1829
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1857
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: mail/mail-search-dialogue.c:107
+#: mail/mail-search-dialogue.c:113
 #, fuzzy
 msgid "_Search"
 msgstr "Cerca"
 
-#: mail/mail-send-recv.c:136
+#: mail/mail-send-recv.c:138
 #, fuzzy
 msgid "Cancelling ..."
 msgstr "Cancel·lat"
 
-#: mail/mail-send-recv.c:231
+#: mail/mail-send-recv.c:233
 #, fuzzy
 msgid "Send & Receive mail"
 msgstr "Sendmail"
 
-#: mail/mail-send-recv.c:234
+#: mail/mail-send-recv.c:236
 #, fuzzy
 msgid "Receiving"
 msgstr "Data de recepció"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:285
 msgid "Updating ..."
 msgstr ""
 
-#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
 msgid "Waiting ..."
 msgstr ""
 
-#: mail/mail-send-recv.c:304
+#: mail/mail-send-recv.c:306
 #, fuzzy
 msgid "Sending"
 msgstr "S'està enviant \"%s\""
 
-#: mail/mail-send-recv.c:469
+#: mail/mail-send-recv.c:471
 #, fuzzy
 msgid "Cancelled."
 msgstr "Cancel·lat"
 
-#: mail/mail-send-recv.c:473
-#, fuzzy
-msgid "Complete."
-msgstr "% comp_let:"
-
-#: mail/mail-summary.c:111
+#: mail/mail-summary.c:109
 msgid "Incomplete message written on pipe!"
 msgstr "S'ha escrit un missatge incomplet al conducte!"
 
-#: mail/mail-tools.c:138
+#: mail/mail-tools.c:141
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "No s'ha pogut crear la mbox temporal `%s': %s"
 
-#: mail/mail-tools.c:185
+#: mail/mail-tools.c:188
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (missatge reenviat)"
 
-#: mail/mail-tools.c:195
+#: mail/mail-tools.c:198
 msgid "Fwd: (no subject)"
 msgstr "Re: (sense assumpte)"
 
-#: mail/mail-tools.c:212
+#: mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:214
+#: mail/mail-tools.c:217
 msgid "Forwarded message (no subject)"
 msgstr "Missatge reenviat (sense assumpte)"
 
-#: mail/mail-tools.c:411
+#: mail/mail-tools.c:414
 #, c-format
 msgid ""
 "-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
 "%s<br><b>Subject:</b> %s<br>"
 msgstr ""
 
-#: mail/mail-vfolder.c:248
+#: mail/mail-vfolder.c:249
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:427
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:59
 msgid "Reply"
 msgstr "Respon"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:65
 msgid "Reply to the sender of this message"
 msgstr "Respon al remitent d'aquest missatge"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:147 ui/evolution-mail.xml.h:63
 msgid "Reply to all recipients of this message"
 msgstr "Respon a tots els destinataris d'aquest missatge"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:28
 msgid "Forward this message"
 msgstr "Reenvia aquest missatge"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
+#: mail/mail-view.c:154 ui/evolution-mail.xml.h:56
 msgid "Print the selected message"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
 msgid "Delete this message"
 msgstr "Suprimeix aquest missatge"
 
-#: mail/message-list.c:618
+#: mail/message-list.c:648
 msgid "Unseen"
 msgstr "No vist"
 
-#: mail/message-list.c:621
+#: mail/message-list.c:649
 msgid "Seen"
 msgstr "Vist"
 
-#: mail/message-list.c:624
+#: mail/message-list.c:650
 msgid "Answered"
 msgstr "Respost"
 
-#: mail/message-list.c:627
+#: mail/message-list.c:651
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: mail/message-list.c:630
+#: mail/message-list.c:652
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Mou el missatge"
 
-#: mail/message-list.c:952
-#, c-format
-msgid "[ %s ]"
-msgstr ""
+#: mail/message-list.c:656
+#, fuzzy
+msgid "Lowest"
+msgstr "Baixa"
 
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:964 mail/message-list.c:980
-#, c-format
-msgid "%s, et al."
-msgstr ""
+#: mail/message-list.c:657
+#, fuzzy
+msgid "Lower"
+msgstr "Baixa"
 
-#: mail/message-list.c:967 mail/message-list.c:983
+#: mail/message-list.c:661
 #, fuzzy
-msgid "<unknown>"
-msgstr "Desconegut"
+msgid "Higher"
+msgstr "Alta"
 
-#: mail/message-list.c:1035
+#: mail/message-list.c:662
+#, fuzzy
+msgid "Highest"
+msgstr "Alta"
+
+#: mail/message-list.c:912
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1042
+#: mail/message-list.c:919
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1051
+#: mail/message-list.c:928
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1063
+#: mail/message-list.c:940
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1071
+#: mail/message-list.c:948
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1073
+#: mail/message-list.c:950
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:1171
+#: mail/message-list.c:1052
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "From"
 msgstr "De:"
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "Date"
 msgstr "Data de venciment"
 
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
 #, fuzzy
 msgid "Received"
 msgstr "Data de recepció"
 
-#: mail/message-list.c:1173
+#: mail/message-list.c:1054
 msgid "To"
 msgstr "Per a"
 
-#: mail/message-list.c:1173
+#: mail/message-list.c:1054
 msgid "Size"
 msgstr "Mida"
 
-#: mail/openpgp-utils.c:89
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Si us plau, introduïu la vostra contrasenya PGP/GPG."
-
-#: mail/openpgp-utils.c:92
-#, fuzzy, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Si us plau, introduïu la vostra contrasenya PGP/GPG."
-
-#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
-#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
-msgid "No GPG/PGP program available."
-msgstr "No hi ha cap programa GPG/PGP disponible."
-
-#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
-#: mail/openpgp-utils.c:920
-msgid "No password provided."
-msgstr "No s'ha indicat cap contrasenya."
-
-#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
-#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:588
-msgid "No recipients specified"
-msgstr ""
-
-#: mail/openpgp-utils.c:1088
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "No s'ha pogut crear el conducte: %s"
-
-#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
 #, fuzzy
 msgid "Folder"
 msgstr "Carpetes"
 
-#: mail/subscribe-dialog.c:65
+#: mail/subscribe-dialog.c:77
 #, fuzzy
 msgid "Store"
 msgstr "Puntuació"
 
-#: mail/subscribe-dialog.c:147
+#: mail/subscribe-dialog.c:138
 #, fuzzy
 msgid "Display folders starting with:"
 msgstr "Visualitza les carpetes que continguin:"
 
-#: mail/subscribe-dialog.c:177
+#: mail/subscribe-dialog.c:168
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:280
+#: mail/subscribe-dialog.c:271
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:273
 #, fuzzy, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
+#. Construct the app
+#: mail/subscribe-dialog.c:873
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Gestiona les subscripcions..."
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #, fuzzy
 msgid "Folder name:"
@@ -6646,9 +7006,18 @@ msgstr "Carpetes"
 msgid "Specify where to create the folder:"
 msgstr "No hi ha espai suficient per crear la carpeta"
 
+#: shell/importer/importer.c:87
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/importer/importer.c:157
+#: shell/importer/importer.c:182
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -6656,77 +7025,73 @@ msgid ""
 "Waiting 5 seconds to retry."
 msgstr ""
 
-#: shell/importer/importer.c:175 shell/importer/importer.c:202
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/importer/importer.c:309
+#: shell/importer/importer.c:341
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr "No hi ha nou correu a %s."
 
-#: shell/importer/importer.c:319
+#: shell/importer/importer.c:351
 #, fuzzy
 msgid "Importing"
 msgstr "S'està movent"
 
-#: shell/importer/importer.c:327
+#: shell/importer/importer.c:359
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/importer/importer.c:342
+#: shell/importer/importer.c:372
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "Error en carregar el fitxer: %s"
+
+#: shell/importer/importer.c:387
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/importer/importer.c:357
+#: shell/importer/importer.c:402
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/importer/importer.c:428
+#: shell/importer/importer.c:473
 #, fuzzy
 msgid "Automatic"
 msgstr "Tria automàtica"
 
-#: shell/importer/importer.c:478
+#: shell/importer/importer.c:523
 #, fuzzy
 msgid "Filename:"
 msgstr "Nom del fitxer:"
 
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
 #, fuzzy
 msgid "Select a file"
 msgstr "Fitxer de signatura:"
 
-#: shell/importer/importer.c:493
+#: shell/importer/importer.c:538
 #, fuzzy
 msgid "File type:"
 msgstr "Nom del fitxer:"
 
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
 msgid "Import"
 msgstr ""
 
-#: shell/importer/importer.c:609
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -6748,11 +7113,11 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: shell/e-setup.c:118 shell/e-setup.c:191
 msgid "Evolution installation"
 msgstr "Instal·lació de l'Evolution"
 
-#: shell/e-setup.c:116
+#: shell/e-setup.c:122
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -6760,32 +7125,32 @@ msgstr ""
 "Aquesta nova versió de l'Evolution necessita instal·lar fitxers addicionals\n"
 "al directori personal on teniu l'Evolution"
 
-#: shell/e-setup.c:117
+#: shell/e-setup.c:123
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Si us plau, feu clic a \"D'acord\" per instal·lar els fitxers, o a "
 "\"Cancel·la\" per sortir."
 
-#: shell/e-setup.c:157
+#: shell/e-setup.c:163
 msgid "Could not update files correctly"
 msgstr "No s'han pogut actualitzar correctament els fitxers"
 
-#: shell/e-setup.c:160 shell/e-setup.c:228
+#: shell/e-setup.c:166 shell/e-setup.c:234
 msgid "Evolution files successfully installed."
 msgstr "Els fitxers de l'Evolution s'han instal·lat amb èxit."
 
-#: shell/e-setup.c:189
+#: shell/e-setup.c:195
 #, fuzzy
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Sembla que aquesta és la primera vegada que executeu l'Evolution."
 
-#: shell/e-setup.c:190
+#: shell/e-setup.c:196
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Si us plau, feu clic a \"D'acord\" per instal·lar els fitxers d'usuari\n"
 "de l''Evolution a"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:215
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -6796,7 +7161,7 @@ msgstr ""
 "%s\n"
 "Error: %s"
 
-#: shell/e-setup.c:224
+#: shell/e-setup.c:230
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -6805,7 +7170,7 @@ msgstr ""
 "No es poden copiar els fitxers a\n"
 "`%s'."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:255
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -6816,7 +7181,7 @@ msgstr ""
 "Si us plau, moveu-lo per permetre la instal·lació\n"
 "dels fitxers d'usuari de l'Evolution."
 
-#: shell/e-setup.c:261
+#: shell/e-setup.c:267
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -6827,7 +7192,7 @@ msgstr ""
 "de l'Evolution. Si us plau, moveu-lo per permetre\n"
 "la instal·lació dels fitxers d'usuari de l'Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:96
+#: shell/e-shell-folder-creation-dialog.c:99
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -6836,11 +7201,11 @@ msgstr ""
 "No es pot crear la carpeta indicada:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:153
+#: shell/e-shell-folder-creation-dialog.c:156
 msgid "The specified folder name is not valid."
 msgstr "El nom de carpeta indicat no és vàlid."
 
-#: shell/e-shell-folder-creation-dialog.c:245
+#: shell/e-shell-folder-creation-dialog.c:248
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Crea una nova carpeta"
 
@@ -6852,28 +7217,28 @@ msgstr ""
 "El tipus de la carpeta seleccionada no és vàlid per a\n"
 "l'operació sol·licitada."
 
-#: shell/e-shell-folder-selection-dialog.c:318
+#: shell/e-shell-folder-selection-dialog.c:319
 msgid "New..."
 msgstr "Nou..."
 
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
 msgid "(Untitled)"
 msgstr "(Sense títol)"
 
-#: shell/e-shell-view-menu.c:159
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy was not found in your $PATH."
 msgstr "No s'ha trobat el Bug Buddy en el vostre $PATH."
 
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:179
 msgid "Bug buddy could not be run."
 msgstr "No es pot executar el Bug Buddy."
 
-#: shell/e-shell-view-menu.c:194
+#: shell/e-shell-view-menu.c:208
 #, fuzzy
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:196
+#: shell/e-shell-view-menu.c:210
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -6883,34 +7248,30 @@ msgstr ""
 "per a correu, agenda i gestió de contactes\n"
 "dins de l'entorn d'escriptori GNOME."
 
-#: shell/e-shell-view-menu.c:360
+#: shell/e-shell-view-menu.c:374
 msgid "Go to folder..."
 msgstr "Vés a la carpeta..."
 
-#: shell/e-shell-view.c:143
+#: shell/e-shell-view.c:148
 msgid "(No folder displayed)"
 msgstr "(Cap carpeta mostrada)"
 
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Carpetes"
-
-#: shell/e-shell-view.c:1124
+#: shell/e-shell-view.c:1134
 #, fuzzy, c-format
 msgid "%s - Evolution %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1126
+#: shell/e-shell-view.c:1136
 #, fuzzy, c-format
 msgid "%s - Evolution %s [%s]"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:372
+#: shell/e-shell.c:378
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No es pot configurar l'emmagatzemament local -- %s"
 
-#: shell/e-shell.c:1242
+#: shell/e-shell.c:1248
 #, fuzzy, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6919,15 +7280,15 @@ msgstr ""
 "Ep!  La visualització de `%s' s'ha mort inesperadament.  :-(\n"
 "Això segurament vol dir que el component %s ha petat."
 
-#: shell/e-shortcuts-view.c:123
+#: shell/e-shortcuts-view.c:134
 msgid "Create new shortcut group"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:137
 msgid "Group name:"
 msgstr "Nom del grup:"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:260
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -6936,75 +7297,75 @@ msgstr ""
 "Esteu segur que voleu eliminar el grup\n"
 "`%s' de la barra de dreceres?"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:265
 msgid "Don't remove"
 msgstr "No l'eliminis"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:276
 msgid "_Small Icons"
 msgstr "Icones _petites"
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:277
 msgid "Show the shortcuts as small icons"
 msgstr "Mostra les dreceres com a icones petites"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:279
 msgid "_Large Icons"
 msgstr "Icones _grans"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:280
 msgid "Show the shortcuts as large icons"
 msgstr "Mostra les dreceres com a icones grans"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:291
 msgid "_New Group..."
 msgstr "_Nou grup..."
 
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:292
 msgid "Create a new shortcut group"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:294
 msgid "_Remove This Group..."
 msgstr "_Elimina aquest grup..."
 
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:295
 msgid "Remove this shortcut group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:300
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:301
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate"
 msgstr "Activa"
 
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
 msgid "Activate this shortcut"
 msgstr "Activa aquesta drecera"
 
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:388
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Elimina aquesta drecera de la barra de dreceres"
 
-#: shell/e-shortcuts.c:375
+#: shell/e-shortcuts.c:379
 msgid "Error saving shortcuts."
 msgstr "Error en desar les dreceres."
 
-#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
 #: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
 msgid "_View"
 msgstr "_Visualitza"
 
-#: shell/e-storage-set-view.c:468
+#: shell/e-storage-set-view.c:649
 msgid "View the selected folder"
 msgstr "Visualitza la carpeta seleccionada"
 
@@ -7012,47 +7373,47 @@ msgstr "Visualitza la carpeta seleccionada"
 msgid "(No name)"
 msgstr "(Sense nom)"
 
-#: shell/e-storage.c:429
+#: shell/e-storage.c:459
 msgid "No error"
 msgstr "Cap error"
 
-#: shell/e-storage.c:431
+#: shell/e-storage.c:461
 msgid "Generic error"
 msgstr "Error genèric"
 
-#: shell/e-storage.c:433
+#: shell/e-storage.c:463
 msgid "A folder with the same name already exists"
 msgstr "Ja existeix una carpeta amb el mateix nom"
 
-#: shell/e-storage.c:435
+#: shell/e-storage.c:465
 msgid "The specified folder type is not valid"
 msgstr "El tipus de carpeta especificat no és vàlid"
 
-#: shell/e-storage.c:437
+#: shell/e-storage.c:467
 msgid "I/O error"
 msgstr "Error d'E/S"
 
-#: shell/e-storage.c:439
+#: shell/e-storage.c:469
 msgid "Not enough space to create the folder"
 msgstr "No hi ha espai suficient per crear la carpeta"
 
-#: shell/e-storage.c:441
+#: shell/e-storage.c:471
 msgid "The specified folder was not found"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:443
+#: shell/e-storage.c:473
 msgid "Function not implemented in this storage"
 msgstr "Funció no implementada en aquest emmagatzemament"
 
-#: shell/e-storage.c:445
+#: shell/e-storage.c:475
 msgid "Permission denied"
 msgstr "Permís denegat"
 
-#: shell/e-storage.c:447
+#: shell/e-storage.c:477
 msgid "Operation not supported"
 msgstr "Operació no suportada"
 
-#: shell/e-storage.c:449
+#: shell/e-storage.c:479
 msgid "The specified type is not supported in this storage"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
@@ -7061,7 +7422,7 @@ msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 msgid "The Evolution shell."
 msgstr "No es pot inicialitzat l'intèrpret d'ordres de l'Evolution."
 
-#: shell/main.c:73
+#: shell/main.c:83
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -7103,7 +7464,7 @@ msgstr ""
 "Esperem que gaudiu del resultat de la nostra feixuga feina, i esperem\n"
 "ansiosament les vostres contribucions!\n"
 
-#: shell/main.c:98
+#: shell/main.c:108
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -7111,16 +7472,19 @@ msgstr ""
 "Gràcies\n"
 "L'equip de l'Evolution\n"
 
-#: shell/main.c:129
+#: shell/main.c:139
 msgid "Cannot initialize the Evolution shell."
 msgstr "No es pot inicialitzat l'intèrpret d'ordres de l'Evolution."
 
-#: shell/main.c:175
-#, fuzzy
-msgid "Disable."
-msgstr "Inhabilitat"
+#: shell/main.c:185
+msgid "Disable splash screen"
+msgstr ""
 
-#: shell/main.c:195
+#: shell/main.c:186
+msgid "Send the debugging output of all components to a file."
+msgstr ""
+
+#: shell/main.c:219
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No es pot inicialitzar el sistema de components del Bonobo."
 
@@ -7146,8 +7510,7 @@ msgstr "Cerca un contacte"
 msgid "New contact"
 msgstr "Visualitza tots els contactes"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:49
 msgid "Previews the message to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
@@ -7155,7 +7518,7 @@ msgstr "Previsualitza el missatge que s'ha d'imprimir"
 msgid "Print contacts"
 msgstr "Imprimeix els contactes"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:78
 msgid "Stop"
 msgstr "Atura"
 
@@ -7181,7 +7544,7 @@ msgstr "Afegeix una font"
 msgid "_Contact"
 msgstr "_Contactes..."
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
 #: ui/evolution-contact-editor.xml.h:15
 #, fuzzy
 msgid "_Print..."
@@ -7191,9 +7554,9 @@ msgstr "Imprimeix..."
 msgid "_Search for contacts"
 msgstr "_Cerca contactes"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:110
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
 msgid "_Tools"
 msgstr "_Eines"
 
@@ -7206,126 +7569,166 @@ msgid "Alter preferences"
 msgstr "Modifica les preferències"
 
 #: ui/evolution-calendar.xml.h:4
+#, fuzzy
+msgid "Create a new all day Event"
+msgstr "Crea una nova agenda"
+
+#: ui/evolution-calendar.xml.h:5
 msgid "Create a new appointment"
 msgstr "Crea una nova cita"
 
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
 msgid "Create a new calendar"
 msgstr "Crea una nova agenda"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
 msgid "Day"
 msgstr "Dia"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Go To"
 msgstr "Vés a"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
 msgid "Go back in time"
 msgstr "Vés enrera en el temps"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go forward in time"
 msgstr "Vés endavant en el temps"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
+#, fuzzy
+msgid "Go to _Date"
+msgstr "Vés a una data"
+
+#: ui/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Go to _Today"
+msgstr "Vés a avui"
+
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to a specific date"
 msgstr "Vés a una data concreta"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to present time"
 msgstr "Vés al present"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
-msgid "New Appointment"
-msgstr "Nova cita..."
+msgid "New _Event"
+msgstr "Nova a_genda"
 
-#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
 #: ui/evolution-task-editor-dialog.xml.h:32
 msgid "Next"
 msgstr "Següent"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
 #, fuzzy
 msgid "Open Calendar"
 msgstr "_Obre una agenda"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:21
 msgid "Prev"
 msgstr "Anterior"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Previews the calendar to be printed"
+msgstr "Previsualitza el missatge que s'ha d'imprimir"
+
+#: ui/evolution-calendar.xml.h:25
 #, fuzzy
 msgid "Print calendar"
 msgstr "Imprimeix l'agenda"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Print this Calendar"
 msgstr "Imprimeix aquest agenda"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
 #, fuzzy
 msgid "Save As"
 msgstr "_Anomena i desa"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "Save calendar as something else"
 msgstr "Deixa l'agenda com a alguna altra cosa"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
 msgid "Show 1 day"
 msgstr "Mostra 1 dia"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
 msgid "Show 1 month"
 msgstr "Mostra 1 mes"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
 msgid "Show 1 week"
 msgstr "Mostra 1 setmana"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Mostra la setmana de treball"
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
-#: widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
+#: widgets/misc/e-dateedit.c:422
 msgid "Today"
 msgstr "Avui"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "W_ork Week"
+msgstr "Setmana de treball"
+
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Setmana"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
 #, fuzzy
 msgid "_Appointment"
 msgstr "Cites:"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
+#: ui/evolution-calendar.xml.h:38
+#, fuzzy
+msgid "_Day"
+msgstr "Dia"
+
+#: ui/evolution-calendar.xml.h:39
+#, fuzzy
+msgid "_Month"
+msgstr "Mes"
+
+#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
 msgid "_New"
 msgstr "_Nou"
 
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:41
 msgid "_Open Calendar"
 msgstr "_Obre una agenda"
 
-#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:106
 #: ui/evolution-tasks.xml.h:8
 #, fuzzy
 msgid "_Save As..."
 msgstr "Anomena i desa..."
 
+#: ui/evolution-calendar.xml.h:45
+#, fuzzy
+msgid "_Week"
+msgstr "Setmana"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Suprimeix aquest element"
@@ -7351,7 +7754,7 @@ msgid "Print this item"
 msgstr "Imprimeix aquest element"
 
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:57 ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Imprimeix..."
 
@@ -7386,7 +7789,7 @@ msgstr "FIXME: Nou _missatge per contactar"
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
 #: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
 msgid "_File"
 msgstr "_Fitxer"
 
@@ -7451,7 +7854,7 @@ msgstr "Suprimeix aquesta cita"
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "Copia a la carpeta"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
 #: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Copia"
@@ -7555,7 +7958,7 @@ msgid "Print Setup"
 msgstr "Configuració de la pàgina:"
 
 #: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
 msgid "Save"
 msgstr "Desa"
 
@@ -7579,7 +7982,8 @@ msgstr "Seleccioneu una carpeta"
 msgid "Schedule some sort of a meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:68
+#: ui/evolution-task-editor-dialog.xml.h:57
 #, fuzzy
 msgid "Select All"
 msgstr "Selecciona'ls _tots"
@@ -7605,13 +8009,13 @@ msgid "_About..."
 msgstr "_Quant a l'Evolution..."
 
 #: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
 #, fuzzy
 msgid "_Close"
 msgstr "Tanca"
 
 #: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_Contact (FIXME)"
 msgstr "_Contacte (FIXME)"
 
@@ -7626,7 +8030,7 @@ msgid "_Debug"
 msgstr ""
 
 #: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
 msgid "_Help"
 msgstr "_Ajuda"
 
@@ -7670,7 +8074,7 @@ msgstr "Enganxa"
 msgid "_Print"
 msgstr "_Imprimeix"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:102
 #: ui/evolution-task-editor-dialog.xml.h:83
 #, fuzzy
 msgid "_Properties..."
@@ -7682,7 +8086,7 @@ msgid "_Select All"
 msgstr "Selecciona'ls _tots"
 
 #: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:41
 msgid "_Task (FIXME)"
 msgstr "_Tasca (FIXME)"
 
@@ -7715,260 +8119,399 @@ msgid "New Mail"
 msgstr "Recupera el correu"
 
 #: ui/evolution-mail.xml.h:2
+msgid "Apply any new filters to the mail in this box"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:3
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:4
 msgid "Compose"
 msgstr "Redacta"
 
-#: ui/evolution-mail.xml.h:3
+#: ui/evolution-mail.xml.h:5
 msgid "Compose a new message"
 msgstr "Redacta un nou missatge"
 
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Configure Folder..."
+msgstr "Mou a la carpeta"
+
+#: ui/evolution-mail.xml.h:8
 msgid "Copy message to a new folder"
 msgstr "Copia el missatge a una nova carpeta"
 
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail.xml.h:9
+#, fuzzy
+msgid "Copy selected messages to another folder"
+msgstr "Copia el missatge a una nova carpeta"
+
+#: ui/evolution-mail.xml.h:10
 #, fuzzy
 msgid "Create _Virtual Folder From Message"
 msgstr "Carpetes virtuals"
 
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Delete the selected messages"
+msgstr "Imprimeix el missatge seleccionat"
+
+#: ui/evolution-mail.xml.h:14
 msgid "Display all of the message headers"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:10
+#: ui/evolution-mail.xml.h:15
+#, fuzzy
+msgid "Edit Message"
+msgstr "_Edita el missatge"
+
+#: ui/evolution-mail.xml.h:16
 #, fuzzy
-msgid "Empty Trash"
+msgid "Edit the current message"
+msgstr "l'hora actual"
+
+#: ui/evolution-mail.xml.h:17
+#, fuzzy
+msgid "Empty _Trash"
 msgstr "Dies buits:"
 
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Expunge"
+msgstr "_Esborra"
+
+#: ui/evolution-mail.xml.h:19
 #, fuzzy
 msgid "Filter on Se_nder"
 msgstr "Filtre sobre el remitent"
 
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:20
 #, fuzzy
 msgid "Filter on _Recipients"
 msgstr "Filtre sobre els destinataris"
 
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:21
 #, fuzzy
 msgid "Filter on _Subject"
 msgstr "Filtre sobre l'assumpte"
 
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:22
+msgid "Finaly remove all mails tagged for deletion"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:23
 msgid "Forget _Passwords"
 msgstr "Oblida les _contrasenyes"
 
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:25
 #, fuzzy
 msgid "Forward As"
 msgstr "Reenvia"
 
-#: ui/evolution-mail.xml.h:18
+#: ui/evolution-mail.xml.h:27
+msgid "Forward the selected mail to someone"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:29
+#, fuzzy
+msgid "Forward this message in-line with your mail, so you can edit it"
+msgstr "Reenvia un missatge sense cap assumpte"
+
+#: ui/evolution-mail.xml.h:30
 #, fuzzy
-msgid "Full Headers"
+msgid "Full _Headers"
 msgstr "Cerca completa"
 
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:31
+#, fuzzy
+msgid "Hide Deleted Messages"
+msgstr "Suprimeix el missatge"
+
+#: ui/evolution-mail.xml.h:32
 #, fuzzy
 msgid "Hide S_elected Messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:33
 #, fuzzy
 msgid "Hide _Deleted Messages"
 msgstr "Suprimeix el missatge"
 
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:34
 #, fuzzy
 msgid "Hide _Read messages"
 msgstr "Missatge reenviat - %s"
 
-#: ui/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:35
 #, fuzzy
-msgid "Inline"
-msgstr "Visualitza en línia"
+msgid "Invert Selection"
+msgstr "_Inverteix la selecció"
 
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:36
 #, fuzzy
 msgid "Manage _Subscriptions..."
 msgstr "Gestiona les subscripcions..."
 
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:37
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:38
 #, fuzzy
 msgid "Mark All as R_ead"
 msgstr "Mar_ca'l com a llegit"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:39
+#, fuzzy
+msgid "Mark As Read"
+msgstr "Mar_ca'l com a llegit"
+
+#: ui/evolution-mail.xml.h:40
+msgid "Mark As U_nread"
+msgstr "Marca'l com a per _llegir"
+
+#: ui/evolution-mail.xml.h:41
 #, fuzzy
 msgid "Mark as U_nread"
 msgstr "Marca'l com a per _llegir"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:42
 #, fuzzy
-msgid "Message _Display"
-msgstr "Esborra la visualització del missatge"
+msgid "Mark the selected messages as having been read"
+msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:43
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:44
 msgid "Move"
 msgstr "Mou"
 
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:45
 msgid "Move message to a new folder"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:46
+#, fuzzy
+msgid "Move selected messages to another folder"
+msgstr "Mou un missatge a una nova carpeta"
+
+#: ui/evolution-mail.xml.h:47
+msgid "Open in New Window"
+msgstr "Obre'l en una nova finestra"
+
+#: ui/evolution-mail.xml.h:48
+#, fuzzy
+msgid "Open the current message in a new window"
+msgstr "Envia aquest missatge"
+
+#: ui/evolution-mail.xml.h:53
+msgid "Print Preview of message..."
+msgstr "Previsualització d'impressió del missatge..."
+
+#: ui/evolution-mail.xml.h:54
 msgid "Print message to the printer"
 msgstr "Imprimeix el missatge a la impressora"
 
-#: ui/evolution-mail.xml.h:36
-#, fuzzy
-msgid "Quoted"
-msgstr "Cap"
+#: ui/evolution-mail.xml.h:55
+msgid "Print message..."
+msgstr "Imprimeix el missatge..."
 
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:58
 msgid "Redirect (FIXME: implement me)"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:61
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:62
+#, fuzzy
+msgid "Reply to all"
+msgstr "Respon a tots"
+
+#: ui/evolution-mail.xml.h:64
+#, fuzzy
+msgid "Reply to sender"
+msgstr "Respon al remitent"
+
+#: ui/evolution-mail.xml.h:66
 #, fuzzy
 msgid "S_ource"
 msgstr "Font"
 
-#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:67
+#, fuzzy
+msgid "Save the message into a new file"
+msgstr "Desa el missatge a una carpeta determinada"
+
+#: ui/evolution-mail.xml.h:69 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:70
 #, fuzzy
 msgid "Select _Thread"
 msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-mail.xml.h:46
-msgid "Send and Receive"
+#: ui/evolution-mail.xml.h:71
+#, fuzzy
+msgid "Send / Receive"
+msgstr "Sendmail"
+
+#: ui/evolution-mail.xml.h:72
+msgid "Send a reply to the person who sent you this mail"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:73
+msgid "Send a single mail in reply to all the selected mail"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:74
+#, fuzzy
+msgid ""
+"Send queued mail\n"
+"    and retrieve new mail"
+msgstr "Envia el correu de la cua i recupera'n el nou"
+
+#: ui/evolution-mail.xml.h:76
 msgid "Send queued mail and retrieve new mail"
 msgstr "Envia el correu de la cua i recupera'n el nou"
 
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:77
 #, fuzzy
 msgid "Show _All"
 msgstr "Mostra"
 
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:79
 msgid "Threaded Message list"
 msgstr "Llista de missatges en cadena"
 
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:80
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "Imprimeix el missatge seleccionat"
+
+#: ui/evolution-mail.xml.h:82
 msgid "VFolder on Se_nder"
 msgstr "VFolder sobre el remite_nt"
 
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:83
 msgid "VFolder on _Recipients"
 msgstr "VFolder sobre els destinata_ris"
 
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:84
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "VFolder sobre l'assumpte"
 
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:85
 msgid "View Raw Message Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:86
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "Editor de carpetes _virtuals..."
 
-#: ui/evolution-mail.xml.h:56
-msgid "_Actions"
-msgstr "_Accions"
-
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:87
 msgid "_Apply Filters"
 msgstr "_Aplica els filtres"
 
-#: ui/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:88
 #, fuzzy
-msgid "_Compose"
-msgstr "Redacta"
+msgid "_Attachment"
+msgstr "adjunció"
 
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:89
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta"
 
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:90
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:92
 msgid "_Expunge"
 msgstr "_Esborra"
 
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:93
 #, fuzzy
 msgid "_Filters..."
 msgstr "_Filtres de correu ..."
 
-#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+#: ui/evolution-mail.xml.h:94 ui/evolution.xml.h:31
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:95
 msgid "_Forward"
 msgstr "_Reenvia"
 
-#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:96
+#, fuzzy
+msgid "_Inline"
+msgstr "Visualitza en línia"
+
+#: ui/evolution-mail.xml.h:97 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Inverteix la selecció"
 
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:98
 #, fuzzy
 msgid "_Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:99
 #, fuzzy
 msgid "_Mail Settings..."
 msgstr "_Paràmetres"
 
-#: ui/evolution-mail.xml.h:69
-#, fuzzy
-msgid "_Message Hiding"
-msgstr "_Missatge"
-
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail.xml.h:100
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "_Mou a la carpeta"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail.xml.h:101
 #, fuzzy
 msgid "_Open Selected Items"
 msgstr "Obre la tasca"
 
-#: ui/evolution-mail.xml.h:74
-msgid "_Send and Receive"
-msgstr ""
+#: ui/evolution-mail.xml.h:103
+#, fuzzy
+msgid "_Quoted"
+msgstr "Cap"
 
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail.xml.h:104
+#, fuzzy
+msgid "_Reply"
+msgstr "Respon"
+
+#: ui/evolution-mail.xml.h:105
+#, fuzzy
+msgid "_Resend Messages"
+msgstr "_Edita el missatge"
+
+#: ui/evolution-mail.xml.h:107
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "_Anomena i desa..."
+
+#: ui/evolution-mail.xml.h:108
+#, fuzzy
+msgid "_Send / Receive"
+msgstr "Sendmail"
+
+#: ui/evolution-mail.xml.h:109
 msgid "_Threaded"
 msgstr "_En cadena"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:111
 #, fuzzy
 msgid "_Undelete"
 msgstr "_Suprimeix"
@@ -8252,7 +8795,7 @@ msgstr "_Envia"
 msgid "Undo the last action"
 msgstr "Elimina una acció"
 
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
 msgid "_Appointment (FIXME)"
 msgstr "_Cita (FIXME)"
 
@@ -8390,123 +8933,135 @@ msgstr "S'està movent"
 msgid "_About Evolution..."
 msgstr "_Quant a l'Evolution..."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:25
+msgid "_Actions"
+msgstr "_Accions"
+
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Carpeta"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:33
 msgid "_Go to Folder..."
 msgstr "_Vés a la carpeta..."
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Import file..."
 msgstr "_Insereix el fitxer de text... (FIXME)"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:36
 msgid "_Index"
 msgstr "_Índex"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:37
 #, fuzzy
 msgid "_Mail message"
 msgstr "Missatge de _correu (FIXME)"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:39
 #, fuzzy
 msgid "_New Folder"
 msgstr "Nova VFolder"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+msgid "Tentative"
+msgstr "Tentatiu"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Ocupat"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "Fora de l'oficina"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Cap informació"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
 msgid "_Invite Others..."
 msgstr "_Invita a altres..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
 msgid "_Options"
 msgstr "_Opcions"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
 msgid "Show _Only Working Hours"
 msgstr "Mostra _només les hores de treball"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
 msgid "Show _Zoomed Out"
 msgstr "Mostra-ho reduint el zoom"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
 msgid "_Update Free/Busy"
 msgstr "_Actualitza lliure/ocupat"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
 msgid "_Autopick"
 msgstr "Tria automàtica"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
 msgid "_All People and Resources"
 msgstr "_Totes les persones i recursos"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
 msgid "All _People and One Resource"
 msgstr "Totes les persones i un recurs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
 msgid "_Required People"
 msgstr "Persones _requerides"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
 msgid "Required People and _One Resource"
 msgstr "Persones requerides i _un recurs"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
 msgid "Meeting _start time:"
 msgstr "Hora d'_inici de la reunió:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
 msgid "Meeting _end time:"
 msgstr "Hora de _finalització de la reunió:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
 msgid "All Attendees"
 msgstr "Tots els assistents"
 
-#: widgets/menus/gal-view-menus.c:171
+#: widgets/menus/gal-view-menus.c:177
 #, fuzzy
 msgid "_Current View"
 msgstr "l'hora actual"
 
+#: widgets/menus/gal-view-menus.c:196
+msgid "Define Views"
+msgstr ""
+
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: widgets/misc/e-calendar-item.c:421
@@ -8518,99 +9073,112 @@ msgstr "DDDDDDD"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
 msgid "Now"
 msgstr "Ara"
 
-#: widgets/misc/e-cell-date-edit.c:239
+#: widgets/misc/e-cell-date-edit.c:242
 msgid "OK"
 msgstr ""
 
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#.
-#: widgets/misc/e-cell-date-edit.c:460
-#, fuzzy
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S%n"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#.
-#: widgets/misc/e-cell-date-edit.c:469
-#, fuzzy
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p%n"
-
-#. FIXME: Better message needed.
-#: widgets/misc/e-cell-date-edit.c:736
-msgid "The time is invalid"
+#: widgets/misc/e-cell-date-edit.c:723
+#, fuzzy, c-format
+msgid "The time must be in the format: %s"
 msgstr ""
+"La data s'ha d'introduir amb el format: \n"
+"\n"
+"%s"
 
 #: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:160
+#: widgets/misc/e-filter-bar.c:166
 #, fuzzy
 msgid "Save Search"
 msgstr "Cerca"
 
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:237
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Afegeix..."
 
-#: widgets/misc/e-filter-bar.c:311
+#: widgets/misc/e-filter-bar.c:317
 #, fuzzy
 msgid "Advanced ..."
 msgstr "Afegeix..."
 
-#: widgets/misc/e-messagebox.c:141
+#: widgets/misc/e-messagebox.c:152
 #, fuzzy
 msgid "Information"
 msgstr "Cap informació"
 
-#: widgets/misc/e-messagebox.c:148
+#: widgets/misc/e-messagebox.c:159
 #, fuzzy
 msgid "Warning"
 msgstr "S'està movent"
 
-#: widgets/misc/e-messagebox.c:162
+#: widgets/misc/e-messagebox.c:173
 #, fuzzy
 msgid "Question"
 msgstr "Descripció:"
 
-#: widgets/misc/e-messagebox.c:169
+#: widgets/misc/e-messagebox.c:180
 #, fuzzy
 msgid "Message"
 msgstr "_Missatge"
 
 #. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
+#: widgets/misc/e-messagebox.c:224
 #, fuzzy
 msgid "Don't show this message again."
 msgstr "Envia aquest missatge"
 
-#: widgets/misc/e-search-bar.c:140
+#: widgets/misc/e-search-bar.c:148
 #, fuzzy
 msgid "Sear_ch"
 msgstr "Cerca"
 
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "Adress Cards"
+msgstr "Adreça"
+
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "By Company"
+msgstr "Empresa"
+
+#: views/addressbook/galview.xml.h:3
+#, fuzzy
+msgid "Phone List"
+msgstr "Tipus de telèfon"
+
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "By Sender"
+msgstr "Remitent"
+
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By Status"
+msgstr "_Estat:"
+
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Subject"
+msgstr "Assumpte"
+
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "Messages"
+msgstr "_Missatge"
+
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With Category"
+msgstr "categories"
+
 #: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
 #, fuzzy
 msgid "The Personal Addressbook Server"
@@ -8620,22 +9188,209 @@ msgstr "Afegeix una font"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:153
+#: wombat/wombat.c:173
 #, fuzzy
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: wombat/wombat.c:165
+#: wombat/wombat.c:185
 #, fuzzy
 msgid "init_corba(): could not initialize GNOME"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: wombat/wombat.c:178
+#: wombat/wombat.c:198
 #, fuzzy
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #, fuzzy
+#~ msgid "Click here to add a contact"
+#~ msgstr "<feu clic aquí per seleccionar una data>"
+
+#, fuzzy
+#~ msgid ""
+#~ "This option will connect to the server using a the PLAIN SASL mechanism if "
+#~ "the server supports it."
+#~ msgstr ""
+#~ "Aquesta opció es connectarà al servidor IMAP mitjançant una contrasenya de "
+#~ "text net."
+
+#~ msgid "No such host %s."
+#~ msgstr "L'ordinador central %s no existeix."
+
+#~ msgid "Temporarily unable to look up hostname %s."
+#~ msgstr "Temporalment no es pot cercar el nom d'ordinador central %s."
+
+#~ msgid "URL string `%s' contains no protocol"
+#~ msgstr "La cadena d'URL `%s' no conté cap protocol"
+
+#~ msgid "URL string `%s' contains an invalid protocol"
+#~ msgstr "La cadena d'URL `%s' conté un protocol incorrecte"
+
+#~ msgid "Port number in URL `%s' is non-numeric"
+#~ msgstr "El número de port de l'URL `%s' no és numèric"
+
+#, fuzzy
+#~ msgid "Secure IMAPv4"
+#~ msgstr "IMAPv4"
+
+#, fuzzy
+#~ msgid "For reading and storing mail on IMAP servers over an SSL connection."
+#~ msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
+
+#, fuzzy
+#~ msgid ""
+#~ "For connecting to POP servers over an SSL connection. The POP protocol can "
+#~ "also be used to retrieve mail from certain web mail providers and "
+#~ "proprietary email systems."
+#~ msgstr ""
+#~ "Per connectar als servidors POP. El protocol POP també es pot utilitzar per "
+#~ "recuperar correu des de determinats proveïdors de correu web i sistemes "
+#~ "propietaris de correu."
+
+#, fuzzy
+#~ msgid ""
+#~ "For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
+#~ "connection.\n"
+#~ msgstr ""
+#~ "Per al lliurament de correu mitjançant la connexió a un concentrador de "
+#~ "correu utilitzant SMTP."
+
+#, fuzzy
+#~ msgid "No authentication required"
+#~ msgstr "Autenticació:"
+
+#, fuzzy
+#~ msgid ""
+#~ "This option will connect to the SMTP server without using any kind of "
+#~ "authentication. This should be fine for connecting to most SMTP servers."
+#~ msgstr ""
+#~ "Aquesta opció us connectarà al sevidor POP mitjançant una contrasenya en "
+#~ "text net. És l'única suportada per molts servidors POP."
+
+#~ msgid "Remove action"
+#~ msgstr "Elimina una acció"
+
+#~ msgid "Remove criterion"
+#~ msgstr "Elimina un criteri"
+
+#~ msgid "Source"
+#~ msgstr "Font"
+
+#, fuzzy
+#~ msgid "Unspecified"
+#~ msgstr "Especifiqueu la capçalera"
+
+#, fuzzy
+#~ msgid "Advanced"
+#~ msgstr "Afegeix..."
+
+#, fuzzy
+#~ msgid "Check settings"
+#~ msgstr "Paràmetres de prova"
+
+#~ msgid "Email address:"
+#~ msgstr "Adreça electrònica:"
+
+#, fuzzy
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Configuració del correu"
+
+#, fuzzy
+#~ msgid "Hostname:"
+#~ msgstr "Nom d'usuari:"
+
+#, fuzzy
+#~ msgid "IMAP"
+#~ msgstr "IMAPv4"
+
+#, fuzzy
+#~ msgid "Keep mail on server"
+#~ msgstr "No suprimeixis els missatges del servidor"
+
+#, fuzzy
+#~ msgid "Mail"
+#~ msgstr "_Correu"
+
+#, fuzzy
+#~ msgid "Mail Account"
+#~ msgstr "conté"
+
+#, fuzzy
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Configuració del correu"
+
+#, fuzzy
+#~ msgid "Optional"
+#~ msgstr "Opcions"
+
+#, fuzzy
+#~ msgid "Password:"
+#~ msgstr "Contrasenya"
+
+#, fuzzy
+#~ msgid "Remember my password"
+#~ msgstr "Desa com a VCard"
+
+#, fuzzy
+#~ msgid "Reply address:"
+#~ msgstr "Adreça electrònica:"
+
+#, fuzzy
+#~ msgid "Required"
+#~ msgstr "Persones _requerides"
+
+#, fuzzy
+#~ msgid "Save password"
+#~ msgstr "Desa com a VCard"
+
+#, fuzzy
+#~ msgid "Select signature file"
+#~ msgstr "Fitxer de signatura:"
+
+#, fuzzy
+#~ msgid "Server type:"
+#~ msgstr "Servidor:"
+
+#, fuzzy
+#~ msgid "Signature:"
+#~ msgstr "Fitxer de signatura:"
+
+#, fuzzy
+#~ msgid "Transport"
+#~ msgstr "Transparent"
+
+#, fuzzy
+#~ msgid "Transport Authentication"
+#~ msgstr "Autenticació:"
+
+#, fuzzy
+#~ msgid "minutes."
+#~ msgstr "minuts"
+
+#~ msgid "%s message %d of %d (uid \"%s\")"
+#~ msgstr "%s missatge %d de %d (uid \"%s\")"
+
+#, fuzzy
+#~ msgid "<unknown>"
+#~ msgstr "Desconegut"
+
+#~ msgid "No GPG/PGP program available."
+#~ msgstr "No hi ha cap programa GPG/PGP disponible."
+
+#, fuzzy
+#~ msgid "Message _Display"
+#~ msgstr "Esborra la visualització del missatge"
+
+#, fuzzy
+#~ msgid "_Compose"
+#~ msgstr "Redacta"
+
+#, fuzzy
+#~ msgid "_Message Hiding"
+#~ msgstr "_Missatge"
+
+#, fuzzy
 #~ msgid "Copyright (C) 2000, Helix Code, Inc."
 #~ msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
@@ -8651,10 +9406,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "el disc local."
 
 #, fuzzy
-#~ msgid "Connecting to server"
-#~ msgstr "Connexió de prova a \"%s\""
-
-#, fuzzy
 #~ msgid "Connect to server"
 #~ msgstr "No s'ha pogut connectar al servidor POP en %s."
 
@@ -8844,12 +9595,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Registering local folder"
 #~ msgstr "Creació d'una nova carpeta"
 
-#, fuzzy
-#~ msgid ""
-#~ "Unable to register folder '%s':\n"
-#~ "%s"
-#~ msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
-
 #~ msgid "Fetching email from %s"
 #~ msgstr "S'està recollint el correu des de %s"
 
@@ -8935,9 +9680,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Retrieving message %d of %d"
 #~ msgstr "S'està recuperant el missatge %d de %d"
 
-#~ msgid "Writing message %d of %d"
-#~ msgstr "S'està escrivint el missatge %d de %d"
-
 #~ msgid "Saving changes to %s"
 #~ msgstr "S'estan desant els canvis a %s"
 
@@ -8949,10 +9691,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "%s"
 
 #, fuzzy
-#~ msgid "Subscribe to folder \"%s\""
-#~ msgstr "Escaneja les carpetes de \"%s\""
-
-#, fuzzy
 #~ msgid "Unsubscribe from folder \"%s\""
 #~ msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
@@ -9215,12 +9953,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Server:"
 #~ msgstr "Servidor:"
 
-#~ msgid "Detect supported types..."
-#~ msgstr "Detecta els tipus suportats..."
-
-#~ msgid "Don't delete messages from server"
-#~ msgstr "No suprimeixis els missatges del servidor"
-
 #~ msgid "Mail source type:"
 #~ msgstr "Tipus de font del correu:"
 
@@ -9283,9 +10015,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Edit News Server"
 #~ msgstr "Edita el servidor de notícies"
 
-#~ msgid "Testing \"%s\""
-#~ msgstr "S'està comprovant \"%s\""
-
 #~ msgid "The connection was successful!"
 #~ msgstr "La connexió ha tingut èxit!"
 
@@ -9368,18 +10097,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Filter on Rec_ipients"
 #~ msgstr "Filtre sobre els dest_inataris"
 
-#~ msgid "Mar_k As Read"
-#~ msgstr "Mar_ca'l com a llegit"
-
-#~ msgid "Mark As U_nread"
-#~ msgstr "Marca'l com a per _llegir"
-
-#~ msgid "Print Preview of message..."
-#~ msgstr "Previsualització d'impressió del missatge..."
-
-#~ msgid "Print message..."
-#~ msgstr "Imprimeix el missatge..."
-
 #~ msgid "Reply to _Sender"
 #~ msgstr "Respon al _remitent"
 
@@ -9387,9 +10104,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Show _All messages"
 #~ msgstr "Mostra"
 
-#~ msgid "_Edit Message"
-#~ msgstr "_Edita el missatge"
-
 #~ msgid "_Filter on Subject"
 #~ msgstr "_Filtre sobre l'assumpte"
 
@@ -9403,10 +10117,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "_Imprimeix el missatge"
 
 #, fuzzy
-#~ msgid "_Save Message As..."
-#~ msgstr "_Anomena i desa..."
-
-#, fuzzy
 #~ msgid "_Source"
 #~ msgstr "Font"
 
@@ -9416,9 +10126,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Show the _Folder Bar"
 #~ msgstr "Mostra la barra de _carpetes"
 
-#~ msgid "Available Categories:"
-#~ msgstr "Categories disponibles:"
-
 #~ msgid "External Directories"
 #~ msgstr "Directoris externs"
 
@@ -9575,9 +10282,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Mark messages in folder \"%s\""
 #~ msgstr "Marca els missatges de la carpeta \"%s\""
 
-#~ msgid "Marking message %d of %d"
-#~ msgstr "S'està marcant el missatge %d de %d"
-
 #~ msgid "Scan folders in \"%s\""
 #~ msgstr "Escaneja les carpetes de \"%s\""
 
@@ -9593,9 +10297,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Forward message \"%s\""
 #~ msgstr "Reenvia el missatge \"%s\""
 
-#~ msgid "Forward a message without a subject"
-#~ msgstr "Reenvia un missatge sense cap assumpte"
-
 #~ msgid ""
 #~ "Failed to generate mime part from message while generating forwarded message."
 #~ msgstr ""
@@ -9747,9 +10448,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Highlight not yet due items"
 #~ msgstr "Ressalta els elements que encara no han vençut"
 
-#~ msgid "Highlight items due today"
-#~ msgstr "Ressalta els elemts que vencen avui"
-
 #~ msgid "To Do List"
 #~ msgstr "Llista de coses per fer"
 
@@ -9774,9 +10472,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Could not create summary"
 #~ msgstr "No s'ha pogut crear el resum"
 
-#~ msgid "Cannot get message: %s"
-#~ msgstr "No es pot recuperar el missatge: %s"
-
 #~ msgid "Could not rename folder %s to %s: destination exists"
 #~ msgstr ""
 #~ "No s'ha pogut canviar el nom de la carpeta %s a %s: el nom de destí ja "
@@ -9836,18 +10531,12 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Don't know protocol to open URI `%s'"
 #~ msgstr "No es coneix cap protocol per obrir l'URI '%s'"
 
-#~ msgid "Open in New Window"
-#~ msgstr "Obre'l en una nova finestra"
-
 #~ msgid "Forward Message"
 #~ msgstr "Reenvia el missatge"
 
 #~ msgid "Copy Message"
 #~ msgstr "Copia el missatge"
 
-#~ msgid "New Ca_lendar"
-#~ msgstr "Nova a_genda"
-
 #~ msgid "_New appointment..."
 #~ msgstr "_Nova cita..."
 
@@ -9977,9 +10666,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "_Format"
 #~ msgstr "_Formata"
 
-#~ msgid "Check for new mail"
-#~ msgstr "Comprova si hi ha nou correu"
-
 #~ msgid "Currently pending operations:"
 #~ msgstr "Operacions encara pendents:"
author	Michael Meeks <michael@ximian.com>	2001-04-14 16:02:59 +0800
committer	Michael Meeks <michael@src.gnome.org>	2001-04-14 16:02:59 +0800
commit	04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2 (patch)
tree	b5e5eb3fca54a50b8643bfdf7125fef9b272e6dd /po/ca.po
parent	a5e6e0b5f3e06eee5726edfe276c5d3c65bb155c (diff)
download	gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.gz gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.tar.zst gsoc2013-evolution-04fac44de1b9b0106ef95b6bf6cfc2d877b01fd2.zip