Updated italian translation from Clara Tattoni <clara.tattoni@libero.it>

svn path=/trunk/; revision=7503

1 files changed, 1506 insertions, 1822 deletions

diff --git a/po/it.po b/po/it.po
index 532f3386e6..4703d1b4a3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2,23 +2,23 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Clara Tattoni <clara.tattoni@libero.it>, 2000
 #
-#: camel/providers/smtp/camel-smtp-transport.c:287
+#: camel/providers/smtp/camel-smtp-transport.c:285
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 0.5\n"
-"POT-Creation-Date: 2001-01-06 00:11+0100\n"
-"PO-Revision-Date: 2000-12-16 18:21-01:00\n"
+"POT-Creation-Date: 2001-01-15 16:44+0100\n"
+"PO-Revision-Date: 2001-01-12 18:36-01:00\n"
 "Last-Translator: Clara Tattoni <clara.tattoni@libero.it>\n"
 "Language-Team: Italiano <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: addressbook/backend/ebook/e-card.c:3049
 msgid "Card: "
 msgstr "Tessera:"
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "Name: "
@@ -26,7 +26,7 @@ msgstr ""
 "\n"
 "Nome:"
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Prefix:     "
@@ -34,7 +34,7 @@ msgstr ""
 "\n"
 " Prefisso:"
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Given:      "
@@ -42,7 +42,7 @@ msgstr ""
 "\n"
 " Dato:"
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3054
 msgid ""
 "\n"
 "  Additional: "
@@ -50,7 +50,7 @@ msgstr ""
 "\n"
 " Addizionale:"
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "  Family:     "
@@ -58,7 +58,7 @@ msgstr ""
 "\n"
 " Famigila:"
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Suffix:     "
@@ -66,7 +66,7 @@ msgstr ""
 "\n"
 " Suffisso:"
 
-#: addressbook/backend/ebook/e-card.c:3067
+#: addressbook/backend/ebook/e-card.c:3070
 msgid ""
 "\n"
 "Birth Date: "
@@ -74,7 +74,7 @@ msgstr ""
 "\n"
 "Data di nascita:"
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "Address:"
@@ -82,7 +82,7 @@ msgstr ""
 "\n"
 "Indirizzo:"
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -90,13 +90,13 @@ msgstr ""
 "\n"
 " Casella Postale: "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Street:      "
@@ -104,7 +104,7 @@ msgstr ""
 "\n"
 " Via:   "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  City:        "
@@ -112,7 +112,7 @@ msgstr ""
 "\n"
 " Città:     "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Region:      "
@@ -120,7 +120,7 @@ msgstr ""
 "\n"
 " Regione:       "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Postal Code: "
@@ -128,7 +128,7 @@ msgstr ""
 "\n"
 " Codice di avviamento postale:  "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Country:     "
@@ -136,7 +136,7 @@ msgstr ""
 "\n"
 " Stato:    "
 
-#: addressbook/backend/ebook/e-card.c:3099
+#: addressbook/backend/ebook/e-card.c:3102
 msgid ""
 "\n"
 "Delivery Label: "
@@ -144,7 +144,7 @@ msgstr ""
 "\n"
 "Etichetta di spedizione: "
 
-#: addressbook/backend/ebook/e-card.c:3111
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephones:\n"
@@ -152,7 +152,7 @@ msgstr ""
 "\n"
 " Telefoni:\n"
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3117
 msgid ""
 "\n"
 "Telephone:"
@@ -160,7 +160,7 @@ msgstr ""
 "\n"
 "Telefono:"
 
-#: addressbook/backend/ebook/e-card.c:3138
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:\n"
@@ -168,7 +168,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3144
 msgid ""
 "\n"
 "E-mail:"
@@ -176,7 +176,7 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3160
+#: addressbook/backend/ebook/e-card.c:3163
 msgid ""
 "\n"
 "Mailer: "
@@ -184,7 +184,7 @@ msgstr ""
 "\n"
 "Programma di posta: "
 
-#: addressbook/backend/ebook/e-card.c:3166
+#: addressbook/backend/ebook/e-card.c:3169
 msgid ""
 "\n"
 "Time Zone: "
@@ -192,7 +192,7 @@ msgstr ""
 "\n"
 "Fuso orario: "
 
-#: addressbook/backend/ebook/e-card.c:3174
+#: addressbook/backend/ebook/e-card.c:3177
 msgid ""
 "\n"
 "Geo Location: "
@@ -200,7 +200,7 @@ msgstr ""
 "\n"
 "Posizione Geografica: "
 
-#: addressbook/backend/ebook/e-card.c:3178
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Business Role: "
@@ -208,7 +208,7 @@ msgstr ""
 "\n"
 "Occupazione:"
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "Org: "
@@ -216,7 +216,7 @@ msgstr ""
 "\n"
 "Org: "
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Name:  "
@@ -224,7 +224,7 @@ msgstr ""
 "\n"
 " Nome:"
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit:  "
@@ -232,7 +232,7 @@ msgstr ""
 "\n"
 " Unità:"
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3196
 msgid ""
 "\n"
 "  Unit2: "
@@ -240,7 +240,7 @@ msgstr ""
 "\n"
 " Unità2:"
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "  Unit3: "
@@ -248,7 +248,7 @@ msgstr ""
 "\n"
 " Unità3:"
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Unit4: "
@@ -256,7 +256,7 @@ msgstr ""
 "\n"
 " Unità4:"
 
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "Categories: "
@@ -264,7 +264,7 @@ msgstr ""
 "\n"
 "Categorie:"
 
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3203
 msgid ""
 "\n"
 "Comment: "
@@ -282,7 +282,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Unique String: "
@@ -290,7 +290,7 @@ msgstr ""
 "\n"
 "Stringa Unica: "
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3219
 msgid ""
 "\n"
 "Public Key: "
@@ -302,10 +302,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1083
+#: addressbook/conduit/address-conduit.c:1084
 #: addressbook/gui/component/addressbook-factory.c:38
 #: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:55
 msgid "Could not initialize Bonobo"
 msgstr "Impossibile inizializzare Bonobo"
 
@@ -438,28 +438,28 @@ msgstr "Il cursore non può essere caricato\n"
 msgid "EBook not loaded\n"
 msgstr "EBook non caricato\n"
 
-#: addressbook/conduit/address-conduit.c:646
+#: addressbook/conduit/address-conduit.c:647
 #: calendar/conduits/calendar/calendar-conduit.c:730
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Impossibile avviare il server wombat"
 
-#: addressbook/conduit/address-conduit.c:647
+#: addressbook/conduit/address-conduit.c:648
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Impossibile avviare wombat"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:680
+#: addressbook/conduit/address-conduit.c:683
 msgid "Could not read pilot's Address application block"
 msgstr "Impossibile leggere il blocco Indirizzi del Pilot"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:6
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "Cancellare il Contatto?"
 
@@ -473,7 +473,7 @@ msgid "_Add"
 msgstr "_Aggiungi"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:53
 msgid "_Delete"
 msgstr "_Elimina"
 
@@ -487,13 +487,12 @@ msgid "New phone type"
 msgstr "Nuovo tipo di telefono"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: addressbook/gui/component/addressbook-config.glade.h:6
-#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
+#: po/tmp/addressbook-config.glade.h:6 po/tmp/event-editor-dialog.glade.h:7
+#: po/tmp/filter.glade.h:6 po/tmp/mail-config.glade.h:10
 msgid "Add"
 msgstr "Aggiungi"
 
@@ -551,13 +550,13 @@ msgid "C_ontacts..."
 msgstr "C_ontatti..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+#: po/tmp/event-editor-dialog.glade.h:9 po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ca_tegorie..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:27
 msgid "_Job title:"
-msgstr "_Titolo:"
+msgstr "_Posizione:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:28
 msgid "_Company:"
@@ -568,8 +567,7 @@ msgid "_Address..."
 msgstr "_Indirizzo..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: mail/mail-config-druid.glade.h:33
+#: po/tmp/event-editor-dialog.glade.h:16 po/tmp/mail-config.glade.h:31
 msgid "General"
 msgstr "Generale"
 
@@ -614,24 +612,28 @@ msgid "No_tes:"
 msgstr "No_te:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Dettagli"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
-msgstr "P_artecipante"
+msgstr "Assistente"
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "Ufficio"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr "Ufficio2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr "Fax Ufficio"
 
@@ -640,6 +642,7 @@ msgid "Callback"
 msgstr "Richiamare"
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "Auto"
 
@@ -649,28 +652,33 @@ msgstr "Ditta"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "Casa"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "Casa 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "Fax Casa"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "Cellulare"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: mail/mail-config.glade.h:17
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "Altro"
 
@@ -679,10 +687,12 @@ msgid "Other Fax"
 msgstr "Altro fax"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "Impaginatore"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr "Principale"
 
@@ -699,58 +709,60 @@ msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr "Email 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr "Email 3"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: po/tmp/fulladdr.glade.h:6
 msgid "Address _2:"
 msgstr "Indirizzo _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: po/tmp/fulladdr.glade.h:7
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: po/tmp/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Controlla Indirizzo"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: po/tmp/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "_Stato:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: po/tmp/fulladdr.glade.h:10
 msgid "Finland"
 msgstr "Finlandia"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: po/tmp/fulladdr.glade.h:11
 msgid "USA"
 msgstr "USA"
 
-#: addressbook/contact-editor/fulladdr.glade.h:12
+#: po/tmp/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Indirizzo:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
+#: po/tmp/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Città:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:14
+#: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_Casella Postale:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:15
+#: po/tmp/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "_Stato/Provincia:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:16
+#: po/tmp/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "_ZIP/CAP:"
 
@@ -764,7 +776,6 @@ msgid "Check Full Name"
 msgstr "Verifiare Nome e Cognome"
 
 #: addressbook/contact-editor/fullname-strings.h:8
-#, fuzzy
 msgid ""
 "\n"
 "Mr.\n"
@@ -776,6 +787,8 @@ msgstr ""
 "\n"
 "Sig.\n"
 "Sig.ra\n"
+"Sig.ra\n"
+"Sig.na\n"
 "Dott.\n"
 
 #: addressbook/contact-editor/fullname-strings.h:15
@@ -820,11 +833,11 @@ msgid "As _Minicards"
 msgstr "Come _Minicards"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
 #: addressbook/gui/component/addressbook.c:237
-#: ui/evolution-addressbook.xml.h:6
+#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Come _Tabella"
 
@@ -857,27 +870,27 @@ msgstr ""
 "Se si desidera usare LDAP, è necessario scaricare e \n"
 "installare OpenLDAP, ricompilare e reinstallare Evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr "Mostra Tutto"
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr "Avanzato..."
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 msgid "Any field contains"
 msgstr "Qualunque campo contiene"
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr "Il nome contiene"
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 msgid "Email contains"
 msgstr "Email contiene"
 
-#: addressbook/gui/component/addressbook.c:648
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI visualizzata dal Browser delle cartelle"
 
@@ -906,9 +919,9 @@ msgid "None (anonymous mode)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:155
-#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/imap/camel-imap-store.c:248
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:146
 msgid "Password"
 msgstr "Password"
 
@@ -944,12 +957,11 @@ msgid "Bind DN:"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:311
-#: mail/mail-config-gui.c:968
 msgid "Remember this password"
 msgstr "Ricorda questa password"
 
 #: addressbook/gui/component/addressbook-config.c:360
-#: mail/mail-config-druid.glade.h:34
+#: po/tmp/mail-config.glade.h:32
 #, fuzzy
 msgid "Host:"
 msgstr "Ore"
@@ -969,12 +981,12 @@ msgid "Search Scope:"
 msgstr "Cerca"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
+#: po/tmp/mail-config.glade.h:14
 msgid "Authentication:"
 msgstr "Autenticazione:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
+#: po/tmp/mail-config.glade.h:51
 msgid "Path:"
 msgstr "Percorso:"
 
@@ -1000,62 +1012,61 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:616
-#: mail/mail-config-druid.glade.h:45
+#: po/tmp/mail-config.glade.h:44
 msgid "Name:"
 msgstr "Nome:"
 
 #: addressbook/gui/component/addressbook-config.c:617
-#: composer/e-msg-composer-attachment.glade.h:7
+#: po/tmp/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
+#: po/tmp/addressbook-config.glade.h:7
 #, fuzzy
 msgid "Addressbook Sources"
 msgstr "Aggiungi Sorgente"
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
-#: calendar/gui/e-calendar-table.c:342
-#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
-#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
-#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
-#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
+#: calendar/gui/e-calendar-table.c:381 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
+#: po/tmp/addressbook-config.glade.h:8 po/tmp/event-editor-dialog.glade.h:13
+#: po/tmp/evolution-addressbook.xml.h:8 po/tmp/evolution-event-editor.xml.h:19
+#: po/tmp/evolution-mail.xml.h:11 po/tmp/filter.glade.h:7
+#: po/tmp/mail-config.glade.h:24
 msgid "Delete"
 msgstr "Elimina"
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: filter/filter.glade.h:8 mail/folder-browser.c:671
-#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
+#: mail/folder-browser.c:659 po/tmp/addressbook-config.glade.h:9
+#: po/tmp/filter.glade.h:8 po/tmp/mail-config.glade.h:27
 msgid "Edit"
 msgstr "Modifica"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:565
+#: po/tmp/addressbook-config.glade.h:10
 #, fuzzy
 msgid "Name"
 msgstr "Nome:"
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
+#: po/tmp/addressbook-config.glade.h:11
 msgid "URI"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: po/tmp/select-names.glade.h:6
 msgid "Find..."
 msgstr "Trova..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: po/tmp/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "Destinatari del messaggio:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: po/tmp/select-names.glade.h:8
 msgid "Select Names"
 msgstr "Seleziona Nomi"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
+#: po/tmp/select-names.glade.h:9
 #, fuzzy
 msgid "Select name from:"
 msgstr "Seleziona un nome dalla Lista:"
@@ -1066,127 +1077,184 @@ msgid "Search"
 msgstr "Cerca"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:6
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:7
+#: po/tmp/alphabet.glade.h:7
 msgid "a"
 msgstr "a"
 
-#: addressbook/gui/widgets/alphabet.glade.h:8
+#: po/tmp/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
+#: po/tmp/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: addressbook/gui/widgets/alphabet.glade.h:10
+#: po/tmp/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: addressbook/gui/widgets/alphabet.glade.h:11
+#: po/tmp/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: addressbook/gui/widgets/alphabet.glade.h:12
+#: po/tmp/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: addressbook/gui/widgets/alphabet.glade.h:13
+#: po/tmp/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: addressbook/gui/widgets/alphabet.glade.h:14
+#: po/tmp/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: addressbook/gui/widgets/alphabet.glade.h:15
+#: po/tmp/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: addressbook/gui/widgets/alphabet.glade.h:16
+#: po/tmp/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
+#: po/tmp/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: addressbook/gui/widgets/alphabet.glade.h:18
+#: po/tmp/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
+#: po/tmp/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
+#: po/tmp/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
+#: po/tmp/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
+#: po/tmp/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
+#: po/tmp/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
+#: po/tmp/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
+#: po/tmp/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
+#: po/tmp/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
+#: po/tmp/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
+#: po/tmp/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
+#: po/tmp/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
+#: po/tmp/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
+#: po/tmp/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
+#: po/tmp/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-addressbook-view.c:469
 #: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Salva come VCard"
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-addressbook-view.c:566
+#, fuzzy
+msgid "Email"
+msgstr "Email 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "Organizzazione"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+#, fuzzy
+msgid "Department"
+msgstr "_Dipartimento:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+#, fuzzy
+msgid "Office"
+msgstr "_Ufficio:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+#, fuzzy
+msgid "Title"
+msgstr "_Titolo:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+#, fuzzy
+msgid "Profession"
+msgstr "_Professione:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+#, fuzzy
+msgid "Manager"
+msgstr "Impaginatore"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+#, fuzzy
+msgid "Nickname"
+msgstr "_Nickname:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+#, fuzzy
+msgid "Spouse"
+msgstr "_Coniuge:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+#, fuzzy
+msgid "Note"
+msgstr "Nessuno "
+
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "Salva nella rubrica"
 
-#: addressbook/gui/widgets/e-minicard-view.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:129
 msgid ""
 "\n"
 "\n"
@@ -1201,175 +1269,174 @@ msgstr ""
 "Fare doppio click qui per creare un nuovo contatto."
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:6
+#: po/tmp/e-contact-print.glade.h:6
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:7
+#: po/tmp/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:8
+#: po/tmp/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr "Moduli bianchi alla fine:"
 
-#: addressbook/printing/e-contact-print.glade.h:9
+#: po/tmp/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "Corpo"
 
-#: addressbook/printing/e-contact-print.glade.h:10
+#: po/tmp/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Inferiore:"
 
-#: addressbook/printing/e-contact-print.glade.h:11
+#: po/tmp/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Dimensioni:"
 
-#: addressbook/printing/e-contact-print.glade.h:12
+#: po/tmp/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Carattere..."
 
-#: addressbook/printing/e-contact-print.glade.h:13
+#: po/tmp/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Caratteri"
 
-#: addressbook/printing/e-contact-print.glade.h:14
+#: po/tmp/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "Note a piè di pagina:"
 
-#: addressbook/printing/e-contact-print.glade.h:15
+#: po/tmp/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "Formato"
 
-#: addressbook/printing/e-contact-print.glade.h:16
+#: po/tmp/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "Intestazione"
 
-#: addressbook/printing/e-contact-print.glade.h:17
+#: po/tmp/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "Intestazione/Note a piè di pagina"
 
-#: addressbook/printing/e-contact-print.glade.h:18
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "Titoli"
 
-#: addressbook/printing/e-contact-print.glade.h:19
+#: po/tmp/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr "Titolo per ogni lettera"
 
-#: addressbook/printing/e-contact-print.glade.h:20
+#: po/tmp/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "Altezza:"
 
-#: addressbook/printing/e-contact-print.glade.h:21
+#: po/tmp/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr "Concatenati l'un l'altro"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: po/tmp/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr "Includi:"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: po/tmp/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Orizzontale"
 
-#: addressbook/printing/e-contact-print.glade.h:24
+#: po/tmp/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Sinistra:"
 
-#: addressbook/printing/e-contact-print.glade.h:25
+#: po/tmp/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "Lettere sul bordo"
 
-#: addressbook/printing/e-contact-print.glade.h:26
+#: po/tmp/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "Margini"
 
-#: addressbook/printing/e-contact-print.glade.h:27
+#: po/tmp/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "Numero di colonne:"
 
-#: addressbook/printing/e-contact-print.glade.h:28
+#: po/tmp/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Opzioni"
 
-#: addressbook/printing/e-contact-print.glade.h:29
+#: po/tmp/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "Orientazione"
 
-#: addressbook/printing/e-contact-print.glade.h:30
+#: po/tmp/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Pagina"
 
-#: addressbook/printing/e-contact-print.glade.h:31
+#: po/tmp/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "Impostazione pagina:"
 
-#: addressbook/printing/e-contact-print.glade.h:32
+#: po/tmp/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Carta"
 
-#: addressbook/printing/e-contact-print.glade.h:33
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Alimentazione della carta:"
 
-#: addressbook/printing/e-contact-print.glade.h:34
+#: po/tmp/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Verticale"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: po/tmp/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "Anteprima:"
 
-#: addressbook/printing/e-contact-print.glade.h:36
+#: po/tmp/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr "Stampa usando ombreggiatura grigia"
 
-#: addressbook/printing/e-contact-print.glade.h:37
+#: po/tmp/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "Inverti le pagine pari"
 
-#: addressbook/printing/e-contact-print.glade.h:38
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Destra:"
 
-#: addressbook/printing/e-contact-print.glade.h:39
+#: po/tmp/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "Sezioni:"
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "Ombreggiatura"
 
-#: addressbook/printing/e-contact-print.glade.h:41
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Dimensione:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: po/tmp/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "Inizia su una nuova pagina"
 
-#: addressbook/printing/e-contact-print.glade.h:43
+#: po/tmp/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Nome dello stile:"
 
-#: addressbook/printing/e-contact-print.glade.h:44
+#: po/tmp/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "Superiore:"
 
-#: addressbook/printing/e-contact-print.glade.h:45
-#: mail/mail-config-druid.glade.h:75
+#: po/tmp/e-contact-print.glade.h:45 po/tmp/mail-config.glade.h:72
 msgid "Type:"
 msgstr "Tipo:"
 
-#: addressbook/printing/e-contact-print.glade.h:46
+#: po/tmp/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Larghezza:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
+#: po/tmp/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "label26"
 
@@ -1405,68 +1472,12 @@ msgstr "Utilità di configurazione per il conduit di Evolution.\n"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Impossibile leggere il blocco delle applicazioni da fare del Pilot "
 
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
-msgid "Factory for the sample Calendar control"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
-msgid "Calendar Repository"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
-#, fuzzy
-msgid "Calendar Server"
-msgstr "Calendario"
-
-#.
-#. * Translatable strings file generated by xml-i18n-extract.
-#. * DO NOT compile this file as part of your application.
-#.
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Evolution calendar executive summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Conduit per il Calendario di Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the Calendar Summary component."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr ""
-"Utilità di configurazione per il conduit del calendario di Evolution.\n"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory for the calendar iTip view control"
-msgstr ""
-
 #: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
 #: calendar/gui/alarm-notify.c:940
 msgid "Reminder of your appointment at "
 msgstr "Promemoria dell'appuntamento alle"
 
-#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+#: calendar/gui/alarm-notify.c:876 po/tmp/alarm-notify.glade.h:8
 msgid "Snooze"
 msgstr "Suoneria"
 
@@ -1494,7 +1505,7 @@ msgid ""
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:328
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1502,60 +1513,57 @@ msgstr "%a %m/%d/%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
+#: calendar/gui/calendar-model.c:332 calendar/gui/calendar-model.c:762
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:741
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:765
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:346
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:370 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "Pubblico"
 
-#: calendar/gui/calendar-model.c:349
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:373 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "Privato"
 
-#: calendar/gui/calendar-model.c:352
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:376 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "Confidenziale"
 
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
+#: calendar/gui/calendar-model.c:379 calendar/gui/calendar-model.c:547
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:467
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:467
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:469
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:445
+#: calendar/gui/calendar-model.c:469
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:517
+#: calendar/gui/calendar-model.c:541
 msgid "Transparent"
 msgstr "Trasparente"
 
-#: calendar/gui/calendar-model.c:520
+#: calendar/gui/calendar-model.c:544
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:746
+#: calendar/gui/calendar-model.c:770
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1567,7 +1575,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:871 calendar/gui/calendar-model.c:919
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1575,27 +1583,27 @@ msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:865
+#: calendar/gui/calendar-model.c:889
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:868
+#: calendar/gui/calendar-model.c:892
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:872
+#: calendar/gui/calendar-model.c:896
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:875
+#: calendar/gui/calendar-model.c:899
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:995
+#: calendar/gui/calendar-model.c:1019
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1605,38 +1613,58 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1035
+#: calendar/gui/calendar-model.c:1059
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Il valore percentuale deve essere compreso tra 0 e 100, inclusi"
 
-#: calendar/gui/calendar-model.c:1075
+#: calendar/gui/calendar-model.c:1099
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "La priorità dev'essere compresa tra 1 e 9, inclusi"
 
-#: calendar/gui/calendar-summary.c:81
+#: calendar/gui/calendar-summary.c:93
 #, fuzzy
 msgid "%A, %e %B %Y"
 msgstr "%A, %B %d, %Y"
 
-#: calendar/gui/calendar-summary.c:224
+#: calendar/gui/calendar-summary.c:134 calendar/gui/calendar-summary.c:140
+#, fuzzy
+msgid "%I:%M%p"
+msgstr "%I:%M %p"
+
+#: calendar/gui/calendar-summary.c:299
 #, fuzzy
 msgid "<b>Error loading calendar</b>"
 msgstr "Errore nel caricare il file: %s"
 
-#: calendar/gui/calendar-summary.c:229
+#: calendar/gui/calendar-summary.c:304
 msgid "<b>Error loading calendar:<br>Calendar in use."
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:235
+#: calendar/gui/calendar-summary.c:310
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:293
+#: calendar/gui/calendar-summary.c:476
+#, fuzzy
+msgid "Display"
+msgstr "_Visualizza"
+
+#: calendar/gui/calendar-summary.c:481
+#, fuzzy
+msgid "Show appointments"
+msgstr "Mostra i termini dell'appuntamento"
+
+#: calendar/gui/calendar-summary.c:489
+#, fuzzy
+msgid "Show tasks"
+msgstr "Mostra allegati"
+
+#: calendar/gui/calendar-summary.c:581
 #, fuzzy
 msgid "Loading Calendar"
 msgstr "Stampa Calendario"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "La URI che il calendario visualizzerà"
 
@@ -1653,288 +1681,275 @@ msgid "No summary available."
 msgstr "Indice non disponibile."
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:6
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
+#: po/tmp/alarm-notify.glade.h:6 po/tmp/evolution-contact-editor.xml.h:6
+#: po/tmp/evolution-event-editor.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:8
+#: po/tmp/evolution-subscribe.xml.h:7
 msgid "Close"
 msgstr "Chiudi"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Modifica appuntamenti"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
+#: po/tmp/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Suoneria (minuti)"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: po/tmp/cal-prefs-dialog.glade.h:6
 msgid "05 minutes"
 msgstr "05 minuti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: po/tmp/cal-prefs-dialog.glade.h:7
 msgid "10 minutes"
 msgstr "10 minuti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: po/tmp/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12 ore (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: po/tmp/cal-prefs-dialog.glade.h:9
 msgid "15 minutes"
 msgstr "15 minuti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: po/tmp/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24 ore"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: po/tmp/cal-prefs-dialog.glade.h:11
 msgid "30 minutes"
 msgstr "30 minuti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: po/tmp/cal-prefs-dialog.glade.h:12
 msgid "60 minutes"
 msgstr "60 minuti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: po/tmp/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr "Interruzione avviso sonoro dopo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: po/tmp/cal-prefs-dialog.glade.h:14
 msgid "Audio Alarms"
 msgstr "Avviso Sonoro"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: po/tmp/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr "Emette un suono quondo appare la finestra di avviso"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: po/tmp/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "Calendario"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: po/tmp/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "Preferenze del Calendario"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: po/tmp/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Colori"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: po/tmp/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr "Comprimi i fine settimana"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: po/tmp/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr "Opzioni del navigatore delle date"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: po/tmp/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr "Predefinito"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: po/tmp/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Visualizza opzioni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/e-calendar-table.c:158 po/tmp/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "Scadenza"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: po/tmp/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr "Attiva la suoneria per "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: po/tmp/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "Fine della giornata: "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: po/tmp/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "Primo giorno della settimana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/gnome-month-item.c:741
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
 msgid "Fri"
 msgstr "Ven"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/event-editor.c:433
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:28
 msgid "Friday"
 msgstr "Venerdì"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: po/tmp/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr "Evidenzia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: po/tmp/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr "Scadenze per oggi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: po/tmp/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr "Scadenze per oggi:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: po/tmp/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
-msgstr ""
+msgstr "Compiti non ancora scaduti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: po/tmp/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
-msgstr ""
+msgstr "Compiti non ancora scaduti:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/gnome-month-item.c:737
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
 msgid "Mon"
 msgstr "Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: calendar/gui/event-editor.c:429
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:35
 msgid "Monday"
 msgstr "Lunedì"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: po/tmp/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr "Compiti scaduti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: po/tmp/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: po/tmp/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr "Prendi un colore"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
+#: calendar/gui/e-calendar-table.c:161 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr "Priorità"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: po/tmp/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr "Ricordami tutti gli appuntamenti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: po/tmp/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr "Promemoria"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/gnome-month-item.c:742
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
 msgid "Sat"
 msgstr "Sab"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/event-editor.c:434
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:43
 msgid "Saturday"
 msgstr "Sabato"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: po/tmp/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr "Mostra"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: po/tmp/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr "Mostra i termini dell'appuntamento"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: po/tmp/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "Mostra i numeri delle settimane"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: po/tmp/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "Inizio della giornata:"
 
 #. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/gnome-month-item.c:736
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
 msgid "Sun"
 msgstr "Dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/event-editor.c:435
+#: calendar/gui/event-editor.c:440 po/tmp/cal-prefs-dialog.glade.h:49
 msgid "Sunday"
 msgstr "Domenica"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: po/tmp/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "TaskPad"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/gnome-month-item.c:740
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
 msgid "Thu"
 msgstr "Gio"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:432
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:52
 msgid "Thursday"
 msgstr "Giovedì"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: po/tmp/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr "Cronometra fino al termine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: po/tmp/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr "Suddivisione del tempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: po/tmp/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Formato del tempo:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:738
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
 msgid "Tue"
 msgstr "Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/event-editor.c:430
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:57
 msgid "Tuesday"
 msgstr "Martedì"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: po/tmp/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "Avviso visivo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:739
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
 msgid "Wed"
 msgstr "Mer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/event-editor.c:431
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:60
 msgid "Wednesday"
 msgstr "Mercoledì"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: po/tmp/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "Settimana lavorativa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: po/tmp/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr "minuti prima che inizino."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: po/tmp/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr "secondi."
 
 #: calendar/gui/dialogs/delete-comp.c:62
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Sei sicuro di voler cancellare %s `%s'?"
+msgstr "Sei sicuro di voler cancellare l'appuntamento?"
 
 #: calendar/gui/dialogs/delete-comp.c:65
 #, fuzzy
 msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Sei sicuro di voler cancellare questo %s?"
+msgstr "Sei sicuro di voler cancellare l'appuntamento?"
 
 #: calendar/gui/dialogs/delete-comp.c:71
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Sei sicuro di voler cancellare %s `%s'?"
+msgstr "Sei sicuro di voler cancellare questo %s?"
 
 #: calendar/gui/dialogs/delete-comp.c:74
 #, fuzzy
@@ -1944,146 +1959,202 @@ msgstr "Sei sicuro di voler cancellare questo %s?"
 #: calendar/gui/dialogs/delete-comp.c:80
 #, fuzzy, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Sei sicuro di voler cancellare %s `%s'?"
+msgstr "Sei sicuro di voler cancellare l'ingresso giornaliero?"
 
 #: calendar/gui/dialogs/delete-comp.c:83
 #, fuzzy
 msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Sei sicuro di voler cancellare questo %s?"
+msgstr "Sei sicuro di voler cancellare l'ingresso giornaliero?"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
+#: po/tmp/task-editor-dialog.glade.h:6
 msgid "% Comp_lete:"
 msgstr "% Comp_leta:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: po/tmp/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr "C_lassificazione"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: po/tmp/task-editor-dialog.glade.h:9
 msgid "Cancelled"
 msgstr "Annullato"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: po/tmp/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "Completato"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: po/tmp/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr "Completato in data:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: po/tmp/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "Altezza"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: po/tmp/task-editor-dialog.glade.h:15
 msgid "In Progress"
 msgstr "In corso"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#: po/tmp/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "Basso"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
+#: po/tmp/mail-config.glade.h:46 po/tmp/task-editor-dialog.glade.h:17
+#: shell/e-shell-view.c:1089 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
 msgid "None"
 msgstr "Nessuno "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: po/tmp/task-editor-dialog.glade.h:18
 msgid "Normal"
 msgstr "Normale"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: po/tmp/task-editor-dialog.glade.h:19
 msgid "Not Started"
 msgstr "Da cominciare"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: po/tmp/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr "_Riassunto"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: po/tmp/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Data di _inizio:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: po/tmp/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Obiettivo"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: po/tmp/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: po/tmp/task-editor-dialog.glade.h:26
+msgid "Undefined"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:27
 msgid "_Contacts..."
 msgstr "_Contatti..."
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: po/tmp/task-editor-dialog.glade.h:28
 msgid "_Due Date:"
 msgstr "Sca_denza:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
+#: po/tmp/task-editor-dialog.glade.h:29
 msgid "_Priority:"
 msgstr "_Priorità:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
+#: po/tmp/task-editor-dialog.glade.h:30
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
+#: po/tmp/task-editor-dialog.glade.h:31
 msgid "task-editor-dialog"
 msgstr "task-editor-dialog"
 
-#: calendar/gui/dialogs/task-editor.c:681
+#: calendar/gui/dialogs/task-editor.c:689
 msgid "Edit Task"
 msgstr "Modifica Obiettivo"
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:336
 msgid "No summary"
 msgstr "Niente indice"
 
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:342
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appuntamento - %s"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:345
 #, c-format
 msgid "Task - %s"
 msgstr "Obiettivo - %s"
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:348
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Voce nell'agenda - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
+#: calendar/gui/dialogs/task-editor.c:1292 calendar/gui/event-editor.c:3269
 msgid "Do you want to save changes?"
 msgstr "Salvare le modifiche?"
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:153
+#, fuzzy
+msgid "Categories"
+msgstr "categorie"
+
+#: calendar/gui/e-calendar-table.c:154 po/tmp/event-editor-dialog.glade.h:10
+msgid "Classification"
+msgstr "Classificazione"
+
+#: calendar/gui/e-calendar-table.c:155
+#, fuzzy
+msgid "Completion Date"
+msgstr "Completato"
+
+#: calendar/gui/e-calendar-table.c:156
+#, fuzzy
+msgid "End Date"
+msgstr "Ora di _fine:"
+
+#: calendar/gui/e-calendar-table.c:157
+#, fuzzy
+msgid "Start Date"
+msgstr "Data di _inizio:"
+
+#: calendar/gui/e-calendar-table.c:159
+msgid "Geographical Position"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:160
+#, fuzzy
+msgid "Precent complete"
+msgstr "Segna l'obiettivo come raggiunto"
+
+#: calendar/gui/e-calendar-table.c:162
+#, fuzzy
+msgid "Summary"
+msgstr "_Riassunto"
+
+#: calendar/gui/e-calendar-table.c:163
+#, fuzzy
+msgid "Transparency"
+msgstr "Trasparente"
+
+#: calendar/gui/e-calendar-table.c:164
+#, fuzzy
+msgid "URL"
+msgstr "URL:"
+
+#: calendar/gui/e-calendar-table.c:165
+#, fuzzy
+msgid "Alarms"
+msgstr "Avviso Sonoro"
+
+#: calendar/gui/e-calendar-table.c:375
 msgid "Open..."
 msgstr "Apri..."
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:376
 msgid "Open the task"
 msgstr "Apri ..."
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:378
 msgid "Mark Complete"
 msgstr "Segna come Completato"
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:379
 msgid "Mark the task complete"
 msgstr "Segna l'obiettivo come raggiunto"
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:382
 msgid "Delete the task"
 msgstr "Elimina questo obiettivo"
 
@@ -2094,21 +2165,21 @@ msgstr "%02i divisioni per minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1213
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1227
 #: 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:269 calendar/gui/e-day-view.c:1238
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1240
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
@@ -2125,34 +2196,61 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:2950 calendar/gui/e-day-view.c:2957
+#: calendar/gui/e-day-view.c:2966 calendar/gui/e-week-view.c:3170
+#: calendar/gui/e-week-view.c:3177 calendar/gui/e-week-view.c:3186
 msgid "New appointment..."
 msgstr "Nuovo appuntamento..."
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-day-view.c:2961
+#: calendar/gui/e-week-view.c:3174 calendar/gui/e-week-view.c:3181
 msgid "Edit this appointment..."
 msgstr "Modifica questo appuntamento..."
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: ui/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3175
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Elimina questo appuntamento"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3182
 msgid "Make this appointment movable"
 msgstr "Rendi rimandabile questo appuntamento"
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:2963 calendar/gui/e-week-view.c:3183
 msgid "Delete this occurrence"
 msgstr "Elimina questa ricorrenza"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3184
 msgid "Delete all occurrences"
 msgstr "Elimina tutte le ricorrenze"
 
+#: calendar/gui/e-tasks.c:156 calendar/gui/e-tasks.c:573
+#: calendar/gui/e-tasks.c:608
+msgid "All"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:162
+#, fuzzy
+msgid "Category:"
+msgstr ""
+"\n"
+"Categorie:"
+
+#: calendar/gui/e-tasks.c:333
+#, fuzzy, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Impossibile caricare il calendario in `%s'"
+
+#: calendar/gui/e-tasks.c:345
+#, fuzzy, c-format
+msgid "Could not create a tasks file in `%s'"
+msgstr "Impossibile creare un calendario in `%s'"
+
+#: calendar/gui/e-tasks.c:358 calendar/gui/gnome-cal.c:731
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "IL metodo richiesto per caricare `%s' non è supportato"
+
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
@@ -2161,292 +2259,278 @@ msgid "%d %B"
 msgstr "%d %B"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: po/tmp/event-editor-dialog.glade.h:6
 msgid "A_ll day event"
 msgstr "_Eventi della giornata"
 
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: po/tmp/event-editor-dialog.glade.h:8
 msgid "Appointment Basics"
 msgstr "Appuntamenti di Base:"
 
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Classification"
-msgstr "Classificazione"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
+#: po/tmp/event-editor-dialog.glade.h:11
 msgid "Custom recurrence"
 msgstr "Ricorrenza personalizzata"
 
-#: calendar/gui/event-editor-dialog.glade.h:11
+#: po/tmp/event-editor-dialog.glade.h:12
 msgid "Days"
 msgstr "Giorni"
 
-#: calendar/gui/event-editor-dialog.glade.h:13
+#: po/tmp/event-editor-dialog.glade.h:14
 msgid "Every"
 msgstr "Ogni"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "Exceptions"
 msgstr "Eccezioni"
 
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: po/tmp/event-editor-dialog.glade.h:17
 msgid "Hours"
 msgstr "Ore"
 
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: po/tmp/event-editor-dialog.glade.h:18
 msgid "Mail _to:"
 msgstr "_Scrivi a:"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
+#: po/tmp/event-editor-dialog.glade.h:19
 msgid "Minutes"
 msgstr "Minuti"
 
-#: calendar/gui/event-editor-dialog.glade.h:19
+#: po/tmp/event-editor-dialog.glade.h:20
 msgid "Modify"
 msgstr "Modifica"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
+#: po/tmp/event-editor-dialog.glade.h:21
 msgid "No recurrence"
 msgstr "Nessuna Ricorrenza"
 
-#: calendar/gui/event-editor-dialog.glade.h:21
+#: po/tmp/event-editor-dialog.glade.h:22
 msgid "Preview"
 msgstr "Anteprima"
 
-#: calendar/gui/event-editor-dialog.glade.h:22
+#: po/tmp/event-editor-dialog.glade.h:23
 msgid "Pri_vate"
 msgstr "Pri_vato"
 
-#: calendar/gui/event-editor-dialog.glade.h:23
+#: po/tmp/event-editor-dialog.glade.h:24
 msgid "Pu_blic"
 msgstr "Pub_blico"
 
-#: calendar/gui/event-editor-dialog.glade.h:24
+#: po/tmp/event-editor-dialog.glade.h:25
 msgid "Recurrence"
 msgstr "Ricorrenza"
 
-#: calendar/gui/event-editor-dialog.glade.h:25
+#: po/tmp/event-editor-dialog.glade.h:26
 msgid "Recurrence Rule"
 msgstr "Regole di ricorrenza"
 
-#: calendar/gui/event-editor-dialog.glade.h:26
+#: po/tmp/event-editor-dialog.glade.h:27
 msgid "Reminder"
 msgstr "Promemoria"
 
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: po/tmp/event-editor-dialog.glade.h:28
 msgid "Simple recurrence"
 msgstr "Semplice ricorrenza"
 
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: po/tmp/event-editor-dialog.glade.h:29
 msgid "Su_mmary:"
 msgstr "_Indice:"
 
-#: calendar/gui/event-editor-dialog.glade.h:29
+#: po/tmp/event-editor-dialog.glade.h:30
 msgid "Time"
 msgstr "Tempo"
 
-#: calendar/gui/event-editor-dialog.glade.h:30
+#: po/tmp/event-editor-dialog.glade.h:31
 msgid "_Audio"
 msgstr "_Audio"
 
-#: calendar/gui/event-editor-dialog.glade.h:31
+#: po/tmp/event-editor-dialog.glade.h:32
 msgid "_Confidential"
 msgstr "_Confidenziale"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
+#: po/tmp/event-editor-dialog.glade.h:33
+#, fuzzy
+msgid "_Contacts"
+msgstr "_Contatti..."
+
+#: po/tmp/event-editor-dialog.glade.h:34
 msgid "_Display"
 msgstr "_Visualizza"
 
-#: calendar/gui/event-editor-dialog.glade.h:33
+#: po/tmp/event-editor-dialog.glade.h:35
 msgid "_End time:"
 msgstr "Ora di _fine:"
 
-#: calendar/gui/event-editor-dialog.glade.h:34
+#: po/tmp/event-editor-dialog.glade.h:36
 msgid "_Mail"
 msgstr "_Posta"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
+#: po/tmp/event-editor-dialog.glade.h:37
 msgid "_Program"
 msgstr "_Programma"
 
-#: calendar/gui/event-editor-dialog.glade.h:36
+#: po/tmp/event-editor-dialog.glade.h:38
 msgid "_Run program:"
 msgstr "Esegui p_rogramma"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
+#: po/tmp/event-editor-dialog.glade.h:39
 msgid "_Start time:"
 msgstr "_Ora di inizio:"
 
-#: calendar/gui/event-editor-dialog.glade.h:38
+#: po/tmp/event-editor-dialog.glade.h:40
 msgid "_Starting date:"
 msgstr "Data di _inizio:"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
+#: po/tmp/event-editor-dialog.glade.h:41
 msgid "day(s)"
 msgstr "giorno(i)"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
+#: po/tmp/event-editor-dialog.glade.h:42
 msgid "event-editor-dialog"
-msgstr ""
+msgstr "event-editor-dialog"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
+#: po/tmp/event-editor-dialog.glade.h:43
 msgid "for"
 msgstr "per"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
+#: po/tmp/event-editor-dialog.glade.h:44
 msgid "forever"
 msgstr "sempre"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
+#: po/tmp/event-editor-dialog.glade.h:45
 msgid "label21"
 msgstr "label21"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
+#: po/tmp/event-editor-dialog.glade.h:46
 msgid "month(s)"
 msgstr "mese(i)"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
+#: po/tmp/event-editor-dialog.glade.h:47
 msgid "until"
 msgstr "fino a"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: po/tmp/event-editor-dialog.glade.h:48
 msgid "week(s)"
 msgstr "Settimana(e)"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
+#: po/tmp/event-editor-dialog.glade.h:49
 msgid "year(s)"
 msgstr "anno(i)"
 
-#: calendar/gui/event-editor.c:325
+#: calendar/gui/event-editor.c:330
 msgid "Edit Appointment"
 msgstr "Modifica Appuntamenti"
 
-#: calendar/gui/event-editor.c:403
+#: calendar/gui/event-editor.c:408
 msgid "on"
 msgstr "il"
 
-#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:433 filter/filter-datespec.c:65
 msgid "day"
 msgstr "giorno"
 
-#: calendar/gui/event-editor.c:555
+#: calendar/gui/event-editor.c:560
 msgid "on the"
 msgstr "il"
 
-#: calendar/gui/event-editor.c:562
+#: calendar/gui/event-editor.c:567
 msgid "th"
 msgstr " "
 
-#: calendar/gui/event-editor.c:716
+#: calendar/gui/event-editor.c:721
 msgid "occurrences"
 msgstr "ricorrenze"
 
-#: calendar/gui/event-editor.c:833
+#: calendar/gui/event-editor.c:838
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Questo appuntamento contiene ricorrenze che Evolution non può modificare."
 
-#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/event-editor.c:3092 calendar/gui/print.c:1090
 #: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
+#: calendar/gui/gnome-cal.c:709
+#, fuzzy, c-format
+msgid "Could not load the folder in `%s'"
 msgstr "Impossibile caricare il calendario in `%s'"
 
-#: calendar/gui/gnome-cal.c:687
-#, c-format
-msgid "Could not create a calendar in `%s'"
+#: calendar/gui/gnome-cal.c:720
+#, fuzzy, c-format
+msgid "Could not create a folder in `%s'"
 msgstr "Impossibile creare un calendario in `%s'"
 
-#: calendar/gui/gnome-cal.c:698
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "IL metodo richiesto per caricare `%s' non è supportato"
-
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:6
 msgid "April"
-msgstr "aprile"
+msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:7
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:7
 msgid "August"
-msgstr "agosto"
+msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:8
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:8
 msgid "December"
-msgstr "dicembre"
+msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:9
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:9
 msgid "February"
-msgstr "febbraio"
+msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: po/tmp/goto-dialog.glade.h:10
 #, fuzzy
 msgid "Go To Date"
-msgstr "Vai alla data"
+msgstr "alle o dopo"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: po/tmp/goto-dialog.glade.h:11
 #, fuzzy
 msgid "Go To Today"
-msgstr "Vai a oggi"
+msgstr "Oggi"
 
-#: calendar/gui/goto-dialog.glade.h:12
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:12
 msgid "January"
-msgstr "gennaio"
+msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:13
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:13
 msgid "July"
-msgstr "luglio"
+msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:14
 msgid "June"
-msgstr "giugno"
+msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:15
+#: po/tmp/goto-dialog.glade.h:15
 #, fuzzy
 msgid "March"
-msgstr "marzo"
+msgstr "Cerca"
 
-#: calendar/gui/goto-dialog.glade.h:16
+#: po/tmp/goto-dialog.glade.h:16
 #, fuzzy
 msgid "May"
 msgstr "Lunedì"
 
-#: calendar/gui/goto-dialog.glade.h:17
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:17
 msgid "November"
-msgstr "novembre"
+msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:18
+#: po/tmp/goto-dialog.glade.h:18
 #, fuzzy
 msgid "October"
-msgstr "ottobre"
+msgstr "Altro"
 
-#: calendar/gui/goto-dialog.glade.h:19
-#, fuzzy
+#: po/tmp/goto-dialog.glade.h:19
 msgid "September"
-msgstr "settembre"
+msgstr ""
 
-#: calendar/gui/main.c:49
-#, fuzzy
+#: calendar/gui/main.c:50
 msgid "Could not initialize GNOME"
-msgstr "Impossibile inizializzare Bonobo"
+msgstr "Impossibile inizializzare GNOME"
 
 #: calendar/gui/print.c:293
 msgid "1st"
@@ -2636,10 +2720,15 @@ msgstr "Anno corrente (%Y)"
 msgid "Print Calendar"
 msgstr "Stampa Calendario"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1042
 msgid "Print Preview"
 msgstr "Anteprima di stampa"
 
+#: calendar/gui/tasks-control.c:105
+#, fuzzy
+msgid "The URI of the tasks folder to display"
+msgstr "La URI che il calendario visualizzerà"
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "DLMMGVS"
@@ -2732,51 +2821,58 @@ msgstr "Impossibile caricare %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Impossibile caricare %s: nessun codice di inizializzazione nel modulo."
 
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s servizio per %s su  %s"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:162
+#: camel/camel-remote-store.c:315
+#, fuzzy
+msgid "Connection cancelled"
+msgstr "Annullato"
+
+#: camel/camel-remote-store.c:318 camel/camel-remote-store.c:331
+#: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Impossibile connettersi a %s (porta %d): %s"
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:319 camel/camel-remote-store.c:332
 msgid "(unknown host)"
 msgstr "(host sconosciuto)"
 
-#: camel/camel-remote-store.c:483
-msgid "Server disconnected."
-msgstr "Server disconnesso."
+#: camel/camel-remote-store.c:423 camel/camel-remote-store.c:485
+#: camel/camel-remote-store.c:553
+#, fuzzy
+msgid "Operation cancelled"
+msgstr "Apri calendario"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:137
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' necessita di un componente per lo username "
 
-#: camel/camel-service.c:147
+#: camel/camel-service.c:146
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' necessita di un componente per l'host"
 
-#: camel/camel-service.c:156
+#: camel/camel-service.c:155
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necessita di un componente per il percorso"
 
-#: camel/camel-service.c:526
+#: camel/camel-service.c:520
 #, c-format
 msgid "No such host %s."
 msgstr "NOn c'è l'host %s."
 
-#: camel/camel-service.c:529
+#: camel/camel-service.c:523
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Temporaneamente incapace di cercare il nome dell'host %s."
@@ -2795,17 +2891,17 @@ msgstr ""
 "Impossibile creare la directory %s:\n"
 "%s"
 
-#: camel/camel-url.c:78
+#: camel/camel-url.c:75
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "La stringa URL `%s' non contiene protocolli "
 
-#: camel/camel-url.c:93
+#: camel/camel-url.c:90
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "La stringa URL `%s' contiene un protocollo non valido"
 
-#: camel/camel-url.c:154
+#: camel/camel-url.c:150
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "IL numero della porta nella stringa URL `%s' non è numerico"
@@ -2821,32 +2917,32 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-auth.c:205
 msgid "Bad authentication response from server."
-msgstr ""
+msgstr "Risposta di autenticazione errata dal server."
 
-#: camel/providers/imap/camel-imap-command.c:231
+#: camel/providers/imap/camel-imap-command.c:233
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Risposta inaspettata dal server IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:239
+#: camel/providers/imap/camel-imap-command.c:241
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Comando IMAP fallito: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:242 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
-#: camel/providers/imap/camel-imap-command.c:286
+#: camel/providers/imap/camel-imap-command.c:288
 msgid "Server response ended too soon."
 msgstr "La risposta del server è terminata troppo presto."
 
-#: camel/providers/imap/camel-imap-command.c:422
+#: camel/providers/imap/camel-imap-command.c:424
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La risposta del server IMAP non contiene informazione %s"
 
-#: camel/providers/imap/camel-imap-command.c:458
+#: camel/providers/imap/camel-imap-command.c:460
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Risposta OK inattesa dal server IMAP: %s"
@@ -2856,7 +2952,7 @@ msgstr "Risposta OK inattesa dal server IMAP: %s"
 msgid "Could not load summary for %s"
 msgstr "Impossibile caricare l'indice per %s"
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:625
 msgid "Could not find message body in FETCH response."
 msgstr "Impossibile trovare il corpo del messaggio nella risposta di FETCH."
 
@@ -2868,29 +2964,29 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Per leggere e archiviare la posta sui server IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:248
+#: camel/providers/imap/camel-imap-store.c:250
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Questa opizone si connette al server IMAP usando una password di testo "
 "semplice."
 
-#: camel/providers/imap/camel-imap-store.c:257
+#: camel/providers/imap/camel-imap-store.c:259
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:259
+#: camel/providers/imap/camel-imap-store.c:261
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Con questa ci si connette al server IMAP usando Kerberos 4 per "
 "l'autenticazione."
 
-#: camel/providers/imap/camel-imap-store.c:345
+#: camel/providers/imap/camel-imap-store.c:335
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sInserire la password IMAP per %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:373
+#: camel/providers/imap/camel-imap-store.c:363
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2901,13 +2997,14 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:619
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Impossibile creare la directory %s: %s"
 
 #: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
+#, fuzzy
+msgid "MH-format mail directories"
 msgstr "Formato MH di UNIX delle directory della posta (versione CamelLocal)"
 
 #: camel/providers/local/camel-local-provider.c:37
@@ -2915,15 +3012,16 @@ msgid "For storing local mail in MH-like mail directories"
 msgstr "Per archiviare la posta locale in directory di posta di tipo MH"
 
 #: camel/providers/local/camel-local-provider.c:47
-msgid "UNIX mbox-format mail files (CamelLocal version)"
-msgstr "Formato dei file di posta UNIX mbox-format (versione CamelLocal)"
+msgid "Standard Unix mailbox file"
+msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:48
 msgid "For storing local mail in standard mbox format"
 msgstr "Per archiviare la posta locale in formato mbox standard"
 
 #: camel/providers/local/camel-local-provider.c:58
-msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+#, fuzzy
+msgid "Qmail maildir-format mail files"
 msgstr "File di posta UNIX qmail maildir-format (versione CamelLocal)"
 
 #: camel/providers/local/camel-local-provider.c:59
@@ -2933,12 +3031,12 @@ msgstr "Per archiviare la posta locale nelle directory qmail maildir"
 #: camel/providers/local/camel-local-store.c:122
 #, c-format
 msgid "Store root %s is not an absolute path"
-msgstr ""
+msgstr "Store root %s non è un percorso assoluto"
 
 #: camel/providers/local/camel-local-store.c:129
 #, c-format
 msgid "Store root %s is not a regular directory"
-msgstr ""
+msgstr "Store root %s non è una directory regolare"
 
 #: camel/providers/local/camel-local-store.c:137
 #: camel/providers/local/camel-local-store.c:153
@@ -2956,7 +3054,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:186
 msgid "Local folders may not be nested."
-msgstr ""
+msgstr "Le cartelle locali non dovrebbero essere annidate."
 
 #: camel/providers/local/camel-local-store.c:200
 #, c-format
@@ -3262,8 +3360,8 @@ msgstr ""
 "Con questa opzione l'autenticazione con il server NNTP avviene usando una "
 "password in testo semplice."
 
-#: camel/providers/nntp/camel-nntp-store.c:334
-#: camel/providers/nntp/camel-nntp-store.c:500
+#: camel/providers/nntp/camel-nntp-store.c:327
+#: camel/providers/nntp/camel-nntp-store.c:490
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Impossibile aprire o creare il file .newsrc per %s: %s"
@@ -3295,7 +3393,7 @@ msgstr ""
 "per scaricare la posta da fornitori di servizi di posta via web e sistemi di "
 "posta proprietari."
 
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/pop3/camel-pop3-store.c:148
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3303,7 +3401,7 @@ msgstr ""
 "Con questa opzione ci si connette al server POP usando una password in testo "
 "semplice. Questa è la sola opzione supportata da molti server POP."
 
-#: camel/providers/pop3/camel-pop3-store.c:160
+#: camel/providers/pop3/camel-pop3-store.c:158
 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 "
@@ -3313,29 +3411,29 @@ msgstr ""
 "attraverso il protocollo APOP.  Potrebbe non funzionare per tutti gli utenti "
 "anche su server che affermano di supportarlo. "
 
-#: camel/providers/pop3/camel-pop3-store.c:172
+#: camel/providers/pop3/camel-pop3-store.c:170
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Con questa ci si connette al server POP usando Kerberos 4 per "
 "l'autenticazione."
 
-#: camel/providers/pop3/camel-pop3-store.c:217
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Impossibile autenticare il KPOP server: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:337
+#: camel/providers/pop3/camel-pop3-store.c:335
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Impossibile connettersi al server POP su %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:391
+#: camel/providers/pop3/camel-pop3-store.c:375
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sPrego inserire la password del POP3 di %s@%s "
 
-#: camel/providers/pop3/camel-pop3-store.c:410
+#: camel/providers/pop3/camel-pop3-store.c:394
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3344,12 +3442,12 @@ msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio dello username: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:413
-#: camel/providers/pop3/camel-pop3-store.c:450
+#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:434
 msgid "(Unknown)"
 msgstr "(Sconosciuto)"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:424
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3357,7 +3455,7 @@ msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Non è presente il supporto per il meccaniscmo di autenticazione richiesto."
 
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:432
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3366,13 +3464,13 @@ msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio della password: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:541
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Cartella `%s' non presente."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config-druid.glade.h:63
+#: po/tmp/mail-config.glade.h:61
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3423,27 +3521,21 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Posta consegnata attraverso il programma sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34
-#: mail/mail-config-druid.glade.h:59
-msgid "SMTP"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-provider.c:36
-#, fuzzy
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "Per consegnare la posta connettendosi a un mail hub remoto usanto SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:185
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
-msgstr ""
+msgstr "Risposta di benvenuto errata: %s: probabilmente non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:281
+#: camel/providers/smtp/camel-smtp-transport.c:279
 msgid "No authentication required"
 msgstr "Non è richiesta autenticazione"
 
-#: camel/providers/smtp/camel-smtp-transport.c:283
+#: camel/providers/smtp/camel-smtp-transport.c:281
 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."
@@ -3452,117 +3544,117 @@ msgstr ""
 "autenticazione. Questa opzione dovrebbe andare bene per connettersi alla "
 "maggior parte dei server SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:297
-#: mail/mail-config-druid.glade.h:16
+#: camel/providers/smtp/camel-smtp-transport.c:290
+#: camel/providers/smtp/camel-smtp-transport.c:295
+#: po/tmp/mail-config.glade.h:15
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/providers/smtp/camel-smtp-transport.c:294
+#: camel/providers/smtp/camel-smtp-transport.c:292
 msgid ""
 "This option will connect to the SMTP server using CRAM-MD5 authentication."
 msgstr ""
 "Con questa ci si connette al server SMTP usando l'autenticazione CRAM-MD5."
 
-#: camel/providers/smtp/camel-smtp-transport.c:332
+#: camel/providers/smtp/camel-smtp-transport.c:320
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:334
+#: camel/providers/smtp/camel-smtp-transport.c:322
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Posta SMTP consegnata attraverso il programma %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:359
+#: camel/providers/smtp/camel-smtp-transport.c:347
 msgid "Cannot send message: sender address not defined."
 msgstr ""
 "Impossibile inviare il messaggio: l'indirizzo del mittente non è stato "
 "definito."
 
-#: camel/providers/smtp/camel-smtp-transport.c:366
+#: camel/providers/smtp/camel-smtp-transport.c:354
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Impossibile inviare il messaggio: l'indirizzo del mittente non è valido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:380
+#: camel/providers/smtp/camel-smtp-transport.c:368
 msgid "Cannot send message: no recipients defined."
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/providers/smtp/camel-smtp-transport.c:474
+#: camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Richiesta di HELO scaduta: %s: non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:478
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Errore di risposta di HELO scaduta: %s: non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
+msgstr "Richiesta di MAIL FROM scaduta: %s: posta non inviata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
-msgstr ""
+msgstr "Risposta errata di MAIL FROM: %s: posta non inviata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:570
+#: camel/providers/smtp/camel-smtp-transport.c:558
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr "La richiesta di RCPT TO: %s: posta non inviata"
+msgstr "La richiesta di RCPT TO scaduta: %s: posta non inviata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:586
+#: camel/providers/smtp/camel-smtp-transport.c:574
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Errore nella risposta di RCPT TO: %s: posta non inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:617
+#: camel/providers/smtp/camel-smtp-transport.c:605
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "RIchiesta di DATA scaduta: %s: posta non inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:633
+#: camel/providers/smtp/camel-smtp-transport.c:621
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Errore nella risposta di DATA: %s: posta non inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:648
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:636
+#: camel/providers/smtp/camel-smtp-transport.c:654
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA ha inviato il segnale di tempo scaduto: terminazione del messaggio: %s "
 "posta non inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:682
+#: camel/providers/smtp/camel-smtp-transport.c:670
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 "Errore nella risposta di DATA: terminazione del messaggio: %s posta non "
 "inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:694
 #, c-format
 msgid "RSET request timed out: %s"
-msgstr ""
+msgstr "Richiesta di RSET scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:710
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Errore nella risposta di RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:745
+#: camel/providers/smtp/camel-smtp-transport.c:733
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
-msgstr ""
+msgstr "Richiesta di QUIT scaduta: %s non fatale"
 
-#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:749
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
-msgstr ""
+msgstr "Errore nella risposta di QUIT: %s: non fatale"
 
 #: camel/providers/vee/camel-vee-provider.c:30
 msgid "Virtual folder email provider"
@@ -3602,12 +3694,12 @@ msgid "attachment"
 msgstr "allegato"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: ui/evolution-message-composer.xml.h:7
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Allega un file"
 
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:460 po/tmp/filter.glade.h:14
+#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Rimuovere"
 
@@ -3624,56 +3716,56 @@ msgid "Attach a file to the message"
 msgstr "Allegare un file al messaggio"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:6
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "Proprietà dell'allegato"
 
-#: composer/e-msg-composer-attachment.glade.h:8
+#: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Nome del file:"
 
-#: composer/e-msg-composer-attachment.glade.h:9
+#: po/tmp/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr "Da:"
 
-#: composer/e-msg-composer-hdrs.c:247
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr "Fare clic qui per la rubrica"
 
-#: composer/e-msg-composer-hdrs.c:304
+#: composer/e-msg-composer-hdrs.c:313
 msgid "Enter the identity you wish to send this message from"
 msgstr "Inserire l'identità dalla quale si vuole inviare questo messaggio"
 
-#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr "Inserire i destinatari del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:323
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Inserire gli indirizzi che riceveranno una copia conforme del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:329
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3681,11 +3773,11 @@ msgstr ""
 "Inserire gli indirizzi che riceveranno una copia conforme del messaggio "
 "senza apparire nell'elenco dei destinatari del messaggio."
 
-#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "Inserire l'oggetto dell'email"
 
@@ -3725,11 +3817,11 @@ msgstr "Salva i cambiamenti al messaggio..."
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Errore nel salvataggio del componimento in 'Bozze': %s"
 
-#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:754 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:747
+#: composer/e-msg-composer.c:760
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3739,27 +3831,27 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:785
 msgid "Open file"
 msgstr "Apri file"
 
-#: composer/e-msg-composer.c:898
+#: composer/e-msg-composer.c:911
 msgid "That file does not exist."
 msgstr "Il file noon esiste."
 
-#: composer/e-msg-composer.c:908
+#: composer/e-msg-composer.c:921
 msgid "That is not a regular file."
 msgstr "Non è un file regolare."
 
-#: composer/e-msg-composer.c:918
+#: composer/e-msg-composer.c:931
 msgid "That file exists but is not readable."
 msgstr "File esistente ma illeggibile."
 
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:941
 msgid "That file appeared accesible but open(2) failed."
 msgstr "File apparentemente accessibile ma open(2) non ha funzionato."
 
-#: composer/e-msg-composer.c:950
+#: composer/e-msg-composer.c:963
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3767,19 +3859,19 @@ msgstr ""
 "Questo file è molto grande (più di 100K).\n"
 "Inserire ugualmente?"
 
-#: composer/e-msg-composer.c:971
+#: composer/e-msg-composer.c:984
 msgid "An error occurred while reading the file."
 msgstr "Si è verificato un errore durante le lettura del file."
 
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1364
 msgid "Compose a message"
 msgstr "Componi un nuovo messaggio"
 
-#: composer/e-msg-composer.c:1427
+#: composer/e-msg-composer.c:1441
 msgid "Could not create composer window."
 msgstr "Impossibile creare la finestra di composizione."
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:345
 msgid "Cannot initialize Evolution's composer."
 msgstr "Impossibile inizializzare il composer di Evolution."
 
@@ -3919,7 +4011,7 @@ msgstr "In entrata"
 msgid "outgoing"
 msgstr "In uscita"
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:9
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "Modifica Filtri"
 
@@ -3969,6 +4061,8 @@ msgstr ""
 #, c-format
 msgid "Failed to perform regex search on message header: %s"
 msgstr ""
+"Ricerca secondo l'espressione regolare non riuscita sull'header del "
+"messaggio: %s"
 
 #: filter/filter-part.c:467
 msgid "Test"
@@ -4020,186 +4114,191 @@ msgstr "Importante"
 msgid "Read"
 msgstr "Leggi"
 
-#: filter/filter.glade.h:10
+#: po/tmp/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "Modifica VFolder"
 
-#: filter/filter.glade.h:11
+#: po/tmp/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "Regole dei Filtri"
 
-#: filter/filter.glade.h:12
+#: po/tmp/filter.glade.h:12
 msgid "Incoming"
 msgstr "In entrata:"
 
-#: filter/filter.glade.h:13
+#: po/tmp/filter.glade.h:13
 msgid "Outgoing"
 msgstr "In uscita:"
 
-#: filter/filter.glade.h:15
+#: po/tmp/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Cartelle Virtuali"
 
-#: filter/filter.glade.h:16
+#: po/tmp/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "Sorgenti delle cartelle virtuali"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "dopo"
-
-#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Assegna Colore"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Assegna un punteggio"
 
-#: filter/libfilter-i18n.h:5
-msgid "before"
-msgstr "prima"
-
-#: filter/libfilter-i18n.h:6
-msgid "contains"
-msgstr "contiene"
-
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Copia nella Cartella"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Data di Ricezione"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Data di spedizione"
 
+#: filter/libfilter-i18n.h:8
+msgid "Expression"
+msgstr "Espressione"
+
+#: filter/libfilter-i18n.h:9
+msgid "Forward to Address"
+msgstr "Inoltra all'Indirizzo"
+
+#: filter/libfilter-i18n.h:10
+msgid "Message Body"
+msgstr "Corpo del messaggio"
+
 #: filter/libfilter-i18n.h:11
-msgid "does not contain"
-msgstr "non contiene"
+msgid "Message Header"
+msgstr "Header del messaggio"
 
 #: filter/libfilter-i18n.h:12
-msgid "does not end with"
-msgstr "non finisce con"
+msgid "Message was received"
+msgstr "Il messaggio è stato ricevuto"
 
 #: filter/libfilter-i18n.h:13
-msgid "does not exist"
-msgstr "non esiste"
+msgid "Message was sent"
+msgstr "Il messaggio è stato inviato"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not sound like"
-msgstr "non assomiglia a"
+msgid "Move to Folder"
+msgstr "Sposta nella Cartella..."
 
 #: filter/libfilter-i18n.h:15
-msgid "does not start with"
-msgstr "non comincia per"
+msgid "Recipients"
+msgstr "Destinatari"
 
 #: filter/libfilter-i18n.h:16
-msgid "ends with"
-msgstr "finisce per"
+msgid "Regex Match"
+msgstr "Espressione regolare corrisponde"
 
-#: filter/libfilter-i18n.h:17
-msgid "exists"
-msgstr "esiste"
+#: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1107
+msgid "Score"
+msgstr "Punteggio"
 
 #: filter/libfilter-i18n.h:18
-msgid "Expression"
-msgstr "Espressione"
+msgid "Sender"
+msgstr "Mittente"
 
 #: filter/libfilter-i18n.h:19
-msgid "Forward to Address"
-msgstr "Inoltra all'Indirizzo"
+msgid "Set Status"
+msgstr "Imposta _Status"
 
 #: filter/libfilter-i18n.h:20
-msgid "is"
-msgstr "è"
+msgid "Source"
+msgstr "Sorgente"
 
 #: filter/libfilter-i18n.h:21
-msgid "is greater than"
-msgstr "è maggiore di"
+msgid "Specific header"
+msgstr "Specifica header"
 
-#: filter/libfilter-i18n.h:22
-msgid "is less than"
-msgstr "è minore di"
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1107
+msgid "Status"
+msgstr "Status"
 
 #: filter/libfilter-i18n.h:23
-msgid "is not"
-msgstr "non è"
+msgid "Stop Processing"
+msgstr "Arresta processo in corso"
 
-#: filter/libfilter-i18n.h:24
-msgid "Message Body"
-msgstr "Corpo del messaggio"
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1108
+msgid "Subject"
+msgstr "Oggetto"
 
 #: filter/libfilter-i18n.h:25
-msgid "Message Header"
-msgstr "Header del messaggio"
+msgid "after"
+msgstr "dopo"
 
 #: filter/libfilter-i18n.h:26
-msgid "Message was received"
-msgstr "Il messaggio è stato ricevuto"
+msgid "before"
+msgstr "prima"
 
 #: filter/libfilter-i18n.h:27
-msgid "Message was sent"
-msgstr "Il messaggio è stato inviato"
+msgid "contains"
+msgstr "contiene"
 
 #: filter/libfilter-i18n.h:28
-msgid "Move to Folder"
-msgstr "Sposta nella Cartella..."
+msgid "does not contain"
+msgstr "non contiene"
 
 #: filter/libfilter-i18n.h:29
-msgid "on or after"
-msgstr "alle o dopo"
+msgid "does not end with"
+msgstr "non finisce con"
 
 #: filter/libfilter-i18n.h:30
-msgid "on or before"
-msgstr "Alle o prima"
+msgid "does not exist"
+msgstr "non esiste"
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
+msgstr "non assomiglia a"
 
 #: filter/libfilter-i18n.h:32
-msgid "Recipients"
-msgstr "Destinatari"
+msgid "does not start with"
+msgstr "non comincia per"
 
 #: filter/libfilter-i18n.h:33
-msgid "Regex Match"
-msgstr ""
+msgid "ends with"
+msgstr "finisce per"
 
 #: filter/libfilter-i18n.h:34
-msgid "Sender"
-msgstr "Mittente"
+msgid "exists"
+msgstr "esiste"
 
 #: filter/libfilter-i18n.h:35
-msgid "Set Status"
-msgstr "Imposta _Status"
+msgid "is greater than"
+msgstr "è maggiore di"
 
 #: filter/libfilter-i18n.h:36
-msgid "sounds like"
-msgstr "Assomiglia a"
+msgid "is less than"
+msgstr "è minore di"
 
 #: filter/libfilter-i18n.h:37
-msgid "Source"
-msgstr "Sorgente"
+msgid "is not"
+msgstr "non è"
 
 #: filter/libfilter-i18n.h:38
-msgid "Specific header"
-msgstr "Specifica header"
+msgid "is"
+msgstr "è"
 
 #: filter/libfilter-i18n.h:39
-msgid "starts with"
-msgstr "comincia per"
+msgid "on or after"
+msgstr "alle o dopo"
 
 #: filter/libfilter-i18n.h:40
-msgid "Status"
-msgstr "Status"
+msgid "on or before"
+msgstr "Alle o prima"
 
 #: filter/libfilter-i18n.h:41
-msgid "Stop Processing"
-msgstr "Arresta processo in corso"
+msgid "sounds like"
+msgstr "Assomiglia a"
 
 #: filter/libfilter-i18n.h:42
-msgid "Subject"
-msgstr "Oggetto"
+msgid "starts with"
+msgstr "comincia per"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4217,10 +4316,6 @@ msgstr "Aggiungi Regola"
 msgid "Edit Score Rule"
 msgstr "Modifica le Regole di punteggio"
 
-#: filter/score-rule.c:192 filter/score-rule.c:194
-msgid "Score"
-msgstr "Punteggio"
-
 #: filter/vfolder-editor.c:155
 msgid "Add VFolder Rule"
 msgstr "Aggiungi regola per Cartella Virtuale"
@@ -4229,217 +4324,181 @@ msgstr "Aggiungi regola per Cartella Virtuale"
 msgid "Edit VFolder Rule"
 msgstr "Modifica le regole per VFolder"
 
-#: mail/component-factory.c:277
+#: mail/component-factory.c:282
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Impossibile inizializzare il componente della posta di Evolution."
 
-#: mail/component-factory.c:316
+#: mail/component-factory.c:318
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr "Salva"
+#: mail/folder-browser.c:225
+#, fuzzy
+msgid "Store search as vFolder"
+msgstr "Scegli Cartella"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr "Corpo o oggetto contengono"
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr "Il corpo contiene"
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr "L'Oggetto contiene"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr "Il Corpo non contiene"
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr "L'Oggetto non contiene"
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr "Cartella Virtuale per Oggetto"
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr "Cartella Virtuale per Mittente"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr "Cartella Virtuale per Destinatari"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr "Filtra sull'Oggetto"
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr "Filtro sul Mittente"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr "Filtro sui Destinatari:"
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr "Filtra sulla Mailng List"
 
-#: mail/folder-browser.c:655
-#, fuzzy
-msgid "Show all hidden"
-msgstr "Mostra Tutto"
-
-#: mail/folder-browser.c:657
-#, fuzzy
-msgid "Hide selected"
-msgstr "Eliminato"
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-#, fuzzy
-msgid "Hide read"
-msgstr "Nascondi"
-
-#: mail/folder-browser.c:661
-#, fuzzy
-msgid "Hide deleted"
-msgstr "Eliminato"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-#, fuzzy
-msgid "Hide Subject"
-msgstr "Oggetto"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-#, fuzzy
-msgid "Hide from Sender"
-msgstr "Filtro sul Mittente"
-
-#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658 po/tmp/evolution-message-composer.xml.h:15
 msgid "Open"
 msgstr "Apri"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:660
 msgid "Save As..."
 msgstr "Salva con nome..."
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:32
+#: mail/folder-browser.c:661 mail/mail-view.c:148
+#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
+#: po/tmp/evolution-mail.xml.h:31
 msgid "Print"
 msgstr "Stampa"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "Rispondi al Mittente"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
+#: po/tmp/evolution-mail.xml.h:37
 msgid "Reply to All"
 msgstr "Rispondi a Tutti"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/folder-browser.c:665 mail/mail-view.c:144
+#: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Inoltra"
 
-#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666 po/tmp/evolution-mail.xml.h:18
 msgid "Forward inline"
 msgstr "Vai avanti"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr "Segna come Letto"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr "Segna come Non Letto"
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 msgid "Move to Folder..."
 msgstr "Sposta nella Cartella..."
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 msgid "Copy to Folder..."
 msgstr "Copia nella Cartella..."
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 msgid "Undelete"
 msgstr "Ripristina"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr "Applica Filtri"
 
-#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr "Crea Regola dal Messaggio"
 
-#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
-#, fuzzy
-msgid "Hide Messages"
-msgstr "Stampa Messaggio"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtra sulla Mailng List (%s)"
 
-#: mail/folder-browser.c:787
-#, fuzzy, c-format
-msgid "Hide Subject \"%s\""
-msgstr "Oggetto è %s"
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr ""
-
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: mail/local-config.glade.h:6
+#: po/tmp/local-config.glade.h:6
 #, fuzzy
 msgid "Current store format:"
 msgstr "Impossibile avviare wombat"
 
-#: mail/local-config.glade.h:7
+#: po/tmp/local-config.glade.h:7
 #, fuzzy
 msgid "Mailbox Format"
 msgstr "Formato"
 
-#: mail/local-config.glade.h:8
+#: po/tmp/local-config.glade.h:8
 #, fuzzy
 msgid "New store format:"
 msgstr "Tipo di sorgente per le News:"
 
-#: mail/local-config.glade.h:9
-msgid ""
-"Note: When converting between mailbox formats, a failure (such as lack of "
-"disk space) may not be automatically recoverable.  Please use this feature "
-"with care."
+#: po/tmp/local-config.glade.h:9
+msgid "Note: When converting between mailbox formats, a failure\n"
 msgstr ""
 
-#: mail/local-config.glade.h:10
+#: po/tmp/local-config.glade.h:12
 msgid "maildir"
 msgstr ""
 
-#: mail/local-config.glade.h:11
+#: po/tmp/local-config.glade.h:13
 msgid "mbox"
 msgstr ""
 
-#: mail/local-config.glade.h:12
+#: po/tmp/local-config.glade.h:14
 #, fuzzy
 msgid "mh"
 msgstr "h"
 
+#. give our dialog an OK button and title
+#: mail/mail-accounts.c:341
+msgid "Evolution Account Manager"
+msgstr ""
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:605
+#, fuzzy
+msgid "Evolution Account Editor"
+msgstr "Evolution ToDo Conduit"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4460,7 +4519,7 @@ msgstr "Mail da %s"
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:82
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4472,7 +4531,7 @@ msgstr ""
 "ricevere o scrivere posta.\n"
 "Si desidera configurarlo subito?"
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:135
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4480,7 +4539,7 @@ msgstr ""
 "È necessario configurare un' identità\n"
 "prima di poter comporre una email."
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:147
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4488,19 +4547,15 @@ msgstr ""
 "È necessario configurare un trasporto\n"
 "della posta prima di comporla."
 
-#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
-msgid "You have no mail sources configured"
-msgstr "La sorgente della posta non è configurata"
-
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:222
 msgid "You have not set a mail transport method"
 msgstr "Non è stato impostato un sistema di trasporto per la posta"
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:231
 msgid "You have no Outbox configured"
 msgstr "Casella di posta in uscita non configurata"
 
-#: mail/mail-callbacks.c:244
+#: mail/mail-callbacks.c:258
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4508,23 +4563,30 @@ msgstr ""
 "Questo messaggio non ha l'oggetto.\n"
 "Inviare lo stesso?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:318
+#, fuzzy
+msgid "You must configure an account before you can send this email."
+msgstr ""
+"È necessario configurare un' identità\n"
+"prima di poter comporre una email."
+
+#: mail/mail-callbacks.c:338
 msgid "You must specify recipients in order to send this message."
 msgstr "È necessario specificare dei destinatari per inviare questo messaggio."
 
-#: mail/mail-callbacks.c:530
+#: mail/mail-callbacks.c:567
 msgid "Forwarded message:\n"
 msgstr "Messaggio inoltrato:\n"
 
-#: mail/mail-callbacks.c:611
+#: mail/mail-callbacks.c:648
 msgid "Move message(s) to"
 msgstr "Sposta messaggio(i) in"
 
-#: mail/mail-callbacks.c:613
+#: mail/mail-callbacks.c:650
 msgid "Copy message(s) to"
 msgstr "Copia messaggio(i) in"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:785
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4532,11 +4594,11 @@ msgstr ""
 "È possibile modificare solo i messaggi\n"
 "salvati nella cartella Bozze."
 
-#: mail/mail-callbacks.c:781 mail/mail-display.c:79
+#: mail/mail-callbacks.c:818 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Sovrascrivere il file?"
 
-#: mail/mail-callbacks.c:785 mail/mail-display.c:83
+#: mail/mail-callbacks.c:822 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4544,15 +4606,15 @@ msgstr ""
 "Esiste già un file con questo nome.\n"
 "Sovrascriverlo?"
 
-#: mail/mail-callbacks.c:830
+#: mail/mail-callbacks.c:867
 msgid "Save Message As..."
 msgstr "Salva Messaggio con nome..."
 
-#: mail/mail-callbacks.c:832
+#: mail/mail-callbacks.c:869
 msgid "Save Messages As..."
 msgstr "Salva messaggi con nome..."
 
-#: mail/mail-callbacks.c:916
+#: mail/mail-callbacks.c:953
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4561,482 +4623,281 @@ msgstr ""
 "Errore nel caricare le informazioni dei filtri:\n"
 "%s"
 
-#: mail/mail-callbacks.c:961
+#: mail/mail-callbacks.c:1002
 msgid "Print Message"
 msgstr "Stampa Messaggio"
 
-#: mail/mail-callbacks.c:1008
+#: mail/mail-callbacks.c:1049
 msgid "Printing of message failed"
 msgstr "Stampa Messaggio non riuscita"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: mail/mail-config-druid.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Account"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:7
+#: po/tmp/mail-config.glade.h:7
 #, fuzzy
 msgid "Account Information"
 msgstr "Nessuna informazione"
 
-#: mail/mail-config-druid.glade.h:8
+#: po/tmp/mail-config.glade.h:8
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:9
+#: po/tmp/mail-config.glade.h:9
 #, fuzzy
 msgid "Account Properties"
 msgstr "Proprietà dell'allegato"
 
-#: mail/mail-config-druid.glade.h:11
+#: po/tmp/mail-config.glade.h:11
 #, fuzzy
 msgid "Advanced"
 msgstr "Avanzato..."
 
-#: mail/mail-config-druid.glade.h:12
+#: po/tmp/mail-config.glade.h:12
 #, fuzzy
 msgid "Authentication"
 msgstr "Autenticazione:"
 
-#: mail/mail-config-druid.glade.h:13
+#: po/tmp/mail-config.glade.h:13
 #, fuzzy
 msgid "Authentication Type:"
 msgstr "Autenticazione:"
 
-#: mail/mail-config-druid.glade.h:15
-msgid "Automatically check mail every "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:17
+#: po/tmp/mail-config.glade.h:16
 msgid "Congratulations, your mail configuration is complete.\n"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:23
+#: po/tmp/mail-config.glade.h:22
 msgid "DIGEST-MD5"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:24
+#: po/tmp/mail-config.glade.h:23
 #, fuzzy
 msgid "Default"
 msgstr "Predefinito"
 
-#: mail/mail-config-druid.glade.h:26
-#, fuzzy
-msgid "Delete mail from server"
-msgstr "Non cancellare i messaggi dal server"
-
-#: mail/mail-config-druid.glade.h:27
+#: po/tmp/mail-config.glade.h:25
 #, fuzzy
 msgid "Done"
 msgstr "Nessuno "
 
-#: mail/mail-config-druid.glade.h:28
+#: po/tmp/mail-config.glade.h:26
 #, fuzzy
 msgid "E-Mail Address:"
 msgstr "Indirizzo email:"
 
-#: mail/mail-config-druid.glade.h:30
+#: po/tmp/mail-config.glade.h:28
 #, fuzzy
 msgid "Email Address:"
 msgstr "Indirizzo email:"
 
-#: mail/mail-config-druid.glade.h:31
+#: po/tmp/mail-config.glade.h:29
 #, fuzzy
 msgid "Evolution Mail Configuration"
 msgstr "Configurazione della Posta"
 
-#: mail/mail-config-druid.glade.h:32
+#: po/tmp/mail-config.glade.h:30
 #, fuzzy
 msgid "Full Name:"
 msgstr "Nome e cognome:"
 
-#: mail/mail-config-druid.glade.h:35
+#: po/tmp/mail-config.glade.h:33
 #, fuzzy
 msgid "Hostname:"
 msgstr "Username:"
 
-#: mail/mail-config-druid.glade.h:36
-#, fuzzy
-msgid "IMAP"
-msgstr "IMAPv4"
-
-#: mail/mail-config-druid.glade.h:37
+#: po/tmp/mail-config.glade.h:34
 msgid "Identity"
 msgstr "Identità"
 
-#: mail/mail-config-druid.glade.h:38
+#: po/tmp/mail-config.glade.h:35
 msgid "Incoming Mail Server"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:39
+#: po/tmp/mail-config.glade.h:36
+msgid "Keep mail on server"
+msgstr ""
+
+#: po/tmp/mail-config.glade.h:37
 #, fuzzy
 msgid "Kerberos"
 msgstr "Kerberos 4"
 
-#: mail/mail-config-druid.glade.h:40
+#: po/tmp/mail-config.glade.h:38
 #, fuzzy
 msgid "Mail"
 msgstr "_Posta"
 
-#: mail/mail-config-druid.glade.h:41
+#: po/tmp/mail-config.glade.h:39
 #, fuzzy
 msgid "Mail Account"
 msgstr "Email contiene"
 
-#: mail/mail-config-druid.glade.h:42
+#: po/tmp/mail-config.glade.h:40
 msgid "Mail Configuration"
 msgstr "Configurazione della Posta"
 
-#: mail/mail-config-druid.glade.h:43
+#: po/tmp/mail-config.glade.h:41
 #, fuzzy
 msgid "Mail Configuration Druid"
 msgstr "Configurazione della Posta"
 
-#: mail/mail-config-druid.glade.h:44
+#: po/tmp/mail-config.glade.h:42
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:46
+#: po/tmp/mail-config.glade.h:43
+msgid "Miscellaneous"
+msgstr ""
+
+#: po/tmp/mail-config.glade.h:45
 #, fuzzy
 msgid "News"
 msgstr "Nuovo"
 
-#: mail/mail-config-druid.glade.h:48
+#: po/tmp/mail-config.glade.h:47
 #, fuzzy
 msgid "Optional"
 msgstr "Opzioni"
 
-#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+#: po/tmp/mail-config.glade.h:48
 msgid "Organization:"
 msgstr "Organizzazione:"
 
-#: mail/mail-config-druid.glade.h:50
+#: po/tmp/mail-config.glade.h:49
 msgid "Outgoing Mail Server"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:51
+#: po/tmp/mail-config.glade.h:50
 #, fuzzy
 msgid "Password:"
 msgstr "Password"
 
-#: mail/mail-config-druid.glade.h:53
+#: po/tmp/mail-config.glade.h:52
 msgid "Plain Text"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:54
+#: po/tmp/mail-config.glade.h:53
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:55
+#: po/tmp/mail-config.glade.h:54
 #, fuzzy
 msgid "Remember my password"
 msgstr "Ricorda questa password"
 
-#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+#: mail/mail-format.c:626 po/tmp/mail-config.glade.h:55
 msgid "Reply-To:"
 msgstr "Rispondi a:"
 
-#: mail/mail-config-druid.glade.h:57
-#, fuzzy
-msgid "Reply-to:"
-msgstr "Rispondi a:"
-
-#: mail/mail-config-druid.glade.h:58
+#: po/tmp/mail-config.glade.h:56
 #, fuzzy
 msgid "Required"
 msgstr "Personale _Richiesto"
 
-#: mail/mail-config-druid.glade.h:60
+#: po/tmp/mail-config.glade.h:57
+msgid "SMTP"
+msgstr ""
+
+#: po/tmp/mail-config.glade.h:58
 #, fuzzy
 msgid "Save password"
 msgstr "Salva come VCard"
 
-#: mail/mail-config-druid.glade.h:61
+#: po/tmp/mail-config.glade.h:59
 #, fuzzy
 msgid "Select signature file"
 msgstr "File con la firma:"
 
-#: mail/mail-config-druid.glade.h:62
+#: po/tmp/mail-config.glade.h:60
 #, fuzzy
 msgid "Sending Email"
 msgstr "Sendmail"
 
-#: mail/mail-config-druid.glade.h:64
+#: po/tmp/mail-config.glade.h:62
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Configurazione della Posta"
 
-#: mail/mail-config-druid.glade.h:65
-msgid "Server Timeouts"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:66
+#: po/tmp/mail-config.glade.h:63
 #, fuzzy
 msgid "Server Type: "
 msgstr "Server:"
 
-#: mail/mail-config-druid.glade.h:67
+#: po/tmp/mail-config.glade.h:64
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:68
+#: po/tmp/mail-config.glade.h:65
 #, fuzzy
 msgid "Servers"
 msgstr "Server:"
 
-#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+#: po/tmp/mail-config.glade.h:66
 msgid "Signature file:"
 msgstr "File con la firma:"
 
-#: mail/mail-config-druid.glade.h:70
+#: po/tmp/mail-config.glade.h:67
 #, fuzzy
 msgid "Signature:"
 msgstr "File con la firma:"
 
-#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+#: po/tmp/mail-config.glade.h:68
 msgid "Sources"
 msgstr "Sorgenti"
 
-#: mail/mail-config-druid.glade.h:72
+#: po/tmp/mail-config.glade.h:69
 msgid "This server requires a secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:73
+#: po/tmp/mail-config.glade.h:70
 #, fuzzy
 msgid "Type"
 msgstr "Tipo:"
 
-#: mail/mail-config-druid.glade.h:74
+#: po/tmp/mail-config.glade.h:71
 msgid ""
 "Type the name by which you would like to refer to these servers. For "
 "example: \"Work\" or \"Home\"."
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:76
+#: po/tmp/mail-config.glade.h:73
 #, fuzzy
 msgid "User Information"
 msgstr "Nessuna informazione"
 
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+#: po/tmp/mail-config.glade.h:74
 msgid "Username:"
 msgstr "Username:"
 
-#: mail/mail-config-druid.glade.h:78
+#: po/tmp/mail-config.glade.h:75
 #, fuzzy
 msgid "Welcome to the Evolution Mail Configuration Druid.\n"
 msgstr "Benvenuto al Wizard per configurazione della Posta!\n"
 
-#: mail/mail-config-druid.glade.h:81
-#, fuzzy
-msgid "minute(s)"
-msgstr "Minuti"
-
-#: mail/mail-config-gui.c:433
-msgid ""
-"Enter your name and email address to be used in outgoing mail. You may also, "
-"optionally, enter the name of your organization, and the name of a file to "
-"read your signature from."
-msgstr ""
-"Inserire nome e indirizzo di posta elettronica da usare per la posta in "
-"uscita.  È possibile, eventualmente, inserire il nome dell'organizzazione, e "
-"il nome di un file dal quale leggere la firma."
-
-#: mail/mail-config-gui.c:446
-msgid "Full name:"
-msgstr "Nome e cognome:"
-
-#: mail/mail-config-gui.c:470
-msgid "Email address:"
-msgstr "Indirizzo email:"
-
-#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
-msgid "Signature File"
-msgstr "File firma"
-
-#: mail/mail-config-gui.c:922
-msgid "Server:"
-msgstr "Server:"
-
-#: mail/mail-config-gui.c:956
-msgid "Detect supported types..."
-msgstr "Trova i tipi supportati..."
-
-#: mail/mail-config-gui.c:991
-msgid "Don't delete messages from server"
-msgstr "Non cancellare i messaggi dal server"
-
-#: mail/mail-config-gui.c:1003
-msgid "Test Settings"
-msgstr "Prova Impostazioni"
-
-#: mail/mail-config-gui.c:1130
-msgid "Mail source type:"
-msgstr "Tipo di sorgente della posta:"
-
-#: mail/mail-config-gui.c:1135
+#: mail/mail-config-druid.c:346
+#, c-format
 msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
 msgstr ""
-"Selezionare il tipo di server della posta e inserirne le informazioni "
-"rilevanti. \n"
-"\n"
-"Se il server richiede un'autenticazione, è possibile cliccare il\n"
-"bottone \"Trova i tipi supportati...\" dopo aver inserito le altre\n"
-"informazioni. "
-
-#: mail/mail-config-gui.c:1154
-msgid "News source type:"
-msgstr "Tipo di sorgente per le News:"
 
-#: mail/mail-config-gui.c:1159
+#: mail/mail-config-druid.c:612
+#, c-format
 msgid ""
-"Select the kind of news server you have, and enter the relevant information "
-"about it.\n"
-"\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
 msgstr ""
-"Selezionare il tipo di server della posta e inserirne le informazioni "
-"rilevanti. \n"
-"\n"
-"Se il server richiede un'autenticazione, è possibile cliccare il\n"
-"bottone \"Trova i tipi supportati...\" dopo aver inserito le altre\n"
-"informazioni. "
 
-#: mail/mail-config-gui.c:1178
-msgid "Mail transport type:"
-msgstr "Tipo di trasporto della posta:"
-
-#: mail/mail-config-gui.c:1183
-#, fuzzy
-msgid ""
-"Select the kind of mail server you have, and enter the relevant information "
-"about it.\n"
-"If the server requires authentication, you can click the \"Detect supported "
-"types...\" button after entering the other information."
+#. set window title
+#: mail/mail-config-druid.c:889
+msgid "Evolution Account Wizard"
 msgstr ""
-"Selezionare il tipo di server della posta e inserirne le informazioni "
-"rilevanti. \n"
-"\n"
-"Se il server richiede un'autenticazione, è possibile cliccare il\n"
-"bottone \"Trova i tipi supportati...\" dopo aver inserito le altre\n"
-"informazioni. "
-
-#: mail/mail-config-gui.c:1233
-msgid "Add Identity"
-msgstr "Aggiungi Identità"
-
-#: mail/mail-config-gui.c:1235
-msgid "Edit Identity"
-msgstr "Modifica Identità"
-
-#: mail/mail-config-gui.c:1333
-msgid "Add Source"
-msgstr "Aggiungi Sorgente"
-
-#: mail/mail-config-gui.c:1335
-msgid "Edit Source"
-msgstr "Modifica Sorgente"
-
-#: mail/mail-config-gui.c:1430
-msgid "Add News Server"
-msgstr "Aggiungi server delle News"
-
-#: mail/mail-config-gui.c:1432
-msgid "Edit News Server"
-msgstr "Modifica il server delle News"
-
-#: mail/mail-config-gui.c:2253
-#, c-format
-msgid "Testing \"%s\""
-msgstr "Verifica in corso \"%s\""
-
-#: mail/mail-config-gui.c:2255
-#, c-format
-msgid "Test connection to \"%s\""
-msgstr "Verifica connessione a \"%s\""
-
-#: mail/mail-config-gui.c:2296
-msgid "The connection was successful!"
-msgstr "Connessione riuscita!"
-
-#: mail/mail-config-gui.c:2346
-#, c-format
-msgid "Querying authorization capabilities of \"%s\""
-msgstr "Ricerca in corso delle capacità di autorizzazzione di \"%s\""
-
-#: mail/mail-config-gui.c:2348
-#, c-format
-msgid "Query authorization at \"%s\""
-msgstr "Ricerca autorizzazione a \"%s\""
-
-#: mail/mail-config.glade.h:7
-msgid "Address"
-msgstr "Indirizzo"
-
-#: mail/mail-config.glade.h:10
-msgid "Identities"
-msgstr "Identità"
-
-#: mail/mail-config.glade.h:11
-msgid "Mail Sources"
-msgstr "Sorgente della Posta"
-
-#: mail/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "Trasporto della Posta"
-
-#: mail/mail-config.glade.h:13
-msgid "Mark message as seen [ms]: "
-msgstr "Segna il messaggi come visto [ms]:"
-
-#: mail/mail-config.glade.h:14
-msgid "News Servers"
-msgstr "News Server:"
-
-#: mail/mail-config.glade.h:15
-msgid "News Sources"
-msgstr "Sorgenti"
-
-#: mail/mail-config.glade.h:16
-msgid "Organization"
-msgstr "Organizzazione"
-
-#: mail/mail-config.glade.h:18
-msgid "Send messages in HTML format"
-msgstr "Invia posta in formato HTML"
-
-#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
-#: mail/mail-crypto.c:781
-msgid "Please enter your PGP/GPG passphrase."
-msgstr "Digitare la passphrase PGP/GPG."
-
-#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
-#: mail/mail-crypto.c:785
-msgid "No password provided."
-msgstr "Non è stata fornita alcuna password."
-
-#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Impossibile ridirigere verso GPG/PGP: %s  "
-
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
-msgid "No GPG/PGP program available."
-msgstr "Programma GPG/PGP non disponibile."
-
-#: mail/mail-crypto.c:953
-#, fuzzy, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Impossibile ridirigere: %s  "
 
 #: mail/mail-display.c:98
 #, c-format
@@ -5074,68 +4935,64 @@ msgstr "Apri in %s..."
 msgid "View Inline"
 msgstr "Visualizza In linea"
 
-#: mail/mail-display.c:339
+#: mail/mail-display.c:342
 msgid "External Viewer"
 msgstr "Visualizzatore Esterno"
 
-#: mail/mail-display.c:362
+#: mail/mail-display.c:365
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "View Inline (via %s)"
 
-#: mail/mail-display.c:366
+#: mail/mail-display.c:369
 msgid "Hide"
 msgstr "Nascondi"
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr "%s allegato"
 
-#: mail/mail-format.c:851
-msgid "No GPG/PGP support available in this copy of Evolution."
-msgstr "Supporto PGP/GPG non disponibile in questa copia di Evolution."
-
-#: mail/mail-format.c:863
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr "Messaggi cifrati non visualizzati"
 
-#: mail/mail-format.c:869
+#: mail/mail-format.c:862
 msgid "Encrypted message"
 msgstr "Messaggio cifrato"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr "Cliccare l'icona per decifrare."
 
-#: mail/mail-format.c:1450
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntatore al sito FTP (%s)"
 
-#: mail/mail-format.c:1462
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntatore al file locale (%s) valido al sito \"%s\""
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntatore a un file locale (%s)"
 
-#: mail/mail-format.c:1500
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntatore a dati esterni sconosciuti (tipo \"%s\")"
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
-msgstr ""
+msgstr "Parte esterna del messaggio malformata."
 
-#: mail/mail-format.c:1675
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
-msgstr ""
+msgstr "Su %s, %s ha scritto:\n"
 
 #: mail/mail-local.c:204
 #, c-format
@@ -5193,7 +5050,7 @@ msgstr "Registrazione cartella locale"
 msgid "Register local folder"
 msgstr "Registra cartella locale"
 
-#: mail/mail-local.c:894
+#: mail/mail-local.c:893
 #, fuzzy, c-format
 msgid ""
 "Unable to register folder '%s':\n"
@@ -5223,160 +5080,160 @@ msgstr ""
 msgid "Working"
 msgstr "Spostamento in corso"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:89
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Scaricamento posta da %s in corso"
 
-#: mail/mail-ops.c:90
+#: mail/mail-ops.c:91
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Scarica la posta da %s"
 
-#: mail/mail-ops.c:335
+#: mail/mail-ops.c:336
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Non c'è nuova posta su %s."
 
-#: mail/mail-ops.c:405
+#: mail/mail-ops.c:406
 msgid "Filtering email on demand"
 msgstr "Filtraggio della posta su richiesta"
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:408
 msgid "Filter email on demand"
 msgstr "Filtra la posta su richiesta"
 
-#: mail/mail-ops.c:551
+#: mail/mail-ops.c:552
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Invio di \"%s\" in corso"
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:554
 #, fuzzy
 msgid "Sending message"
 msgstr "Invia questo messaggio adesso"
 
-#: mail/mail-ops.c:669
+#: mail/mail-ops.c:670
 msgid "Sending queue"
 msgstr "Invio della coda in corso"
 
-#: mail/mail-ops.c:671
+#: mail/mail-ops.c:672
 msgid "Send queue"
 msgstr "Invia la coda"
 
-#: mail/mail-ops.c:804 mail/mail-ops.c:811
+#: mail/mail-ops.c:813 mail/mail-ops.c:820
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Accoda \"%s\""
 
-#: mail/mail-ops.c:808 mail/mail-ops.c:814
+#: mail/mail-ops.c:817 mail/mail-ops.c:823
 msgid "Appending a message without a subject"
 msgstr "Accoda un messaggio senza oggetto"
 
-#: mail/mail-ops.c:897
+#: mail/mail-ops.c:906
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Spostamento messaggi da \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:899
+#: mail/mail-ops.c:908
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Copia messaggi da \"%s\" a \"%s\" in corso"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:911
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Sposta messaggi da \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:913
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Copia i messaggi da \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:935
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Spostamento in corso"
 
-#: mail/mail-ops.c:938
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Copia in corso"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:967
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s messaggio %d di %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1033
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scansione delle cartelle in \"%s\" in corso"
 
-#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1108 mail/subscribe-dialog.c:348
 msgid "(No description)"
 msgstr "(Nessuna descrizione)"
 
-#: mail/mail-ops.c:1164
+#: mail/mail-ops.c:1173
 msgid "Forwarded messages"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#: mail/mail-ops.c:1214 mail/mail-ops.c:1283
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Scansione delle cartelle in \"%s\" in corso"
 
-#: mail/mail-ops.c:1336
+#: mail/mail-ops.c:1345
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Sincronizzazione \"%s\""
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1395
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Eliminazione \"%s\""
 
-#: mail/mail-ops.c:1434
+#: mail/mail-ops.c:1443
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Scaricamento in corso del messaggio %d di %d"
 
-#: mail/mail-ops.c:1497
+#: mail/mail-ops.c:1506
 #, fuzzy
 msgid "Retrieving messages"
 msgstr "Scaricamento in corso del messaggio %d di %d"
 
-#: mail/mail-ops.c:1507
+#: mail/mail-ops.c:1516
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Scarica in corso del messaggio numero %d di %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1655
+#: mail/mail-ops.c:1664
 #, fuzzy, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Caricamento Cartella %s"
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1666
 #, fuzzy, c-format
 msgid "Load %s Folder for %s"
 msgstr "Carica Cartella %s"
 
-#: mail/mail-ops.c:1823
+#: mail/mail-ops.c:1832
 #, fuzzy
 msgid "Saving messages"
 msgstr "Copia messaggi"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1911
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Impossibile salvare il file con la lista dei gruppi di %s: %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1924
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Salvare messaggio %d di %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:1938
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5387,7 +5244,7 @@ msgstr "Errore nel salvare il file: %s"
 msgid "Cancel"
 msgstr "Annulla"
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "E` stato scritto un messaggio incompleto nella pipe!"
 
@@ -5497,115 +5354,194 @@ msgstr "Nuova Cartella Virtuale"
 
 #. 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:37
+#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:36
 msgid "Reply"
 msgstr "Rispondi"
 
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:41
 msgid "Reply to the sender of this message"
 msgstr "Rispondi all'autore di questo messaggio"
 
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:141 po/tmp/evolution-mail.xml.h:40
 msgid "Reply to all recipients of this message"
 msgstr "Rispondi a tutti i destinatari di questo messaggio"
 
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Inoltra questo messaggio"
 
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:35
 msgid "Print the selected message"
 msgstr "Stampa il messaggio selezionato"
 
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Elimina questo messaggio"
 
-#: mail/message-list.c:590
+#: mail/message-list.c:594
 msgid "Unseen"
 msgstr "Non visto"
 
-#: mail/message-list.c:593
+#: mail/message-list.c:597
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:600
 msgid "Answered"
 msgstr "Risposto"
 
-#: mail/message-list.c:881
+#: mail/message-list.c:885
 #, c-format
 msgid "[ %s ]"
 msgstr "[ %s ]"
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:893 mail/message-list.c:909
+#: mail/message-list.c:897 mail/message-list.c:913
 #, c-format
 msgid "%s, et al."
 msgstr "%s, et al."
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:900 mail/message-list.c:916
 msgid "<unknown>"
 msgstr "<Sconosciuto>"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:969
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:972
+#: mail/message-list.c:976
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:981
+#: mail/message-list.c:985
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:993
+#: mail/message-list.c:997
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1005
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1007
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/subscribe-dialog.c:139
+#: mail/message-list.c:1107
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.c:1107
+#, fuzzy
+msgid "Attachment"
+msgstr "allegato"
+
+#: mail/message-list.c:1108
+#, fuzzy
+msgid "From"
+msgstr "Da:"
+
+#: mail/message-list.c:1108
+#, fuzzy
+msgid "Date"
+msgstr "Scadenza"
+
+#: mail/message-list.c:1108
+#, fuzzy
+msgid "Received"
+msgstr "Data di Ricezione"
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "To"
+msgstr "A:"
+
+#: mail/message-list.c:1109
+#, fuzzy
+msgid "Size"
+msgstr "Dimensione:"
+
+#: mail/openpgp-utils.c:76
+#, fuzzy, c-format
+msgid "Please enter your %s passphrase%s%s"
+msgstr "Digitare la passphrase PGP/GPG."
+
+#: mail/openpgp-utils.c:77
+#, fuzzy
+msgid " for "
+msgstr "per"
+
+#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
+#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1044
+msgid "No GPG/PGP program available."
+msgstr "Programma GPG/PGP non disponibile."
+
+#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
+#: mail/openpgp-utils.c:894
+msgid "No password provided."
+msgstr "Non è stata fornita alcuna password."
+
+#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
+#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1050
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Impossibile ridirigere verso GPG/PGP: %s  "
+
+#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
+msgid "No recipients specified"
+msgstr ""
+
+#: mail/openpgp-utils.c:1061
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Impossibile creare il file temporaneo: %s"
+
+#: mail/subscribe-dialog.c:63 shell/e-storage-set-view.c:44
+#, fuzzy
+msgid "Folder"
+msgstr "Cartelle"
+
+#: mail/subscribe-dialog.c:64
+#, fuzzy
+msgid "Store"
+msgstr "Punteggio"
+
+#: mail/subscribe-dialog.c:146
 msgid "Display folders starting with:"
 msgstr "Visualizza le cartelle a partire da:"
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:179
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:182
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:290
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Sottoscrivere cartella \"%s\" "
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:294
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Annullare sottoscrizione cartella \"%s\""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:298
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Sottoscrivi cartella \"%s\""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:301
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Annulla sottoscrizione cartella \"%s\""
@@ -5717,19 +5653,20 @@ msgstr "Nuovo..."
 msgid "(Untitled)"
 msgstr "(Senza nome)"
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Impossibile trovare Bug Buddy nel tuo $PATH. "
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy non può essere eseguito."
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+#, fuzzy
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5739,7 +5676,7 @@ msgstr ""
 "per posta, calendario e gestione dei contatti\n"
 "nell'ambito dell'ambiente GNOME desktop.  "
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:334
 msgid "Go to folder..."
 msgstr "Vai alla cartella..."
 
@@ -5747,11 +5684,11 @@ msgstr "Vai alla cartella..."
 msgid "(No folder displayed)"
 msgstr "(Nessuna cartella mostrata)"
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr "Cartelle"
 
-#: shell/e-shell-view.c:1077
+#: shell/e-shell-view.c:1093
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
@@ -5761,7 +5698,7 @@ msgstr "Evolution - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr "Impossibile impostare il local storage --%s"
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -5770,15 +5707,15 @@ msgstr ""
 "Ooops! La visualizzazione di `%s' è morta inaspettatamente. :-(\\n\n"
 "Il che significa che probabilmente il componente %s si è impallato"
 
-#: shell/e-shortcuts-view.c:122
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr "Crea un nuovo gruppo di collegamento "
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "Nome del Gruppo:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -5787,51 +5724,61 @@ msgstr ""
 "Si desidera veramente rimuovere il gruppo\n"
 "`%s' dalla barra dei collegamenti?"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr "Non rimuovere"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr "Icone _Piccole"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr "Mostra i collegamenti come icone piccole "
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "Icone _Grandi"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "Mostra i collegamenti come icone grandi"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr "_Nuovo Gruppo..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr "Crea un nuovo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr "_Rimuovi Questo Gruppo..."
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr "Rimuovi questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+#, fuzzy
+msgid "_Hide the Shortcut Bar"
+msgstr "Mostra la _Barra di Collegamento"
+
+#: shell/e-shortcuts-view.c:290
+#, fuzzy
+msgid "Hide the shortcut bar"
+msgstr "Mostra la _Barra di Collegamento"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "Attiva"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr "Attiva questo collegamento"
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Rimuovi il collegamento dalla barra dei collegamenti"
 
@@ -5839,12 +5786,13 @@ msgstr "Rimuovi il collegamento dalla barra dei collegamenti"
 msgid "Error saving shortcuts."
 msgstr "Errore di salvataggio dei collegamenti."
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
-#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
+#: po/tmp/evolution-event-editor.xml.h:125
+#: po/tmp/evolution-message-composer.xml.h:49 po/tmp/evolution.xml.h:36
+#: shell/e-storage-set-view.c:335
 msgid "_View"
 msgstr "_Visualizza"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:335
 msgid "View the selected folder"
 msgstr "Mostra la cartella selezionata"
 
@@ -5956,1129 +5904,1165 @@ msgstr "Disabilita."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Impossibile inizializzare il sistema di componenti Bonobo."
 
-#: ui/evolution-addressbook.xml.h:7
+#: po/tmp/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Crea un nuovo contatto"
 
-#: ui/evolution-addressbook.xml.h:9
+#: po/tmp/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Cancella un contatto"
 
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
 msgid "Find"
 msgstr "Trova"
 
-#: ui/evolution-addressbook.xml.h:11
+#: po/tmp/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Trova un contatto"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Nuovo"
 
-#: ui/evolution-addressbook.xml.h:14
+#: po/tmp/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Stampa contatti"
 
-#: ui/evolution-addressbook.xml.h:15
+#: po/tmp/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:16
+#: po/tmp/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Arresta caricamento"
 
-#: ui/evolution-addressbook.xml.h:17
+#: po/tmp/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Visualizza Tutto"
 
-#: ui/evolution-addressbook.xml.h:18
+#: po/tmp/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Visualizza tutti i contatti"
 
-#: ui/evolution-addressbook.xml.h:19
+#: po/tmp/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "_Addressbook Configuration..."
 msgstr "Configurazione della _Posta"
 
-#: ui/evolution-addressbook.xml.h:20
+#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "Stampa _Contatti..."
 
-#: ui/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr "_Ceca Contatti"
 
-#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
+#: po/tmp/evolution-addressbook.xml.h:22
+#: po/tmp/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "S_trumenti"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-calendar.xml.h:6
+#: po/tmp/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 Giorni"
 
-#: ui/evolution-calendar.xml.h:7
+#: po/tmp/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Cambia preferenze"
 
-#: ui/evolution-calendar.xml.h:8
+#: po/tmp/evolution-calendar.xml.h:8
 msgid "Ca_lendar"
 msgstr "Ca_lendario"
 
-#: ui/evolution-calendar.xml.h:9
+#: po/tmp/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Preferenze del Calendario..."
 
-#: ui/evolution-calendar.xml.h:10
+#: po/tmp/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Crea un nuovo appuntamento"
 
-#: ui/evolution-calendar.xml.h:11
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Crea un nuovo calendario"
 
-#: ui/evolution-calendar.xml.h:12
+#: po/tmp/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Giorno"
 
-#: ui/evolution-calendar.xml.h:13
+#: po/tmp/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Torna indietro nel tempo"
 
-#: ui/evolution-calendar.xml.h:14
+#: po/tmp/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Vai avanti nel tempo"
 
-#: ui/evolution-calendar.xml.h:15
+#: po/tmp/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Vai al"
 
-#: ui/evolution-calendar.xml.h:16
+#: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Vai ad una data specifica"
 
-#: ui/evolution-calendar.xml.h:17
+#: po/tmp/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Vai al presente"
 
-#: ui/evolution-calendar.xml.h:18
+#: po/tmp/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mese"
 
-#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr "Successivo"
 
-#: ui/evolution-calendar.xml.h:21
+#: po/tmp/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Apri un calendario"
 
-#: ui/evolution-calendar.xml.h:22
+#: po/tmp/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Prec"
 
-#: ui/evolution-calendar.xml.h:24
+#: po/tmp/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Stampa questo calendario"
 
-#: ui/evolution-calendar.xml.h:25
+#: po/tmp/evolution-calendar.xml.h:25
 msgid "Save calendar as something else"
 msgstr "Salva calendario con altro nome"
 
-#: ui/evolution-calendar.xml.h:26
+#: po/tmp/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Mostra 1 giorno"
 
-#: ui/evolution-calendar.xml.h:27
+#: po/tmp/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Mostra 1 mese"
 
-#: ui/evolution-calendar.xml.h:28
+#: po/tmp/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Mostra 1 settimana"
 
-#: ui/evolution-calendar.xml.h:29
+#: po/tmp/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Mostra la settimana lavorativa"
 
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Oggi"
 
-#: ui/evolution-calendar.xml.h:31
+#: po/tmp/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Settimana"
 
-#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:33
 msgid "_New"
 msgstr "_Nuovo"
 
-#: ui/evolution-calendar.xml.h:33
+#: po/tmp/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "_Apri calendario"
 
-#: ui/evolution-calendar.xml.h:34
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "_Stampa questo calendario"
 
-#: ui/evolution-calendar.xml.h:35
-#, fuzzy
+#: po/tmp/evolution-calendar.xml.h:35
 msgid "_Save As..."
-msgstr "Salva con nome..."
+msgstr "_Salva con nome..."
 
-#: ui/evolution-contact-editor.xml.h:7
+#: po/tmp/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Elimina quest'oggetto"
 
-#: ui/evolution-contact-editor.xml.h:8
+#: po/tmp/evolution-contact-editor.xml.h:8
 msgid "Delete..."
 msgstr "Elimina..."
 
-#: ui/evolution-contact-editor.xml.h:9
+#: po/tmp/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "Aiuto"
 
-#: ui/evolution-contact-editor.xml.h:10
+#: po/tmp/evolution-contact-editor.xml.h:10
 msgid "Print En_velope..."
 msgstr "Stampa _Busta..."
 
-#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
+#: po/tmp/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:81
 msgid "Print this item"
 msgstr "Stampa questo articolo"
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:82
 msgid "Print..."
 msgstr "Stampa..."
 
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:21
+#: po/tmp/evolution-contact-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:89
+#: po/tmp/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Salva _come..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
 msgid "Save and Close"
 msgstr "Salva ed Esci"
 
-#: ui/evolution-contact-editor.xml.h:15
+#: po/tmp/evolution-contact-editor.xml.h:15
 msgid "Save the contact and close the dialog box"
 msgstr "Salva il contatto e chiudi la finestra di dialogo"
 
-#: ui/evolution-contact-editor.xml.h:16
+#: po/tmp/evolution-contact-editor.xml.h:16
 msgid "Se_nd contact to other..."
 msgstr "_Invia contatto a altri..."
 
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
+#: po/tmp/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:98
 msgid "See online help"
 msgstr "Vedere aiuto in linea"
 
-#: ui/evolution-contact-editor.xml.h:18
+#: po/tmp/evolution-contact-editor.xml.h:18
 msgid "Send _message to contact..."
 msgstr "Invia un _messaggio al contatto..."
 
-#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
-#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:25
+#: po/tmp/evolution-contact-editor.xml.h:19
+#: po/tmp/evolution-event-editor.xml.h:110
+#: po/tmp/evolution-message-composer.xml.h:43
+#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:26
 msgid "_File"
 msgstr "_File"
 
-#: ui/evolution-contact-editor.xml.h:20
+#: po/tmp/evolution-contact-editor.xml.h:20
 msgid "_Print..."
 msgstr "S_tampa..."
 
-#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
-#: ui/evolution-message-composer.xml.h:46
+#: po/tmp/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-message-composer.xml.h:47
 msgid "_Save"
 msgstr "_Salva"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-event-editor.xml.h:6
+#: po/tmp/evolution-event-editor.xml.h:6
 msgid "About this application"
 msgstr "Informazioni su questa applicazione"
 
-#: ui/evolution-event-editor.xml.h:7
+#: po/tmp/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "Informazioni su..."
 
-#: ui/evolution-event-editor.xml.h:8
+#: po/tmp/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "Azio_ni"
 
-#: ui/evolution-event-editor.xml.h:9
+#: po/tmp/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "_Annulla"
 
-#: ui/evolution-event-editor.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "_Taglia"
 
-#: ui/evolution-event-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "Annulla"
 
-#: ui/evolution-event-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "Annulla la Selezione"
 
-#: ui/evolution-event-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "Chiudi questo appuntamento"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
+#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
 msgid "Copy"
 msgstr "Copia"
 
-#: ui/evolution-event-editor.xml.h:16
+#: po/tmp/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Copia selezionato"
 
-#: ui/evolution-event-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Taglia"
 
-#: ui/evolution-event-editor.xml.h:18
+#: po/tmp/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "Taglia selezionato"
 
-#: ui/evolution-event-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr "Dump XML"
 
-#: ui/evolution-event-editor.xml.h:22
+#: po/tmp/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "Fa un Dump della descrizione UI Xml"
 
-#: ui/evolution-event-editor.xml.h:23
+#: po/tmp/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: Address _Book..."
 
-#: ui/evolution-event-editor.xml.h:24
+#: po/tmp/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25
+#: po/tmp/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26
+#: po/tmp/evolution-event-editor.xml.h:26
 #, fuzzy
 msgid "FIXME: Cop_y to Folder..."
 msgstr "Copia nella Cartella"
 
-#: ui/evolution-event-editor.xml.h:27
+#: po/tmp/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:28
+#: po/tmp/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:29
+#: po/tmp/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30
+#: po/tmp/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31
+#: po/tmp/evolution-event-editor.xml.h:31
 #, fuzzy
 msgid "FIXME: For_ward"
 msgstr "Inoltra"
 
-#: ui/evolution-event-editor.xml.h:32
+#: po/tmp/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:33
+#: po/tmp/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34
+#: po/tmp/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:35
+#: po/tmp/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:36
+#: po/tmp/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:37
+#: po/tmp/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:38
+#: po/tmp/evolution-event-editor.xml.h:38
 #, fuzzy
 msgid "FIXME: Print Pre_view"
 msgstr "Anteprima di stampa"
 
-#: ui/evolution-event-editor.xml.h:39
+#: po/tmp/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:40
+#: po/tmp/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:41
+#: po/tmp/evolution-event-editor.xml.h:41
 #, fuzzy
 msgid "FIXME: Rec_urrence..."
 msgstr "Ricorrenza"
 
-#: ui/evolution-event-editor.xml.h:42
+#: po/tmp/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
+#: po/tmp/evolution-event-editor.xml.h:43
 #, fuzzy
 msgid "FIXME: Save Attac_hments..."
 msgstr "Salva Allegati"
 
-#: ui/evolution-event-editor.xml.h:44
+#: po/tmp/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:45
+#: po/tmp/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:46
+#: po/tmp/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:47
+#: po/tmp/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:48
+#: po/tmp/evolution-event-editor.xml.h:48
 #, fuzzy
 msgid "FIXME: _File..."
 msgstr "_Filtri Posta..."
 
-#: ui/evolution-event-editor.xml.h:49
+#: po/tmp/evolution-event-editor.xml.h:49
 #, fuzzy
 msgid "FIXME: _Font..."
 msgstr "Carattere..."
 
-#: ui/evolution-event-editor.xml.h:50
+#: po/tmp/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:51
+#: po/tmp/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:52
+#: po/tmp/evolution-event-editor.xml.h:52
 #, fuzzy
 msgid "FIXME: _Journal Entry"
 msgstr "Voce nell'agenda - %s"
 
-#: ui/evolution-event-editor.xml.h:53
+#: po/tmp/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:54
+#: po/tmp/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "Invia Messaggio"
 
-#: ui/evolution-event-editor.xml.h:55
+#: po/tmp/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:56
+#: po/tmp/evolution-event-editor.xml.h:56
 #, fuzzy
 msgid "FIXME: _Move to Folder..."
 msgstr "_Sposta nella Cartella"
 
-#: ui/evolution-event-editor.xml.h:57
+#: po/tmp/evolution-event-editor.xml.h:57
 #, fuzzy
 msgid "FIXME: _New Appointment"
 msgstr "_Nuovo appuntamento..."
 
-#: ui/evolution-event-editor.xml.h:58
+#: po/tmp/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:59
+#: po/tmp/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60
+#: po/tmp/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61
+#: po/tmp/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:62
+#: po/tmp/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:63
+#: po/tmp/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64
+#: po/tmp/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:65
+#: po/tmp/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-message-composer.xml.h:11
 msgid "F_ormat"
 msgstr "F_ormato"
 
-#: ui/evolution-event-editor.xml.h:68
+#: po/tmp/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "Cerca ancora"
 
-#: ui/evolution-event-editor.xml.h:69
+#: po/tmp/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Trova _Ancora"
 
-#: ui/evolution-event-editor.xml.h:70
+#: po/tmp/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "Vai al successivo"
 
-#: ui/evolution-event-editor.xml.h:71
+#: po/tmp/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Vai al precedente"
 
-#: ui/evolution-event-editor.xml.h:72
+#: po/tmp/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr "Modifica le proprietà del file"
 
-#: ui/evolution-event-editor.xml.h:73
+#: po/tmp/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "S_uccessivo"
 
-#: ui/evolution-event-editor.xml.h:75
+#: po/tmp/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Incolla"
 
-#: ui/evolution-event-editor.xml.h:76
+#: po/tmp/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Incolla agli appunti"
 
-#: ui/evolution-event-editor.xml.h:77
+#: po/tmp/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "_Precedente"
 
-#: ui/evolution-event-editor.xml.h:78
+#: po/tmp/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "Precedente"
 
-#: ui/evolution-event-editor.xml.h:79
+#: po/tmp/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "_Impostazioni Stampa..."
 
-#: ui/evolution-event-editor.xml.h:80
+#: po/tmp/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "Impostazione pagina"
 
-#: ui/evolution-event-editor.xml.h:83
+#: po/tmp/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "Proprietà"
 
-#: ui/evolution-event-editor.xml.h:84
+#: po/tmp/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "Rifai"
 
-#: ui/evolution-event-editor.xml.h:85
+#: po/tmp/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "Rifai l'azione annullata"
 
-#: ui/evolution-event-editor.xml.h:86
+#: po/tmp/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "Sostituisci"
 
-#: ui/evolution-event-editor.xml.h:87
+#: po/tmp/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "Sostituisci una stringa"
 
-#: ui/evolution-event-editor.xml.h:91
+#: po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:19
+msgid "Save"
+msgstr "Salva"
+
+#: po/tmp/evolution-event-editor.xml.h:91
 msgid "Save the appointment and close the dialog box"
 msgstr "Salva l'appuntamento e chiudi la finestra di dialogo"
 
-#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
+#: po/tmp/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-message-composer.xml.h:25
 msgid "Save the current file"
 msgstr "Salva il file corrente"
 
-#: ui/evolution-event-editor.xml.h:93
+#: po/tmp/evolution-event-editor.xml.h:93
 msgid "Schedule Meeting"
 msgstr "Pianifica una Riunione"
 
-#: ui/evolution-event-editor.xml.h:94
+#: po/tmp/evolution-event-editor.xml.h:94
 msgid "Schedule _Meeting"
 msgstr "Pianifica una _Riunione"
 
-#: ui/evolution-event-editor.xml.h:95
+#: po/tmp/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr "Pianifica un tipo di riunione"
 
-#: ui/evolution-event-editor.xml.h:96
+#: po/tmp/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "Cerca ancora la stessa stringa"
 
-#: ui/evolution-event-editor.xml.h:97
+#: po/tmp/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "Cerca una stringa"
 
-#: ui/evolution-event-editor.xml.h:99
+#: po/tmp/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr "Seleziona Tutto"
 
-#: ui/evolution-event-editor.xml.h:100
+#: po/tmp/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "Seleziona ogni cosa"
 
-#: ui/evolution-event-editor.xml.h:101
+#: po/tmp/evolution-event-editor.xml.h:101
 msgid "Setup the page settings for your current printer"
 msgstr "Imposta i parametri della pagina per la stampante corrente"
 
-#: ui/evolution-event-editor.xml.h:102
+#: po/tmp/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "Annulla"
 
-#: ui/evolution-event-editor.xml.h:103
+#: po/tmp/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "Annulla l'ultima azione"
 
-#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-message-composer.xml.h:39
 msgid "_About..."
 msgstr "_Informazioni su"
 
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:40
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: ui/evolution-event-editor.xml.h:106
+#: po/tmp/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "_Copia"
 
-#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
+#: po/tmp/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-message-composer.xml.h:41
 msgid "_Debug"
 msgstr "_Debug"
 
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
+#: po/tmp/evolution-event-editor.xml.h:109
+#: po/tmp/evolution-message-composer.xml.h:42
+#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:25
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ui/evolution-event-editor.xml.h:111
+#: po/tmp/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "_Trova..."
 
-#: ui/evolution-event-editor.xml.h:112
+#: po/tmp/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "_Schede"
 
-#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
-#: ui/evolution.xml.h:28
+#: po/tmp/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-message-composer.xml.h:44 po/tmp/evolution.xml.h:29
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ui/evolution-event-editor.xml.h:114
+#: po/tmp/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "_Inserisci"
 
-#: ui/evolution-event-editor.xml.h:115
+#: po/tmp/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Oggetto"
 
-#: ui/evolution-event-editor.xml.h:116
+#: po/tmp/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "_Incolla"
 
-#: ui/evolution-event-editor.xml.h:117
+#: po/tmp/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "S_tampa"
 
-#: ui/evolution-event-editor.xml.h:118
+#: po/tmp/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "_Proprietà"
 
-#: ui/evolution-event-editor.xml.h:119
+#: po/tmp/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "_Rifai"
 
-#: ui/evolution-event-editor.xml.h:120
+#: po/tmp/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "_Sostituisci"
 
-#: ui/evolution-event-editor.xml.h:122
+#: po/tmp/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "Barra degli S_trumenti"
 
-#: ui/evolution-event-editor.xml.h:124
+#: po/tmp/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "_Annulla"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-mail.xml.h:6
+#: po/tmp/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr "Scrivi"
 
-#: ui/evolution-mail.xml.h:7
+#: po/tmp/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Scrivi un nuovo messaggio"
 
-#: ui/evolution-mail.xml.h:9
+#: po/tmp/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Copia messaggio in una nuova cartella"
 
-#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
+#: po/tmp/evolution-mail.xml.h:10
+#, fuzzy
+msgid "Create Rule"
+msgstr "Crea \"%s\""
+
+#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr "C_artelle"
 
-#: ui/evolution-mail.xml.h:14
+#: po/tmp/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "Fi_ltra sul Mittente"
 
-#: ui/evolution-mail.xml.h:15
+#: po/tmp/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "Filtro sui _Destinatari"
 
-#: ui/evolution-mail.xml.h:16
+#: po/tmp/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Dimantica _Password"
 
-#: ui/evolution-mail.xml.h:20
+#: po/tmp/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Ricevi POsta"
 
-#: ui/evolution-mail.xml.h:22
+#: po/tmp/evolution-mail.xml.h:21
 #, fuzzy
-msgid "Hide _Deleted messages"
-msgstr "Stampa il messaggio selezionato"
+msgid "Hide S_elected Messages"
+msgstr "Nascondi i messaggi _selezionati"
 
-#: ui/evolution-mail.xml.h:23
+#: po/tmp/evolution-mail.xml.h:22
 #, fuzzy
-msgid "Hide _Read messages"
-msgstr "Messaggio inoltrato"
+msgid "Hide _Deleted Messages"
+msgstr "Nascondi i messaggi _cancellati"
 
-#: ui/evolution-mail.xml.h:24
-#, fuzzy
-msgid "Hide _Selected messages"
-msgstr "Stampa il messaggio selezionato"
+#: po/tmp/evolution-mail.xml.h:23
+msgid "Hide _Read messages"
+msgstr "Nascondi Messaggi _Letti"
 
-#: ui/evolution-mail.xml.h:25
+#: po/tmp/evolution-mail.xml.h:24
 #, fuzzy
 msgid "Mail _Filters..."
 msgstr "_Filtri Posta"
 
-#: ui/evolution-mail.xml.h:26
+#: po/tmp/evolution-mail.xml.h:25
 #, fuzzy
 msgid "Manage Subscriptions..."
 msgstr "Gestione sottoscrizioni"
 
-#: ui/evolution-mail.xml.h:27
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Mar_k As Read"
 msgstr "S_egna come Letto"
 
-#: ui/evolution-mail.xml.h:28
+#: po/tmp/evolution-mail.xml.h:27
 msgid "Mark As U_nread"
 msgstr "Segna come _Non Letto"
 
-#: ui/evolution-mail.xml.h:29
+#: po/tmp/evolution-mail.xml.h:28
 msgid "Move"
 msgstr "Sposta"
 
-#: ui/evolution-mail.xml.h:30
+#: po/tmp/evolution-mail.xml.h:29
 msgid "Move message to a new folder"
 msgstr "Sposta il messaggio in una nuova cartella"
 
-#: ui/evolution-mail.xml.h:31
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Previews the message to be printed"
 msgstr "Anteprime del messaggio da stampare"
 
-#: ui/evolution-mail.xml.h:33
+#: po/tmp/evolution-mail.xml.h:32
 msgid "Print Preview of message..."
 msgstr "Anteprima di stampa del messaggio..."
 
-#: ui/evolution-mail.xml.h:34
+#: po/tmp/evolution-mail.xml.h:33
 msgid "Print message to the printer"
 msgstr "Stampa messaggio con la stampante"
 
-#: ui/evolution-mail.xml.h:35
+#: po/tmp/evolution-mail.xml.h:34
 msgid "Print message..."
 msgstr "Stampa messaggio..."
 
-#: ui/evolution-mail.xml.h:39
+#: po/tmp/evolution-mail.xml.h:38
 msgid "Reply to _All"
 msgstr "Rispondi a _Tutti"
 
-#: ui/evolution-mail.xml.h:40
+#: po/tmp/evolution-mail.xml.h:39
 msgid "Reply to _Sender"
 msgstr "Rispondi al _Mittente"
 
-#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
+#: po/tmp/evolution-mail.xml.h:42
+#, fuzzy
+msgid "S_ource"
+msgstr "Sorgente"
+
+#: po/tmp/evolution-mail.xml.h:43 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Seleziona _Tutto"
 
-#: ui/evolution-mail.xml.h:44
+#: po/tmp/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr "Invia la posta in coda e ricevi quella nuova"
 
-#: ui/evolution-mail.xml.h:45
+#: po/tmp/evolution-mail.xml.h:45
 #, fuzzy
-msgid "Show _All messages"
-msgstr "Mostra Tutto"
+msgid "Show _All Messages"
+msgstr "Mostra _Tutti i messaggi"
 
-#: ui/evolution-mail.xml.h:46
+#: po/tmp/evolution-mail.xml.h:46
 msgid "Threaded Message list"
 msgstr "LIsta di Messaggi a Thread"
 
-#: ui/evolution-mail.xml.h:47
+#: po/tmp/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr "Cartella virtuale sul _Mittente"
 
-#: ui/evolution-mail.xml.h:48
+#: po/tmp/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr "Cartella virtuale sui _Destinatari"
 
-#: ui/evolution-mail.xml.h:49
+#: po/tmp/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr "Vedi la sorgente grezza del messaggio"
 
-#: ui/evolution-mail.xml.h:50
+#: po/tmp/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr "_Applica Filtri"
 
-#: ui/evolution-mail.xml.h:51
+#: po/tmp/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr "_Configura Cartella"
 
-#: ui/evolution-mail.xml.h:52
+#: po/tmp/evolution-mail.xml.h:52
 msgid "_Copy to Folder..."
 msgstr "_Copia nella cartella..."
 
-#: ui/evolution-mail.xml.h:54
+#: po/tmp/evolution-mail.xml.h:54
 msgid "_Edit Message"
 msgstr "M_odifica Messaggio"
 
-#: ui/evolution-mail.xml.h:55
+#: po/tmp/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr "_Elimina per sempre"
 
-#: ui/evolution-mail.xml.h:56
+#: po/tmp/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr "_Filtro sull'Oggetto"
 
-#: ui/evolution-mail.xml.h:57
+#: po/tmp/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr "_Inoltra"
 
-#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
+#: po/tmp/evolution-mail.xml.h:58 po/tmp/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "_Inverti Selezione"
 
-#: ui/evolution-mail.xml.h:59
+#: po/tmp/evolution-mail.xml.h:59
 #, fuzzy
 msgid "_Mail Configuration..."
 msgstr "Configurazione della _Posta"
 
-#: ui/evolution-mail.xml.h:60
+#: po/tmp/evolution-mail.xml.h:60
 msgid "_Message"
 msgstr "_Messaggio"
 
-#: ui/evolution-mail.xml.h:61
+#: po/tmp/evolution-mail.xml.h:61
 msgid "_Move to Folder..."
 msgstr "_Sposta nella Cartella..."
 
-#: ui/evolution-mail.xml.h:62
+#: po/tmp/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr "_Apri in una Nuova Finestra"
 
-#: ui/evolution-mail.xml.h:63
+#: po/tmp/evolution-mail.xml.h:63
 msgid "_Print Message"
 msgstr "_Stampa Messaggio"
 
-#: ui/evolution-mail.xml.h:64
+#: po/tmp/evolution-mail.xml.h:64
 msgid "_Save Message As..."
 msgstr "_Salva con Nome..."
 
-#: ui/evolution-mail.xml.h:65
-msgid "_Source"
-msgstr "_Sorgente"
-
-#: ui/evolution-mail.xml.h:66
+#: po/tmp/evolution-mail.xml.h:65
 msgid "_Threaded"
 msgstr "A _Thread"
 
-#: ui/evolution-mail.xml.h:67
+#: po/tmp/evolution-mail.xml.h:66
 msgid "_Undelete"
 msgstr "_Ripristina"
 
-#: ui/evolution-mail.xml.h:68
+#: po/tmp/evolution-mail.xml.h:67
 msgid "_VFolder on Subject"
 msgstr "_Cartella Virtuale sull'Oggetto"
 
-#: ui/evolution-mail.xml.h:69
+#: po/tmp/evolution-mail.xml.h:68
 #, fuzzy
 msgid "_Virtual Folder Editor..."
 msgstr "Editor delle Cartelle _Virtuali"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-message-composer.xml.h:6
+#: po/tmp/evolution-message-composer.xml.h:6
 msgid "Attach"
 msgstr "Allega"
 
-#: ui/evolution-message-composer.xml.h:9
+#: po/tmp/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "Chiudi il file corrente"
 
-#: ui/evolution-message-composer.xml.h:10
-#, fuzzy
+#: po/tmp/evolution-message-composer.xml.h:10
 msgid "Encrypt this message with PGP"
-msgstr "Messaggio cifrato"
+msgstr "Cifra questo messaggio con PGP"
 
-#: ui/evolution-message-composer.xml.h:12
+#: po/tmp/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:13
 msgid "Insert a file as text into the message"
 msgstr "Inserici un file come testo nel messaggio"
 
-#: ui/evolution-message-composer.xml.h:14
+#: po/tmp/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr "Inserici un file di testo..."
 
-#: ui/evolution-message-composer.xml.h:16
+#: po/tmp/evolution-message-composer.xml.h:16
 msgid "Open a file"
 msgstr "Apri un file"
 
-#: ui/evolution-message-composer.xml.h:17
+#: po/tmp/evolution-message-composer.xml.h:17
 msgid "PGP Encrypt"
-msgstr ""
+msgstr "Cifra con PGP"
 
-#: ui/evolution-message-composer.xml.h:18
+#: po/tmp/evolution-message-composer.xml.h:18
 msgid "PGP Sign"
-msgstr ""
+msgstr "Firma con PGP"
 
-#: ui/evolution-message-composer.xml.h:20
+#: po/tmp/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "Salva con Nome"
 
-#: ui/evolution-message-composer.xml.h:22
+#: po/tmp/evolution-message-composer.xml.h:22
+#, fuzzy
+msgid "Save _Draft"
+msgstr "Bozze"
+
+#: po/tmp/evolution-message-composer.xml.h:23
 msgid "Save in _folder... (FIXME)"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:23
+#: po/tmp/evolution-message-composer.xml.h:24
 msgid "Save in folder..."
 msgstr "Salva nella cartella..."
 
-#: ui/evolution-message-composer.xml.h:25
+#: po/tmp/evolution-message-composer.xml.h:26
 msgid "Save the current file with a different name"
 msgstr "Salva il file corrente con un nome diverso"
 
-#: ui/evolution-message-composer.xml.h:26
+#: po/tmp/evolution-message-composer.xml.h:27
 msgid "Save the message in a specified folder"
 msgstr "Salva il messaggio in una cartella specificata"
 
-#: ui/evolution-message-composer.xml.h:27
+#: po/tmp/evolution-message-composer.xml.h:28
 msgid "Send"
 msgstr "Invia"
 
-#: ui/evolution-message-composer.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:29
 msgid "Send _Later"
 msgstr "Invia più _Tardi"
 
-#: ui/evolution-message-composer.xml.h:29
+#: po/tmp/evolution-message-composer.xml.h:30
 msgid "Send _later"
 msgstr "Invia più _tardi"
 
-#: ui/evolution-message-composer.xml.h:30
+#: po/tmp/evolution-message-composer.xml.h:31
 msgid "Send the mail in HTML format"
 msgstr "Invia la posta in formato HTML"
 
-#: ui/evolution-message-composer.xml.h:31
+#: po/tmp/evolution-message-composer.xml.h:32
 msgid "Send the message later"
 msgstr "Invia il messaggio più tardi"
 
-#: ui/evolution-message-composer.xml.h:32
+#: po/tmp/evolution-message-composer.xml.h:33
 msgid "Send the message now"
 msgstr "Invia il messaggio adesso"
 
-#: ui/evolution-message-composer.xml.h:33
+#: po/tmp/evolution-message-composer.xml.h:34
 msgid "Send this message now"
 msgstr "Invia questo messaggio adesso"
 
-#: ui/evolution-message-composer.xml.h:34
+#: po/tmp/evolution-message-composer.xml.h:35
 msgid "Show / hide attachments"
 msgstr "Mostra / nascondi allegati"
 
-#: ui/evolution-message-composer.xml.h:35
+#: po/tmp/evolution-message-composer.xml.h:36
 msgid "Show _attachments"
 msgstr "Mostra _allegati"
 
-#: ui/evolution-message-composer.xml.h:36
+#: po/tmp/evolution-message-composer.xml.h:37
 msgid "Show attachments"
 msgstr "Mostra allegati"
 
-#: ui/evolution-message-composer.xml.h:37
-#, fuzzy
+#: po/tmp/evolution-message-composer.xml.h:38
 msgid "Sign this message with your PGP key"
-msgstr "Invio di un messaggio senza oggetto"
+msgstr "Firma questo messaggio con la chiave PGP"
 
-#: ui/evolution-message-composer.xml.h:44
+#: po/tmp/evolution-message-composer.xml.h:45
 msgid "_Insert text file... (FIXME)"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
+#: po/tmp/evolution-message-composer.xml.h:46
 msgid "_Open..."
 msgstr "_Apri..."
 
-#: ui/evolution-message-composer.xml.h:47
+#: po/tmp/evolution-message-composer.xml.h:48
 msgid "_Security"
-msgstr ""
+msgstr "_Sicurezza"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-subscribe.xml.h:6
+#: po/tmp/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr "Aggiungi una cartella alla lista di cartelle a cui sei iscritto"
 
-#: ui/evolution-subscribe.xml.h:9
+#: po/tmp/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Aggiorna Lista"
 
-#: ui/evolution-subscribe.xml.h:10
+#: po/tmp/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Aggiorna la Lista delle Cartelle"
 
-#: ui/evolution-subscribe.xml.h:11
+#: po/tmp/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Elimina una cartella dalla lista delle cartelle a cui sei iscritto"
 
-#: ui/evolution-subscribe.xml.h:13
+#: po/tmp/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Iscrizione"
 
-#: ui/evolution-subscribe.xml.h:14
+#: po/tmp/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Annulla iscrizione"
 
 #.
-#. * Translatable strings file generated by xml-i18n-extract.
+#. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution.xml.h:6
+#: po/tmp/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr "Visualizza un'altra cartella"
 
-#: ui/evolution.xml.h:7
+#: po/tmp/evolution.xml.h:7
 msgid "E_xit"
 msgstr "E_sci"
 
-#: ui/evolution.xml.h:8
+#: po/tmp/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "_Barra del Collegamenti di Evolution"
 
-#: ui/evolution.xml.h:9
+#: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Esci dal Programma"
 
-#: ui/evolution.xml.h:10
+#: po/tmp/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "Primi _Passi"
 
-#: ui/evolution.xml.h:11
+#: po/tmp/evolution.xml.h:11
+msgid "Import an external file format"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:12
 msgid "Show information about Evolution"
 msgstr "Mostra informazioni su Evolution"
 
-#: ui/evolution.xml.h:12
+#: po/tmp/evolution.xml.h:13
 msgid "Show the _Folder Bar"
 msgstr "Mostra la _Barra delle Cartelle"
 
-#: ui/evolution.xml.h:13
+#: po/tmp/evolution.xml.h:14
 msgid "Show the _Shortcut Bar"
 msgstr "Mostra la _Barra di Collegamento"
 
-#: ui/evolution.xml.h:14
+#: po/tmp/evolution.xml.h:15
 msgid "Submit _Bug Report"
 msgstr "Inoltra un _Bug Report"
 
-#: ui/evolution.xml.h:15
+#: po/tmp/evolution.xml.h:16
 msgid "Submit bug report using Bug Buddy."
 msgstr "Inoltra un Bug Report usando Bug Buddy."
 
-#: ui/evolution.xml.h:16
+#: po/tmp/evolution.xml.h:17
 msgid "Toggle whether to show the folder bar"
 msgstr "Mostra/nasconde la barra delle cartelle"
 
-#: ui/evolution.xml.h:17
+#: po/tmp/evolution.xml.h:18
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Mostra/nasconde la barra dei collegamenti"
 
-#: ui/evolution.xml.h:18
+#: po/tmp/evolution.xml.h:19
 msgid "Using the C_ontact Manager"
 msgstr "Uso del manger dei C_ontatti"
 
-#: ui/evolution.xml.h:19
+#: po/tmp/evolution.xml.h:20
 msgid "Using the _Calendar"
 msgstr "Uso del _Calendario"
 
-#: ui/evolution.xml.h:20
+#: po/tmp/evolution.xml.h:21
 msgid "Using the _Mailer"
 msgstr "Uso del programma di _Posta"
 
-#: ui/evolution.xml.h:21
+#: po/tmp/evolution.xml.h:22
 msgid "_About Evolution..."
 msgstr "_Informazioni su Evolution..."
 
-#: ui/evolution.xml.h:22
+#: po/tmp/evolution.xml.h:23
 #, fuzzy
 msgid "_Appointment (FIXME)"
 msgstr "Appuntamenti:"
 
-#: ui/evolution.xml.h:23
+#: po/tmp/evolution.xml.h:24
 #, fuzzy
 msgid "_Contact (FIXME)"
 msgstr "Editor dei Contatti"
 
-#: ui/evolution.xml.h:26
+#: po/tmp/evolution.xml.h:27
 msgid "_Folder"
 msgstr "_Cartelle"
 
-#: ui/evolution.xml.h:27
+#: po/tmp/evolution.xml.h:28
 msgid "_Go to Folder..."
 msgstr "_Vai alla cartella..."
 
-#: ui/evolution.xml.h:29
+#: po/tmp/evolution.xml.h:30
+msgid "_Import file"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:31
 msgid "_Index"
 msgstr "_Indice"
 
-#: ui/evolution.xml.h:30
-msgid "_Mail message (FIXME)"
+#: po/tmp/evolution.xml.h:32
+#, fuzzy
+msgid "_Mail message"
 msgstr "_Invia messaggio"
 
-#: ui/evolution.xml.h:32
+#: po/tmp/evolution.xml.h:34
 msgid "_Settings"
 msgstr "_Impostazioni"
 
-#: ui/evolution.xml.h:33
+#: po/tmp/evolution.xml.h:35
 msgid "_Task (FIXME)"
 msgstr ""
 
@@ -7131,7 +7115,7 @@ msgstr "_<<"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:508
 msgid "_Autopick"
-msgstr ""
+msgstr "_Autopick"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:522
 msgid ">_>"
@@ -7176,7 +7160,7 @@ msgstr "LMMGVSD"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:111
+#: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
@@ -7201,303 +7185,3 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "Gruppo %i"
 
-#~ msgid "categories"
-#~ msgstr "categorie"
-
-#~ msgid "Item(s) belong to these categories:"
-#~ msgstr "Oggetto(i) appartenente a queste categorie:"
-
-#~ msgid "Available Categories:"
-#~ msgstr "Categorie disponibili:"
-
-#~ msgid "External Directories"
-#~ msgstr "Directory Esterne"
-
-#~ msgid "Port Number:"
-#~ msgstr "Porta Numero:"
-
-#~ msgid "Outline:"
-#~ msgstr "Linea:"
-
-#~ msgid "Headings:"
-#~ msgstr "Titoli:"
-
-#~ msgid "Empty days:"
-#~ msgstr "Giorni liberi:"
-
-#~ msgid "Appointments:"
-#~ msgstr "Appuntamenti:"
-
-#~ msgid "Highlighted day:"
-#~ msgstr "Giorno evidenziato:"
-
-#~ msgid "Day numbers:"
-#~ msgstr "Data:"
-
-#~ msgid "Current day's number:"
-#~ msgstr "Data odierna:"
-
-#~ msgid "To-Do item that is not yet due:"
-#~ msgstr "Obiettivo non ancora raggiunto:"
-
-#~ msgid "To-Do item that is due today:"
-#~ msgstr "Obiettivo da raggiungere oggi:"
-
-#~ msgid "To-Do item that is overdue:"
-#~ msgstr "Obiettivo raggiunto:"
-
-#~ msgid "appointment"
-#~ msgstr "appuntamento"
-
-#, fuzzy
-#~ msgid "task"
-#~ msgstr "Obiettivo"
-
-#~ msgid "journal entry"
-#~ msgstr "voce nell'agenda"
-
-#~ msgid "Year:"
-#~ msgstr "Anno:"
-
-#~ msgid ""
-#~ "Please select the date you want to go to.\n"
-#~ "When you click on a day, you will be taken\n"
-#~ "to that date."
-#~ msgstr ""
-#~ "Selezionare la data a cui si vuole andare.\n"
-#~ "Clickando su un giorno, si viene spostati\n"
-#~ "su quella data."
-
-#~ msgid "Deleted"
-#~ msgstr "Eliminato"
-
-#~ msgid "Draft"
-#~ msgstr "Bozze"
-
-#~ msgid "Mail Source"
-#~ msgstr "Sorgente della Posta"
-
-#~ msgid ""
-#~ "Your email configuration is now complete.\n"
-#~ "Click \"Finish\" to save your new settings"
-#~ msgstr ""
-#~ "la configurazione della posta è completata.\n"
-#~ "Clicca \"Fine\" per salvare le nuove impostazioni"
-
-#~ msgid "Sending a message without a subject"
-#~ msgstr "Invio di un messaggio senza oggetto"
-
-#~ msgid "Send \"%s\""
-#~ msgstr "Invia \"%s\""
-
-#~ msgid "Send a message without a subject"
-#~ msgstr "Invia un messaggio senza oggetto"
-
-#~ msgid "Expunge \"%s\""
-#~ msgstr "Elimina \"%s\""
-
-#~ msgid "Marking messages in folder \"%s\""
-#~ msgstr "Segnatura dei messaggi nella cartella \"%s\" in corso"
-
-#~ msgid "Mark messages in folder \"%s\""
-#~ msgstr "Segna i messaggi nella cartella \"%s\""
-
-#~ msgid "Marking message %d of %d"
-#~ msgstr "Sto segnando il messaggio %d di %d"
-
-#~ msgid "Scan folders in \"%s\""
-#~ msgstr "Scansione delle cartelle in \"%s\""
-
-#~ msgid "Attaching messages from folder \"%s\""
-#~ msgstr "Allega messaggi dalla cartella \"%s\""
-
-#~ msgid "Attach messages from \"%s\""
-#~ msgstr "Allega messaggi da \"%s\""
-
-#~ msgid "Forwarding messages \"%s\""
-#~ msgstr "Inoltro messaggi \"%s\" in corso"
-
-#~ msgid "Forwarding a message without a subject"
-#~ msgstr "Inoltro messaggio senza oggetto in corso"
-
-#~ msgid "Forward message \"%s\""
-#~ msgstr "Inoltra messaggio \"%s\""
-
-#~ msgid "Forward a message without a subject"
-#~ msgstr "Inoltra un messaggio senza oggetto"
-
-#~ msgid ""
-#~ "Failed to generate mime part from message while generating forwarded message."
-#~ msgstr ""
-#~ "Non è riuscita la generazione della parte mime durante la generazione\n"
-#~ "del messaggio da inoltrare. "
-
-#~ msgid "Loading \"%s\""
-#~ msgstr "Caricamento \"%s\" in corso"
-
-#~ msgid "Load \"%s\""
-#~ msgstr "Carica \"%s\""
-
-#~ msgid "Creating \"%s\""
-#~ msgstr "Creazione in corso \"%s\""
-
-#~ msgid "Create \"%s\""
-#~ msgstr "Crea \"%s\""
-
-#~ msgid "Exception while reporting result to shell component listener."
-#~ msgstr ""
-#~ "Eccezione nel riportare il risultato al componente di ascolto della\n"
-#~ "shell."
-
-#~ msgid "Synchronize \"%s\""
-#~ msgstr "Sincronizza \"%s\""
-
-#~ msgid "Displaying message UID \"%s\""
-#~ msgstr "Visualizzazione UID \"%s\" del messaggio"
-
-#~ msgid "Clearing message display"
-#~ msgstr "Pulizia del display dei messaggi"
-
-#~ msgid "Display message UID \"%s\""
-#~ msgstr "Visualizza UID \"%s\" del messaggio"
-
-#~ msgid "Clear message display"
-#~ msgstr "Pulisci il display dei messaggi"
-
-#~ msgid "Opening messages from folder \"%s\""
-#~ msgstr "Apertura messaggi dalla cartella \"%s\""
-
-#~ msgid "Open messages from \"%s\""
-#~ msgstr "Apri i messaggi di \"%s\""
-
-#~ msgid "Viewing messages from folder \"%s\""
-#~ msgstr "Visulaizzazione messaggi dalla cartella \"%s\""
-
-#~ msgid "View messages from \"%s\""
-#~ msgstr "Visualizza messaggi di \"%s\""
-
-#~ msgid "Retrieving message %d of %d (uid \"%s\")"
-#~ msgstr "Ricezione del messaggio %d di %d (uid \"%s\")"
-
-#~ msgid "Saving messages from folder \"%s\""
-#~ msgstr "Salvare messaggi dalla cartella \"%s\""
-
-#~ msgid "Save messages from folder \"%s\""
-#~ msgstr "Salva messaggi dalla cartella \"%s\""
-
-#~ msgid "Rebuilding message view"
-#~ msgstr "Rivisualizzazione del messaggio"
-
-#~ msgid "Rebuild message view"
-#~ msgstr "Rivisualizza il messaggio"
-
-#~ msgid "N_ew Directory Server"
-#~ msgstr "N_uovo Server delle Directory"
-
-#~ msgid "_Actions"
-#~ msgstr "_Azioni"
-
-#~ msgid "_Save Calendar As"
-#~ msgstr "_Salva Calendario come"
-
-#~ msgid "may"
-#~ msgstr "maggio"
-
-#~ msgid "sept"
-#~ msgstr "set"
-
-#~ msgid "sunday"
-#~ msgstr "domenica"
-
-#~ msgid "monday"
-#~ msgstr "lunedì"
-
-#~ msgid "tuesday"
-#~ msgstr "martedì"
-
-#~ msgid "tues"
-#~ msgstr "mar"
-
-#~ msgid "wednesday"
-#~ msgstr "mercoledì"
-
-#~ msgid "wednes"
-#~ msgstr "mer"
-
-#~ msgid "thursday"
-#~ msgstr "giovedì"
-
-#~ msgid "thur"
-#~ msgstr "gio"
-
-#~ msgid "thurs"
-#~ msgstr "gio"
-
-#~ msgid "friday"
-#~ msgstr "venerdì"
-
-#~ msgid "saturday"
-#~ msgstr "sabato"
-
-#~ msgid "fortnight"
-#~ msgstr "stanotte"
-
-#~ msgid "min"
-#~ msgstr "min"
-
-#~ msgid "sec"
-#~ msgstr "sec"
-
-#~ msgid "tomorrow"
-#~ msgstr "domani"
-
-#~ msgid "yesterday"
-#~ msgstr "ieri"
-
-#~ msgid "today"
-#~ msgstr "oggi"
-
-#~ msgid "last"
-#~ msgstr "scorso"
-
-#~ msgid "this"
-#~ msgstr "questo"
-
-#~ msgid "next"
-#~ msgstr "Successivo"
-
-#~ msgid "first"
-#~ msgstr "primo"
-
-#~ msgid "third"
-#~ msgstr "tre"
-
-#~ msgid "fourth"
-#~ msgstr "quattro"
-
-#~ msgid "fifth"
-#~ msgstr "cinque"
-
-#~ msgid "sixth"
-#~ msgstr "sei"
-
-#~ msgid "seventh"
-#~ msgstr "sette"
-
-#~ msgid "eighth"
-#~ msgstr "otto"
-
-#~ msgid "ninth"
-#~ msgstr "nono"
-
-#~ msgid "tenth"
-#~ msgstr "dieci"
-
-#~ msgid "eleventh"
-#~ msgstr "undici"
-
-#~ msgid "twelfth"
-#~ msgstr "dodici"
-
-#~ msgid "ago"
-#~ msgstr "fa"