From 58f3fc6bd160335a6a935cfe9d6f57bbfb1077f8 Mon Sep 17 00:00:00 2001
From: Federico Bruni <fede@inventati.org>
Date: Sun, 31 May 2020 13:52:26 +0000
Subject: [PATCH] Update Italian translation

---
 po/it.po | 1140 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 655 insertions(+), 485 deletions(-)

diff --git a/po/it.po b/po/it.po
index f6347b87..671ac75a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n"
-"POT-Creation-Date: 2020-03-04 07:58+0000\n"
-"PO-Revision-Date: 2020-03-10 11:34+0100\n"
+"POT-Creation-Date: 2020-05-07 01:10+0000\n"
+"PO-Revision-Date: 2020-05-26 22:17+0200\n"
 "Last-Translator: Federico Bruni <fede@inventati.org>\n"
 "Language-Team: Italian <gnome-it-list@gnome.org>\n"
 "Language: it\n"
@@ -28,7 +28,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Gtranslator 3.34.0\n"
+"X-Generator: Gtranslator 3.36.0\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
@@ -43,7 +43,7 @@ msgstr "Invia file usando Geary"
 #: desktop/org.gnome.Geary.appdata.xml.in.in:12
 #: desktop/org.gnome.Geary.desktop.in.in:3
 #: src/client/accounts/accounts-editor-servers-pane.vala:555
-#: src/client/application/application-main-window.vala:555
+#: src/client/application/application-main-window.vala:590
 msgid "Geary"
 msgstr "Geary"
 
@@ -346,10 +346,18 @@ msgid ""
 msgstr "La durata (in secondi) di visualizzazione delle notifiche brevi."
 
 #: desktop/org.gnome.Geary.gschema.xml:146
+msgid "List of optional plugins"
+msgstr "Elenco dei plugin opzionali"
+
+#: desktop/org.gnome.Geary.gschema.xml:147
+msgid "Plugins listed here will be loaded on startup."
+msgstr "I plugin elencati qui verranno caricati all'avvio."
+
+#: desktop/org.gnome.Geary.gschema.xml:152
 msgid "Whether we migrated the old settings"
 msgstr "Indica se le vecchie impostazioni sono state migrate"
 
-#: desktop/org.gnome.Geary.gschema.xml:147
+#: desktop/org.gnome.Geary.gschema.xml:153
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
@@ -626,12 +634,12 @@ msgstr[0] "%d giorno fa"
 msgstr[1] "%d giorni fa"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:255
-#: src/client/application/application-main-window.vala:2053
+#: src/client/application/application-main-window.vala:2027
 msgid "Undo"
 msgstr "Annulla"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:264
-#: src/client/application/application-main-window.vala:2036
+#: src/client/application/application-main-window.vala:2010
 msgid "Redo"
 msgstr "Ripeti"
 
@@ -702,54 +710,53 @@ msgstr "Fornitore del servizio"
 #. Translators: This label describes what form of transport
 #. security (TLS, StartTLS, etc) used by an account's IMAP or SMTP
 #. service.
-#: src/client/accounts/accounts-editor-row.vala:468
+#: src/client/accounts/accounts-editor-row.vala:469
 msgid "Connection security"
 msgstr "Sicurezza della connessione"
 
 #. Translators: Label used when no auth scheme is used
 #. by an account's IMAP or SMTP service.
-#: src/client/accounts/accounts-editor-row.vala:479
+#: src/client/accounts/accounts-editor-row.vala:480
 #: src/client/accounts/accounts-editor-servers-pane.vala:755
 #: src/client/accounts/accounts-editor-servers-pane.vala:970
-#: src/engine/api/geary-special-folder-type.vala:58
 msgid "None"
 msgstr "Nessuna"
 
-#: src/client/accounts/accounts-editor-row.vala:486
+#: src/client/accounts/accounts-editor-row.vala:487
 msgid "StartTLS"
 msgstr "StartTLS"
 
-#: src/client/accounts/accounts-editor-row.vala:493
+#: src/client/accounts/accounts-editor-row.vala:494
 msgid "TLS"
 msgstr "TLS"
 
 #. Translators: Label for source of SMTP authentication
 #. credentials (none, use IMAP, custom) when adding a new
 #. account
-#. Button label for retrying when a login error has occurred
-#: src/client/accounts/accounts-editor-row.vala:534
-#: ui/application-main-window.ui:346
+#. Translators: An info bar button label
+#: src/client/accounts/accounts-editor-row.vala:535
+#: src/client/application/application-main-window.vala:544
 msgid "Login"
 msgstr "Accesso"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (none) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:541
+#: src/client/accounts/accounts-editor-row.vala:542
 msgid "No login needed"
 msgstr "Nessun accesso richiesto"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (use IMAP) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:549
+#: src/client/accounts/accounts-editor-row.vala:550
 msgid "Use same login as receiving"
 msgstr "Usare le stesse credenziali di accesso usate in ricezione"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (custom) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:557
+#: src/client/accounts/accounts-editor-row.vala:558
 msgid "Use a different login"
 msgstr "Usare delle credenziali di accesso diverse"
 
@@ -830,145 +837,141 @@ msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: src/client/application/application-client.vala:34
-msgid "Copyright 2016-2019 Geary Development Team."
-msgstr "Copyright 2016-2019 gruppo sviluppatori di Geary."
+#| msgid "Copyright 2016-2019 Geary Development Team."
+msgid "Copyright 2016-2020 Geary Development Team."
+msgstr "Copyright 2016-2020 gruppo sviluppatori di Geary."
 
 #: src/client/application/application-client.vala:36
 msgid "Visit the Geary web site"
 msgstr "Visita il sito web di Geary"
 
 #. / Command line option
-#: src/client/application/application-client.vala:94
+#: src/client/application/application-client.vala:96
 msgid "Print debug logging"
 msgstr "Stampa le informazioni di debug"
 
 #. / Command line option
-#: src/client/application/application-client.vala:97
+#: src/client/application/application-client.vala:99
 msgid "Start with the main window hidden (deprecated)"
 msgstr "Avvia l'applicazione nascondendo la finestra principale (deprecato)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:100
+#: src/client/application/application-client.vala:102
 msgid "Enable WebKitGTK Inspector in web views"
 msgstr "Abilita l'inspector WebKitGTK nelle viste web"
 
 #. / Command line option
-#: src/client/application/application-client.vala:103
+#: src/client/application/application-client.vala:105
 msgid "Log conversation monitoring"
 msgstr "Registra il monitoraggio delle conversazioni"
 
 #. / Command line option
-#: src/client/application/application-client.vala:106
+#: src/client/application/application-client.vala:108
 msgid "Log IMAP network deserialization"
 msgstr "Registra deserializzazione di rete IMAP"
 
 #. / Command line option. "Normalization" can also be called
 #. / "synchronization".
-#: src/client/application/application-client.vala:110
+#: src/client/application/application-client.vala:112
 msgid "Log folder normalization"
 msgstr "Registra la sincronizzazione della cartella"
 
 #. / Command line option
-#: src/client/application/application-client.vala:113
-msgid "Log network activity"
-msgstr "Registra attività di rete"
-
-#. / Command line option
-#: src/client/application/application-client.vala:116
-msgid "Log periodic activity"
-msgstr "Registra attività periodiche"
+#: src/client/application/application-client.vala:115
+#| msgid "Log network activity"
+msgid "Log IMAP network activity"
+msgstr "Registra attività di rete IMAP"
 
 #. / Command line option. The IMAP replay queue is how changes
 #. / on the server are replicated on the client.  It could
 #. / also be called the IMAP events queue.
-#: src/client/application/application-client.vala:121
+#: src/client/application/application-client.vala:120
 msgid "Log IMAP replay queue"
 msgstr "Registra la coda di eventi IMAP"
 
-#. / Command line option. Serialization is how commands and
-#. / responses are converted into a stream of bytes for
-#. / network transmission
-#: src/client/application/application-client.vala:126
-msgid "Log IMAP network serialization"
-msgstr "Registra serializzazione di rete IMAP"
+#. / Command line option
+#: src/client/application/application-client.vala:123
+#| msgid "Log network activity"
+msgid "Log SMTP network activity"
+msgstr "Registra attività di rete SMTP"
 
 #. / Command line option
-#: src/client/application/application-client.vala:129
+#: src/client/application/application-client.vala:126
 msgid "Log database queries (generates lots of messages)"
 msgstr "Registra le ricerche nel database (genera numerosi messaggi)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:132
+#: src/client/application/application-client.vala:129
 msgid "Perform a graceful quit"
 msgstr "Esegui un'uscita non forzata"
 
-#: src/client/application/application-client.vala:134
+#: src/client/application/application-client.vala:131
 msgid "Open a new window"
 msgstr "Apri una nuova finestra"
 
 #. / Command line option
-#: src/client/application/application-client.vala:137
+#: src/client/application/application-client.vala:134
 msgid "Revoke all pinned TLS server certificates"
 msgstr "Revoca tutti i certificati TLS «pinned» del server"
 
 #. / Command line option
-#: src/client/application/application-client.vala:140
+#: src/client/application/application-client.vala:137
 msgid "Display program version"
 msgstr "Visualizza la versione del programma"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:264
+#: src/client/application/application-client.vala:261
 msgid "Geary version"
 msgstr "Geary versione"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:266
+#: src/client/application/application-client.vala:263
 msgid "Geary revision"
 msgstr "Geary revisione"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:268
+#: src/client/application/application-client.vala:265
 msgid "GTK version"
 msgstr "GTK versione"
 
 #. / Applciation runtime information label
-#: src/client/application/application-client.vala:275
+#: src/client/application/application-client.vala:272
 msgid "GLib version"
 msgstr "GLib versione"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:282
+#: src/client/application/application-client.vala:279
 msgid "WebKitGTK version"
 msgstr "WebKitGTK versione"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:289
+#: src/client/application/application-client.vala:286
 msgid "Desktop environment"
 msgstr "Ambiente desktop"
 
 #. Translators: This is the file type displayed for
 #. attachments with unknown file types.
-#: src/client/application/application-client.vala:291
+#: src/client/application/application-client.vala:288
 #: src/client/components/components-attachment-pane.vala:91
 msgid "Unknown"
 msgstr "Sconosciuto"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:321
+#: src/client/application/application-client.vala:318
 msgid "Distribution name"
 msgstr "Nome della distribuzione"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:326
+#: src/client/application/application-client.vala:323
 msgid "Distribution release"
 msgstr "Rilascio della distribuzione"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:334
+#: src/client/application/application-client.vala:331
 msgid "Installation prefix"
 msgstr "Prefisso di installazione"
 
-#: src/client/application/application-client.vala:587
+#: src/client/application/application-client.vala:584
 #, c-format
 msgid "About %s"
 msgstr "Informazioni su %s"
@@ -976,7 +979,7 @@ msgstr "Informazioni su %s"
 #. Translators: add your name and email address to receive
 #. credit in the About dialog For example: Yamada Taro
 #. <yamada.taro@example.com>
-#: src/client/application/application-client.vala:591
+#: src/client/application/application-client.vala:588
 msgid "translator-credits"
 msgstr ""
 "Daniele Napolitano\n"
@@ -985,37 +988,37 @@ msgstr ""
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/application-client.vala:937
+#: src/client/application/application-client.vala:1049
 msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr "L'opzione `--hidden` è deprecata e in futuro verrà tolta."
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/application-client.vala:970
+#: src/client/application/application-client.vala:1082
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "Argomento del programma non riconosciuto: «%s»"
 
 #. / Notification title.
-#: src/client/application/application-controller.vala:458
+#: src/client/application/application-controller.vala:485
 #, c-format
 msgid "A problem occurred sending email for %s"
 msgstr "Si è verificato un problema nell'inviare la posta per %s"
 
 #. / Notification body
-#: src/client/application/application-controller.vala:462
+#: src/client/application/application-controller.vala:489
 msgid "Email will not be sent until re-connected"
 msgstr "La posta non sarà inviata finché fuori rete"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:568
+#: src/client/application/application-controller.vala:588
 msgid "Conversation marked"
 msgid_plural "Conversations marked"
 msgstr[0] "Conversazione contrassegnata"
 msgstr[1] "Conversazioni contrassegnate"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:574
+#: src/client/application/application-controller.vala:594
 msgid "Conversation un-marked"
 msgid_plural "Conversations un-marked"
 msgstr[0] "Conversazione non contrassegnata"
@@ -1024,8 +1027,8 @@ msgstr[1] "Conversazioni non contrassegnate"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:600
-#: src/client/application/application-controller.vala:684
+#: src/client/application/application-controller.vala:620
+#: src/client/application/application-controller.vala:704
 #, c-format
 msgid "Conversation moved to %s"
 msgid_plural "Conversations moved to %s"
@@ -1037,8 +1040,8 @@ msgstr[1] "Conversazioni spostate in %s"
 #. / of the source folder.
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:608
-#: src/client/application/application-controller.vala:630
+#: src/client/application/application-controller.vala:628
+#: src/client/application/application-controller.vala:650
 #, c-format
 msgid "Conversation restored to %s"
 msgid_plural "Conversations restored to %s"
@@ -1046,7 +1049,7 @@ msgstr[0] "Conversazione ripristinata in %s"
 msgstr[1] "Conversazioni ripristinate in %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:651
+#: src/client/application/application-controller.vala:671
 msgid "Conversation archived"
 msgid_plural "Conversations archived"
 msgstr[0] "Conversazione archiviata in %s"
@@ -1054,7 +1057,7 @@ msgstr[1] "Conversazioni archiviate in %s"
 
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:707
+#: src/client/application/application-controller.vala:727
 #, c-format
 msgid "Message restored to %s"
 msgid_plural "Messages restored to %s"
@@ -1062,7 +1065,7 @@ msgstr[0] "Messaggio ripristinato in %s"
 msgstr[1] "Messaggi ripristinati in %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:728
+#: src/client/application/application-controller.vala:748
 msgid "Message archived"
 msgid_plural "Messages archived"
 msgstr[0] "Messaggio archiviato"
@@ -1071,7 +1074,7 @@ msgstr[1] "Messaggi archiviati"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:763
+#: src/client/application/application-controller.vala:783
 #, c-format
 msgid "Message moved to %s"
 msgid_plural "Messages moved to %s"
@@ -1081,7 +1084,7 @@ msgstr[1] "Messaggi spostati in %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:791
+#: src/client/application/application-controller.vala:811
 #, c-format
 msgid "Conversation labelled as %s"
 msgid_plural "Conversations labelled as %s"
@@ -1091,19 +1094,19 @@ msgstr[1] "Conversazioni etichettate come %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:799
+#: src/client/application/application-controller.vala:819
 #, c-format
 msgid "Conversation un-labelled as %s"
 msgid_plural "Conversations un-labelled as %s"
 msgstr[0] "Conversazione non etichettata come %s"
 msgstr[1] "Conversazioni non etichettate come %s"
 
-#: src/client/application/application-controller.vala:1222
+#: src/client/application/application-controller.vala:1305
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Impossibile aprire il database per %s"
 
-#: src/client/application/application-controller.vala:1223
+#: src/client/application/application-controller.vala:1306
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -1129,20 +1132,20 @@ msgstr ""
 "allegati. <b>Tale operazione non ha effetti sulla posta presente sul server."
 "</b>"
 
-#: src/client/application/application-controller.vala:1225
+#: src/client/application/application-controller.vala:1308
 msgid "_Rebuild"
 msgstr "_Ricostruisci"
 
-#: src/client/application/application-controller.vala:1225
+#: src/client/application/application-controller.vala:1308
 msgid "E_xit"
 msgstr "_Esci"
 
-#: src/client/application/application-controller.vala:1235
+#: src/client/application/application-controller.vala:1318
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "Impossibile ricostruire il database per «%s»"
 
-#: src/client/application/application-controller.vala:1236
+#: src/client/application/application-controller.vala:1319
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -1155,88 +1158,139 @@ msgstr ""
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:1560
+#: src/client/application/application-controller.vala:1449
 #, c-format
 msgid "Email sent to %s"
 msgstr "Email inviata a %s"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2643
+#: src/client/application/application-controller.vala:2448
 #, c-format
 msgid "Email to %s queued for delivery"
 msgstr "Email a %s in coda per la consegna"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2707
+#: src/client/application/application-controller.vala:2512
 #, c-format
 msgid "Email to %s saved"
 msgstr "Email a %s salvata"
 
 #. / Translators: A label for an in-app notification.
-#: src/client/application/application-controller.vala:2722
-#: src/client/application/application-controller.vala:2780
+#: src/client/application/application-controller.vala:2527
+#: src/client/application/application-controller.vala:2585
 msgid "Composer could not be restored"
 msgstr "Impossibile ripristinare il compositore"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2765
+#: src/client/application/application-controller.vala:2570
 #, c-format
 msgid "Email to %s discarded"
 msgstr "Email a %s scartata"
 
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:530
+msgid "Working offline"
+msgstr "Fuori rete"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:532
+msgid "You will not be able to send or receive email until re-connected."
+msgstr "Non si potrà inviare o ricevere la posta finché non è riconnesso."
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:539
+msgid "Login problem"
+msgstr "Problema di accesso"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:541
+msgid "An account has reported an incorrect login or password."
+msgstr ""
+"Un account ha segnalato un nome di accesso o una password non corretti."
+
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:547
+msgid "Retry login, you will be prompted for your password"
+msgstr "Ritentare l'accesso, verrà richiesta la password"
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:554
+msgid "Security problem"
+msgstr "Problema di sicurezza"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:556
+#| msgid "An account has reported an untrusted server."
+msgid "An account has reported an untrusted server.."
+msgstr "Un account ha segnalato un server inaffidabile..."
+
+#. Translators: An info bar button label
+#: src/client/application/application-main-window.vala:559
+msgid "Check"
+msgstr "Controlla"
+
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:562
+msgid "Check the security details for the connection"
+msgstr "Controllare i dettagli di sicurezza della connessione"
+
 #. / Translators: Main window title, first string
 #. / substitution being the currently selected folder name,
 #. / the second being the selected account name.
-#: src/client/application/application-main-window.vala:560
+#: src/client/application/application-main-window.vala:595
 #, c-format
 msgid "%s — %s"
 msgstr "%s — %s"
 
-#: src/client/application/application-main-window.vala:967
+#. Translators: The name of the folder group containing
+#. folders created by people (as opposed to special-use
+#. folders)
+#: src/client/application/application-main-window.vala:972
+#: src/client/folder-list/folder-list-account-branch.vala:43
 msgid "Labels"
 msgstr "Etichette"
 
+#: src/client/application/application-main-window.vala:1261
+#, c-format
+msgid "Empty all email from your %s folder?"
+msgstr "Svuotare tutte le email dalla cartella %s?"
+
+#: src/client/application/application-main-window.vala:1262
+msgid "This removes the email from Geary and your email server."
+msgstr "Questo rimuoverà le email dall'applicazione e dal server di posta."
+
+#: src/client/application/application-main-window.vala:1263
+msgid "This cannot be undone."
+msgstr "Impossibile annullare questa azione."
+
+#: src/client/application/application-main-window.vala:1264
+#, c-format
+msgid "Empty %s"
+msgstr "Svuota %s"
+
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1306
+#: src/client/application/application-main-window.vala:1321
 msgid "Do you want to permanently delete this conversation?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Eliminare permanentemente questa conversazione?"
 msgstr[1] "Eliminare permanentemente queste conversazioni?"
 
-#: src/client/application/application-main-window.vala:1311
 #: src/client/application/application-main-window.vala:1326
+#: src/client/application/application-main-window.vala:1341
 msgid "Delete"
 msgstr "Elimina"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1321
+#: src/client/application/application-main-window.vala:1336
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Eliminare permanentemente questo messaggio?"
 msgstr[1] "Eliminare permanentemente questi messaggi?"
 
-#: src/client/application/application-main-window.vala:1334
-#, c-format
-msgid "Empty all email from your %s folder?"
-msgstr "Svuotare tutte le email dalla cartella %s?"
-
-#: src/client/application/application-main-window.vala:1337
-msgid "This removes the email from Geary and your email server."
-msgstr "Questo rimuoverà le email dall'applicazione e dal server di posta."
-
-#: src/client/application/application-main-window.vala:1338
-msgid "This cannot be undone."
-msgstr "Impossibile annullare questa azione."
-
-#: src/client/application/application-main-window.vala:1339
-#, c-format
-msgid "Empty %s"
-msgstr "Svuota %s"
-
-#: src/client/application/application-main-window.vala:1669
+#: src/client/application/application-main-window.vala:1659
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1247,7 +1301,7 @@ msgstr "%s (%d)"
 #. Document (100.9MB)
 #. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
 #: src/client/components/components-attachment-pane.vala:107
-#: src/client/composer/composer-widget.vala:1834
+#: src/client/composer/composer-widget.vala:1918
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -1268,13 +1322,13 @@ msgstr ""
 msgid "Don’t _ask me again"
 msgstr "_Non chiederlo più"
 
-#: src/client/components/components-inspector.vala:72
+#: src/client/components/components-inspector.vala:78
 msgid "Inspector"
 msgstr "Inspector"
 
 #. / Translators: Title for Inspector logs pane
 #. / Translators: Title for problem report dialog logs pane
-#: src/client/components/components-inspector.vala:87
+#: src/client/components/components-inspector.vala:93
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:102
 msgid "Logs"
 msgstr "Registro"
@@ -1282,47 +1336,47 @@ msgstr "Registro"
 #. / Translators: Title for Inspector system system information pane
 #. / Translators: Title for problem report system information
 #. / pane
-#: src/client/components/components-inspector.vala:91
+#: src/client/components/components-inspector.vala:97
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:105
 msgid "System"
 msgstr "Sistema"
 
 #. Button label for saving problem report information
-#: src/client/components/components-inspector.vala:208
-#: src/client/components/components-inspector.vala:211
+#: src/client/components/components-inspector.vala:226
+#: src/client/components/components-inspector.vala:229
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:221
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:224
 #: ui/problem-details-dialog.ui:42
 msgid "Save As"
 msgstr "Salva come"
 
-#: src/client/components/components-inspector.vala:212
+#: src/client/components/components-inspector.vala:230
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:225
 #: ui/accounts_editor_servers_pane.ui:17
 msgid "Cancel"
 msgstr "Annulla"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:43
+#: src/client/components/components-preferences-window.vala:52
 msgid "_Automatically select next message"
 msgstr "_Selezionare automaticamente il messaggio successivo"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:53
+#: src/client/components/components-preferences-window.vala:62
 msgid "_Display conversation preview"
 msgstr "_Visualizzare l'anteprima della conversazione"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:63
+#: src/client/components/components-preferences-window.vala:72
 msgid "Use _three pane view"
 msgstr "Usare la visuale a _tre riquadri"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:73
+#: src/client/components/components-preferences-window.vala:82
 msgid "Use _single key email shortcuts"
 msgstr "Usa le scorciatoie da tastiera a tasto _singolo"
 
-#: src/client/components/components-preferences-window.vala:75
+#: src/client/components/components-preferences-window.vala:84
 msgid ""
 "Enable keyboard shortcuts for email actions that do not require pressing "
 "<Ctrl>"
@@ -1331,21 +1385,102 @@ msgstr ""
 "l'uso di <Ctrl>"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:86
+#: src/client/components/components-preferences-window.vala:95
 msgid "_Watch for new mail when closed"
 msgstr "_Controllare la nuova posta dopo la chiusura"
 
 #. / Translators: Preferences tooltip
-#: src/client/components/components-preferences-window.vala:90
+#: src/client/components/components-preferences-window.vala:99
 msgid "Geary will keep running after all windows are closed"
 msgstr ""
 "L'applicazione resterà in esecuzione anche dopo che tutte le finestre sono "
 "state chiuse"
 
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:117
+#| msgid "_Preferences"
+msgid "Preferences"
+msgstr "Preferenze"
+
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:180
+msgid "Plugins"
+msgstr "Plugin"
+
+#. Translators: Info bar title for a generic account
+#. problem.
+#: src/client/components/components-problem-report-info-bar.vala:36
+msgid "Account problem"
+msgstr "Problema account"
+
+#. Translators: Info bar sub-title for a generic account
+#. problem. String substitution is the account name.
+#: src/client/components/components-problem-report-info-bar.vala:40
+#, c-format
+msgid "Geary has encountered a problem with %s."
+msgstr "L'applicazione ha rilevato un problema con %s."
+
+#. Translators: Info bar sub-title for a generic
+#. account problem. String substitution is the
+#. account name.
+#: src/client/components/components-problem-report-info-bar.vala:53
+#, c-format
+msgid "Geary encountered a problem checking mail for %s."
+msgstr ""
+"L'applicazione ha incontrato un problema nel controllare la posta per %s."
+
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:57
+msgid "Try reconnecting"
+msgstr "Tenta la riconnessione"
+
+#. Translators: Info bar title for an outgoing
+#. account problem. String substitution is the
+#. account name
+#: src/client/components/components-problem-report-info-bar.vala:65
+#, c-format
+msgid "Geary encountered a problem sending email for %s."
+msgstr "L'applicazione ha incontrato un problema nell'invio di email per %s."
+
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:69
+msgid "Retry sending queued messages"
+msgstr "Ritenta l'invio dei messaggi in coda"
+
+#. Translators: Info bar title for a generic application
+#. problem.
+#: src/client/components/components-problem-report-info-bar.vala:76
+msgid "Geary has encountered a problem"
+msgstr "L'applicazione ha rilevato un problema"
+
+#. Translators: Info bar sub-title for a generic
+#. application problem.
+#: src/client/components/components-problem-report-info-bar.vala:80
+msgid "Please report the details if it persists."
+msgstr "Segnalare i dettagli del problema nel caso persista."
+
+#. Translators: Button label for viewing technical details
+#. for a problem report.
+#: src/client/components/components-problem-report-info-bar.vala:94
+msgid "_Details"
+msgstr "_Dettagli"
+
+#. Translators: Tooltip for viewing technical details for
+#. a problem report.
+#: src/client/components/components-problem-report-info-bar.vala:97
+msgid "View technical details about the error"
+msgstr "Visualizza i dettagli tecnici relativi all'errore"
+
+#. Translators: Button label for retrying a server
+#. connection
+#: src/client/components/components-problem-report-info-bar.vala:103
+msgid "_Retry"
+msgstr "_Riprova"
+
 #. / Translators: Search entry placeholder text
 #: src/client/components/components-search-bar.vala:12
 #: src/client/folder-list/folder-list-search-branch.vala:53
-#: src/engine/api/geary-special-folder-type.vala:51
+#: src/client/util/util-i18n.vala:298
 msgid "Search"
 msgstr "Cerca"
 
@@ -1424,76 +1559,6 @@ msgid_plural "Delete conversations"
 msgstr[0] "Elimina conversazione"
 msgstr[1] "Elimina conversazioni"
 
-#. Translators: Info bar title for a generic account
-#. problem.
-#: src/client/components/main-window-info-bar.vala:44
-msgid "Account problem"
-msgstr "Problema account"
-
-#. Translators: Info bar sub-title for a generic account
-#. problem. String substitution is the account name.
-#: src/client/components/main-window-info-bar.vala:48
-#, c-format
-msgid "Geary has encountered a problem with %s."
-msgstr "L'applicazione ha rilevato un problema con %s."
-
-#. Translators: Info bar sub-title for a generic
-#. account problem. String substitution is the
-#. account name.
-#: src/client/components/main-window-info-bar.vala:61
-#, c-format
-msgid "Geary encountered a problem checking mail for %s."
-msgstr ""
-"L'applicazione ha incontrato un problema nel controllare la posta per %s."
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:65
-msgid "Try reconnecting"
-msgstr "Tenta la riconnessione"
-
-#. Translators: Info bar title for an outgoing
-#. account problem. String substitution is the
-#. account name
-#: src/client/components/main-window-info-bar.vala:73
-#, c-format
-msgid "Geary encountered a problem sending email for %s."
-msgstr "L'applicazione ha incontrato un problema nell'invio di email per %s."
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:77
-msgid "Retry sending queued messages"
-msgstr "Ritenta l'invio dei messaggi in coda"
-
-#. Translators: Info bar title for a generic application
-#. problem.
-#: src/client/components/main-window-info-bar.vala:84
-msgid "Geary has encountered a problem"
-msgstr "L'applicazione ha rilevato un problema"
-
-#. Translators: Info bar sub-title for a generic
-#. application problem.
-#: src/client/components/main-window-info-bar.vala:88
-msgid "Please report the details if it persists."
-msgstr "Segnalare i dettagli del problema nel caso persista."
-
-#. Translators: Button label for viewing technical details
-#. for a problem report.
-#: src/client/components/main-window-info-bar.vala:99
-msgid "_Details"
-msgstr "_Dettagli"
-
-#. Translators: Tooltip for viewing technical details for
-#. a problem report.
-#: src/client/components/main-window-info-bar.vala:102
-msgid "View technical details about the error"
-msgstr "Visualizza i dettagli tecnici relativi all'errore"
-
-#. Translators: Button label for retrying a server
-#. connection
-#: src/client/components/main-window-info-bar.vala:108
-msgid "_Retry"
-msgstr "_Riprova"
-
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
 #: src/client/components/status-bar.vala:26
 msgid "Sending…"
@@ -1534,7 +1599,7 @@ msgstr "_Chiudi"
 msgid "_Discard"
 msgstr "_Scarta"
 
-#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:52
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:42
 msgid "_Help"
 msgstr "A_iuto"
 
@@ -1542,7 +1607,7 @@ msgstr "A_iuto"
 msgid "_Open"
 msgstr "_Apri"
 
-#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:42
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:32
 msgid "_Preferences"
 msgstr "Preferen_ze"
 
@@ -1583,23 +1648,23 @@ msgid "Invalid email address"
 msgstr "Indirizzo email non valido"
 
 #. / Translators: Title for an empty composer window
-#: src/client/composer/composer-widget.vala:30
+#: src/client/composer/composer-widget.vala:31
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
-#: src/client/composer/composer-widget.vala:217
+#: src/client/composer/composer-widget.vala:235
 msgid "Saved"
 msgstr "Salvato"
 
-#: src/client/composer/composer-widget.vala:218
+#: src/client/composer/composer-widget.vala:236
 msgid "Saving"
 msgstr "Salvataggio"
 
-#: src/client/composer/composer-widget.vala:219
+#: src/client/composer/composer-widget.vala:237
 msgid "Error saving"
 msgstr "Errore durante il salvataggio"
 
-#: src/client/composer/composer-widget.vala:220
+#: src/client/composer/composer-widget.vala:238
 msgid "Press Backspace to delete quote"
 msgstr "Premere Backspace per eliminare la citazione"
 
@@ -1608,7 +1673,7 @@ msgstr "Premere Backspace per eliminare la citazione"
 #. checking, include all variants of each word. No spaces are
 #. allowed. The words will be converted to lower case based on
 #. locale and English versions included automatically.
-#: src/client/composer/composer-widget.vala:236
+#: src/client/composer/composer-widget.vala:254
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1620,90 +1685,90 @@ msgstr ""
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. Keep, Discard or Cancel.
-#: src/client/composer/composer-widget.vala:843
+#: src/client/composer/composer-widget.vala:903
 msgid "Do you want to keep or discard this draft message?"
 msgstr "Mantenere o scartare questa bozza?"
 
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. only Discard or Cancel.
-#: src/client/composer/composer-widget.vala:869
+#: src/client/composer/composer-widget.vala:929
 msgid "Do you want to discard this draft message?"
 msgstr "Scartare questa bozza?"
 
-#: src/client/composer/composer-widget.vala:1503
+#: src/client/composer/composer-widget.vala:1575
 msgid "Send message with an empty subject and body?"
 msgstr "Inviare il messaggio con un oggetto e un corpo vuoti?"
 
-#: src/client/composer/composer-widget.vala:1505
+#: src/client/composer/composer-widget.vala:1577
 msgid "Send message with an empty subject?"
 msgstr "Inviare il messaggio con un oggetto vuoto?"
 
-#: src/client/composer/composer-widget.vala:1507
+#: src/client/composer/composer-widget.vala:1579
 msgid "Send message with an empty body?"
 msgstr "Inviare il messaggio con un corpo vuoto?"
 
-#: src/client/composer/composer-widget.vala:1516
+#: src/client/composer/composer-widget.vala:1588
 msgid "Send message without an attachment?"
 msgstr "Inviare il messaggio senza un allegato?"
 
-#: src/client/composer/composer-widget.vala:1820
+#: src/client/composer/composer-widget.vala:1904
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "«%s» è già allegato per l'invio."
 
-#: src/client/composer/composer-widget.vala:1856
-#: src/client/composer/composer-widget.vala:1906
+#: src/client/composer/composer-widget.vala:1940
+#: src/client/composer/composer-widget.vala:1990
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "«%s» è un file vuoto."
 
-#: src/client/composer/composer-widget.vala:1894
+#: src/client/composer/composer-widget.vala:1978
 #, c-format
 msgid "“%s” could not be found."
 msgstr "Impossibile trovare «%s»."
 
-#: src/client/composer/composer-widget.vala:1900
+#: src/client/composer/composer-widget.vala:1984
 #, c-format
 msgid "“%s” is a folder."
 msgstr "«%s» è una cartella."
 
-#: src/client/composer/composer-widget.vala:1919
+#: src/client/composer/composer-widget.vala:2003
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "Impossibile aprire «%s» per la lettura."
 
-#: src/client/composer/composer-widget.vala:1927
+#: src/client/composer/composer-widget.vala:2011
 msgid "Cannot add attachment"
 msgstr "Impossibile aggiungere l'allegato"
 
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:1984
-#: src/client/conversation-viewer/conversation-email.vala:559
-#: src/client/util/util-email.vala:235 ui/conversation-message.ui:312
+#: src/client/composer/composer-widget.vala:2071
+#: src/client/conversation-viewer/conversation-email.vala:542
+#: src/client/util/util-email.vala:236 ui/conversation-message.ui:312
 msgid "To:"
 msgstr "A:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:1990
-#: src/client/conversation-viewer/conversation-email.vala:564
-#: src/client/util/util-email.vala:240 ui/conversation-message.ui:357
+#: src/client/composer/composer-widget.vala:2077
+#: src/client/conversation-viewer/conversation-email.vala:547
+#: src/client/util/util-email.vala:241 ui/conversation-message.ui:357
 msgid "Cc:"
 msgstr "Cc:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:1996
-#: src/client/conversation-viewer/conversation-email.vala:569
+#: src/client/composer/composer-widget.vala:2083
+#: src/client/conversation-viewer/conversation-email.vala:552
 #: ui/conversation-message.ui:402
 msgid "Bcc:"
 msgstr "Ccn:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:2002
+#: src/client/composer/composer-widget.vala:2089
 msgid "Reply-To: "
 msgstr "Rispondi a: "
 
-#: src/client/composer/composer-widget.vala:2254
+#: src/client/composer/composer-widget.vala:2341
 msgid "Select Color"
 msgstr "Seleziona colore"
 
@@ -1712,20 +1777,14 @@ msgstr "Seleziona colore"
 #. printf argument will be the alternate email address,
 #. and the second will be the account's primary email
 #. address.
-#: src/client/composer/composer-widget.vala:2440
+#: src/client/composer/composer-widget.vala:2530
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s tramite %2$s"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: src/client/composer/composer-widget.vala:2496
-msgid "_From:"
-msgstr "_Da:"
-
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2801
+#: src/client/composer/composer-widget.vala:2887
 msgid "Images"
 msgstr "Immagini"
 
@@ -1796,20 +1855,20 @@ msgid "Me"
 msgstr "Io"
 
 #. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:554
-#: src/client/util/util-email.vala:226
+#: src/client/conversation-viewer/conversation-email.vala:537
+#: src/client/util/util-email.vala:227
 msgid "From:"
 msgstr "Da:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
-#: src/client/conversation-viewer/conversation-email.vala:574
-#: src/client/util/util-email.vala:231
+#: src/client/conversation-viewer/conversation-email.vala:557
+#: src/client/util/util-email.vala:232
 msgid "Date:"
 msgstr "Data:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
-#: src/client/conversation-viewer/conversation-email.vala:584
-#: src/client/util/util-email.vala:229
+#: src/client/conversation-viewer/conversation-email.vala:567
+#: src/client/util/util-email.vala:230
 msgid "Subject:"
 msgstr "Oggetto:"
 
@@ -1817,27 +1876,67 @@ msgstr "Oggetto:"
 msgid "This email address may have been forged"
 msgstr "Questo indirizzo email potrebbe essere contraffatto"
 
+#. Translators: Label text displayed when there are too
+#. many email addresses to be shown by default in an
+#. email's header, but they are all being shown anyway.
+#: src/client/conversation-viewer/conversation-message.vala:234
+#| msgid "Show Images"
+msgid "Show less"
+msgstr "Mostra meno"
+
+#. Translators: Label text displayed when there are
+#. too many email addresses to be shown by default in
+#. an email's header. The string substitution is the
+#. number of extra email to be shown.
+#: src/client/conversation-viewer/conversation-message.vala:260
+#, c-format
+msgid "%d more…"
+msgstr "%d di più…"
+
 #. Compact headers. These are partially done here and partially
 #. in load_contacts.
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: src/client/conversation-viewer/conversation-message.vala:439
+#: src/client/conversation-viewer/conversation-message.vala:529
 msgid "No sender"
 msgstr "Nessun mittente"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:831
+#: src/client/conversation-viewer/conversation-message.vala:920
 msgid ", "
 msgstr ", "
 
 #. Translators: This string is used as the HTML IMG ALT
 #. attribute value when displaying an inline image in an email
 #. that did not specify a file name. E.g. <IMG ALT="Image" ...
-#: src/client/conversation-viewer/conversation-message.vala:951
+#: src/client/conversation-viewer/conversation-message.vala:1040
 msgid "Image"
 msgstr "Immagine"
 
+#. Translators: Info bar status message
+#: src/client/conversation-viewer/conversation-message.vala:1305
+msgid "Remote images not shown"
+msgstr "Immagini remote non mostrate"
+
+#. Translators: Info bar description
+#: src/client/conversation-viewer/conversation-message.vala:1307
+msgid "Only show remote images from senders you trust."
+msgstr "Mostra immagini remote solo da mittenti fidati."
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1311
+#| msgctxt "shortcut window"
+#| msgid "Show help"
+msgid "Show"
+msgstr "Mostra"
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1315
+#| msgid "Always Show From Sender"
+msgid "Always show from sender"
+msgstr "Mostra sempre dal mittente"
+
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
 #: src/client/conversation-viewer/conversation-viewer.vala:83
@@ -1983,26 +2082,32 @@ msgstr "Dettagli"
 msgid "Geary requires your email password to continue"
 msgstr "È richiesta la password dell'account email per continuare"
 
-#. Label displaying total number of email messages in a folder
-#: src/client/folder-list/folder-list-folder-entry.vala:32
+#. Translators: Label displaying total number of email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:42
 #, c-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] "%d messaggio"
 msgstr[1] "%d messaggi"
 
-#. / Label displaying number of unread email messages in a folder
-#: src/client/folder-list/folder-list-folder-entry.vala:39
+#. Translators: Label displaying number of unread email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:52
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
 msgstr[0] "%d non letto"
 msgstr[1] "%d non letti"
 
-#. / This string represents the divider between two messages: "n messages" and "n unread",
-#. / shown in the folder list as a tooltip.  Please use your languages conventions for
-#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
-#: src/client/folder-list/folder-list-folder-entry.vala:45
+#. Translators: This string represents the divider between two
+#. messages: "n messages" and "n unread", shown in the folder
+#. list as a tooltip.  Please use your languages conventions
+#. for combining the two, i.e. a comma (",") for English; "6
+#. messages, 3 unread"
+#: src/client/folder-list/folder-list-folder-entry.vala:60
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
@@ -2018,45 +2123,205 @@ msgid_plural "%d results"
 msgstr[0] "%d risultato"
 msgstr[1] "%d risultati"
 
-#. / Notification body text for new email when no other
-#. / new messages are already awaiting.
-#: src/client/plugin/desktop-notifications/desktop-notifications.vala:68
+#: src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in:4
+#| msgid "Desktop notification of new mail"
+msgid "Desktop Notifications"
+msgstr "Notifiche desktop"
+
+#: src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in:5
+#| msgid "Desktop notification of new mail"
+msgid "Displays desktop notifications when new email is delivered"
+msgstr "Mostra le notifiche desktop quando viene consegnata nuova posta"
+
+#. / Notification body when a message as been received
+#. / and other unread messages have not been
+#. / seen. First string substitution is the message
+#. / subject and the second is the number of unseen
+#. / messages
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:138
+#, c-format
+#| msgid ""
+#| "%s\n"
+#| "(%d other new message for %s)"
+#| msgid_plural ""
+#| "%s\n"
+#| "(%d other new messages for %s)"
+msgid ""
+"%s\n"
+"(%d other new message)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages)"
+msgstr[0] ""
+"%s\n"
+"(%d altro nuovo messaggio)"
+msgstr[1] ""
+"%s\n"
+"(%d altri nuovi messaggi)"
+
+#. / Notification body when multiple messages have been
+#. / received at the same time and other unseen messages
+#. / exist. String substitution is the number of new
+#. / messages that have arrived.
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:157
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nuovo messaggio"
 msgstr[1] "%d nuovi messaggi"
 
-#. / Notification body text for new email when
-#. / other new messages have already been notified
-#. / about
-#: src/client/plugin/desktop-notifications/desktop-notifications.vala:83
+#. / Notification body when multiple messages have been
+#. / received at the same time and some unseen messages
+#. / already exist. String substitution is the message
+#. / above with the number of new messages that have
+#. / arrived, number substitution is the total number
+#. / of unseen messages.
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:167
 #, c-format
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d nuovo messaggio in totale"
 msgstr[1] "%s, %d nuovi messaggi in totale"
 
-#: src/client/plugin/desktop-notifications/desktop-notifications.vala:118
-#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
-"%s\n"
-"(%d altro nuovo messaggio per %s)"
-msgstr[1] ""
-"%s\n"
-"(%d altri nuovi messaggi per %s)"
+#. / Notification title when new messages have been
+#. / received
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:282
+#| msgid "New Message"
+msgid "New message"
+msgid_plural "New messages"
+msgstr[0] "Nuovo messaggio"
+msgstr[1] "Nuovi messaggi"
 
-#: src/client/plugin/messaging-menu/messaging-menu.vala:90
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:4
+#| msgid "Email address"
+msgid "Email Templates"
+msgstr "Modelli email"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:5
+msgid "Create reusable templates for sending email"
+msgstr "Crea modelli riutilizzabili per inviare email"
+
+#. Translators: Templates folder name alternatives. Separate names
+#. using a vertical bar and put the most common localized name to
+#. the front for the default. English names do not need to be
+#. included.
+#: src/client/plugin/email-templates/email-templates.vala:29
+#| msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgid "Templates | Template Mail | Template Email | Template E-Mail"
+msgstr ""
+"Modelli | Modello per email | Modello di messaggio di posta elettronica"
+
+#. Translators: The name of the folder used to
+#. store email templates
+#: src/client/plugin/email-templates/email-templates.vala:195
+msgid "Templates"
+msgstr "Modelli"
+
+#. Translators: Info bar button label for creating a
+#. new email template
+#: src/client/plugin/email-templates/email-templates.vala:276
+#| msgid "Now"
+msgid "New"
+msgstr "Nuovo"
+
+#. Translators: Infobar status label for an email template
+#: src/client/plugin/email-templates/email-templates.vala:287
+#| msgid "Message not saved"
+msgid "Message template"
+msgstr "Modello di messaggio"
+
+#. Translators: Info bar button label for sending an
+#. email template
+#: src/client/plugin/email-templates/email-templates.vala:291
+#| msgctxt "shortcut window"
+#| msgid "Send"
+msgid "Send"
+msgstr "Invia"
+
+#. Translators: Info bar button label for editing an
+#. existing email template
+#. Translators: Info bar button label for editing a draft
+#. email
+#: src/client/plugin/email-templates/email-templates.vala:299
+#: src/client/plugin/special-folders/special-folders.vala:180
+#| msgctxt "shortcut window"
+#| msgid "Editing"
+msgid "Edit"
+msgstr "Modifica"
+
+#: src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in:4
+msgid "Folder Highlight"
+msgstr "Evidenzia cartella"
+
+#: src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in:5
+msgid "Highlights folders that have newly delivered mail"
+msgstr "Evidenzia le cartelle che hanno posta appena consegnata"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:4
+msgid "Messaging Menu"
+msgstr "Menù dei messaggi"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:5
+#| msgid "Desktop notification of new mail"
+msgid "Displays Unity Messaging Menu notifications for new email"
+msgstr "Mostra le notifiche di nuova posta nel menù dei messaggi di Unity"
+
+#: src/client/plugin/messaging-menu/messaging-menu.vala:75
 #, c-format
 msgid "%s — New Messages"
 msgstr "%s — Nuovi messaggi"
 
+#: src/client/plugin/notification-badge/notification-badge.plugin.desktop.in:4
+msgid "Notification Badge"
+msgstr "Icona di notifica"
+
+#: src/client/plugin/notification-badge/notification-badge.plugin.desktop.in:5
+msgid "Displays a dock badge showing the number of new messages"
+msgstr "Visualizza nella dock un'icona che mostra il numero di nuovi messaggi"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:4
+msgid "Sent Sound"
+msgstr "Suono posta inviata"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:5
+msgid "Plays the desktop sent-mail sound when an email is sent"
+msgstr ""
+"Riproduce il suono desktop della posta inviata quando un'email viene inviata"
+
+#: src/client/plugin/special-folders/special-folders.plugin.desktop.in:4
+msgid "Special Folders"
+msgstr "Cartelle speciali"
+
+#. Translators: Info bar button label for emptying
+#. trash/spam folders
+#: src/client/plugin/special-folders/special-folders.vala:160
+#| msgid "Empty %s"
+msgid "Empty"
+msgstr "Svuota"
+
+#. Translators: Info bar status message for a draft email
+#: src/client/plugin/special-folders/special-folders.vala:172
+msgid "Draft message"
+msgstr "Bozza"
+
+#. Translators: Info bar status description for a draft
+#. email
+#: src/client/plugin/special-folders/special-folders.vala:175
+msgid "This message has not yet been sent."
+msgstr "Questo messaggio non è stato ancora inviato."
+
+#. Translators: Info bar status message for an sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:191
+msgid "Message not saved"
+msgstr "Messaggio non salvato"
+
+#. Translators: Info bar status description for a sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:194
+msgid "This message was sent, but has not been saved to your account."
+msgstr "Questo messaggio è stato inviato, ma non è stato possibile salvarlo."
+
 #. / Datetime format for 12-hour time, i.e. 8:31 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: src/client/util/util-date.vala:69
@@ -2144,14 +2409,14 @@ msgid "%a, %b %-e, %Y at %X"
 msgstr "%a %-e %b %Y alle %X"
 
 #: src/client/util/util-email.vala:38
-#: src/engine/rfc822/rfc822-message.vala:1000
-msgid "(no subject)"
-msgstr "(nessun oggetto)"
+#| msgid "(no subject)"
+msgid "(No subject)"
+msgstr "(Nessun oggetto)"
 
 #. / Translators: This is shown for displaying a list of email
 #. / recipients that happens to be empty, i.e. contains no
 #. / email addresses.
-#: src/client/util/util-email.vala:134
+#: src/client/util/util-email.vala:135
 msgid "(No recipients)"
 msgstr "(Nessun destinatario)"
 
@@ -2160,7 +2425,7 @@ msgstr "(Nessun destinatario)"
 #. / addresses. The first (string) substitution is
 #. / address of the first, the second substitution is
 #. / the number of n - 1 remaining recipients.
-#: src/client/util/util-email.vala:146
+#: src/client/util/util-email.vala:147
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
@@ -2170,26 +2435,26 @@ msgstr[1] "%s e altri %d"
 #. / The quoted header for a message being replied to.
 #. / %1$s will be substituted for the date, and %2$s will be substituted for
 #. / the original sender.
-#: src/client/util/util-email.vala:179
+#: src/client/util/util-email.vala:180
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr "Il giorno %1$s, %2$s ha scritto:"
 
 #. / The quoted header for a message being replied to (in case the date is not known).
 #. / %s will be replaced by the original sender.
-#: src/client/util/util-email.vala:186
+#: src/client/util/util-email.vala:187
 #, c-format
 msgid "%s wrote:"
 msgstr "%s ha scritto:"
 
 #. / The quoted header for a message being replied to (in case the sender is not known).
 #. / %s will be replaced by the original date
-#: src/client/util/util-email.vala:192
+#: src/client/util/util-email.vala:193
 #, c-format
 msgid "On %s:"
 msgstr "Il %s:"
 
-#: src/client/util/util-email.vala:221
+#: src/client/util/util-email.vala:222
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Messaggio inoltrato ----------"
 
@@ -2217,43 +2482,44 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KB"
 
-#: src/engine/api/geary-special-folder-type.vala:24
+#: src/client/util/util-i18n.vala:271
 msgid "Inbox"
 msgstr "In arrivo"
 
-#: src/engine/api/geary-special-folder-type.vala:27
+#: src/client/util/util-i18n.vala:274
 msgid "Drafts"
 msgstr "Bozze"
 
-#: src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
+#: src/client/util/util-i18n.vala:277
+#| msgid "Sent by:"
+msgid "Sent"
 msgstr "Inviata"
 
-#: src/engine/api/geary-special-folder-type.vala:33
+#: src/client/util/util-i18n.vala:280
 msgid "Starred"
 msgstr "Speciale"
 
-#: src/engine/api/geary-special-folder-type.vala:36
+#: src/client/util/util-i18n.vala:283
 msgid "Important"
 msgstr "Importante"
 
-#: src/engine/api/geary-special-folder-type.vala:39
+#: src/client/util/util-i18n.vala:286
 msgid "All Mail"
 msgstr "Tutta la posta"
 
-#: src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
+#: src/client/util/util-i18n.vala:289
+msgid "Junk"
 msgstr "Indesiderata"
 
-#: src/engine/api/geary-special-folder-type.vala:45
+#: src/client/util/util-i18n.vala:292
 msgid "Trash"
 msgstr "Cestino"
 
-#: src/engine/api/geary-special-folder-type.vala:48
+#: src/client/util/util-i18n.vala:295
 msgid "Outbox"
 msgstr "In uscita"
 
-#: src/engine/api/geary-special-folder-type.vala:54
+#: src/client/util/util-i18n.vala:301
 msgid "Archive"
 msgstr "Archivio"
 
@@ -2429,7 +2695,7 @@ msgstr "nonletto"
 #. Draft mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:882
+#: src/engine/imap-engine/imap-engine-generic-account.vala:892
 msgid "Drafts | Draft"
 msgstr "Bozze | Bozza | Drafts | Draft"
 
@@ -2437,7 +2703,7 @@ msgstr "Bozze | Bozza | Drafts | Draft"
 #. Sent mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:891
+#: src/engine/imap-engine/imap-engine-generic-account.vala:901
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr ""
 "Inviata | Posta inviata | Email inviate | E-mail inviate | Sent | Sent Mail "
@@ -2445,16 +2711,16 @@ msgstr ""
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:896
+#: src/engine/imap-engine/imap-engine-generic-account.vala:906
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Messaggi inviati"
 
 #. List of general possible folder names to match for the
-#. Spam mailbox. Separate names using a vertical bar and
-#. put the most common localized name to the front for the
-#. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:906
+#. Junk/Spam mailbox. Separate names using a vertical bar
+#. and put the most common localized name to the front for
+#. the default. English names do not need to be included.
+#: src/engine/imap-engine/imap-engine-generic-account.vala:916
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2466,13 +2732,13 @@ msgstr ""
 #. Trash mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:916
+#: src/engine/imap-engine/imap-engine-generic-account.vala:926
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Cestino | Trash | Rubbish | Rubbish Bin"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:921
+#: src/engine/imap-engine/imap-engine-generic-account.vala:931
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Messaggi eliminati"
@@ -2481,34 +2747,39 @@ msgstr "Messaggi eliminati"
 #. Archive mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:931
+#: src/engine/imap-engine/imap-engine-generic-account.vala:941
 msgid "Archive | Archives"
 msgstr "Archivio | Archivi"
 
-#: src/engine/rfc822/rfc822-message.vala:458
+#: src/engine/rfc822/rfc822-message.vala:461
 #, c-format
 msgid "Could not determine mime type for “%s”."
 msgstr "Impossibile determinare il tipo mime per “%s”."
 
-#: src/engine/rfc822/rfc822-message.vala:469
+#: src/engine/rfc822/rfc822-message.vala:472
 #, c-format
 msgid "Could not determine content type for mime type “%s” on “%s”."
 msgstr ""
 "Impossibile determinare il tipo di contenuto per il tipo mime “%s” di “%s”."
 
+#: src/engine/rfc822/rfc822-message.vala:1003
+msgid "(no subject)"
+msgstr "(nessun oggetto)"
+
 #: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
 msgid "Add an account"
 msgstr "Aggiungi un account"
 
 #: ui/accounts_editor_add_pane.ui:53
-msgid "Create"
-msgstr "Crea"
+#| msgid "Create"
+msgid "_Create"
+msgstr "_Crea"
 
-#: ui/accounts_editor_add_pane.ui:130 ui/accounts_editor_servers_pane.ui:125
+#: ui/accounts_editor_add_pane.ui:131 ui/accounts_editor_servers_pane.ui:125
 msgid "Receiving"
 msgstr "Ricezione"
 
-#: ui/accounts_editor_add_pane.ui:178 ui/accounts_editor_servers_pane.ui:165
+#: ui/accounts_editor_add_pane.ui:179 ui/accounts_editor_servers_pane.ui:165
 msgid "Sending"
 msgstr "Invio"
 
@@ -2582,79 +2853,6 @@ msgstr "Rimuovi account"
 msgid "Apply"
 msgstr "Applica"
 
-#. Infobar title when one or more accounts are offline
-#: ui/application-main-window.ui:185
-msgid "Working offline"
-msgstr "Fuori rete"
-
-#. Label and tooltip for offline infobar
-#: ui/application-main-window.ui:199
-msgid ""
-"Your computer does not appear to be connected to the Internet.\n"
-"You will not be able to send or receive email until it is re-connected."
-msgstr ""
-"Il computer non sembra connesso a Internet.\n"
-"Non si potrà inviare o ricevere la posta finché non è riconnesso."
-
-#. Label and tooltip for offline infobar
-#: ui/application-main-window.ui:202
-msgid "You will not be able to send or receive email until re-connected."
-msgstr "Non si potrà inviare o ricevere la posta finché non è riconnesso."
-
-#. Button label for retrying TLS cert validation
-#: ui/application-main-window.ui:249
-msgid "Check"
-msgstr "Controlla"
-
-#. Button tooltip for retrying TLS cert validation
-#: ui/application-main-window.ui:253
-msgid "Check the security details for the connection"
-msgstr "Controllare i dettagli di sicurezza della connessione"
-
-#. Infobar title when one or more accounts have a TLS cert validation error
-#: ui/application-main-window.ui:282
-msgid "Security problem"
-msgstr "Problema di sicurezza"
-
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/application-main-window.ui:296
-msgid ""
-"An account has reported an untrusted server.\n"
-"Please check the server configuration and try again."
-msgstr ""
-"Un account ha segnalato un server inaffidabile.\n"
-"Controllare la configurazione del server e riprovare."
-
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/application-main-window.ui:299
-msgid "An account has reported an untrusted server."
-msgstr "Un account ha segnalato un server inaffidabile."
-
-#. Button tooltip for retrying when a login error has occurred
-#: ui/application-main-window.ui:350
-msgid "Retry login, you will be prompted for your password"
-msgstr "Ritentare l'accesso, verrà richiesta la password"
-
-#. Infobar title when one or more accounts have a login error
-#: ui/application-main-window.ui:379
-msgid "Login problem"
-msgstr "Problema di accesso"
-
-#. Label and tooltip for authentication problem infobar
-#: ui/application-main-window.ui:393
-msgid ""
-"An account has reported an incorrect login or password.\n"
-"Please check your login name and try again."
-msgstr ""
-"Un account ha segnalato un nome di accesso o una password non corretti.\n"
-"Controllare il proprio nome di accesso e riprovare."
-
-#. Label and tooltip for authentication problem infobar
-#: ui/application-main-window.ui:396
-msgid "An account has reported an incorrect login or password."
-msgstr ""
-"Un account ha segnalato un nome di accesso o una password non corretti."
-
 #: ui/certificate_warning_dialog.glade:7
 msgid "Untrusted Connection"
 msgstr "Connessione non sicura"
@@ -2749,8 +2947,9 @@ msgstr "_Ispeziona…"
 
 #. Geary account mail will be sent from
 #: ui/composer-widget.ui:60
-msgid "From"
-msgstr "Da"
+#| msgid "_From:"
+msgid "_From"
+msgstr "_Da"
 
 #. Address(es) e-mail is to be sent to
 #: ui/composer-widget.ui:130
@@ -2945,29 +3144,40 @@ msgstr ""
 msgid "Details:"
 msgstr "Dettagli:"
 
-#. Tooltip for inspector button
-#: ui/components-inspector.ui:20
-msgid "Toggle appending new log entries"
-msgstr "Attiva/Disattiva l'aggiunta di nuove voci di registro"
-
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:37 ui/problem-details-dialog.ui:19
+#: ui/components-inspector.ui:19 ui/problem-details-dialog.ui:19
 msgid "Search for matching log entries"
 msgstr "Cerca voci di registro corrispondenti"
 
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:35
+msgid "Toggle appending new log entries"
+msgstr "Attiva/Disattiva l'aggiunta di nuove voci di registro"
+
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:55
+msgid "Add a marker entry to the log"
+msgstr "Aggiunge un marcatore nelle voci di registro"
+
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:63 ui/problem-details-dialog.ui:46
+#: ui/components-inspector.ui:81 ui/problem-details-dialog.ui:46
 msgid "Save logs entries and details"
 msgstr "Salva voci e dettagli del registro"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:84 ui/problem-details-dialog.ui:62
+#: ui/components-inspector.ui:101 ui/problem-details-dialog.ui:62
 msgid "Copy to clipboard"
 msgstr "Copia negli appunti"
 
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:121
+#| msgid "Search for matching log entries"
+msgid "Clears all log entries"
+msgstr "Cancella tutte le voci di registro"
+
 #: ui/conversation-contact-popover.ui:146
 msgid "New Conversation…"
 msgstr "Nuova conversazione…"
@@ -3026,26 +3236,6 @@ msgstr "Contrassegna questo messaggio come speciale"
 msgid "Mark this message as not starred"
 msgstr "Contrassegna questo messaggio come non speciale"
 
-#: ui/conversation-email.ui:124
-msgid "Edit Draft"
-msgstr "Modifica bozza"
-
-#: ui/conversation-email.ui:151
-msgid "Draft message"
-msgstr "Bozza"
-
-#: ui/conversation-email.ui:167
-msgid "This message has not yet been sent."
-msgstr "Questo messaggio non è stato ancora inviato."
-
-#: ui/conversation-email.ui:213
-msgid "Message not saved"
-msgstr "Messaggio non salvato"
-
-#: ui/conversation-email.ui:229
-msgid "This message was sent, but has not been saved to your account."
-msgstr "Questo messaggio è stato inviato, ma non è stato possibile salvarlo."
-
 #. Translators: Menu item to reply to a specific message.
 #: ui/conversation-email-menus.ui:15
 msgid "Reply to _All"
@@ -3152,22 +3342,6 @@ msgstr "Rispondi a:"
 msgid "Subject"
 msgstr "Oggetto"
 
-#: ui/conversation-message.ui:501
-msgid "Show Images"
-msgstr "Mostra immagini"
-
-#: ui/conversation-message.ui:514
-msgid "Always Show From Sender"
-msgstr "Mostra sempre dal mittente"
-
-#: ui/conversation-message.ui:542
-msgid "Remote images not shown"
-msgstr "Immagini remote non mostrate"
-
-#: ui/conversation-message.ui:559
-msgid "Only show remote images from senders you trust."
-msgstr "Mostra immagini remote solo da mittenti fidati."
-
 #: ui/conversation-viewer.ui:60
 msgid "Find in conversation"
 msgstr "Trova nella conversazione"
@@ -3204,7 +3378,7 @@ msgstr "etichetta"
 msgid "Conversation Shortcuts"
 msgstr "Scorciatoie conversazioni"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:355
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:377
 msgctxt "shortcut window"
 msgid "Actions"
 msgstr "Azioni"
@@ -3219,37 +3393,37 @@ msgctxt "shortcut window"
 msgid "Reply to sender"
 msgstr "Rispondi al mittente"
 
-#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:269
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:281
 msgctxt "shortcut window"
 msgid "Reply to all"
 msgstr "Rispondi a tutti"
 
-#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:276
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:288
 msgctxt "shortcut window"
 msgid "Forward"
 msgstr "Inoltra"
 
-#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:283
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:295
 msgctxt "shortcut window"
 msgid "Un-mark/mark read"
 msgstr "Contrassegna/non contrassegna come letto"
 
-#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:290
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:302
 msgctxt "shortcut window"
 msgid "Mark/un-mark starred"
 msgstr "Contrassegna/non contrassegna come speciale"
 
-#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:297
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:309
 msgctxt "shortcut window"
 msgid "Archive conversations"
 msgstr "Archivia conversazioni"
 
-#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:304
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:326
 msgctxt "shortcut window"
 msgid "Move conversations"
 msgstr "Sposta conversazioni"
 
-#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:311
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:333
 msgctxt "shortcut window"
 msgid "Label conversations"
 msgstr "Etichetta conversazioni"
@@ -3259,12 +3433,12 @@ msgctxt "shortcut window"
 msgid "Trash conversations"
 msgstr "Cestina conversazioni"
 
-#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:318
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:340
 msgctxt "shortcut window"
 msgid "Junk conversations"
 msgstr "Contrassegna conversazioni come indesiderate"
 
-#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:325
+#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:347
 msgctxt "shortcut window"
 msgid "Delete conversations"
 msgstr "Elimina conversazioni"
@@ -3279,7 +3453,7 @@ msgctxt "shortcut window"
 msgid "Search for conversations"
 msgstr "Cerca conversazioni"
 
-#: ui/gtk/help-overlay.ui:115
+#: ui/gtk/help-overlay.ui:115 ui/gtk/help-overlay.ui:354
 msgctxt "shortcut window"
 msgid "Find in current conversation"
 msgstr "Trova nella conversazione corrente"
@@ -3319,7 +3493,7 @@ msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "Azzera ingrandimento"
 
-#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:375
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:397
 msgctxt "shortcut window"
 msgid "General"
 msgstr "Generale"
@@ -3369,121 +3543,124 @@ msgctxt "shortcut window"
 msgid "Focus next/previous message"
 msgstr "Sposta lo stato attivo al messaggio successivo/precedente"
 
-#: ui/gtk/help-overlay.ui:258
-msgctxt "shortcut window"
-msgid "Single-key shortcuts"
-msgstr "Scorciatoie da tastiera a tasto singolo"
+#: ui/gtk/help-overlay.ui:260
+#| msgctxt "shortcut window"
+#| msgid "Single-key shortcuts"
+msgid "Single-key Shortcuts"
+msgstr "Scorciatoie a tasto singolo"
 
-#: ui/gtk/help-overlay.ui:262
+#: ui/gtk/help-overlay.ui:265
+#| msgctxt "shortcut window"
+#| msgid "Single-key shortcuts"
+msgctxt "shortcut window"
+msgid "Single-key shortcuts (if enabled)"
+msgstr "Scorciatoie a tasto singolo (se abilitate)"
+
+#: ui/gtk/help-overlay.ui:274
 msgctxt "shortcut window"
 msgid "Reply to sender "
 msgstr "Rispondi al mittente "
 
-#: ui/gtk/help-overlay.ui:332
-msgctxt "shortcut window"
-msgid "Find in current conversations"
-msgstr "Trova nelle conversazioni correnti"
-
-#: ui/gtk/help-overlay.ui:339
+#: ui/gtk/help-overlay.ui:361
 msgctxt "shortcut window"
 msgid "Select next/previous conversations"
 msgstr "Seleziona le conversazioni successive/precedenti"
 
-#: ui/gtk/help-overlay.ui:351
+#: ui/gtk/help-overlay.ui:373
 msgid "Composer Shortcuts"
 msgstr "Scorciatoie compositore"
 
-#: ui/gtk/help-overlay.ui:359
+#: ui/gtk/help-overlay.ui:381
 msgctxt "shortcut window"
 msgid "Send"
 msgstr "Invia"
 
-#: ui/gtk/help-overlay.ui:366
+#: ui/gtk/help-overlay.ui:388
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "Aggiungi allegato"
 
-#: ui/gtk/help-overlay.ui:379
+#: ui/gtk/help-overlay.ui:401
 msgctxt "shortcut window"
 msgid "Close composer window"
 msgstr "Chiudi la finestra di composizione"
 
-#: ui/gtk/help-overlay.ui:386
+#: ui/gtk/help-overlay.ui:408
 msgctxt "shortcut window"
 msgid "Detach composer window"
 msgstr "Stacca la finestra di composizione"
 
-#: ui/gtk/help-overlay.ui:393
+#: ui/gtk/help-overlay.ui:415
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Gestione del testo"
 
-#: ui/gtk/help-overlay.ui:398
+#: ui/gtk/help-overlay.ui:420
 msgctxt "shortcut window"
 msgid "Move selection to the clipboard"
 msgstr "Sposta selezione negli appunti"
 
-#: ui/gtk/help-overlay.ui:405
+#: ui/gtk/help-overlay.ui:427
 msgctxt "shortcut window"
 msgid "Copy selection to clipboard"
 msgstr "Copia selezione negli appunti"
 
-#: ui/gtk/help-overlay.ui:412
+#: ui/gtk/help-overlay.ui:434
 msgctxt "shortcut window"
 msgid "Paste from the clipboard"
 msgstr "Incolla dagli appunti"
 
-#: ui/gtk/help-overlay.ui:419
+#: ui/gtk/help-overlay.ui:441
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "Cita il testo"
 
-#: ui/gtk/help-overlay.ui:426
+#: ui/gtk/help-overlay.ui:448
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "Rimuovi la citazione del testo"
 
-#: ui/gtk/help-overlay.ui:435
+#: ui/gtk/help-overlay.ui:457
 msgctxt "shortcut window"
 msgid "Rich text editing"
 msgstr "Gestione del testo formattato"
 
-#: ui/gtk/help-overlay.ui:439
+#: ui/gtk/help-overlay.ui:461
 msgctxt "shortcut window"
 msgid "Paste without formatting"
 msgstr "Incolla senza formattazione"
 
-#: ui/gtk/help-overlay.ui:446
+#: ui/gtk/help-overlay.ui:468
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "Testo in grassetto"
 
-#: ui/gtk/help-overlay.ui:453
+#: ui/gtk/help-overlay.ui:475
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "Testo in corsivo"
 
-#: ui/gtk/help-overlay.ui:460
+#: ui/gtk/help-overlay.ui:482
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Testo sottolineato"
 
-#: ui/gtk/help-overlay.ui:467
+#: ui/gtk/help-overlay.ui:489
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "Testo barrato"
 
-#: ui/gtk/help-overlay.ui:474
+#: ui/gtk/help-overlay.ui:496
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Rimuovi formattazione"
 
-#: ui/gtk/help-overlay.ui:481
+#: ui/gtk/help-overlay.ui:503
 msgctxt "shortcut window"
 msgid "Insert an image"
 msgstr "Inserisci un'immagine"
 
-#: ui/gtk/help-overlay.ui:488
+#: ui/gtk/help-overlay.ui:510
 msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "Inserisci un collegamento"
@@ -3518,26 +3695,19 @@ msgid "_Archive"
 msgstr "_Archivia"
 
 #: ui/main-toolbar-menus.ui:21
-msgid "Toggle as S_pam"
-msgstr "Contrassegna come in_desiderata"
+#| msgid "Toggle as S_pam"
+msgid "Toggle as _Junk"
+msgstr "Contrassegna/Non contrassegna come in_desiderata"
 
 #: ui/main-toolbar-menus.ui:28
-msgid "Empty _Spam…"
-msgstr "Svuota _indesiderata…"
-
-#: ui/main-toolbar-menus.ui:32
-msgid "Empty _Trash…"
-msgstr "Svuota _cestino…"
-
-#: ui/main-toolbar-menus.ui:38
 msgid "_Accounts"
 msgstr "_Account"
 
-#: ui/main-toolbar-menus.ui:46
+#: ui/main-toolbar-menus.ui:36
 msgid "_Keyboard Shortcuts"
-msgstr "Scorciatoie _tastiera"
+msgstr "Scorciatoie da _tastiera"
 
-#: ui/main-toolbar-menus.ui:57
+#: ui/main-toolbar-menus.ui:47
 msgid "_About Geary"
 msgstr "I_nformazioni"