bump version

2004-05-19  JP Rosevear  <jpr@novell.com>

	* configure.in: bump version

svn path=/trunk/; revision=25982

1 files changed, 812 insertions, 721 deletions

diff --git a/po/it.po b/po/it.po
index fabbfa7491..e6a663c1b8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-12 10:40+0200\n"
+"POT-Creation-Date: 2004-05-19 14:00-0400\n"
 "PO-Revision-Date: 2004-05-12 17:07+0200\n"
 "Last-Translator: Marco Ciampa <ciampix@libero.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
@@ -119,7 +119,8 @@ msgstr "Crea un nuovo gruppo contatti"
 
 #: addressbook/gui/component/addressbook-component.c:182
 msgid "Failed upgrading Addressbook settings or folders."
-msgstr "Fallito l'aggiornamento delle impostazioni o delle cartelle della rubrica."
+msgstr ""
+"Fallito l'aggiornamento delle impostazioni o delle cartelle della rubrica."
 
 #: addressbook/gui/component/addressbook-config.c:483
 msgid "Failed to connect to LDAP server"
@@ -137,15 +138,15 @@ msgstr "Impossibile eseguire interrogazione su DSE Root"
 msgid "The server responded with no supported search bases"
 msgstr "Il server ha risposto con basi di ricerca non supportate"
 
-#: addressbook/gui/component/addressbook-config.c:1242
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Questo server non supporta le informazioni di schema LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1263
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Errore nel caricare le informazioni di schema"
 
-#: addressbook/gui/component/addressbook-config.c:1271
+#: addressbook/gui/component/addressbook-config.c:1274
 msgid "Server did not respond with valid schema information"
 msgstr "Il server non risponde con informazioni di schema valide"
 
@@ -161,20 +162,16 @@ msgid "Migrating `%s':"
 msgstr "Migrazione di `%s':"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:243
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Su questo computer"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
@@ -266,9 +263,8 @@ msgstr "Proprietà..."
 #. can not get name, should be a bug of e-book.Anyway, should set a default name.
 #.
 #. name = e_book_get_name (book);
-#. Create the contacts group
 #: addressbook/gui/component/addressbook-view.c:1002
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
@@ -296,47 +292,56 @@ msgstr ""
 "URI per la cartella usata più recentemente nella finestra di selezione nomi"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Autocompletion"
 msgstr "Autocompletamento"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Contatti"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Certificates"
 msgstr "Certificati"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Configure autocomplete here"
 msgstr "Configura qui l'autocompletamento"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook"
 msgstr "Rubrica di Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address pop-up"
 msgstr "Pop-up della rubrica di Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook address viewer"
 msgstr "Visualizzatore di indirizzi della rubrica di Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook card viewer"
 msgstr "Visualizzatore di card della rubrica di Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution Addressbook component"
 msgstr "Componente della rubrica di Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Geatione controllo certificati S/Mime di Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Evolution folder settings configuration control"
 msgstr ""
 "Controllo di configurazione delle impostazioni delle cartelle di Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
 #, fuzzy
 msgid "Manage your S/MIME certificates here"
 msgstr "Gestione dei certificati S/Mime"
@@ -869,9 +874,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Lavoro</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:361
 msgid "AIM"
 msgstr "AIM"
 
@@ -905,7 +910,7 @@ msgid "Company:"
 msgstr "Società:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:270
+#: addressbook/gui/contact-editor/e-contact-editor.c:271
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -913,7 +918,7 @@ msgid "Contact"
 msgstr "Contatto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1523
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Editor dei contatti"
 
@@ -934,7 +939,7 @@ msgid "Full _Name..."
 msgstr "_Nome e cognome..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
 msgid "Home"
 msgstr "Casa"
@@ -979,61 +984,66 @@ msgid "Novell Groupwise"
 msgstr "GroupWise Novell"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
 msgid "Other"
 msgstr "Altro"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Casella postale:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Personal Information"
 msgstr "Informazioni personali"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "Profession:"
 msgstr "Professione:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "State/Province:"
 msgstr "Stato/Provincia:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr "Vuole ricevere messaggi in HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "Webcam:"
 msgstr "Webcam:"
 
 #. red
-#: addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: addressbook/gui/contact-editor/e-contact-editor.c:200
+#: addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
 #: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Lavoro"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "Zip/Postal Code:"
 msgstr "CAP:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Categories"
 msgstr "_Categorie"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_File under:"
 msgstr "_File sotto:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Where:"
 msgstr "_Dove:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-editor/contact-editor.glade.h:48
 msgid "item7"
 msgstr "voce7"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "item8"
 msgstr "voce8"
 
@@ -1054,13 +1064,13 @@ msgstr ""
 "questo contatto?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 msgid "Address"
 msgstr "Indirizzo"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:291
+#: addressbook/gui/contact-editor/e-contact-editor.c:292
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
@@ -2041,65 +2051,82 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:347
+#: addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
+#: addressbook/gui/widgets/eab-contact-display.c:344
+#: addressbook/gui/widgets/eab-contact-display.c:363
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:256
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Libro sorgente"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:263
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Libro oggetto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:277
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Nuovo contatto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:284
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Campi scrivibili"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:298
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Cambiato"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "Editor delle categorie non disponibile."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Questo contatto appartiene a queste categorie:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2592
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Selezionare una delle seguenti opzioni"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2738
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Impossibile trovare il widget per un campo: `%s'"
@@ -2351,143 +2378,144 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Ricerca avanzata"
 
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
 msgid "(map)"
 msgstr "(mappa)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
 msgid "map"
 msgstr "mappa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
 msgid "List Members"
 msgstr "Elenco membri"
 
-#: addressbook/gui/widgets/eab-contact-display.c:293
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "E-mail"
 msgstr "Email"
 
-#: addressbook/gui/widgets/eab-contact-display.c:300
+#: addressbook/gui/widgets/eab-contact-display.c:340
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: addressbook/gui/widgets/eab-contact-display.c:301
+#: addressbook/gui/widgets/eab-contact-display.c:341
 msgid "Position"
 msgstr "Posizione"
 
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Groupwise"
 msgstr "Di gruppo"
 
-#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:348
 msgid "Video Conferencing"
 msgstr "Video conferenza"
 
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
 msgid "Phone"
 msgstr "Telefono"
 
-#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:350
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "work"
 msgstr "lavoro"
 
-#: addressbook/gui/widgets/eab-contact-display.c:327
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:371
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Cellulare"
 
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "personal"
 msgstr "personale"
 
-#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:382
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/gui/widgets/eab-contact-display.c:508
+#: addressbook/gui/widgets/eab-contact-display.c:548
 msgid "Job Title"
 msgstr "Qualifica"
 
-#: addressbook/gui/widgets/eab-contact-display.c:512
+#: addressbook/gui/widgets/eab-contact-display.c:552
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/eab-contact-display.c:539
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Home page"
 msgstr "Pagina web"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
 msgstr "Completato"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Backend busy"
 msgstr "Backend occupato"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Repository offline"
 msgstr "Deposito non in linea"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Address Book does not exist"
 msgstr "La rubrica non esiste"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "No Self Contact defined"
 msgstr "Nessun auto contatto definito"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Permission denied"
 msgstr "Permesso negato"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact not found"
 msgstr "Contatto non trovato"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Contact ID already exists"
 msgstr "ID del contatto esiste già"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Protocol not supported"
 msgstr "Protocollo non supportato"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:62
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2500,37 +2528,37 @@ msgid "Cancelled"
 msgstr "Annullato"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Could not cancel"
 msgstr "Impossibile annullare"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Failed"
 msgstr "Autenticazione non riuscita"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Authentication Required"
 msgstr "Autenticazione richiesta"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:66
 msgid "TLS not Available"
 msgstr "TLS non disponibile"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "No such source"
 msgstr "Nessuna sorgente"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Other error"
 msgstr "Altro errore"
 
-#: addressbook/gui/widgets/eab-gui-util.c:102
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2538,7 +2566,7 @@ msgstr ""
 "Impossibile aprire questa rubrica. Controllare che il percorso esista e che "
 "si abbia il permesso di accedervi."
 
-#: addressbook/gui/widgets/eab-gui-util.c:109
+#: addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2546,7 +2574,7 @@ msgstr ""
 "Impossibile aprire questa rubrica.  Questo significa che è stata inserita "
 "una URI errata, oppure che il server LDAP non è raggiungibile."
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:115
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution you must compile the program from the CVS "
@@ -2556,7 +2584,7 @@ msgstr ""
 "LDAP con Evolution è necessario compilare il programma dai sorgenti CVS dopo "
 "aver scaricato Open LDAP dal collegamento sottostante."
 
-#: addressbook/gui/widgets/eab-gui-util.c:123
+#: addressbook/gui/widgets/eab-gui-util.c:124
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2564,11 +2592,11 @@ msgstr ""
 "Impossibile aprire questa rubrica. Questo significa che è stata inserita una "
 "URI errata, oppure che il server LDAP non è raggiungibile."
 
-#: addressbook/gui/widgets/eab-gui-util.c:140
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "Unable to open addressbook"
 msgstr "Impossibile aprire la rubrica"
 
-#: addressbook/gui/widgets/eab-gui-util.c:161
+#: addressbook/gui/widgets/eab-gui-util.c:162
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2581,7 +2609,7 @@ msgstr ""
 "più specifica o aumentare il limite di risultati nelle preferenze \n"
 "del server di elenchi per questa rubrica."
 
-#: addressbook/gui/widgets/eab-gui-util.c:167
+#: addressbook/gui/widgets/eab-gui-util.c:168
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2593,56 +2621,56 @@ msgstr ""
 "la ricerca più specifica o elevare il limite di tempo del\n"
 "server di elenchi nelle preferenze di questa rubrica."
 
-#: addressbook/gui/widgets/eab-gui-util.c:173
+#: addressbook/gui/widgets/eab-gui-util.c:174
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Il backend per questa rubrica è incapace di elaborare questa interrogazione."
 
-#: addressbook/gui/widgets/eab-gui-util.c:176
+#: addressbook/gui/widgets/eab-gui-util.c:177
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "Il backend per questa rubrica si è rifiutato di eseguire questa "
 "interrogazione."
 
-#: addressbook/gui/widgets/eab-gui-util.c:179
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "This query did not complete successfully."
 msgstr "Questa interrogazione non è stata completata con successo."
 
-#: addressbook/gui/widgets/eab-gui-util.c:205
+#: addressbook/gui/widgets/eab-gui-util.c:206
 msgid "Do you want to save changes?"
 msgstr "Salvare le modifiche?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 msgid "_Discard"
 msgstr "_Annulla"
 
-#: addressbook/gui/widgets/eab-gui-util.c:228
+#: addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error adding list"
 msgstr "Errore nell'aggiungere l'elenco"
 
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:651
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
 msgid "Error adding contact"
 msgstr "Errore nell'aggiungere un contatto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:239
+#: addressbook/gui/widgets/eab-gui-util.c:240
 msgid "Error modifying list"
 msgstr "Errore nella modifica dell'elenco"
 
-#: addressbook/gui/widgets/eab-gui-util.c:239
+#: addressbook/gui/widgets/eab-gui-util.c:240
 msgid "Error modifying contact"
 msgstr "Errore nella modifica di un contatto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:251
+#: addressbook/gui/widgets/eab-gui-util.c:252
 msgid "Error removing list"
 msgstr "Errore nella rimozione dell'elenco"
 
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:609
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
 msgid "Error removing contact"
 msgstr "Errore nella rimozione di una contatto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:333
+#: addressbook/gui/widgets/eab-gui-util.c:334
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2651,7 +2679,7 @@ msgstr ""
 "L'apertura di %d contatti causerà l'apertura di %d nuove finestre.\n"
 " Visualizzare tutti i contatti indicati?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:359
+#: addressbook/gui/widgets/eab-gui-util.c:360
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2660,49 +2688,49 @@ msgstr ""
 "%s esiste già\n"
 "Sovrascriverlo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:363
+#: addressbook/gui/widgets/eab-gui-util.c:364
 msgid "Overwrite"
 msgstr "Sovrascrivi"
 
-#: addressbook/gui/widgets/eab-gui-util.c:399
+#: addressbook/gui/widgets/eab-gui-util.c:400
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Errore nel salvare %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
+#: addressbook/gui/widgets/eab-gui-util.c:437
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:570
+#: addressbook/gui/widgets/eab-gui-util.c:571
 msgid "list"
 msgstr "elenco"
 
-#: addressbook/gui/widgets/eab-gui-util.c:705
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Move contact to"
 msgstr "Sposta contatto su"
 
-#: addressbook/gui/widgets/eab-gui-util.c:707
+#: addressbook/gui/widgets/eab-gui-util.c:708
 msgid "Copy contact to"
 msgstr "Copia contatto su"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:711
 msgid "Move contacts to"
 msgstr "Sposta contatti su"
 
-#: addressbook/gui/widgets/eab-gui-util.c:712
+#: addressbook/gui/widgets/eab-gui-util.c:713
 msgid "Copy contacts to"
 msgstr "Copia contatti su"
 
-#: addressbook/gui/widgets/eab-gui-util.c:715
+#: addressbook/gui/widgets/eab-gui-util.c:716
 msgid "Select target addressbook."
 msgstr "Seleziona rubrica obbiettivo."
 
-#: addressbook/gui/widgets/eab-gui-util.c:888
+#: addressbook/gui/widgets/eab-gui-util.c:939
 msgid "Multiple VCards"
 msgstr "VCard multiple"
 
-#: addressbook/gui/widgets/eab-gui-util.c:891
+#: addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard per %s"
@@ -2847,7 +2875,8 @@ msgstr "Rubrica"
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
 #: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Salva come vcard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2924,7 +2953,7 @@ msgid "Paste"
 msgstr "Incolla"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1279
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Vista corrente"
 
@@ -3156,17 +3185,17 @@ msgstr "Vista della card"
 msgid "GTK Tree View"
 msgstr "Vista da albero GTK"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Prova di rifresco"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "Questo dovrebbe controllare il rinfresco delle voci immagini"
 
@@ -3536,24 +3565,24 @@ msgstr "_Modifica appuntamenti"
 msgid "_Snooze"
 msgstr "_Suoneria"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Apri"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Abbandona"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Abbandona tutto"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Nessuna descrizione disponibile."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3566,12 +3595,12 @@ msgstr ""
 "Inizia da %s\n"
 "Finisce a %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Attenzione"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: calendar/gui/alarm-notify/alarm-queue.c:1073
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3583,7 +3612,7 @@ msgstr ""
 "richiede l'invio di un messaggio Email.  Per questo,\n"
 "Evolution visualizzerà invece un messaggio a video."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3600,7 +3629,7 @@ msgstr ""
 "\n"
 "Si vuole davvero eseguire questo programma?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Non chiedere più su questo programma in futuro."
 
@@ -3608,15 +3637,11 @@ msgstr "Non chiedere più su questo programma in futuro."
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servizio di notifica dell'avviso sonoro del calendario di Evolution"
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Impossibile inizializzare Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Impossibile inizializzare gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 "Impossibile creare la fabbrica per il servizio di notifica dell'avviso sonoro"
@@ -3727,30 +3752,34 @@ msgid "Weekday the week starts on"
 msgstr "Giorno di inizio della settimana"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Whether or not to use the notification tray for display alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Chiedi conferma prima di cancellare un appuntamento"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Chiedi conferma prima di eliminare una cartella"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Nascondi attività completate"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr "Imposta un allarme predefinito per gli eventi"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Mostra l'ora in formato di 24h o usando am/pm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "Mostra i numeri delle settimane nel navigatore date"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/calendar-component.c:552
+#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
 #: calendar/gui/dialogs/select-source-dialog.c:88
 #: calendar/gui/gnome-cal.c:1703
 #: camel/providers/groupwise/camel-gw-listener.c:304
@@ -3758,7 +3787,7 @@ msgstr "Mostra i numeri delle settimane nel navigatore date"
 msgid "Calendar"
 msgstr "Calendario"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -3768,40 +3797,36 @@ msgstr ""
 "dell'ammontare di tempo impostato. Se si continua, non sarà più possibile "
 "ripristinare questi eventi."
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Elimina eventi più vecchi di"
 
-#: calendar/gui/calendar-commands.c:362
+#: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
 #: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
 msgid "days"
 msgstr "giorni"
 
-#: calendar/gui/calendar-commands.c:431 calendar/gui/calendar-component.c:504
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 msgstr "%A, %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: calendar/gui/calendar-commands.c:434 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443 calendar/gui/calendar-component.c:509
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
+#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:509
 #: calendar/gui/calendar-component.c:514 calendar/gui/calendar-component.c:516
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467
+#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
 #: calendar/gui/calendar-component.c:528 calendar/gui/calendar-component.c:535
 #: calendar/gui/calendar-component.c:541 calendar/gui/calendar-component.c:543
 msgid "%d %B %Y"
@@ -3810,7 +3835,7 @@ msgstr "%d %B %Y"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:464 calendar/gui/calendar-component.c:533
+#: calendar/gui/calendar-commands.c:465 calendar/gui/calendar-component.c:533
 #: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
 msgid "%d %B"
 msgstr "%d %B"
@@ -3847,7 +3872,7 @@ msgstr ""
 "creati. Selezionare un calendario abilitato in scrittura."
 
 #: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Calendars"
 msgstr "Calendari"
 
@@ -3945,15 +3970,15 @@ msgstr "La locazione contiene"
 msgid "Unmatched"
 msgstr "Non corrispondenti"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Errore durante l'apertura del calendario"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Metodo non supportato durante l'apertura del calendario"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Negato il permesso di aprire il calendario"
 
@@ -4027,7 +4052,7 @@ msgstr "tempo in più ogni"
 msgid "hours"
 msgstr "ore"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Azione"
 
@@ -4046,14 +4071,14 @@ msgstr "Di base"
 msgid "Date/Time:"
 msgstr "Data/ora:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Visualizza un messaggio"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Emetti un suono"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Reminders"
 msgstr "Promemoria"
@@ -4576,7 +4601,7 @@ msgid "No summary"
 msgstr "Nessuna descrizione"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1037
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Salva come..."
@@ -4744,27 +4769,27 @@ msgstr "Delega a:"
 msgid "Enter Delegate"
 msgstr "Inserire delegato"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Appuntamento"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Promemoria"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Ricorrenza"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Pianificazione"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:229
+#: calendar/gui/dialogs/event-editor.c:298
+#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Riunione"
 
@@ -4860,17 +4885,12 @@ msgid "_Start time:"
 msgstr "_Ora di inizio:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:927 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:2039 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
+#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4896,8 +4916,8 @@ msgstr "_Delega a..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
-#: mail/em-folder-tree.c:2619 mail/em-folder-view.c:918
+#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
+#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5171,8 +5191,9 @@ msgid "Save Event"
 msgstr "Salva eventi"
 
 #: calendar/gui/dialogs/select-source-dialog.c:65
-msgid "Select source"
-msgstr "Seleziona sorgente"
+#, fuzzy
+msgid "Select destination"
+msgstr "Seleziona un'azione"
 
 #: calendar/gui/dialogs/select-source-dialog.c:86
 msgid "_Destination"
@@ -5221,7 +5242,7 @@ msgstr "Completato"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:928
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Alta"
 
@@ -5235,14 +5256,14 @@ msgstr "In corso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:926
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Bassa"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:927
+#: mail/message-list.c:957
 msgid "Normal"
 msgstr "Normale"
 
@@ -5443,7 +5464,7 @@ msgstr "%s alle %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s per un'attivazione di tipo sconosciuto"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2331
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
 #, c-format
 msgid "Click to open %s"
 msgstr "Fare clic qui per aprire %s"
@@ -5552,8 +5573,8 @@ msgid "Updating objects"
 msgstr "Aggiornamento elementi in corso"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1292 calendar/gui/e-calendar-view.c:1372
-#: mail/em-folder-view.c:893 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Apri"
 
@@ -5562,41 +5583,42 @@ msgid "Open _Web Page"
 msgstr "Apri pagina _web"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1378
-#: mail/em-folder-view.c:895 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
+#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Salva con nome..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1271 calendar/gui/e-calendar-view.c:1294
-#: calendar/gui/e-calendar-view.c:1376 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
+#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "S_tampa..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1299 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Taglia"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1340
-#: mail/em-folder-tree.c:2612 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
+#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
+#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Copia"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1301
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
+#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Incolla"
 
@@ -5660,67 +5682,67 @@ msgstr "Sommario"
 msgid "Task sort"
 msgstr "Ordina attività"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1352
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Nuovo _appuntamento..."
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1357
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Nuovo _evento del giorno"
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1362
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Nuova riunione"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1367
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Nuova attività"
 
-#: calendar/gui/e-calendar-view.c:1281 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Seleziona _oggi"
 
-#: calendar/gui/e-calendar-view.c:1282
+#: calendar/gui/e-calendar-view.c:1280
 msgid "_Select Date..."
 msgstr "_Seleziona data..."
 
-#: calendar/gui/e-calendar-view.c:1286 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Pubblica le informazioni sulla disponibilità"
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1303
 msgid "Cop_y to Calendar..."
 msgstr "_Copia nel calendario..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1304
 msgid "Mo_ve to Calendar..."
 msgstr "_Sposta nel calendario..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Pianifica una riunione..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Inoltra come iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "_Elimina questa ricorrenza"
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Elimina _tutte le ricorrenze"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Vai a _oggi"
 
-#: calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Vai alla data..."
 
-#: calendar/gui/e-calendar-view.c:1380 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Impostazioni..."
 
@@ -5738,7 +5760,7 @@ msgstr "Inizio"
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
+#: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/imap4/camel-imap4-engine.c:1534
 #: camel/providers/imap4/camel-imap4-engine.c:1561
@@ -5747,8 +5769,9 @@ msgstr "Inizio"
 #: camel/providers/imap4/camel-imap4-store.c:1039
 #: camel/providers/imap4/camel-imap4-utils.c:292
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1046
-#: shell/e-component-registry.c:170 widgets/misc/e-charset-picker.c:62
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
+#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
+#: widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -5798,20 +5821,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 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, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5829,34 +5844,27 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: calendar/gui/e-day-view.c:1572 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-day-view.c:1605 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
@@ -5960,6 +5968,7 @@ msgstr "Errore iCalendar"
 msgid "An unknown person"
 msgstr "Partecipante sconosciuto"
 
+#. Describe what the user can do
 #: calendar/gui/e-itip-control.c:910
 msgid ""
 "<br> Please review the following information, and then select an action from "
@@ -6452,10 +6461,6 @@ msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel.c:2093
 #: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
 #: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6464,10 +6469,6 @@ msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -6525,7 +6526,7 @@ msgid "Expunging"
 msgstr "Pulizia"
 
 #: calendar/gui/e-tasks.c:960
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
 #: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
@@ -6558,37 +6559,55 @@ msgid "Purging"
 msgstr "Pulizia"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Calendar and Tasks"
 msgstr "Calendario e attività"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Configura quì il tuo fuso orario, il calendario e l'elenco attività"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar and Tasks"
 msgstr "Calendario e attività di Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar configuration control"
 msgstr "Controllo di configurazione del calendario di Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Visualizzatore di messaggi di scadenze del calendario di Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution Calendar/Task editor"
 msgstr "Editor del calendario/attività di Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Calendar component"
 msgstr "Componente del calendario di Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "Evolution's Tasks component"
 msgstr "Componente delle attività di Evolution"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Calendari"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Attività"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprile"
@@ -6968,7 +6987,7 @@ msgid "Contacts: "
 msgstr "Contatti: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Anteprima di stampa"
 
@@ -6996,7 +7015,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d totale"
 msgstr[1] "%d totali"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:498
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8716,7 +8735,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr "Scaricamento nuovi messaggi per la modalità non in linea"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Preparazione cartella '%s' per l'accesso fuorilinea"
@@ -8865,7 +8884,8 @@ msgid "(match-all) requires a single bool result"
 msgstr "(match-all) richiede un singolo risultato booleano"
 
 #: camel/camel-folder-search.c:755
-msgid "(match-threads) now allowed inside match-all"
+#, fuzzy
+msgid "(match-threads) not allowed inside match-all"
 msgstr "(match-threads) è ora consentito dentro match-all"
 
 #: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
@@ -8885,7 +8905,7 @@ msgstr "(match-threads) richiede l'impostazione cartella"
 msgid "Performing query on unknown header: %s"
 msgstr "É stata effettuata una ricerca su un header sconosciuto: %s"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8896,15 +8916,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Analisi userid hint gpg non riuscita."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Analisi richiesta passphrase gpg non riuscita."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8913,29 +8933,29 @@ msgstr ""
 "È necessaria una passphrase per sbloccare la chiave\n"
 "per l'utente: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
+#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
+#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Annullato."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Sblocco della chiave segreta non riuscito: sono state fornite 3 passphrases "
 "errate."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Risposta inaspettata da GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Impossibile cifrare: nessun destinatario valido specificato."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8946,61 +8966,61 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Impossibile elaborare con GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Impossibile generare i dati per la firma: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
+#: camel/camel-gpg-context.c:1753
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Esecuzione di gpg non riuscita: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
+#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
+#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
 msgid "Failed to execute gpg."
 msgstr "Esecuzione di gpg non riuscita."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Questa parte del messaggio è firmata"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
+#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
+#: camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "Impossibile verificare la firma del messaggio: formato messaggio non valido"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Impossibile verificare la firma di questo messaggio: impossibile creare un "
 "file temporaneo: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Impossibile generare i dati per la crittografia: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "Questa parte del messaggio è cifrata"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Contenuto cifrato"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "Impossibile elaborare i contenuti del messaggio"
 
@@ -9304,7 +9324,7 @@ msgstr "Le credenziali di riferimento sono scadute."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1207
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Risposta di autenticazione dal server errata."
 
@@ -9520,7 +9540,7 @@ msgstr "Impossibile creare contesto del codificatore"
 msgid "Failed to add data to CMS encoder"
 msgstr "Impossibile aggiungere dati al codificatore CMS"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 msgid "Failed to encode data"
 msgstr "Fallita la codifica dei dati"
 
@@ -9580,93 +9600,95 @@ msgstr "Impossibile calcolare le raccolte"
 msgid "Cannot set message digests"
 msgstr "Impossibile impostare le raccolte messaggi"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr "Importazione certificato non riuscita"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+#, fuzzy
+msgid "Certificate only message, cannot verify certificates"
 msgstr "Messaggio di soli certificati, impossibile verificare i certificati"
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+#, fuzzy
+msgid "Certificate only message, certificates imported and verified"
 msgstr "Messaggio di soli certificati, certificati importati e verificati"
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 msgid "Can't find signature digests"
 msgstr "Impossibile trovare le raccolte firma"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Firmatario: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 msgid "Decoder failed"
 msgstr "Decodificatore fallito"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Impossibile trovare certificato per `%s'"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Impossibile trovare algoritmo di crittografia di uso comune"
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 #, fuzzy
 msgid "Can't allocate slot for encryption bulk key"
 msgstr "Impossibile allocare uno slot per la crittografia di una chiave comune"
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 msgid "Can't create CMS Message"
 msgstr "Impossibile creare messaggio CMS"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr "Impossibile creare dati busta CMS"
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr "Impossibile allegare dati busta CMS"
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr "Impossibile allegare oggetto dati CMS"
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr "Impossibile creare informazioni destinatario CMS"
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr "Impossibile aggiungere informazioni destinatario CMS"
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 msgid "Can't create encoder context"
 msgstr "Impossibile creare contesto codificatore"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "Fallita l'aggiunta dati al codificatore"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr "Decoder fallito, errore %d"
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "Decrittazione S/MIME: non è stato trovato nessun contenuto crittato"
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 msgid "import keys: unimplemented"
 msgstr "importazione chiavi: non implementato"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr "esportazione chiavi: non implementato"
 
@@ -9686,16 +9708,26 @@ msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Impossibile creare una cartella: operazione non supportata in questo archivio"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Impossibile creare la cartella `%s': la cartella esiste"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Impossibile eliminare la cartella: %s: operazione non valida"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Impossibile rinominare la cartella %s: operazione non valida"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Cestino"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Da cestinare"
@@ -9917,12 +9949,12 @@ msgstr "Impossibile interpretare URL `%s'"
 msgid "Error storing `%s': %s"
 msgstr "Errore durante la memorizzazione `%s': %s"
 
-#: camel/camel-vee-folder.c:673
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Non é presente il messaggio %s in %s"
 
-#: camel/camel-vee-folder.c:839 camel/camel-vee-folder.c:845
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Impossibile copiare o spostare messaggi in una cartella virtuale"
 
@@ -9931,11 +9963,6 @@ msgstr "Impossibile copiare o spostare messaggi in una cartella virtuale"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Impossibile eliminare la cartella %s: cartella inesistente"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Impossibile rinominare la cartella %s: operazione non valida"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10147,21 +10174,21 @@ msgstr ""
 "testo semplice."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap/camel-imap-store.c:429
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap/camel-imap-store.c:431
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "servizio IMAP per %s su %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:208
 #: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:546
-#: camel/providers/imap/camel-imap-store.c:566
+#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
 #: camel/providers/nntp/camel-nntp-store.c:140
 #: camel/providers/pop3/camel-pop3-store.c:175
@@ -10172,15 +10199,15 @@ msgid "Could not connect to %s (port %d): %s"
 msgstr "Impossibile connettersi a %s (porta %d): %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:548
+#: camel/providers/imap/camel-imap-store.c:553
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL non disponibile"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:563
-#: camel/providers/imap/camel-imap-store.c:810
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:815
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
@@ -10196,8 +10223,8 @@ msgid ""
 msgstr "Impossibile connettersi al server IMAP.%s in modalità sicura: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:644
-#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Impossibile connettersi al server IMAP.%s in modalità sicura: %s"
@@ -10234,9 +10261,11 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Impossibile avere la cartella %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
+#: camel/providers/imap/camel-imap-store.c:1857
+#: camel/providers/imap/camel-imap-store.c:2235
 #, fuzzy, c-format
 msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr ""
 "Il nome della cartella \"%s\" non è valido perché contiene il carattere \"%c"
 "\""
@@ -10314,12 +10343,12 @@ msgstr "Il server si é disconnesso inaspettatamente: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3129
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operazione annullata"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3132
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Il server si é disconnesso inaspettatamente: %s"
@@ -10368,21 +10397,21 @@ msgstr "Impossibile creare la directory %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Impossibile caricare il sommario di %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Cartella distrutta e ricreata sul server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Ricerca messaggi modificati"
 
-#: camel/providers/imap/camel-imap-folder.c:1936
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Impossibile la ricezione del messaggio: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1973
+#: camel/providers/imap/camel-imap-folder.c:1977
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -10398,25 +10427,25 @@ msgstr ""
 "Impossibile prendere il messaggio: %s\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-folder.c:1973
+#: camel/providers/imap/camel-imap-folder.c:1977
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Messaggio assente"
 
-#: camel/providers/imap/camel-imap-folder.c:2015
-#: camel/providers/imap/camel-imap-folder.c:2617
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Questo messaggio non è al momento disponibile"
 
-#: camel/providers/imap/camel-imap-folder.c:2281
-#: camel/providers/imap/camel-imap-folder.c:2351
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Ricezione delle informazioni sul sommario per i nuovi messaggi"
 
-#: camel/providers/imap/camel-imap-folder.c:2655
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Impossibile trovare il corpo del messaggio nella risposta di FETCH."
 
@@ -10474,43 +10503,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Per leggere e memorizzare la posta su server IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:645
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Estensione SSL/TLS non supportata"
 
-#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Negoziazione SSL non riuscita"
 
-#: camel/providers/imap/camel-imap-store.c:813
+#: camel/providers/imap/camel-imap-store.c:818
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Impossibile connettersi con il comando \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1237
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Il server IMAP %s non supporta il tipo di autenticazione richiesto %s "
 
-#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/imap/camel-imap-store.c:1252
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nessun supporto per il tipo di autenticazione %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1275
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, 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:1284
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Non è stata inserita la password."
 
-#: camel/providers/imap/camel-imap-store.c:1313
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10521,27 +10550,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1800
-#: camel/providers/imap/camel-imap-store.c:1990
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Non è presente la cartella %s"
 
-#: camel/providers/imap/camel-imap-store.c:1818
-#: camel/providers/imap/camel-imap-store.c:2196
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"Il nome della cartella \"%s\" non è valido perché contiene il carattere \"%c"
-"\""
-
-#: camel/providers/imap/camel-imap-store.c:1876
-#: camel/providers/imap/camel-imap-store.c:2257
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Alla cartella madre non è permesso contenere sottocartelle"
 
-#: camel/providers/imap/camel-imap-store.c:1931
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10549,7 +10569,7 @@ msgstr "Alla cartella madre non è permesso contenere sottocartelle"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Impossibile creare la cartella: `%s': la cartella esiste."
 
-#: camel/providers/imap/camel-imap-store.c:2207
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Cartella madre sconosciuta: %s"
@@ -10657,58 +10677,58 @@ msgstr ""
 "Può anche essere usata per leggere un albero di cartelle stile Elm, Pine o "
 "Mutt."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:253
 #: camel/providers/local/camel-mbox-store.c:356
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "La radice di archiviazione %s non è un percorso assoluto"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "La radice di archiviazione %s non è una directory normale"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:166
+#: camel/providers/local/camel-local-store.c:264
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Impossibile avere la cartella %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Gli archivi locali non hanno una cartella della posta in arrivo"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "File di posta locale: %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Impossibile rinominare la cartella %s con %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Impossibile rinominare la cartella '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: camel/providers/local/camel-local-store.c:423
 #: camel/providers/local/camel-mbox-store.c:284
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Impossibile cancellare il sommario della cartella `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: camel/providers/local/camel-local-store.c:433
 #: camel/providers/local/camel-mbox-store.c:296
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Impossibile cancellare il file indice della cartella `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10775,7 +10795,7 @@ msgstr "Impossibile cancellare la cartella `%s': %s"
 msgid "not a maildir directory"
 msgstr "non è una directory maildir"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -11111,7 +11131,7 @@ msgid "Server rejected username/password"
 msgstr "Il server ha respinto il nomeutente/password"
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: camel/providers/nntp/camel-nntp-folder.c:263
 #: camel/providers/pop3/camel-pop3-folder.c:262
 #: camel/providers/pop3/camel-pop3-folder.c:430
 #: camel/providers/pop3/camel-pop3-folder.c:491
@@ -11120,8 +11140,8 @@ msgid "User cancelled"
 msgstr "Utente cancellato"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11130,53 +11150,53 @@ msgstr "Utente cancellato"
 msgid "Cannot get message %s: %s"
 msgstr "Impossibile prendere il messaggio: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: camel/providers/nntp/camel-nntp-folder.c:188
+#: camel/providers/nntp/camel-nntp-folder.c:228
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Errore interno: uid in formato non valido: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: camel/providers/nntp/camel-nntp-folder.c:201
 #, c-format
 msgid "Could not get article %s from NNTP server"
 msgstr "Impossibile ricevere l'articolo %s dal server NNTP"
 
-#: camel/providers/nntp/camel-nntp-folder.c:357
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr "Spedizione di posta non permessa dal server delle news"
 
-#: camel/providers/nntp/camel-nntp-folder.c:368
+#: camel/providers/nntp/camel-nntp-folder.c:373
 #, c-format
 msgid "Failed to send newsgroups header: %s: message not posted"
 msgstr ""
 "Fallita la spedizione dell'intestazione dei newsgroup: %s: messaggio non "
 "spedito"
 
-#: camel/providers/nntp/camel-nntp-folder.c:408
-#: camel/providers/nntp/camel-nntp-folder.c:421
+#: camel/providers/nntp/camel-nntp-folder.c:413
+#: camel/providers/nntp/camel-nntp-folder.c:426
 #, c-format
 msgid "Error posting to newsgroup: %s: message not posted"
 msgstr ""
 "Errore durante la spedizione ad un newsgroup: %s: messaggio non spedito"
 
-#: camel/providers/nntp/camel-nntp-folder.c:433
+#: camel/providers/nntp/camel-nntp-folder.c:438
 msgid "Error reading response to posted message: message not posted"
 msgstr ""
 "Errore durante la lettura della risposta al messaggio spedito: messaggio non "
 "spedito"
 
-#: camel/providers/nntp/camel-nntp-folder.c:436
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr "Errore nella spedizione del messaggio: %s: messaggio non spedito"
 
-#: camel/providers/nntp/camel-nntp-folder.c:452
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 "È impossibile spedire messaggi NNTP durante una sessione di lavoro non in "
 "linea!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:463
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "È impossibile copiare messaggi da una cartella NNTP!"
 
@@ -11820,7 +11840,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:404
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "allegato"
 
@@ -12331,16 +12351,12 @@ msgstr "Categorie Sync:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
@@ -12392,31 +12408,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12513,7 +12521,6 @@ msgid "Missing file name."
 msgstr "Manca il nome file."
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "È necessario indicare un nome file."
@@ -12544,7 +12551,6 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr "Impossibile compilare espressione regolare \"{1}\"."
 
 #. filter:no-name primary
-#. filter:no-name-vfolder primary
 #: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
 msgid "Missing name."
 msgstr "Manca il nome."
@@ -12574,6 +12580,7 @@ msgstr "Scegliere un'altro nome."
 msgid "No sources selected."
 msgstr "Nessuna sorgente selezionata."
 
+#. filter:vfolder-no-source secondary
 #: filter/filter-errors.xml.h:36
 #, fuzzy
 msgid ""
@@ -12594,7 +12601,7 @@ msgstr "Scegli un file"
 msgid "<b>Then</b>"
 msgstr "<b>allora</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
 #: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Scegli cartella"
@@ -12889,7 +12896,7 @@ msgstr "non è segnato"
 msgid "Junk Test"
 msgstr "Test spazzatura"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:926
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etichetta"
@@ -12997,8 +13004,8 @@ msgstr "comincia per"
 msgid "Stop Processing"
 msgstr "Arresta processo in corso"
 
-#: filter/libfilter-i18n.h:64 mail/em-format.c:747 mail/em-format-html.c:1533
-#: mail/em-format-quote.c:301 mail/em-mailer-prefs.c:89
+#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
 #: smime/lib/e-cert.c:1079
 msgid "Subject"
@@ -13062,7 +13069,12 @@ msgstr "L'oggetto non contiene"
 msgid "Virtual _Folders"
 msgstr "Cartelle virtuali"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+#, fuzzy
+msgid "_Add"
+msgstr "A_ggiungi"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "Sorgente delle cartelle virtuali"
 
@@ -13080,7 +13092,7 @@ msgid "Protocol"
 msgstr "Protocollo"
 
 #: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
-#: mail/mail-config.c:1061
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Senza nome"
 
@@ -13097,17 +13109,17 @@ msgstr "_Aggiungi firma"
 msgid "Signature(s)"
 msgstr "Firme"
 
-#: mail/em-composer-utils.c:883
+#: mail/em-composer-utils.c:888
 msgid "-------- Forwarded Message --------"
 msgstr "------- Messaggio inoltrato -------"
 
-#: mail/em-composer-utils.c:1494
+#: mail/em-composer-utils.c:1499
 msgid "an unknown sender"
 msgstr "un mittente sconosciuto"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1504
+#: mail/em-composer-utils.c:1509
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Lì %A, %Y/%m/%d alle %H:%M, %%+05d, %%s ha scritto:"
 
@@ -13145,95 +13157,120 @@ msgstr "<fare clic qui per selezionare una cartella>"
 msgid "Create New Folder"
 msgstr "Crea nuova cartella"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2344
-#: mail/mail-component.c:698
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Specificare dove creare la cartella:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Crea cartella"
+
 #: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Nome della cartella:"
 
-#: mail/em-folder-tree.c:937
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Rimozione cartella %s"
 
-#: mail/em-folder-tree.c:939
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Lettura cartella %s in corso"
 
-#: mail/em-folder-tree.c:946
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Sposta messaggii in %s"
 
-#: mail/em-folder-tree.c:948
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copia messaggi in %s"
 
-#: mail/em-folder-tree.c:964
+#: mail/em-folder-tree.c:866
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Impossibile copiare o spostare messaggi in una cartella virtuale"
 
-#: mail/em-folder-tree.c:2118 mail/em-folder-tree.c:2131
-#: mail/em-folder-view.c:797 mail/em-folder-view.c:811
+#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+msgid "_Copy to Folder"
+msgstr "_Copia nella cartella"
+
+#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+msgid "_Move to Folder"
+msgstr "_Sposta nella cartella"
+
+#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
+#: mail/message-list.c:1645
+msgid "_Move"
+msgstr "_Sposta"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Annulla attività"
+
+#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Scegli cartella"
 
-#: mail/em-folder-tree.c:2158
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Copia"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Archiviazione cartella '%s'"
 
-#: mail/em-folder-tree.c:2344 mail/mail-component.c:698
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Crea cartella"
 
-#: mail/em-folder-tree.c:2536
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rinominare la cartella \\\"%s\\\" in:"
 
-#: mail/em-folder-tree.c:2538
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Rinomina cartella"
 
-#: mail/em-folder-tree.c:2607 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_Visualizza"
 
-#: mail/em-folder-tree.c:2608
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Apri in una nuova _finestra"
 
-#: mail/em-folder-tree.c:2613
-msgid "_Move"
-msgstr "_Sposta"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2617
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Nuova cartella..."
 
-#: mail/em-folder-tree.c:2620
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: mail/em-folder-tree.c:2623 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Proprietà..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:851
+#: mail/mail-vfolder.c:889
 msgid "VFolders"
 msgstr "Cartelle virtuali"
 
@@ -13251,306 +13288,308 @@ msgstr "Posta in arrivo"
 msgid "Loading..."
 msgstr "Sto caricando..."
 
-#: mail/em-folder-view.c:413 mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
-#: mail/mail-component.c:549
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:551
 msgid "Mail"
 msgstr "Posta"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:894 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Modifica come nuovo messaggio..."
 
-#: mail/em-folder-view.c:896
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "S_tampa"
 
-#: mail/em-folder-view.c:899 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Rispondi al mittente"
 
-#: mail/em-folder-view.c:900 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Rispondi alla _lista"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Rispondi a _tutti"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:813
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Inoltra"
 
-#: mail/em-folder-view.c:905
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Segue..."
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Flag completata"
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Flag annullata"
 
-#: mail/em-folder-view.c:910 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Segna come _letto"
 
-#: mail/em-folder-view.c:911
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Segna come non letto"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Segna come _importante"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Segna come non i_mportante"
 
-#: mail/em-folder-view.c:914 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Segna come _da cancellare"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Segna come _non da cancellare"
 
-#: mail/em-folder-view.c:919
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "_Ripristina"
 
-#: mail/em-folder-view.c:922
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "_Sposta nella cartella..."
 
-#: mail/em-folder-view.c:923 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copia nella cartella..."
 
-#: mail/em-folder-view.c:931
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Aggiungi mittente alla ru_brica"
 
-#: mail/em-folder-view.c:934
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Applica _filtri"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Regole dei filtri"
 
-#: mail/em-folder-view.c:938
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Crea re_gola dal messaggio"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "Cartella virtuale sull'_oggetto"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "Cartella virtuale sul _mittente"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "Cartella virtuale sui _destinatari"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "Cartella virtuale sulla mailing _list"
 
-#: mail/em-folder-view.c:946
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filtro sull'_oggetto"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filtro sul _mittente"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filtro sui _destinatari"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filtro sulla _mailing list"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1717 mail/em-folder-view.c:1757
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Predefinito"
 
-#: mail/em-folder-view.c:1807
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Stampa messaggio"
 
-#: mail/em-folder-view.c:2072
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "_Copia indirizzo del collegamento"
 
-#: mail/em-folder-view.c:2326
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Fare clic per spedire %s"
 
-#: mail/em-format.c:742 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:7
+#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
 #: mail/message-tag-followup.c:325
 msgid "From"
 msgstr "Da"
 
-#: mail/em-format.c:743 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:85
+#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:83
 msgid "Reply-To"
 msgstr "Rispondi-a"
 
-#: mail/em-format.c:744 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:86 mail/message-list.etspec.h:14
+#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "A"
 
-#: mail/em-format.c:745 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:87
+#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:85
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format.c:746 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:88
+#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:86
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format.c:748 mail/em-format-html.c:1577 mail/em-format-quote.c:315
-#: mail/em-mailer-prefs.c:90 mail/message-list.etspec.h:2
+#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/em-format.c:749 mail/em-format-html.c:1598 mail/em-mailer-prefs.c:91
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "News"
 
-#: mail/em-format.c:986
+#: mail/em-format.c:993
 #, c-format
 msgid "%s attachment"
 msgstr "%s allegato"
 
-#: mail/em-format.c:1065 mail/em-format.c:1184
+#: mail/em-format.c:1024 mail/em-format.c:1143
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Impossibile interpretare il messaggio S/MIME: errore sconosciuto"
 
-#: mail/em-format.c:1174
+#: mail/em-format.c:1133
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Crittografia non supportata per tipo multipart/encrypted"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1279
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Impossibile interpretare il messaggio MIME.  Viene visualizzato il sorgente."
 
-#: mail/em-format.c:1339
+#: mail/em-format.c:1298
 msgid "Unsupported signature format"
 msgstr "Formato firma non supportato"
 
-#: mail/em-format.c:1347
+#: mail/em-format.c:1306
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Errore sconosciuto durante la verifica della firma"
 
-#: mail/em-format.c:1347
+#: mail/em-format.c:1306
 msgid "Unknown error verifying signature"
 msgstr "Errore sconosciuto durante la verifica della firma"
 
-#: mail/em-format-html.c:453 mail/em-format-html.c:455
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Scaricamento di '%s'"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:646
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 msgid "Unsigned"
 msgstr "Non firmato"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:647
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
 msgid "Valid signature"
 msgstr "Firma valida"
 
-#: mail/em-format-html.c:562 mail/em-format-html-display.c:648
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
 msgid "Invalid signature"
 msgstr "Firma errata"
 
-#: mail/em-format-html.c:563 mail/em-format-html-display.c:649
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
 msgstr "Firma valida, non è possibile verificare il mittente"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:655
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 msgid "Unencrypted"
 msgstr "Non decifrato"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:656
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
 msgid "Encrypted, weak"
 msgstr "Cifrato, crittografia debole"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:657
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
 msgid "Encrypted"
 msgstr "Cifrato"
 
-#: mail/em-format-html.c:572 mail/em-format-html-display.c:658
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
 msgid "Encrypted, strong"
 msgstr "Cifrato, crittografia forte"
 
-#: mail/em-format-html.c:834
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "Parte esterna del messaggio malformulata."
 
-#: mail/em-format-html.c:864
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntatore al sito FTP (%s)"
 
-#: mail/em-format-html.c:875
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntatore al file locale (%s) valido al sito \"%s\""
 
-#: mail/em-format-html.c:877
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntatore a un file locale (%s)"
 
-#: mail/em-format-html.c:898
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntatore a dati remoti (%s)"
 
-#: mail/em-format-html.c:909
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntatore a dati esterni sconosciuti (tipo \"%s\")"
 
-#: mail/em-format-html.c:1151
+#: mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr "Formattazione messaggio in corso"
 
 #. pseudo-header
-#: mail/em-format-html.c:1537 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:932
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
 msgid "Mailer"
 msgstr "Gestore di posta"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1564
+#: mail/em-format-html.c:1550
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1567
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
@@ -13560,7 +13599,7 @@ msgstr "<I> (%R %Z)</I>"
 msgid "Matches: %d"
 msgstr "Corrisponde: %d"
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13569,7 +13608,7 @@ msgstr ""
 "Questo messaggio non è firmato. Non c'è garanzia che il mittente sia "
 "autentico."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13578,7 +13617,7 @@ msgstr ""
 "Questo messaggio è firmato ed è valido. Chi ha spedito il messaggio è molto "
 "probabilmente chi sostiene di essere."
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13586,7 +13625,11 @@ msgstr ""
 "La firma di questo messaggio non può essere verificata. Può essere stata "
 "alterata durante il transito."
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
+msgstr "Firma valida, non è possibile verificare il mittente"
+
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13594,7 +13637,7 @@ msgstr ""
 "Il messaggio è firmato con una firma valida ma chi ha spedito il messaggio "
 "non può essere verificato."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13603,7 +13646,7 @@ msgstr ""
 "Il messaggio non è cifrato. Il suo contenuto può essere letto durante il "
 "tragitto attraverso Internet."
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:654
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
@@ -13613,7 +13656,7 @@ msgstr ""
 "difficile, ma non impossibile che un estraneo abbia letto il contenuto di "
 "questo messaggio in un tempo ragionevolmente breve."
 
-#: mail/em-format-html-display.c:657
+#: mail/em-format-html-display.c:655
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13621,7 +13664,7 @@ msgstr ""
 "Questo messaggio è crittografato. È difficile che un estraneo possa leggere "
 "il contenuto del messaggio."
 
-#: mail/em-format-html-display.c:658
+#: mail/em-format-html-display.c:656
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -13631,57 +13674,57 @@ msgstr ""
 "Dovrebbe essere molto difficile che un estraneo riesca a vedere il contenuto "
 "di questo messaggio in un tempo ragionevole."
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "_Visualizza certificato"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "Certificato non è visualizzabile"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completato il %d %B %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Scadute:"
 
 # per il %d %b %l:%M %p
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "per il %d %b %l:%M %p"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "_Visualizza inlinea"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Nascondi"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pagina %d di %d"
 
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (integrato)"
 
-#: mail/em-mailer-prefs.c:102
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr "Ogni volta"
 
-#: mail/em-mailer-prefs.c:103
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr "Ogni giorno"
 
-#: mail/em-mailer-prefs.c:104
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr "Ogni settimana"
 
-#: mail/em-mailer-prefs.c:105
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr "Ogni mese"
 
@@ -13743,7 +13786,9 @@ msgstr ""
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
-msgstr "Impossibile leggere le impostazioni dalle installazioni precedenti di Evolution, `evolution/config.xmldb' non esiste o è danneggiato."
+msgstr ""
+"Impossibile leggere le impostazioni dalle installazioni precedenti di "
+"Evolution, `evolution/config.xmldb' non esiste o è danneggiato."
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13800,28 +13845,28 @@ msgstr "Selezionare un server."
 msgid "No server has been selected"
 msgstr "Nessun server è stato selezionato"
 
-#: mail/em-utils.c:98
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Non mostrare questo messagio in futuro."
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/em-utils.c:402
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "messaggio"
 
-#: mail/em-utils.c:505
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Salva messaggio..."
 
-#: mail/em-utils.c:554
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Aggiungi indirizzo"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:989
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Mail da %s"
@@ -14321,58 +14366,67 @@ msgid "spamd port"
 msgstr "porta di spamd"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid "Composer Preferences"
 msgstr "Preferenze di composizione"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configura qui le preferenze della posta, incluse sicurezza e aspetto "
 "visualizzazione"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 "Configura qui il controllo ortografico, le firme e il compositore dei "
 "messaggi"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configure your email accounts here"
 msgstr "Configura qui gli account di posta elettronica"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Posta di Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
 msgstr "Controllo di configurazione degli account di posta di Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Componente della posta di Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Compositore della posta di Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr "Controllo di configurazione del compositore di Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "Controllo delle preferenze della posta di Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
 msgid "Mail Accounts"
 msgstr "Account di posta"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr "Preferenze di posta"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "Posta"
+
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution sta importando posta da Elm"
@@ -14630,74 +14684,75 @@ msgstr "%s mailing list"
 msgid "Add Filter Rule"
 msgstr "Aggiungi una regola di filtro"
 
-#: mail/mail-component.c:459
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d eliminato"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "%d spazzatura"
 
-#: mail/mail-component.c:484
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "%d bozze"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d spediti"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d non spediti"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d totali"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", %d non letti"
 
-#: mail/mail-component.c:650
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Nuovo messaggio di posta"
 
-#: mail/mail-component.c:651
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "Invia _messaggio"
 
-#: mail/mail-component.c:652
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Componi un nuovo messaggio di posta"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr "Nuova cartella di posta"
 
-#: mail/mail-component.c:659
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr "Cartella di _posta"
 
-#: mail/mail-component.c:660
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr "Crea una nuova cartella di posta"
 
-#: mail/mail-component.c:760
+#: mail/mail-component.c:795
 msgid "Failed upgrading Mail settings or folders."
-msgstr "Fallito l'aggiornamento delle impostazioni della posta o delle cartelle."
+msgstr ""
+"Fallito l'aggiornamento delle impostazioni della posta o delle cartelle."
 
-#: mail/mail-config.c:911
+#: mail/mail-config.c:895
 msgid "Checking Service"
 msgstr "Verifica servizi"
 
-#: mail/mail-config.c:989 mail/mail-config.c:993
+#: mail/mail-config.c:973 mail/mail-config.c:977
 msgid "Connecting to server..."
 msgstr "Connessione al server..."
 
@@ -15419,6 +15474,7 @@ msgstr ""
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Sicuro di voler cancellare questo URL?"
 
+#. mail:ask-send-html secondary
 #: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
@@ -15453,12 +15509,12 @@ msgstr ""
 "un'idea dell'argomento della lettera."
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 #, fuzzy
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Segnala l'invio di messaggi senza i campi A o Cc."
 
+#. mail:ask-send-only-bcc-contact secondary
 #: mail/mail-errors.xml.h:24
 #, fuzzy
 msgid ""
@@ -15537,7 +15593,6 @@ msgid ""
 msgstr "Rimuovi permanentemente i messaggi cancellati da questa cartella"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Se si continua non si sarà più in grado di recuperare questi messaggi."
@@ -15577,6 +15632,7 @@ msgstr ""
 msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr "Il vostro messaggio con oggetto \"{0}\" non è stato spedito."
 
+#. mail:camel-exception secondary
 #: mail/mail-errors.xml.h:59
 #, fuzzy
 msgid ""
@@ -15611,13 +15667,6 @@ msgid "{0}."
 msgstr "{0}."
 
 #. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
 #: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
 #: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
 #: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
@@ -15647,8 +15696,6 @@ msgid "{1}"
 msgstr "{1}"
 
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15665,9 +15712,6 @@ msgid "Cannot create temporary save directory."
 msgstr "Impossibile creare una cartella di salvataggio temporanea."
 
 #. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
 #: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
 #: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
 msgid "Because \"{1}\"."
@@ -15696,7 +15740,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Impossibile eliminare la cartella %s: cartella inesistente"
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15730,13 +15773,11 @@ msgstr ""
 "sottocartelle, saranno persi irrimediabilmente."
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Impossibile rinominare \"{0}\" a \"{1}\"."
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Una cartella di nome \"{1}\" esiste già. Usare un altro nome."
@@ -15747,25 +15788,21 @@ msgid "Because \"{2}\"."
 msgstr "Perché \"{2}\"."
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Impossibile spostare la cartella \"{0}\" su \"{1}\"."
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "Impossibile aprire sorgente \"{2}\"."
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "Impossibile aprire l'obbiettivo \"{2}\"."
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Impossibile copiare la cartella \"{0}\" su \"{1}\"."
@@ -15781,7 +15818,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "Impossibile aprire sorgente \"{1}\""
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "Impossibile salvare i cambiamenti sull'account."
@@ -15885,6 +15921,7 @@ msgstr "Impossibile aggiungere cartella virtuale \"{0}\"."
 msgid "vFolders automatically updated."
 msgstr "Cartelle virtuali aggiornate automaticamente."
 
+#. mail:vfolder-updated secondary
 #: mail/mail-errors.xml.h:196
 #, fuzzy
 msgid ""
@@ -15904,6 +15941,7 @@ msgstr ""
 msgid "Mail filters automatically updated."
 msgstr "Filtri posta aggiornati automaticamente."
 
+#. mail:filter-updated secondary
 #: mail/mail-errors.xml.h:204
 #, fuzzy
 msgid ""
@@ -15919,8 +15957,10 @@ msgstr ""
 #. mail:ask-migrate-existing primary
 #: mail/mail-errors.xml.h:210
 msgid "Problem migrating old mail folder \"{0}\"."
-msgstr "Problemi durante la migrazione dalla vecchia cartella di posta \"{0}\"."
+msgstr ""
+"Problemi durante la migrazione dalla vecchia cartella di posta \"{0}\"."
 
+#. mail:ask-migrate-existing secondary
 #: mail/mail-errors.xml.h:212
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
@@ -15930,7 +15970,8 @@ msgid ""
 msgstr ""
 "Esiste già una cartella non vuota su \"{1}\".\n"
 "\n"
-"Puoi: saltare questa cartella, sovrascriverla, aggiungerne il contenuto o uscire.\n"
+"Puoi: saltare questa cartella, sovrascriverla, aggiungerne il contenuto o "
+"uscire.\n"
 
 #: mail/mail-errors.xml.h:216
 msgid "Ignore"
@@ -15945,7 +15986,7 @@ msgstr "S_ovrascrivi"
 msgid "_Append"
 msgstr "_Invia"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Sto facendo ping a %s"
@@ -16253,84 +16294,89 @@ msgstr "Cartella non valida: `%s' "
 msgid "Setting up vfolder: %s"
 msgstr "Impostazione cartella virtuale %s in corso"
 
-#: mail/mail-vfolder.c:206
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "Aggiornamento cartella virtuale per %s in corso"
 
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Aggiornamento cartella virtuale per %s in corso"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "Cartelle virtuali"
 
-#: mail/mail-vfolder.c:960
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Modifica cartella virtuale"
 
-#: mail/mail-vfolder.c:1044
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Nuova cartella virtuale"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Non visto"
 
-#: mail/message-list.c:917
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:918
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Risposto"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Messaggi multipli non visti"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Messaggi multipli"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Il più basso"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Più basso"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Più alto"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Il più alto"
 
-#: mail/message-list.c:1249
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1256
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Oggi %I:%M %p"
 
-#: mail/message-list.c:1265
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l %M %p"
 
-#: mail/message-list.c:1277
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1285
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1287
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3124
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Generazione elenco messaggi"
 
@@ -16739,37 +16785,42 @@ msgstr ""
 "Evolution di Ximian è attualmente in modalità non in linea. Fare clic su "
 "questo tasto per lavorare in linea."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Posta a %s"
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "I tool di GNOME Pilot non sembrano essere installati."
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Errore nell'esecuzione di %s."
 
-#: shell/e-shell-window-commands.c:120
+#: shell/e-shell-window-commands.c:121
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy non è installato."
 
-#: shell/e-shell-window-commands.c:128
+#: shell/e-shell-window-commands.c:129
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy non può essere eseguito."
 
-#: shell/e-shell-window-commands.c:170
+#: shell/e-shell-window-commands.c:171
 #, fuzzy
 msgid "About Evolution"
 msgstr "Informazioni su Ximian Evolution"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_In linea"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Non in linea"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Non in linea"
 
@@ -17006,8 +17057,9 @@ msgstr "Non chiedere di nuovo"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution può importare dati dai seguenti file:"
 
-#: shell/main.c:230
-#, fuzzy, c-format
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -17042,7 +17094,7 @@ msgstr ""
 "Speriamo che il risultato dei nostri sforzi Vi piaccia e attendiamo con\n"
 "ansia i Vostri contributi!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -17051,49 +17103,39 @@ msgstr ""
 "Grazie\n"
 "Il Gruppo Evolution di Ximian\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Non chiedere più"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Evolution shell."
-msgstr "Impossibile inizializzare la shell di Ximian Evolution."
-
-#: shell/main.c:400
-#, fuzzy, c-format
-msgid "Cannot initialize the Evolution shell: %s"
-msgstr "Impossibile inizializzare la shell di Ximian Evolution: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Attivazione del componente Evolution specificato."
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Inizia in modalità non in linea"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Inizia in modalità in linea"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Forza la chiusura di tutti i componenti di Evolution"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forza la migrazione da Evolution 1.4"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Inviare l'output del debugging di tutte i componenti ad un file."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17107,6 +17149,7 @@ msgstr ""
 msgid "Insufficient disk space for upgrade."
 msgstr "Spazio su disco insufficiente per l'aggiornamento."
 
+#. shell:upgrade-nospace secondary
 #: shell/shell-errors.xml.h:4
 msgid ""
 "Upgrading your data and settings will require upto {0} of disk space, but "
@@ -17116,6 +17159,7 @@ msgid ""
 "can continue."
 msgstr ""
 
+#. shell:upgrade-failed primary
 #: shell/shell-errors.xml.h:8
 msgid ""
 "Upgrade from previous version failed:\n"
@@ -17124,6 +17168,7 @@ msgstr ""
 "Aggiornamento dalla versione precedente fallito:\n"
 "{0}"
 
+#. shell:upgrade-failed secondary
 #: shell/shell-errors.xml.h:11
 msgid ""
 "{1}\n"
@@ -17133,12 +17178,43 @@ msgid ""
 msgstr ""
 "{1}<\n"
 "\n"
-"Se si sceglie di continuare, potresti non avere accessi a qualche tuo vecchio dato.\n"
+"Se si sceglie di continuare, potresti non avere accessi a qualche tuo "
+"vecchio dato.\n"
 
 #: shell/shell-errors.xml.h:15
 msgid "Continue"
 msgstr "Continua"
 
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Impossibile inizializzare la shell di Ximian Evolution."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Guida agli account di Evolution"
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
 #: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
@@ -17731,7 +17807,8 @@ msgid "_Preview Pane"
 msgstr "_Anteprima"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Salva come VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -18439,7 +18516,8 @@ msgid "Open the selected message in a new window"
 msgstr "Apre il messaggio selezionato in una nuova finestra"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr ""
 "Apre il messaggio selezionato in una finestra di composizione per rinviarlo"
 
@@ -18555,58 +18633,46 @@ msgstr "Cartella virtuale sull'_oggetto..."
 msgid "_Attached"
 msgstr "_Allegato"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Copia nella cartella"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Crea filtro dal messaggio"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "Vai a"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "Più _grande"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "Visualizzazione _messaggio"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Sposta nella cartella"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "Messaggio successivo"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "Visualizzazione _normale"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Apri messaggio"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "Messaggio _precedente"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Citato"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "_Rispedisci..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "S_trumenti"
@@ -19008,6 +19074,11 @@ msgstr "Preferenze di posta"
 msgid "_Send / Receive"
 msgstr "_Invia / ricevi"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Finestra"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Per società"
@@ -19075,10 +19146,6 @@ msgstr "Sca_denza:"
 msgid "With _Status"
 msgstr "Imposta _stato"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Attività"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -19237,30 +19304,30 @@ msgstr "Altro..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:76 widgets/misc/e-error.c:77
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:117
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Posta di Evolution"
 
-#: widgets/misc/e-error.c:116
+#: widgets/misc/e-error.c:118
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Dettagli della riunione"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Test di Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:389
+#: widgets/misc/e-error.c:410
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19409,3 +19476,27 @@ msgstr "%s (...)"
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completata)"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Impossibile inizializzare gnome-vfs"
+
+#~ msgid "Display a message"
+#~ msgstr "Visualizza un messaggio"
+
+#~ msgid "Select source"
+#~ msgstr "Seleziona sorgente"
+
+#, fuzzy
+#~ msgid ""
+#~ "The folder name \"%s\" is invalid because it containes the character \"%c"
+#~ "\""
+#~ msgstr ""
+#~ "Il nome della cartella \"%s\" non è valido perché contiene il carattere "
+#~ "\"%c\""
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution shell: %s"
+#~ msgstr "Impossibile inizializzare la shell di Ximian Evolution: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "_Rispedisci..."