From 4c64b7fb263a5767fa4831aade359432926b7bd0 Mon Sep 17 00:00:00 2001
From: Jim Nelson <jim@yorba.org>
Date: Tue, 2 Oct 2012 12:50:19 -0700
Subject: [PATCH] Forgot to include Italian translations in distribution.

---
 po/CMakeLists.txt |   3 +-
 po/it.po          | 811 ++++++++++++++++++++++++----------------------
 2 files changed, 424 insertions(+), 390 deletions(-)

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index a9f66703..d608cf43 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 set(TRANSLATED
-    ca_ES
     ca
+    ca_ES
     de
     el_GR
     en_CA
@@ -13,6 +13,7 @@ set(TRANSLATED
     fr
     he
     id
+    it
     km_KH
     nb
     nl_NL
diff --git a/po/it.po b/po/it.po
index 287a692f..e012ecd2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -3,7 +3,7 @@
 # Copyright 2012 Yorba Foundation
 # This file is distributed under the GNU LGPL, version 2.1.
 # Jim Nelson <jim@yorba.org>
-# 
+#
 # Translators:
 #   <gianmarcobrocchi@gmail.com>, 2012.
 # Massimiliano Torromeo <massimiliano.torromeo@gmail.com>, 2012.
@@ -11,76 +11,70 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.2\n"
-"Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n"
-"POT-Creation-Date: 2012-09-05 12:06-0700\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-10-02 12:38-0700\n"
 "PO-Revision-Date: 2012-09-11 17:15+0000\n"
 "Last-Translator: gimmy <gianmarcobrocchi@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../src/client/ui/composer-window.vala:550
+#: ../../src/client/composer/composer-window.vala:569
 #, c-format
 msgid "\"%s\" already attached for delivery"
 msgstr "\"%s\" è già allegato per l'invio"
 
-#: ../../src/client/ui/composer-window.vala:544
+#: ../../src/client/composer/composer-window.vala:563
 #, c-format
 msgid "\"%s\" could not be opened for reading"
 msgstr "\"%s\" non può essere aperto per la lettura"
 
-#: ../../src/client/ui/composer-window.vala:525
+#: ../../src/client/composer/composer-window.vala:544
 #, c-format
 msgid "\"%s\" does not exist"
 msgstr "\"%s\" non esiste"
 
-#: ../../src/client/ui/composer-window.vala:531
+#: ../../src/client/composer/composer-window.vala:550
 #, c-format
 msgid "\"%s\" is a folder"
 msgstr "\"%s\" è una cartella"
 
 #. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-
-#. format
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: ../../src/client/util/util-date.vala:79
 msgid "%B %-e, %Y %-H:%M"
 msgstr ""
 
 #. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-
-#. format
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: ../../src/client/util/util-date.vala:76
 msgid "%B %-e, %Y %-l:%M %P"
 msgstr ""
 
 #. / Verbose datetime format for the locale default (full month, day and time)
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-
-#. format
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: ../../src/client/util/util-date.vala:82
 msgctxt "Default full date"
 msgid "%B %-e, %Y %-l:%M %P"
 msgstr ""
 
 #. / Datetime format for 24-hour time, i.e. 16:35
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-
-#. format
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: ../../src/client/util/util-date.vala:59
 msgid "%H:%M"
 msgstr ""
 
 #. / Format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-
-#. format
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: ../../src/engine/rfc822/rfc822-utils.vala:39
 msgid "%a, %b %-e, %Y at %-l:%M %p"
 msgstr ""
 
 #. / Date format for dates within the current year, i.e. Nov 8
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-
-#. format
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: ../../src/client/util/util-date.vala:66
 msgid "%b %-e"
 msgstr ""
@@ -93,15 +87,13 @@ msgstr[0] "%d nuovo messaggio"
 msgstr[1] "%d nuovi messaggi"
 
 #. / 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
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: ../../src/client/util/util-date.vala:56
 msgid "%l:%M %P"
 msgstr ""
 
 #. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-
-#. format
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: ../../src/client/util/util-date.vala:62
 msgctxt "Default clock format"
 msgid "%l:%M %P"
@@ -112,20 +104,19 @@ msgstr ""
 msgid "%s wrote:"
 msgstr "%s ha scritto:"
 
-#: ../../src/client/ui/message-viewer.vala:409
+#: ../../src/client/views/conversation-viewer.vala:407
 #, c-format
 msgid "%u conversations selected."
 msgstr "%u conversazioni selezionate."
 
 #. / Date format for dates within a different year, i.e. 02/04/10
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-
-#. format
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: ../../src/client/util/util-date.vala:71
 #, no-c-format
 msgid "%x"
 msgstr "%x"
 
-#: ../../src/client/ui/message-list-cell-renderer.vala:115
+#: ../../src/client/views/formatted-conversation-data.vala:233
 msgid "(no subject)"
 msgstr "(nessun oggetto)"
 
@@ -133,12 +124,12 @@ msgstr "(nessun oggetto)"
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Messaggio inoltrato ----------"
 
-#: ../../src/client/geary-controller.vala:926
+#: ../../src/client/geary-controller.vala:1007
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "Un file \"%s\" è già presente. Vuoi sostituirlo?"
 
-#: ../../src/client/geary-controller.vala:730
+#: ../../src/client/geary-controller.vala:779
 #, c-format
 msgid "About %s"
 msgstr "Informazioni su %s"
@@ -151,71 +142,107 @@ msgstr "Tutta la posta"
 msgid "Archive the selected conversation"
 msgstr "Archivia la conversazione selezionata"
 
-#: ../../src/client/geary-controller.vala:912
+#: ../../src/client/geary-controller.vala:993
 #, c-format
 msgid "Are you sure you want to open \"%s\"?"
 msgstr "Sei sicuro di voler aprire \"%s\"?"
 
-#: ../../src/client/geary-controller.vala:913
+#: ../../src/client/geary-controller.vala:994
 msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from"
-" trusted sources."
-msgstr "Gli allegati possono danneggiare il tuo sistema se aperti. Apri solo file provenienti da fonti fidate."
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
+"Gli allegati possono danneggiare il tuo sistema se aperti. Apri solo file "
+"provenienti da fonti fidate."
 
-#: ../../src/client/ui/message-viewer.vala:496
+#: ../../src/client/views/conversation-viewer.vala:494
 msgid "Bcc:"
 msgstr "Ccn:"
 
-#: ../../src/client/ui/composer-window.vala:519
+#: ../../ui/composer.glade:368 ../../ui/composer.glade:370
+msgid "Bold"
+msgstr "Grassetto"
+
+#: ../../ui/composer.glade:68
+msgid "C_olor"
+msgstr "C_olore"
+
+#: ../../src/client/composer/composer-window.vala:538
 msgid "Cannot add attachment"
 msgstr "Impossibile aggiungere l'allegato"
 
-#: ../../src/client/ui/message-viewer.vala:492
+#: ../../src/client/views/conversation-viewer.vala:490
 msgid "Cc:"
 msgstr "Cc:"
 
-#: ../../src/client/ui/composer-window.vala:504
+#: ../../src/client/composer/composer-window.vala:523
 msgid "Choose a file"
 msgstr "Scegli un file"
 
-#: ../../src/client/geary-application.vala:440
+#: ../../src/client/geary-application.vala:373
 msgid "Co_ntinue"
 msgstr "Co_ntinua"
 
+#: ../../ui/composer.glade:512 ../../ui/composer.glade:514
+msgid "Color"
+msgstr "Colore"
+
 #: ../../src/client/notification/libindicate.vala:33
 msgid "Compose Message"
 msgstr "Componi Messaggio"
 
-#: ../../src/client/ui/message-viewer.vala:713
+#. Button for creating a new email message
+#: ../../ui/toolbar.glade:12
+msgid "Compose message"
+msgstr "Componi messaggio"
+
+#: ../../ui/preferences.glade:123
+#, fuzzy
+msgid "Composer"
+msgstr "Componi Messaggio"
+
+#: ../../src/client/views/conversation-viewer.vala:711
 msgid "Copy _Email Address"
 msgstr "Copia Indirizzo _Email"
 
-#: ../../src/client/ui/message-viewer.vala:707
+#: ../../src/client/views/conversation-viewer.vala:705
 msgid "Copy _Link"
 msgstr "Copia _Co_llegamento"
 
+#: ../../ui/composer.glade:112
+msgid "Copy _link"
+msgstr "Copia co_llegamento"
+
 #: ../../src/client/geary-application.vala:17
 msgid "Copyright 2011-2012 Yorba Foundation"
 msgstr "Copyright 2011-2012 Yorba Foundation"
 
-#: ../../src/client/ui/message-viewer.vala:503
+#: ../../src/client/views/conversation-viewer.vala:501
 msgid "Date:"
 msgstr "Data:"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:74
+#: ../../src/engine/rfc822/rfc822-utils.vala:78
 #, c-format
 msgid "Date: %s\n"
 msgstr "Data: %s\n"
 
-#: ../../src/client/geary-application.vala:107
+#: ../../ui/toolbar.glade:159
+msgid "Delete"
+msgstr "Cancella"
+
+#: ../../ui/toolbar.glade:157
+msgid "Delete the selected conversation"
+msgstr "Elimina la conversazione selezionata"
+
+#: ../../src/client/geary-args.vala:23
 msgid "Display program version"
 msgstr "Visualizza versione programma"
 
-#: ../../src/client/ui/composer-window.vala:478
+#: ../../src/client/composer/composer-window.vala:498
 msgid "Do you want to discard the unsaved message?"
 msgstr "Vuoi scartare il messaggio non salvato?"
 
-#: ../../src/client/geary-controller.vala:914
+#: ../../src/client/geary-controller.vala:995
 msgid "Don't _ask me again"
 msgstr "_Non chiedermelo più"
 
@@ -223,28 +250,65 @@ msgstr "_Non chiedermelo più"
 msgid "Drafts"
 msgstr "Bozze"
 
-#: ../../src/client/ui/geary-login.vala:93
+#: ../../ui/composer.glade:324
+msgid "Drop files here"
+msgstr "Trascina file qui"
+
+#: ../../ui/preferences.glade:137
+msgid "Enable _spell checking"
+msgstr ""
+
+#: ../../ui/login.glade:557
+msgid "Encr_yption:"
+msgstr "Ci_fratura:"
+
+#: ../../ui/login.glade:576
+msgid "Encrypt_ion:"
+msgstr "Cifra_tura:"
+
+#: ../../src/client/dialogs/login-dialog.vala:93
 msgid "Enter your account information to get started."
 msgstr "Inserisci le informazioni sul tuo account per iniziare."
 
-#: ../../src/client/ui/message-viewer.vala:1468
+#: ../../src/client/views/conversation-viewer.vala:1460
 msgid "Failed to open default text editor."
 msgstr "Non è stato possibile aprire l'editor di testo predefinito."
 
-#: ../../src/client/geary-application.vala:120
+#: ../../src/client/geary-args.vala:50
 #, c-format
 msgid "Failed to parse command line options: %s\n"
 msgstr "Opzioni di riga di comando non riconosciute: %s\n"
 
-#: ../../src/client/ui/composer-window.vala:285
+#: ../../src/client/composer/composer-window.vala:296
 msgid "Fixed width"
 msgstr "Larghezza fissa"
 
-#: ../../src/client/ui/message-viewer.vala:481
+#: ../../ui/composer.glade:75
+msgid "Font"
+msgstr "Carattere"
+
+#: ../../ui/composer.glade:141 ../../ui/composer.glade:497
+#: ../../ui/composer.glade:499
+msgid "Font size"
+msgstr "Dimensione carattere"
+
+#: ../../ui/composer.glade:482 ../../ui/composer.glade:484
+msgid "Fonts"
+msgstr "Caratteri"
+
+#: ../../ui/toolbar.glade:77
+msgid "Forward"
+msgstr "Inoltra"
+
+#: ../../ui/toolbar.glade:74
+msgid "Forward email"
+msgstr "Inoltra email"
+
+#: ../../src/client/views/conversation-viewer.vala:479
 msgid "From:"
 msgstr "Da:"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:72
+#: ../../src/engine/rfc822/rfc822-utils.vala:74
 #, c-format
 msgid "From: %s\n"
 msgstr "Da: %s\n"
@@ -262,52 +326,86 @@ msgstr "Geary Mail"
 msgid "Gmail"
 msgstr "Gmail"
 
+#: ../../ui/password-dialog.glade:151
+msgid "IMAP Credentials"
+msgstr "Credenziali IMAP"
+
+#: ../../ui/login.glade:263 ../../ui/password-dialog.glade:374
+msgid "IMAP settings"
+msgstr "Impostazioni IMAP"
+
 #: ../../src/engine/api/geary-special-folder-type.vala:21
 msgid "Inbox"
 msgstr "Posta in arrivo"
 
+#: ../../ui/composer.glade:440 ../../ui/composer.glade:442
+msgid "Indent"
+msgstr "Indenta"
+
+#: ../../ui/composer.glade:383 ../../ui/composer.glade:385
+msgid "Italic"
+msgstr "Italico"
+
 #: ../../src/client/util/util-files.vala:28
 msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KB"
 
-#: ../../src/client/ui/main-toolbar.vala:29
+#: ../../ui/toolbar.glade:119
 msgid "Label as"
 msgstr "Etichetta come:"
 
-#: ../../src/client/geary-controller.vala:301
+#. Toggles menu for applying labels to emails.
+#: ../../ui/toolbar.glade:117
+msgid "Label the selected conversation"
+msgstr "Etichetta la conversazione selezionata"
+
+#: ../../src/client/geary-controller.vala:333
 msgid "Labels"
 msgstr "Etichette"
 
-#: ../../src/client/ui/composer-window.vala:299
+#: ../../src/client/composer/composer-window.vala:310
 msgid "Large"
 msgstr "Grande"
 
-#: ../../src/client/geary-application.vala:102
+#: ../../ui/composer.glade:61
+msgid "Lin_k"
+msgstr "_Collegamento"
+
+#: ../../ui/composer.glade:527 ../../ui/composer.glade:529
+msgid "Link"
+msgstr "Collegamento"
+
+#. / 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/geary-args.vala:15
 msgid "Log IMAP replay queue"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:100
+#: ../../src/client/geary-args.vala:11
 msgid "Log conversation monitoring"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:105
+#: ../../src/client/geary-args.vala:20
 msgid "Log database queries (generates lots of messages)"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:106
+#. / "Normalization" can also be called "synchronization"
+#: ../../src/client/geary-args.vala:22
 msgid "Log folder normalization"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:101
+#: ../../src/client/geary-args.vala:12
 msgid "Log network activity"
 msgstr "Registra attività di rete"
 
-#: ../../src/client/geary-application.vala:103
+#. / Serialization is how commands and responses are converted into a stream of bytes for
+#. / network transmission
+#: ../../src/client/geary-args.vala:18
 msgid "Log network serialization"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:104
+#: ../../src/client/geary-args.vala:19
 msgid "Log periodic activity"
 msgstr "Registra attività periodiche"
 
@@ -320,39 +418,58 @@ msgstr "MB"
 msgid "Mail Client"
 msgstr "Client di Posta"
 
-#: ../../src/client/ui/main-toolbar.vala:42
+#: ../../ui/toolbar.glade:104
 msgid "Mark"
 msgstr "Contrassegna"
 
-#: ../../src/client/geary-controller.vala:175
+#: ../../src/client/geary-controller.vala:185
 msgid "Mark as _read"
 msgstr "Contrassegna come _letta"
 
-#: ../../src/client/geary-controller.vala:180
+#: ../../src/client/geary-controller.vala:190
 msgid "Mark as _unread"
 msgstr "Contrassegna come _non letta"
 
-#: ../../src/client/ui/message-list-cell-renderer.vala:77
+#. Toggles menu for marking a message as read/unread or starred/unstarred
+#: ../../ui/toolbar.glade:102
+msgid "Mark email"
+msgstr "Segna email"
+
+#: ../../src/client/views/formatted-conversation-data.vala:9
 msgid "Me"
 msgstr "Io"
 
-#: ../../src/client/ui/composer-window.vala:296
+#: ../../src/client/composer/composer-window.vala:307
 msgid "Medium"
 msgstr "Media"
 
-#: ../../src/client/ui/main-toolbar.vala:33
+#: ../../ui/toolbar.glade:186
+msgid "Menu"
+msgstr "Menu"
+
+#. Toggles menu for applying labels to emails.
+#: ../../ui/toolbar.glade:132
+msgid "Move the selected conversation"
+msgstr "Sposta la conversazione selezionata"
+
+#: ../../ui/toolbar.glade:134
 msgid "Move to"
 msgstr "Sposta in"
 
-#: ../../src/client/ui/composer-window.vala:9
+#: ../../ui/login.glade:188
+msgid "N_ame:"
+msgstr "N_ome:"
+
+#: ../../src/client/composer/composer-window.vala:9
 msgid "New Message"
 msgstr "Nuovo Messaggio"
 
 #: ../../src/client/notification/libindicate.vala:39
+#: ../../src/client/notification/libmessagingmenu.vala:54
 msgid "New Messages"
 msgstr "Nuovi Messaggi"
 
-#: ../../src/client/ui/message-viewer.vala:407
+#: ../../src/client/views/conversation-viewer.vala:405
 msgid "No conversations selected."
 msgstr "Nessuna conversazione selezionata."
 
@@ -360,6 +477,10 @@ msgstr "Nessuna conversazione selezionata."
 msgid "None"
 msgstr "Nulla"
 
+#: ../../ui/preferences.glade:166
+msgid "Notifications"
+msgstr ""
+
 #. / The datetime that a message being replied to was received
 #: ../../src/engine/rfc822/rfc822-utils.vala:36
 #, c-format
@@ -378,45 +499,118 @@ msgstr "Altro"
 msgid "Outbox"
 msgstr "Posta in Uscita"
 
-#: ../../src/client/geary-application.vala:99
+#: ../../src/client/geary-args.vala:10
 msgid "Output debugging information"
 msgstr "Emetti informazioni di debug"
 
-#: ../../src/client/ui/password-dialog.vala:16
+#: ../../ui/login.glade:313
+msgid "P_ort:"
+msgstr "P_orta:"
+
+#: ../../ui/login.glade:447
+msgid "Pass_word:"
+msgstr "Pass_word:"
+
+#: ../../ui/password-dialog.glade:217
+msgid "Password:"
+msgstr "Password:"
+
+#: ../../ui/composer.glade:106
+msgid "Paste _with formatting"
+msgstr "Incolla con _formattazione"
+
+#: ../../src/client/dialogs/password-dialog.vala:16
 msgid "Please enter your email password"
 msgstr "Prego inserisci la tua password email"
 
-#: ../../src/client/geary-application.vala:141
+#: ../../src/client/geary-args.vala:43
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "Prego riportare commenti, suggerimenti e bug a:"
 
-#: ../../src/client/ui/geary-login.vala:270
+#: ../../ui/login.glade:394
+msgid "Por_t:"
+msgstr "Por_ta:"
+
+#: ../../ui/password-dialog.glade:407 ../../ui/password-dialog.glade:510
+msgid "Port:"
+msgstr "Porta:"
+
+#: ../../src/client/dialogs/login-dialog.vala:270
 msgid "Re_member password"
 msgstr "R_icorda password"
 
-#: ../../src/client/ui/geary-login.vala:265
+#: ../../src/client/dialogs/login-dialog.vala:265
 msgid "Re_member passwords"
 msgstr "R_icorda password"
 
-#: ../../src/client/ui/message-viewer.vala:942
+#: ../../ui/preferences.glade:57
+msgid "Reading"
+msgstr ""
+
+#: ../../ui/password-dialog.glade:314
+msgid "Real name:"
+msgstr "Nome reale:"
+
+#: ../../ui/password-dialog.glade:256
+msgid "Remember password"
+msgstr "Ricorda password"
+
+#: ../../ui/composer.glade:99 ../../ui/composer.glade:542
+#: ../../ui/composer.glade:544
+msgid "Remove formatting"
+msgstr "Rimuovi formattazione"
+
+#: ../../ui/toolbar.glade:60
+msgid "Reply All"
+msgstr "Rispondi a tutti"
+
+#: ../../ui/toolbar.glade:43
+msgid "Reply To"
+msgstr "Rispondi a"
+
+#: ../../src/client/views/conversation-viewer.vala:935
 msgid "Reply to _All"
 msgstr "Rispondi a _Tutti"
 
-#: ../../src/client/ui/composer-window.vala:278
+#: ../../ui/toolbar.glade:57
+msgid "Reply to all"
+msgstr "Rispondi a tutti"
+
+#: ../../ui/toolbar.glade:40
+msgid "Reply to sender"
+msgstr "Rispondi al mittente"
+
+#: ../../ui/password-dialog.glade:184
+msgid "SMTP Credentials"
+msgstr "Credenziali SMTP"
+
+#: ../../ui/login.glade:412 ../../ui/password-dialog.glade:477
+msgid "SMTP settings"
+msgstr "Impostazioni SMTP"
+
+#: ../../ui/password-dialog.glade:422 ../../ui/password-dialog.glade:525
+msgid "SSL/TLS encryption:"
+msgstr "Cifratura SSL/TLS"
+
+#: ../../src/client/composer/composer-window.vala:289
 msgid "Sans Serif"
 msgstr "Sans Serif"
 
-#: ../../src/client/ui/message-viewer.vala:928
+#: ../../src/client/views/conversation-viewer.vala:921
 msgid "Save A_ttachment..."
 msgid_plural "Save All A_ttachments..."
 msgstr[0] "Salva A_llegato..."
 msgstr[1] "Salva A_llegati..."
 
-#: ../../src/client/ui/message-viewer.vala:909
+#: ../../src/client/views/conversation-viewer.vala:902
 msgid "Save All A_ttachments..."
 msgstr "Salva Tutti gli A_llegati..."
 
-#: ../../src/client/ui/message-viewer.vala:725
+#: ../../ui/login.glade:281
+msgid "Se_rver:"
+msgstr "Se_rver:"
+
+#: ../../src/client/views/conversation-viewer.vala:718
 msgid "Select _All"
 msgstr "Seleziona _Tutto"
 
@@ -428,11 +622,27 @@ msgstr "Invia e ricevi email"
 msgid "Sent Mail"
 msgstr "Invia Posta"
 
-#: ../../src/client/ui/composer-window.vala:281
+#: ../../ui/login.glade:377
+msgid "Ser_ver:"
+msgstr "Ser_ver:"
+
+#: ../../src/client/composer/composer-window.vala:292
 msgid "Serif"
 msgstr "Serif"
 
-#: ../../src/client/ui/composer-window.vala:293
+#: ../../ui/password-dialog.glade:392 ../../ui/password-dialog.glade:495
+msgid "Server:"
+msgstr "Server:"
+
+#: ../../ui/password-dialog.glade:299
+msgid "Service:"
+msgstr "Servizio:"
+
+#: ../../ui/preferences.glade:203
+msgid "Show _notifications for new mail"
+msgstr ""
+
+#: ../../src/client/composer/composer-window.vala:304
 msgid "Small"
 msgstr "Piccola"
 
@@ -444,12 +654,12 @@ msgstr "Spam"
 msgid "Starred"
 msgstr "Speciale"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:73
-#, c-format
-msgid "Subject %s\n"
-msgstr "Oggetto %s\n"
+#: ../../ui/composer.glade:413 ../../ui/composer.glade:415
+msgid "Strikethrough"
+msgstr "Barrato"
 
-#: ../../src/client/ui/message-viewer.vala:500
+#: ../../src/client/views/conversation-viewer.vala:498
+#: ../../src/engine/rfc822/rfc822-utils.vala:77
 msgid "Subject:"
 msgstr "Oggetto:"
 
@@ -458,22 +668,26 @@ msgctxt "Abbreviation for terabyte"
 msgid "TB"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:928
+#: ../../src/client/geary-controller.vala:1009
 #, c-format
 msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its "
-"contents."
-msgstr "Il file esiste già in \"%s\".  Sostituirlo sovrascriverà il suo contenuto."
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+"Il file esiste già in \"%s\".  Sostituirlo sovrascriverà il suo contenuto."
 
-#: ../../src/client/ui/message-viewer.vala:95
+#: ../../src/client/views/conversation-viewer.vala:95
 msgid "This message contains images. Do you want to show them?"
 msgstr "Questo messaggio contiene immagini. Si desidera visualizzarle?"
 
-#: ../../src/client/ui/message-viewer.vala:488
+#: ../../ui/composer.glade:340
+msgid "To add them as attachments"
+msgstr "Per aggiungerli come allegati"
+
+#: ../../src/client/views/conversation-viewer.vala:486
 msgid "To:"
 msgstr "A:"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:75
+#: ../../src/engine/rfc822/rfc822-utils.vala:81
 #, c-format
 msgid "To: %s\n"
 msgstr "A: %s\n"
@@ -482,28 +696,40 @@ msgstr "A: %s\n"
 msgid "Trash"
 msgstr "Cestino"
 
-#: ../../src/client/geary-controller.vala:190
+#: ../../src/client/geary-controller.vala:200
 msgid "U_nstar"
 msgstr "_Non speciale"
 
-#: ../../src/client/ui/password-dialog.vala:17
+#: ../../ui/composer.glade:455 ../../ui/composer.glade:457
+msgid "Un-indent"
+msgstr "De-indenta"
+
+#: ../../src/client/dialogs/password-dialog.vala:17
 msgid "Unable to login to email server"
 msgstr "Impossibile accedere al server email"
 
-#: ../../src/client/geary-application.vala:131
+#: ../../ui/composer.glade:398 ../../ui/composer.glade:400
+msgid "Underline"
+msgstr "Sottolinea"
+
+#: ../../src/client/geary-args.vala:61
 #, c-format
 msgid "Unrecognized command line option \"%s\"\n"
 msgstr "Opzione a riga di comando non riconosciuto \"%s\"\n"
 
-#: ../../src/client/ui/message-viewer.vala:720
-msgid "View _Source"
-msgstr "Visualizza _Sorgente"
+#: ../../ui/login.glade:430
+msgid "User_name:"
+msgstr "_Nome utente:"
+
+#: ../../ui/password-dialog.glade:69 ../../ui/password-dialog.glade:202
+msgid "Username:"
+msgstr "Nome utente:"
 
 #: ../../src/client/geary-application.vala:19
 msgid "Visit the Yorba web site"
 msgstr "Visita il sito web Yorba"
 
-#: ../../src/client/ui/geary-login.vala:93
+#: ../../src/client/dialogs/login-dialog.vala:93
 #, c-format
 msgid "Welcome to Geary."
 msgstr "Benvenuto in Geary."
@@ -512,18 +738,21 @@ msgstr "Benvenuto in Geary."
 msgid "Yahoo! Mail"
 msgstr "Yahoo! Mail"
 
-#: ../../src/client/geary-application.vala:439
+#: ../../src/client/geary-application.vala:372
 msgid ""
 "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
 "username and password could be read by another person on the network.  Are "
 "you sure you want to do this?"
-msgstr "Nelle tue impostazioni IMAP e/o SMTP non è specificato SSL o TLS. Questo significa che il tuo username e password potrebbero essere letti da altre persone sulla rete. Si è sicuri di volere ciò?"
+msgstr ""
+"Nelle tue impostazioni IMAP e/o SMTP non è specificato SSL o TLS. Questo "
+"significa che il tuo username e password potrebbero essere letti da altre "
+"persone sulla rete. Si è sicuri di volere ciò?"
 
-#: ../../src/client/geary-application.vala:438
+#: ../../src/client/geary-application.vala:371
 msgid "Your settings are insecure"
 msgstr "Le tue impostazioni non sono sicure"
 
-#: ../../src/client/geary-controller.vala:161
+#: ../../src/client/geary-controller.vala:171
 msgid "_About"
 msgstr "_A proposito"
 
@@ -531,23 +760,27 @@ msgstr "_A proposito"
 msgid "_Archive"
 msgstr "_Archivia"
 
-#: ../../src/client/ui/composer-window.vala:506
+#: ../../src/client/composer/composer-window.vala:525
 msgid "_Attach"
 msgstr "_Allega"
 
-#: ../../src/client/ui/composer-window.vala:588
+#: ../../ui/composer.glade:618
 msgid "_Attach a file"
 msgstr "_Allega un file"
 
-#: ../../src/client/ui/composer-window.vala:587
-msgid "_Attach another file"
-msgstr "_Allega un altro file"
+#: ../../ui/preferences.glade:71
+msgid "_Automatically select next message"
+msgstr ""
 
-#: ../../src/client/ui/message-viewer.vala:88
+#: ../../src/client/views/conversation-viewer.vala:88
 msgid "_Cancel"
 msgstr "_Annulla"
 
-#: ../../src/client/ui/message-viewer.vala:700
+#: ../../ui/composer.glade:49
+msgid "_Center"
+msgstr "_Centra"
+
+#: ../../src/client/views/conversation-viewer.vala:698
 msgid "_Copy"
 msgstr "_Copia"
 
@@ -555,67 +788,116 @@ msgstr "_Copia"
 msgid "_Delete"
 msgstr "_Cancella"
 
-#: ../../src/client/ui/message-viewer.vala:947
+#: ../../ui/password-dialog.glade:588
+msgid "_Details"
+msgstr "_Dettagli"
+
+#: ../../ui/preferences.glade:94
+msgid "_Display message preview"
+msgstr ""
+
+#: ../../ui/login.glade:127
+msgid "_Email address:"
+msgstr "Indirizzo _email:"
+
+#: ../../src/client/views/conversation-viewer.vala:940
 msgid "_Forward"
 msgstr "_Inoltra"
 
-#: ../../src/client/geary-controller.vala:157
+#: ../../src/client/geary-controller.vala:167
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../../src/client/geary-controller.vala:195
+#: ../../ui/composer.glade:55
+msgid "_Justify"
+msgstr "_Giustifica"
+
+#: ../../src/client/geary-controller.vala:204
 msgid "_Label"
 msgstr "_Etichetta"
 
-#: ../../src/client/ui/message-viewer.vala:957
+#: ../../ui/composer.glade:37
+msgid "_Left"
+msgstr "_Sinistra"
+
+#: ../../src/client/views/conversation-viewer.vala:950
 msgid "_Mark as Read"
 msgstr "_Segna come Letto"
 
-#: ../../src/client/ui/message-viewer.vala:961
+#: ../../src/client/views/conversation-viewer.vala:954
 msgid "_Mark as Unread"
 msgstr "_Segna come Da leggere"
 
-#: ../../src/client/geary-controller.vala:170
+#: ../../src/client/geary-controller.vala:180
 msgid "_Mark as..."
 msgstr "_Segna come..."
 
-#: ../../src/client/geary-controller.vala:200
+#: ../../src/client/geary-controller.vala:208
 msgid "_Move"
 msgstr "_Muovi"
 
-#: ../../src/client/geary-controller.vala:205
+#: ../../src/client/geary-controller.vala:213
 msgid "_New Message"
 msgstr "_Nuovo Messaggio"
 
-#: ../../src/client/geary-controller.vala:153
+#: ../../ui/login.glade:143 ../../ui/login.glade:510
+#: ../../ui/password-dialog.glade:84
+msgid "_Password:"
+msgstr "_Password:"
+
+#: ../../ui/preferences.glade:180
+msgid "_Play notification sounds"
+msgstr ""
+
+#: ../../src/client/geary-controller.vala:163
 msgid "_Preferences"
 msgstr "_Preferenze"
 
-#: ../../src/client/geary-controller.vala:165
+#: ../../src/client/geary-controller.vala:175
 msgid "_Quit"
 msgstr "_Chiudi"
 
-#: ../../src/client/geary-controller.vala:931
+#: ../../ui/password-dialog.glade:129
+msgid "_Remember password"
+msgstr "_Ricorda password"
+
+#: ../../src/client/geary-controller.vala:1012
 msgid "_Replace"
 msgstr "_Sostituisci"
 
-#: ../../src/client/ui/message-viewer.vala:937
+#: ../../src/client/views/conversation-viewer.vala:930
 msgid "_Reply"
 msgstr "_Rispondi"
 
-#: ../../src/client/ui/message-viewer.vala:904
+#: ../../ui/composer.glade:43
+msgid "_Right"
+msgstr "_Destra"
+
+#: ../../src/client/views/conversation-viewer.vala:897
 msgid "_Save As..."
 msgstr "_Salva Come..."
 
-#: ../../src/client/ui/message-viewer.vala:88
+#: ../../ui/composer.glade:655
+msgid "_Send"
+msgstr "_Invia"
+
+#: ../../ui/login.glade:172
+msgid "_Service:"
+msgstr "_Servizio:"
+
+#: ../../src/client/views/conversation-viewer.vala:88
 msgid "_Show Images"
 msgstr "_Mostra Immagini"
 
-#: ../../src/client/geary-controller.vala:185
+#: ../../src/client/geary-controller.vala:195
 msgid "_Star"
 msgstr "_Speciale"
 
-#: ../../src/client/ui/message-viewer.vala:976
+#: ../../ui/login.glade:493
+msgid "_Username:"
+msgstr "Nome_utente:"
+
+#: ../../src/client/views/conversation-viewer.vala:969
 msgid "_View Source"
 msgstr "_Visualizza Sorgenti"
 
@@ -624,271 +906,22 @@ msgid "bytes"
 msgstr "byte"
 
 #. / Placeholder filename for attachments with no filename.
-#: ../../src/client/ui/message-viewer.vala:1368
-#: ../../src/engine/imap-db/imap-db-folder.vala:1192
+#: ../../src/client/views/conversation-viewer.vala:1361
+#: ../../src/engine/imap-db/imap-db-folder.vala:1211
 msgid "none"
 msgstr "nulla"
 
-#. / Translator credit for the About dialog
-#: ../../src/client/geary-controller.vala:732
+#. / Translators: add your name and email address to receive credit in the About dialog
+#. / For example: Yamada Taro <yamada.taro@example.com>
+#: ../../src/client/geary-controller.vala:782
 msgid "translator-credits"
 msgstr ""
 
-#: ../../ui/composer.glade:37
-msgid "_Left"
-msgstr "_Sinistra"
+#~ msgid "Subject %s\n"
+#~ msgstr "Oggetto %s\n"
 
-#: ../../ui/composer.glade:43
-msgid "_Right"
-msgstr "_Destra"
+#~ msgid "View _Source"
+#~ msgstr "Visualizza _Sorgente"
 
-#: ../../ui/composer.glade:49
-msgid "_Center"
-msgstr "_Centra"
-
-#: ../../ui/composer.glade:55
-msgid "_Justify"
-msgstr "_Giustifica"
-
-#: ../../ui/composer.glade:61
-msgid "Lin_k"
-msgstr "_Collegamento"
-
-#: ../../ui/composer.glade:68
-msgid "C_olor"
-msgstr "C_olore"
-
-#: ../../ui/composer.glade:75
-msgid "Font"
-msgstr "Carattere"
-
-#: ../../ui/composer.glade:99 ../../ui/composer.glade:614
-#: ../../ui/composer.glade:616
-msgid "Remove formatting"
-msgstr "Rimuovi formattazione"
-
-#: ../../ui/composer.glade:106
-msgid "Paste _with formatting"
-msgstr "Incolla con _formattazione"
-
-#: ../../ui/composer.glade:112
-msgid "Copy _link"
-msgstr "Copia co_llegamento"
-
-#: ../../ui/composer.glade:141 ../../ui/composer.glade:569
-#: ../../ui/composer.glade:571
-msgid "Font size"
-msgstr "Dimensione carattere"
-
-#: ../../ui/composer.glade:171
-msgid "_Send"
-msgstr "_Invia"
-
-#: ../../ui/composer.glade:394
-msgid "Drop files here"
-msgstr "Trascina file qui"
-
-#: ../../ui/composer.glade:410
-msgid "To add them as attachments"
-msgstr "Per aggiungerli come allegati"
-
-#: ../../ui/composer.glade:440 ../../ui/composer.glade:442
-msgid "Bold"
-msgstr "Grassetto"
-
-#: ../../ui/composer.glade:455 ../../ui/composer.glade:457
-msgid "Italic"
-msgstr "Italico"
-
-#: ../../ui/composer.glade:470 ../../ui/composer.glade:472
-msgid "Underline"
-msgstr "Sottolinea"
-
-#: ../../ui/composer.glade:485 ../../ui/composer.glade:487
-msgid "Strikethrough"
-msgstr "Barrato"
-
-#: ../../ui/composer.glade:512 ../../ui/composer.glade:514
-msgid "Indent"
-msgstr "Indenta"
-
-#: ../../ui/composer.glade:527 ../../ui/composer.glade:529
-msgid "Un-indent"
-msgstr "De-indenta"
-
-#: ../../ui/composer.glade:554 ../../ui/composer.glade:556
-msgid "Fonts"
-msgstr "Caratteri"
-
-#: ../../ui/composer.glade:584 ../../ui/composer.glade:586
-msgid "Color"
-msgstr "Colore"
-
-#: ../../ui/composer.glade:599 ../../ui/composer.glade:601
-msgid "Link"
-msgstr "Collegamento"
-
-#: ../../ui/login.glade:126
-msgid "_Email address:"
-msgstr "Indirizzo _email:"
-
-#: ../../ui/login.glade:142 ../../ui/login.glade:509
-#: ../../ui/password-dialog.glade:84
-msgid "_Password:"
-msgstr "_Password:"
-
-#: ../../ui/login.glade:171
-msgid "_Service:"
-msgstr "_Servizio:"
-
-#: ../../ui/login.glade:187
-msgid "N_ame:"
-msgstr "N_ome:"
-
-#: ../../ui/login.glade:262 ../../ui/password-dialog.glade:374
-msgid "IMAP settings"
-msgstr "Impostazioni IMAP"
-
-#: ../../ui/login.glade:280
-msgid "Se_rver:"
-msgstr "Se_rver:"
-
-#: ../../ui/login.glade:312
-msgid "P_ort:"
-msgstr "P_orta:"
-
-#: ../../ui/login.glade:376
-msgid "Ser_ver:"
-msgstr "Ser_ver:"
-
-#: ../../ui/login.glade:393
-msgid "Por_t:"
-msgstr "Por_ta:"
-
-#: ../../ui/login.glade:411 ../../ui/password-dialog.glade:477
-msgid "SMTP settings"
-msgstr "Impostazioni SMTP"
-
-#: ../../ui/login.glade:429
-msgid "User_name:"
-msgstr "_Nome utente:"
-
-#: ../../ui/login.glade:446
-msgid "Pass_word:"
-msgstr "Pass_word:"
-
-#: ../../ui/login.glade:492
-msgid "_Username:"
-msgstr "Nome_utente:"
-
-#: ../../ui/login.glade:556
-msgid "Encr_yption:"
-msgstr "Ci_fratura:"
-
-#: ../../ui/login.glade:575
-msgid "Encrypt_ion:"
-msgstr "Cifra_tura:"
-
-#: ../../ui/password-dialog.glade:69 ../../ui/password-dialog.glade:202
-msgid "Username:"
-msgstr "Nome utente:"
-
-#: ../../ui/password-dialog.glade:129
-msgid "_Remember password"
-msgstr "_Ricorda password"
-
-#: ../../ui/password-dialog.glade:151
-msgid "IMAP Credentials"
-msgstr "Credenziali IMAP"
-
-#: ../../ui/password-dialog.glade:184
-msgid "SMTP Credentials"
-msgstr "Credenziali SMTP"
-
-#: ../../ui/password-dialog.glade:217
-msgid "Password:"
-msgstr "Password:"
-
-#: ../../ui/password-dialog.glade:256
-msgid "Remember password"
-msgstr "Ricorda password"
-
-#: ../../ui/password-dialog.glade:299
-msgid "Service:"
-msgstr "Servizio:"
-
-#: ../../ui/password-dialog.glade:314
-msgid "Real name:"
-msgstr "Nome reale:"
-
-#: ../../ui/password-dialog.glade:392 ../../ui/password-dialog.glade:495
-msgid "Server:"
-msgstr "Server:"
-
-#: ../../ui/password-dialog.glade:407 ../../ui/password-dialog.glade:510
-msgid "Port:"
-msgstr "Porta:"
-
-#: ../../ui/password-dialog.glade:422 ../../ui/password-dialog.glade:525
-msgid "SSL/TLS encryption:"
-msgstr "Cifratura SSL/TLS"
-
-#: ../../ui/password-dialog.glade:588
-msgid "_Details"
-msgstr "_Dettagli"
-
-#. Button for creating a new email message
-#: ../../ui/toolbar.glade:13
-msgid "Compose message"
-msgstr "Componi messaggio"
-
-#: ../../ui/toolbar.glade:29
-msgid "Reply to sender"
-msgstr "Rispondi al mittente"
-
-#: ../../ui/toolbar.glade:31
-msgid "Reply To"
-msgstr "Rispondi a"
-
-#: ../../ui/toolbar.glade:45
-msgid "Reply to all"
-msgstr "Rispondi a tutti"
-
-#: ../../ui/toolbar.glade:47
-msgid "Reply All"
-msgstr "Rispondi a tutti"
-
-#: ../../ui/toolbar.glade:61
-msgid "Forward email"
-msgstr "Inoltra email"
-
-#: ../../ui/toolbar.glade:63
-msgid "Forward"
-msgstr "Inoltra"
-
-#: ../../ui/toolbar.glade:88
-msgid "Delete the selected conversation"
-msgstr "Elimina la conversazione selezionata"
-
-#: ../../ui/toolbar.glade:89
-msgid "Delete"
-msgstr "Cancella"
-
-#. Toggles menu for applying labels to emails.
-#: ../../ui/toolbar.glade:102
-msgid "Move the selected conversation"
-msgstr "Sposta la conversazione selezionata"
-
-#. Toggles menu for applying labels to emails.
-#: ../../ui/toolbar.glade:117
-msgid "Label the selected conversation"
-msgstr "Etichetta la conversazione selezionata"
-
-#. Toggles menu for marking a message as read/unread or starred/unstarred
-#: ../../ui/toolbar.glade:143
-msgid "Mark email"
-msgstr "Segna email"
-
-#: ../../ui/toolbar.glade:175
-msgid "Menu"
-msgstr "Menu"
+#~ msgid "_Attach another file"
+#~ msgstr "_Allega un altro file"