Commit from One Laptop Per Child: Translation System by user carlo. 217 of 217 messages translated (0 fuzzy).

1 files changed, 799 insertions, 518 deletions

diff --git a/po/it.po b/po/it.po
index 408a8d2..0de29d4 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-25 00:30-0400\n"
-"PO-Revision-Date: 2008-10-09 08:42-0400\n"
+"POT-Creation-Date: 2009-01-27 13:34-0500\n"
+"PO-Revision-Date: 2009-02-05 06:48-0500\n"
 "Last-Translator: Carlo Falciola <cfalciola@yahoo.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -15,404 +15,97 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0rc2\n"
 
-#: ../src/intro/window.py:93 ../src/controlpanel/aboutme/view.py:100
-msgid "Name:"
-msgstr "Nome:"
-
-#: ../src/intro/window.py:125
-msgid "Click to change color:"
-msgstr "Seleziona per cambiare colore:"
-
-#: ../src/intro/window.py:175 ../src/journal/detailview.py:119
-msgid "Back"
-msgstr "Indietro"
-
-#: ../src/intro/window.py:189 ../src/controlpanel/toolbar.py:61
-msgid "Done"
-msgstr "Fatto"
-
-#: ../src/intro/window.py:192
-msgid "Next"
-msgstr "Prossimo"
-
-#: ../src/view/BuddyMenu.py:60
-msgid "Remove friend"
-msgstr "Rimuovi l'amico"
-
-#: ../src/view/BuddyMenu.py:63
-msgid "Make friend"
-msgstr "Aggiungi agli amici"
-
-#: ../src/view/BuddyMenu.py:92
-#, python-format
-msgid "Invite to %s"
-msgstr "Invito per %s"
-
-#: ../src/view/clipboardmenu.py:51
-msgid "Remove"
-msgstr "Rimuovi"
-
-#: ../src/view/clipboardmenu.py:56 ../src/view/clipboardmenu.py:78
-msgid "Open"
-msgstr "Apri"
-
-# self._stop_item = MenuItem(_('Stop download'), 'stock-close')
-# TODO: Implement stopping downloads
-# self._stop_item.connect('activate', self._stop_item_activate_cb)
-# self.append_menu_item(self._stop_item)
-#: ../src/view/clipboardmenu.py:61 ../src/view/home/HomeBox.py:84
-msgid "Keep"
-msgstr "Memorizza"
-
-#: ../src/view/clipboardmenu.py:83
-msgid "Open with"
-msgstr "Apri con"
-
-#: ../src/view/clipboardmenu.py:228
-#, python-format
-msgid "%s clipping"
-msgstr "ritaglio %s"
-
-#: ../src/hardware/keydialog.py:150
-msgid "Key Type:"
-msgstr "Tipo Chiave:"
-
-#: ../src/hardware/keydialog.py:170
-msgid "Authentication Type:"
-msgstr "Tipo di Autenticazione:"
-
-#: ../src/hardware/keydialog.py:251
-msgid "Encryption Type:"
-msgstr "Tipo di Crittografia:"
-
-#: ../src/hardware/schoolserver.py:17
-msgid "Cannot obtain data needed for registration."
-msgstr "Non riesco ad ottenere i dati necessari alla registrazione."
-
-#: ../src/hardware/schoolserver.py:31
-msgid "Cannot connect to the server."
-msgstr "Impossibile connettersi al server."
-
-#: ../src/hardware/schoolserver.py:36
-msgid "The server could not complete the request."
-msgstr "Il server non può completare la richiesta."
-
-#: ../src/view/Shell.py:251
-msgid "Screenshot"
-msgstr "Schermata"
-
-#: ../src/view/home/HomeBox.py:78
-msgid "Confirm erase"
-msgstr "Conferma cancellazione"
-
-#: ../src/view/home/HomeBox.py:80
-#, python-format
-msgid "Confirm erase: Do you want to permanently erase %s?"
-msgstr ""
-"Conferma cancellazione: Sei sicuro di voler eliminare definitivamente %s?"
-
-#: ../src/view/home/HomeBox.py:87 ../src/view/palettes.py:120
-#: ../src/journal/journaltoolbox.py:335 ../src/journal/palettes.py:75
-msgid "Erase"
-msgstr "Elimina"
-
-#: ../src/view/home/HomeBox.py:117
-msgid "Software Update"
-msgstr "Aggiornamento software"
-
-#: ../src/view/home/HomeBox.py:118
-msgid "Update your activities to ensure compatibility with your new software"
-msgstr ""
-"Aggiorna le tue attività perchè siano compatibili con il tuo sistema "
-"aggiornato."
-
-#: ../src/view/home/HomeBox.py:122 ../src/controlpanel/toolbar.py:115
-msgid "Cancel"
-msgstr "Annulla"
-
-#: ../src/view/home/HomeBox.py:124 ../src/controlpanel/gui.py:273
-msgid "Later"
-msgstr "Dopo"
-
-#: ../src/view/home/HomeBox.py:127
-msgid "Check now"
-msgstr "Verifica adesso"
-
-#: ../src/view/home/HomeBox.py:261
-msgid "List view"
-msgstr "Vista Elenco"
-
-#: ../src/view/home/HomeBox.py:262
-msgid "<Ctrl>2"
-msgstr "<Ctrl>2"
-
-#: ../src/view/home/HomeBox.py:320
-msgid "Favorites view"
-msgstr "Visualizza i Preferiti"
-
-#: ../src/view/home/HomeBox.py:321
-msgid "<Ctrl>1"
-msgstr "<Ctrl>1"
-
-#: ../src/view/home/MeshBox.py:97
-msgid "Connect"
-msgstr "Connetti"
-
-#: ../src/view/home/MeshBox.py:106
-msgid "Disconnect"
-msgstr "Disconnetti"
-
-# Only show disconnect when there's a mesh device, because mesh takes
-# priority over the normal wireless device.  NM doesn't have a "disconnect"
-# method for a device either (for various reasons) so this doesn't
-# have a good mapping
-#: ../src/view/home/MeshBox.py:118
-msgid "Disconnecting..."
-msgstr "Disconnessione..."
-
-#: ../src/view/home/MeshBox.py:159
-msgid "Connecting..."
-msgstr "Connessione..."
-
-# TODO: show the channel number
-#. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:166
-msgid "Connected"
-msgstr "Connesso"
-
-# A complete translation in italian: "rete a maglie" becames a tautology
-#: ../src/view/home/MeshBox.py:218 ../src/view/devices/network/mesh.py:41
-#: ../src/view/devices/network/mesh.py:68
-#: ../src/view/devices/network/mesh.py:72
-msgid "Mesh Network"
-msgstr "Rete Mesh"
-
-# Only show disconnect when there's a mesh device, because mesh takes
-# priority over the normal wireless device.  NM doesn't have a "disconnect"
-# method for a device either (for various reasons) so this doesn't
-# have a good mapping
-#: ../src/view/home/MeshBox.py:221 ../src/view/devices/network/wireless.py:125
-#: ../src/view/devices/network/mesh.py:89
-msgid "Disconnect..."
-msgstr "Disconnessione..."
-
-#. TRANS: Action label for resuming an activity.
-#: ../src/view/home/MeshBox.py:309 ../src/view/palettes.py:61
-#: ../src/journal/journaltoolbox.py:399 ../src/journal/palettes.py:57
-msgid "Resume"
-msgstr "Riprendi"
-
-#: ../src/view/home/MeshBox.py:314 ../src/view/frame/activitiestray.py:206
-msgid "Join"
-msgstr "Associa"
-
-#: ../src/view/devices/battery.py:45
-msgid "My Battery"
-msgstr "La mia Batteria"
-
-#: ../src/view/devices/battery.py:114
-msgid "Charging"
-msgstr "Caricando"
-
-#: ../src/view/devices/battery.py:117
-msgid "Very little power remaining"
-msgstr "Pochissima carica rimanente"
-
-#: ../src/view/devices/battery.py:123
-#, python-format
-msgid "%(hour)d:%(min).2d remaining"
-msgstr "%(ore)d:%(min).2d rimanenti"
-
-#: ../src/view/devices/battery.py:127
-msgid "Charged"
-msgstr "Carica"
-
-#: ../src/view/devices/speaker.py:44
-msgid "My Speakers"
-msgstr "I miei Altoparlanti"
-
-#: ../src/view/devices/speaker.py:125
-msgid "Unmute"
-msgstr "riAttiva"
-
-#: ../src/view/devices/speaker.py:128
-msgid "Mute"
-msgstr "Silenzia"
-
-#: ../src/view/devices/network/wireless.py:67
-msgid "Disconnected"
-msgstr "Disconnesso"
-
-#: ../src/view/devices/network/wireless.py:143
-msgid "Channel"
-msgstr "Canale"
-
-# Letterale "Vicinato",  sperimentale: I miei vicini
-#: ../src/view/frame/zoomtoolbar.py:37
-msgid "Neighborhood"
-msgstr "I miei vicini"
-
-#: ../src/view/frame/zoomtoolbar.py:39
-msgid "Group"
-msgstr "Gruppo"
-
-#: ../src/view/frame/zoomtoolbar.py:41
-msgid "Home"
-msgstr "Casa"
-
-#: ../src/view/frame/zoomtoolbar.py:43
-msgid "Activity"
-msgstr "Attività"
-
-#: ../src/controlpanel/cmd.py:26
-#, python-format
-msgid ""
-"sugar-control-panel: WARNING, found more than one option with the same name: "
-"%s module: %r"
-msgstr ""
-"sugar-control-panel: ATTENZIONE, trovata più di una opzione avente lo stesso "
-"nome: %s modulo: %r"
-
-#: ../src/controlpanel/cmd.py:28
-#, python-format
-msgid "sugar-control-panel: key=%s not an available option"
-msgstr "sugar-control-panel: key=%s non è una opzione disponibile"
-
-# non credo sia da tradurre....
-#: ../src/controlpanel/cmd.py:29
-#, python-format
-msgid "sugar-control-panel: %s"
-msgstr "sugar-control-panel: %s"
-
-#. TRANS: Translators, there's a empty line at the end of this string,
-#. which must appear in the translated string (msgstr) as well.
-#: ../src/controlpanel/cmd.py:35
-msgid ""
-"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
-"    Control for the sugar environment. \n"
-"    Options: \n"
-"    -h           show this help message and exit \n"
-"    -l           list all the available options \n"
-"    -h key       show information about this key \n"
-"    -g key       get the current value of the key \n"
-"    -s key       set the current value for the key \n"
-"    -c key       clear the current value for the key \n"
-"    "
-msgstr ""
-"Utilizzo: sugar-control-panel [ opzioni ] key [ args ... ] \n"
-"    Controllo dell'ambiente sugar. \n"
-"    Opzioni: \n"
-"    -h          Mostra questo messaggio di aiuto ed esci\n"
-"    -l           lista tutte le opzioni disponibili \n"
-"    -h key       mostra informazioni sulla \"key\" \n"
-"    -g key       stampa il valore corrente della \"key\" \n"
-"    -s key       assegna il valore corrente alla \"key\" \n"
-"    "
-
-#: ../src/controlpanel/cmd.py:48
-msgid "To apply your changes you have to restart sugar.\n"
-msgstr "Per applicare le modifiche è necessario riavviare sugar.\n"
-
-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
-msgid "Ok"
-msgstr "Ok"
-
-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:265
-msgid "Changes require restart"
-msgstr "Le modifiche rendono necessario un riavvio"
-
-#: ../src/controlpanel/gui.py:264
-msgid "Warning"
-msgstr "Attenzione"
-
-#: ../src/controlpanel/gui.py:268
-msgid "Cancel changes"
-msgstr "Annulla modifiche"
-
-#: ../src/controlpanel/gui.py:277
-msgid "Restart now"
-msgstr "Riavvia adesso"
+#: ../extensions/cpsection/aboutme/__init__.py:24
+msgid "About Me"
+msgstr "Informazioni su"
 
-#: ../src/controlpanel/aboutme/model.py:44
+#: ../extensions/cpsection/aboutme/model.py:43
 msgid "You must enter a name."
 msgstr "Devi inserire un nome."
 
-#: ../src/controlpanel/aboutme/model.py:69
+#: ../extensions/cpsection/aboutme/model.py:68
 #, python-format
 msgid "stroke:   color=%s hue=%s"
 msgstr "linea:   colore=%s tinta=%s"
 
-#: ../src/controlpanel/aboutme/model.py:72
+#: ../extensions/cpsection/aboutme/model.py:71
 #, python-format
 msgid "stroke:   %s"
 msgstr "linea:   %s"
 
-#: ../src/controlpanel/aboutme/model.py:74
+#: ../extensions/cpsection/aboutme/model.py:73
 #, python-format
 msgid "fill:     color=%s hue=%s"
 msgstr "riempimento:     colore=%s tinta=%s"
 
-#: ../src/controlpanel/aboutme/model.py:76
+#: ../extensions/cpsection/aboutme/model.py:75
 #, python-format
 msgid "fill:     %s"
 msgstr "riempimento:     %s"
 
-#: ../src/controlpanel/aboutme/model.py:87
+#: ../extensions/cpsection/aboutme/model.py:86
 msgid "Error in specified color modifiers."
 msgstr "Errore nella variazione dei colori richiesta"
 
-#: ../src/controlpanel/aboutme/model.py:90
+#: ../extensions/cpsection/aboutme/model.py:89
 msgid "Error in specified colors."
 msgstr "Errore nella definizione dei colori."
 
-#: ../src/controlpanel/aboutme/view.py:32
-#: ../src/controlpanel/aboutme/__init__.py:22
-msgid "About Me"
-msgstr "Informazioni su"
+#: ../extensions/cpsection/aboutme/view.py:94 ../src/jarabe/intro/window.py:92
+msgid "Name:"
+msgstr "Nome:"
 
-#: ../src/controlpanel/aboutme/view.py:134
+#: ../extensions/cpsection/aboutme/view.py:128
 msgid "Click to change your color:"
 msgstr "Seleziona per cambiare il tuo colore:"
 
-#: ../src/controlpanel/aboutxo/model.py:24
+#: ../extensions/cpsection/aboutcomputer/__init__.py:21
+msgid "About my Computer"
+msgstr "Il mio Computer"
+
+#: ../extensions/cpsection/aboutcomputer/model.py:26
 msgid "Not available"
 msgstr "Non disponibile"
 
-#: ../src/controlpanel/aboutxo/view.py:55
+#: ../extensions/cpsection/aboutcomputer/view.py:59
 msgid "Identity"
 msgstr "Identità"
 
-#: ../src/controlpanel/aboutxo/view.py:64
+#: ../extensions/cpsection/aboutcomputer/view.py:68
 msgid "Serial Number:"
 msgstr "Numero di Serie:"
 
-#: ../src/controlpanel/aboutxo/view.py:87
+#: ../extensions/cpsection/aboutcomputer/view.py:90
 msgid "Software"
 msgstr "Software"
 
-#: ../src/controlpanel/aboutxo/view.py:96
+#: ../extensions/cpsection/aboutcomputer/view.py:99
 msgid "Build:"
 msgstr "Build:"
 
-#: ../src/controlpanel/aboutxo/view.py:111
+#: ../extensions/cpsection/aboutcomputer/view.py:114
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../src/controlpanel/aboutxo/view.py:126
+#: ../extensions/cpsection/aboutcomputer/view.py:130
 msgid "Firmware:"
 msgstr "Firmware:"
 
-#: ../src/controlpanel/aboutxo/view.py:148
+#: ../extensions/cpsection/aboutcomputer/view.py:145
+msgid "Wireless Firmware:"
+msgstr "Wireless Firmware:"
+
+#: ../extensions/cpsection/aboutcomputer/view.py:168
 msgid "Copyright and License"
 msgstr "Copyright e Licenza"
 
-#: ../src/controlpanel/aboutxo/view.py:156
+#: ../extensions/cpsection/aboutcomputer/view.py:176
 msgid ""
 "© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
 msgstr ""
 "© 2008 One Laptop per Child Association Inc; Red Hat Inc; e Contributori."
 
-#: ../src/controlpanel/aboutxo/view.py:163
+#: ../extensions/cpsection/aboutcomputer/view.py:183
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -424,391 +117,979 @@ msgstr ""
 "chiunque è il benvenuto per apportare modifiche e migliorie e/o distribuirne "
 "copie, alle condizioni descritte nella licenza medesima."
 
-#: ../src/controlpanel/aboutxo/view.py:175
+#: ../extensions/cpsection/aboutcomputer/view.py:195
 msgid "Full license:"
 msgstr "Testo della Licenza:"
 
-#: ../src/controlpanel/aboutxo/__init__.py:21
-msgid "About my XO"
-msgstr "Informazioni sul mio XO"
+#: ../extensions/cpsection/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr "Data e Ora"
 
-#: ../src/controlpanel/datetime/model.py:89
+#: ../extensions/cpsection/datetime/model.py:87
 msgid "Error timezone does not exist."
 msgstr "Errore, timezone non esistente."
 
-#: ../src/controlpanel/datetime/view.py:68
+#: ../extensions/cpsection/datetime/view.py:68 ../data/sugar.schemas.in.h:19
 msgid "Timezone"
 msgstr "Timezone"
 
-#: ../src/controlpanel/datetime/__init__.py:21
-msgid "Date & Time"
-msgstr "Data e Ora"
+#: ../extensions/cpsection/frame/__init__.py:21
+msgid "Frame"
+msgstr "Cornice"
 
-#: ../src/controlpanel/frame/model.py:38 ../src/controlpanel/frame/model.py:60
+#: ../extensions/cpsection/frame/model.py:38
+#: ../extensions/cpsection/frame/model.py:60
 msgid "Value must be an integer."
 msgstr "Valore deve essere un intero."
 
-#: ../src/controlpanel/frame/view.py:26
+#: ../extensions/cpsection/frame/view.py:26
 msgid "never"
 msgstr "mai"
 
-#: ../src/controlpanel/frame/view.py:27
+#: ../extensions/cpsection/frame/view.py:27
 msgid "instantaneous"
 msgstr "istantaneamente"
 
-#: ../src/controlpanel/frame/view.py:28
+#: ../extensions/cpsection/frame/view.py:28
 #, python-format
 msgid "%s seconds"
 msgstr "%s secondi"
 
-#: ../src/controlpanel/frame/view.py:52
+#: ../extensions/cpsection/frame/view.py:52
 msgid "Activation Delay"
 msgstr "Ritardo attivazione"
 
-#: ../src/controlpanel/frame/view.py:76
+#: ../extensions/cpsection/frame/view.py:76
 msgid "Corner"
 msgstr "Angolo"
 
-#: ../src/controlpanel/frame/view.py:111
+#: ../extensions/cpsection/frame/view.py:111
 msgid "Edge"
 msgstr "Margine"
 
-#: ../src/controlpanel/frame/__init__.py:21
-msgid "Frame"
-msgstr "Cornice"
+#: ../extensions/cpsection/language/__init__.py:21
+#: ../extensions/cpsection/language/view.py:32
+msgid "Language"
+msgstr "Lingua"
 
-#: ../src/controlpanel/language/model.py:28
+#: ../extensions/cpsection/language/model.py:28
 msgid "Could not access ~/.i18n. Create standard settings."
 msgstr "Impossibile accedere a ~/.i18n. Creazione configurazione standard."
 
-#: ../src/controlpanel/language/model.py:114
+#: ../extensions/cpsection/language/model.py:124
 #, python-format
 msgid "Language for code=%s could not be determined."
 msgstr "Linguaggio con codice=%s sconosciuto."
 
-#: ../src/controlpanel/language/model.py:131
+#: ../extensions/cpsection/language/model.py:144
 #, python-format
 msgid "Sorry I do not speak '%s'."
 msgstr "Spiacente, ma non parlo '%s'."
 
-#: ../src/controlpanel/language/view.py:70
-#: ../src/controlpanel/language/__init__.py:21
-msgid "Language"
-msgstr "Lingua"
+#: ../extensions/cpsection/network/__init__.py:21
+#: ../extensions/cpsection/network/view.py:28
+msgid "Network"
+msgstr "Network"
 
-#: ../src/controlpanel/network/model.py:62
+#: ../extensions/cpsection/network/model.py:79
 msgid "State is unknown."
 msgstr "Stato sconosciuto."
 
-#: ../src/controlpanel/network/model.py:82
+#: ../extensions/cpsection/network/model.py:105
 msgid "Error in specified radio argument use on/off."
 msgstr "Errore nel campo specificato, utilizzare on/off."
 
-#: ../src/controlpanel/network/view.py:28
-#: ../src/controlpanel/network/__init__.py:21
-msgid "Network"
-msgstr "Network"
+#: ../extensions/cpsection/network/model.py:137
+msgid "Error in specified argument use 0/1."
+msgstr "Errore nel campo specificato, utilizzare 0/1."
 
-#: ../src/controlpanel/network/view.py:54
+#: ../extensions/cpsection/network/view.py:56
 msgid "Wireless"
 msgstr "Wireless"
 
-#: ../src/controlpanel/network/view.py:62
-msgid "Turn of the wireless radio to save battery life"
-msgstr "Spegni il trasmettitore wireless per risparmiare energia"
+#: ../extensions/cpsection/network/view.py:64
+msgid "Turn off the wireless radio to save battery life"
+msgstr "Spegni il trasmettitore wireless per risparmiare carica della batteria"
 
-#: ../src/controlpanel/network/view.py:75
+#: ../extensions/cpsection/network/view.py:77
 msgid "Radio"
 msgstr "Radio"
 
-#: ../src/controlpanel/network/view.py:91
+#: ../extensions/cpsection/network/view.py:93
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr ""
 "Elimina la storia delle connessioni di rete effettuate nel caso di problemi "
 "di connessione"
 
-#: ../src/controlpanel/network/view.py:100
+#: ../extensions/cpsection/network/view.py:102
 msgid "Discard network history"
 msgstr "Elimina la storia delle connessioni di rete"
 
-#: ../src/controlpanel/network/view.py:113
-msgid "Mesh"
-msgstr "Mesh"
+#: ../extensions/cpsection/network/view.py:115
+msgid "Collaboration"
+msgstr "Collaborazione"
 
-#: ../src/controlpanel/network/view.py:122
+#: ../extensions/cpsection/network/view.py:123
+msgid ""
+"The server is the equivalent of what room you are in; people on the same "
+"server will be able to see each other, even when they aren't on the same "
+"network."
+msgstr ""
+"Il Server equivale alla stanza in cui si sta; le persone collegate allo "
+"stesso server sono in grado di vedersi fra loro, anche se collegate a reti "
+"differenti."
+
+#: ../extensions/cpsection/network/view.py:133
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/controlpanel/power/model.py:55
+#: ../extensions/cpsection/power/__init__.py:21
+msgid "Power"
+msgstr "Energia"
+
+#: ../extensions/cpsection/power/model.py:54
 msgid "Error in automatic pm argument, use on/off."
 msgstr ""
 "Errore nel campo Gestione Automatica Risparmio Energetico, utilizza on/off"
 
-#: ../src/controlpanel/power/model.py:84
+#: ../extensions/cpsection/power/model.py:81
 msgid "Error in extreme pm argument, use on/off."
 msgstr "Errore nel campo Gestione Estrema Risparmio Energetico, utilizza on/off"
 
-#: ../src/controlpanel/power/view.py:47
+#: ../extensions/cpsection/power/view.py:47
 msgid "Power management"
 msgstr "Gestione Risparmio Energetico (power management)"
 
-#: ../src/controlpanel/power/view.py:57
+#: ../extensions/cpsection/power/view.py:57
 msgid "Automatic power management (increases battery life)"
 msgstr ""
 "Gestione Automatica Risparmio Energetico (incrementa la durata delle "
 "batterie)"
 
-#: ../src/controlpanel/power/view.py:85
+#: ../extensions/cpsection/power/view.py:85
 msgid ""
 "Extreme power management (disableswireless radio, increases battery life)"
 msgstr ""
 "Gestione Risparmio Energetico Estrema (spegne la connessione radio wireless, "
 "incrementa la durata delle batterie)"
 
-#: ../src/controlpanel/power/__init__.py:21
-msgid "Power"
-msgstr "Energia"
+#: ../extensions/deviceicon/battery.py:56
+msgid "My Battery"
+msgstr "La mia Batteria"
 
-#: ../src/view/devices/network/mesh.py:111
-msgid "Connected to a School Mesh Portal"
-msgstr "Connesso ad un Portale Mesh di scuola"
+#: ../extensions/deviceicon/battery.py:137
+msgid "Removed"
+msgstr "Rimosso"
 
-#: ../src/view/devices/network/mesh.py:113
-msgid "Looking for a School Mesh Portal..."
-msgstr "Ricerca di un Portale Mesh di scuola..."
+#: ../extensions/deviceicon/battery.py:140
+msgid "Charging"
+msgstr "Caricando"
 
-#: ../src/view/devices/network/mesh.py:116
-msgid "Connected to an XO Mesh Portal"
-msgstr "Connesso ad un Portale Mesh XO"
+#: ../extensions/deviceicon/battery.py:143
+msgid "Very little power remaining"
+msgstr "Pochissima carica rimanente"
 
-#: ../src/view/devices/network/mesh.py:118
-msgid "Looking for an XO Mesh Portal..."
-msgstr "Sto cercando un Portale Mesh XO..."
+#: ../extensions/deviceicon/battery.py:149
+#, python-format
+msgid "%(hour)d:%(min).2d remaining"
+msgstr "%(ore)d:%(min).2d rimanenti"
 
-# Diretto?
-#: ../src/view/devices/network/mesh.py:121
-msgid "Connected to a Simple Mesh"
-msgstr "Connesso ad un Mesh Semplice"
+#: ../extensions/deviceicon/battery.py:153
+msgid "Charged"
+msgstr "Carica"
 
-# Diretto?
-#: ../src/view/devices/network/mesh.py:123
-msgid "Starting a Simple Mesh"
-msgstr "Attivazione Mesh Semplice"
+#: ../extensions/deviceicon/network.py:40
+#, python-format
+msgid "IP address: %s"
+msgstr "Indirizzo IP: %s"
 
-#: ../src/view/devices/network/mesh.py:130
-msgid "Unknown Mesh"
-msgstr "Mesh sconosciuto"
+# Only show disconnect when there's a mesh device, because mesh takes
+# priority over the normal wireless device.  NM doesn't have a "disconnect"
+# method for a device either (for various reasons) so this doesn't
+# have a good mapping
+#: ../extensions/deviceicon/network.py:104
+msgid "Disconnect..."
+msgstr "Disconnessione..."
 
-#: ../src/view/frame/activitiestray.py:211
-msgid "Decline"
-msgstr "Rinuncia"
+#: ../extensions/deviceicon/network.py:109
+#: ../src/jarabe/desktop/meshbox.py:246
+msgid "Connecting..."
+msgstr "Connessione..."
+
+# TODO: show the channel number
+#: ../extensions/deviceicon/network.py:113
+#: ../extensions/deviceicon/network.py:166
+#: ../src/jarabe/desktop/meshbox.py:252
+msgid "Connected"
+msgstr "Connesso"
+
+#: ../extensions/deviceicon/network.py:126
+msgid "Channel"
+msgstr "Canale"
+
+#: ../extensions/deviceicon/network.py:141
+msgid "Wired Network"
+msgstr "Rete su cavo"
+
+#: ../extensions/deviceicon/network.py:169
+msgid "Speed"
+msgstr "Velocità"
+
+#: ../extensions/deviceicon/speaker.py:46
+msgid "My Speakers"
+msgstr "I miei Altoparlanti"
+
+#: ../extensions/deviceicon/speaker.py:128
+msgid "Unmute"
+msgstr "riAttiva"
+
+#: ../extensions/deviceicon/speaker.py:131
+msgid "Mute"
+msgstr "Silenzia"
+
+#: ../extensions/globalkey/screenshot.py:50
+msgid "Screenshot"
+msgstr "Schermata"
+
+#: ../extensions/globalkey/viewsource.py:196
+#, python-format
+msgid "View source: %r"
+msgstr "Vedi codice sorgente: %r"
+
+#: ../extensions/globalkey/viewsource.py:205
+#: ../src/jarabe/frame/zoomtoolbar.py:42
+msgid "Activity"
+msgstr "Attività"
+
+#: ../extensions/globalkey/viewsource.py:212
+msgid "Document"
+msgstr "Documento"
+
+#: ../extensions/globalkey/viewsource.py:226
+#: ../src/jarabe/journal/objectchooser.py:141
+msgid "Close"
+msgstr "Chiudi"
+
+#: ../data/sugar.schemas.in.h:1
+msgid "Backup URL"
+msgstr "URL di salvataggio"
+
+#: ../data/sugar.schemas.in.h:2
+msgid ""
+"Color for the XO icon that is used throughout the desktop. The string is "
+"composed of the stroke color and fill color, format is that of rbg colors. "
+"Example: #AC32FF,#9A5200"
+msgstr ""
+"Colore per l'icona XO che viene utilizzata nel sistema. La stringa è "
+"composta dal colore della linea e dal colore del riempimento, il formato è "
+"quello dei colori rbg. Esempio: #AC32FF,#9A5200"
+
+#: ../data/sugar.schemas.in.h:3
+msgid "Corner Delay"
+msgstr "Ritardo dell'angolo"
+
+#: ../data/sugar.schemas.in.h:4
+msgid "Delay for the activation of the frame using the corners."
+msgstr ""
+"Ritardo nella attivazione della cornice portando il puntatore in un angolo."
+
+#: ../data/sugar.schemas.in.h:5
+msgid "Delay for the activation of the frame using the edges."
+msgstr "Ritardo nella attivazione della cornice portando il puntatore sui bordi"
+
+#: ../data/sugar.schemas.in.h:6
+msgid "Edge Delay"
+msgstr "Ritardo del bordo"
+
+#: ../data/sugar.schemas.in.h:7
+msgid "Favorites Layout"
+msgstr "Disposizione delle attività preferite"
+
+#: ../data/sugar.schemas.in.h:8
+msgid "Favorites resume mode"
+msgstr "Modalità di richiamo delle attività preferite"
+
+#: ../data/sugar.schemas.in.h:9
+msgid ""
+"If TRUE, Sugar will make us searchable for the other users of the Jabber "
+"server."
+msgstr ""
+"Se TRUE, Sugar renderà il computer rintracciabile dagli altri utenti del "
+"server Jabber."
+
+#: ../data/sugar.schemas.in.h:10
+msgid "Jabber Server"
+msgstr "Jabber Server"
+
+#: ../data/sugar.schemas.in.h:11
+msgid "Layout of the favorites view."
+msgstr "Disposizione della vista dei favoriti."
+
+#: ../data/sugar.schemas.in.h:12
+msgid "Power Automatic"
+msgstr "Economizzazione Automatica"
+
+#: ../data/sugar.schemas.in.h:13
+msgid "Power Automatic."
+msgstr "Economizzazione Automatica."
+
+#: ../data/sugar.schemas.in.h:14
+msgid "Power Extreme"
+msgstr "Economizzazione Massima"
+
+#: ../data/sugar.schemas.in.h:15
+msgid "Power Extreme."
+msgstr "Economizzazione Massima."
+
+#: ../data/sugar.schemas.in.h:16
+msgid "Publish to Gadget"
+msgstr "Pubblica su Gadget"
+
+#: ../data/sugar.schemas.in.h:17
+msgid "Setting for muting the sound device."
+msgstr "Selezione per silenziare il riproduttore sonoro."
+
+#: ../data/sugar.schemas.in.h:18
+msgid "Sound Muted"
+msgstr "Suono Silenziato"
+
+#: ../data/sugar.schemas.in.h:20
+msgid "Timezone setting for the system."
+msgstr "Selezione per il Timezone del sistema"
+
+#: ../data/sugar.schemas.in.h:21
+msgid "Url of the jabber server to use."
+msgstr "Url del server jabber da utilizzare."
+
+#: ../data/sugar.schemas.in.h:22
+msgid "Url where the backup is saved to."
+msgstr "Url su cui effettuare i salvataggi."
+
+#: ../data/sugar.schemas.in.h:23
+msgid "User Color"
+msgstr "Colore dell'Utente "
+
+#: ../data/sugar.schemas.in.h:24
+msgid "User Name"
+msgstr "Nome Utente"
+
+#: ../data/sugar.schemas.in.h:25
+msgid "User name that is used throughout the desktop."
+msgstr "Nome Utente utilizzato in tutto il sistema."
+
+#: ../data/sugar.schemas.in.h:26
+msgid "Volume Level"
+msgstr "Livello Volume"
+
+#: ../data/sugar.schemas.in.h:27
+msgid "Volume level for the sound device."
+msgstr "Livello del volume del riproduttore di suoni."
+
+#: ../data/sugar.schemas.in.h:28
+msgid ""
+"When in resume mode, clicking on a favorite icon will cause the last entry "
+"for that activity to be resumed."
+msgstr ""
+"Quando è selezionata la modalità di ripresa, selezionando una delle icone "
+"delle attività favorite provocherà il riavvio della ultima versione "
+"utilizzata."
+
+#: ../src/jarabe/controlpanel/cmd.py:28
+#, python-format
+msgid ""
+"sugar-control-panel: WARNING, found more than one option with the same name: "
+"%s module: %r"
+msgstr ""
+"sugar-control-panel: ATTENZIONE, trovata più di una opzione avente lo stesso "
+"nome: %s modulo: %r"
+
+#: ../src/jarabe/controlpanel/cmd.py:30
+#, python-format
+msgid "sugar-control-panel: key=%s not an available option"
+msgstr "sugar-control-panel: key=%s non è una opzione disponibile"
+
+# non credo sia da tradurre....
+#: ../src/jarabe/controlpanel/cmd.py:31
+#, python-format
+msgid "sugar-control-panel: %s"
+msgstr "sugar-control-panel: %s"
+
+# TRANS: Translators, there's a empty line at the end of this string,
+# which must appear in the translated string (msgstr) as well.
+#. TRANS: Translators, there's a empty line at the end of this string,
+#. which must appear in the translated string (msgstr) as well.
+#: ../src/jarabe/controlpanel/cmd.py:37
+msgid ""
+"Usage: sugar-control-panel [ option ] key [ args ... ] \n"
+"    Control for the sugar environment. \n"
+"    Options: \n"
+"    -h           show this help message and exit \n"
+"    -l           list all the available options \n"
+"    -h key       show information about this key \n"
+"    -g key       get the current value of the key \n"
+"    -s key       set the current value for the key \n"
+"    -c key       clear the current value for the key \n"
+"    "
+msgstr ""
+"Utilizzo: sugar-control-panel [ opzioni ] key [ args ... ] \n"
+"    Controllo dell'ambiente sugar. \n"
+"    Opzioni: \n"
+"    -h          Mostra questo messaggio di aiuto ed esci\n"
+"    -l           lista tutte le opzioni disponibili \n"
+"    -h key       mostra informazioni sulla \"key\" \n"
+"    -g key       stampa il valore corrente della \"key\" \n"
+"    -s key       assegna il valore corrente alla \"key\" \n"
+"    "
+
+#: ../src/jarabe/controlpanel/cmd.py:50
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr "Per applicare le modifiche è necessario riavviare sugar.\n"
+
+#: ../src/jarabe/controlpanel/gui.py:272
+msgid "Warning"
+msgstr "Attenzione"
+
+#: ../src/jarabe/controlpanel/gui.py:273
+#: ../src/jarabe/controlpanel/sectionview.py:42
+msgid "Changes require restart"
+msgstr "Le modifiche rendono necessario un riavvio"
+
+#: ../src/jarabe/controlpanel/gui.py:276
+msgid "Cancel changes"
+msgstr "Annulla modifiche"
+
+#: ../src/jarabe/controlpanel/gui.py:281 ../src/jarabe/desktop/homebox.py:113
+msgid "Later"
+msgstr "Dopo"
+
+#: ../src/jarabe/controlpanel/gui.py:285
+msgid "Restart now"
+msgstr "Riavvia adesso"
+
+#: ../src/jarabe/controlpanel/toolbar.py:61 ../src/jarabe/intro/window.py:188
+msgid "Done"
+msgstr "Fatto"
+
+#: ../src/jarabe/controlpanel/toolbar.py:115
+#: ../src/jarabe/desktop/homebox.py:111
+#: ../src/jarabe/frame/activitiestray.py:683
+#: ../src/jarabe/frame/activitiestray.py:762
+#: ../src/jarabe/frame/activitiestray.py:790
+msgid "Cancel"
+msgstr "Annulla"
+
+#: ../src/jarabe/controlpanel/toolbar.py:121
+#: ../src/jarabe/desktop/favoritesview.py:334
+msgid "Ok"
+msgstr "Ok"
 
 # TRANS: label for the freeform layout in the favorites view
 #. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:107
+#: ../src/jarabe/desktop/favoriteslayout.py:114
 msgid "Freeform"
 msgstr "Formato libero"
 
 # TRANS: label for the ring layout in the favorites view
 #. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:189
+#: ../src/jarabe/desktop/favoriteslayout.py:196
 msgid "Ring"
 msgstr "Anello"
 
+# TRANS: label for the spiral layout in the favorites view
 #. TRANS: label for the spiral layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:334
+#: ../src/jarabe/desktop/favoriteslayout.py:341
 msgid "Spiral"
 msgstr "Spirale"
 
+# TRANS: label for the box layout in the favorites view
 #. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:401
+#: ../src/jarabe/desktop/favoriteslayout.py:408
 msgid "Box"
 msgstr "Scatola"
 
+# TRANS: label for the box layout in the favorites view
 #. TRANS: label for the box layout in the favorites view
-#: ../src/view/home/favoriteslayout.py:442
+#: ../src/jarabe/desktop/favoriteslayout.py:449
 msgid "Triangle"
 msgstr "Triangolo"
 
-#: ../src/view/home/favoritesview.py:295
+#: ../src/jarabe/desktop/favoritesview.py:325
 msgid "Registration Failed"
 msgstr "Registrazione Fallita"
 
-#: ../src/view/home/favoritesview.py:296
+#: ../src/jarabe/desktop/favoritesview.py:326
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/view/home/favoritesview.py:298
+#: ../src/jarabe/desktop/favoritesview.py:328
 msgid "Registration Successful"
 msgstr "Registrazione Effettuata"
 
-#: ../src/view/home/favoritesview.py:299
+#: ../src/jarabe/desktop/favoritesview.py:329
 msgid "You are now registered with your school server."
 msgstr "Ora sei registrato sul tuo server di scuola"
 
-#: ../src/view/home/favoritesview.py:420
-msgid "Settings"
-msgstr "Configurazioni"
+#: ../src/jarabe/desktop/favoritesview.py:666
+msgid "Register"
+msgstr "Registra"
 
-#: ../src/view/home/favoritesview.py:425
-msgid "Restart"
-msgstr "Riavvia"
+#: ../src/jarabe/desktop/homebox.py:67
+msgid "Confirm erase"
+msgstr "Conferma cancellazione"
 
-#: ../src/view/home/favoritesview.py:430
-msgid "Shutdown"
-msgstr "Spegni"
+#: ../src/jarabe/desktop/homebox.py:69
+#, python-format
+msgid "Confirm erase: Do you want to permanently erase %s?"
+msgstr ""
+"Conferma cancellazione: Sei sicuro di voler eliminare definitivamente %s?"
 
-#: ../src/view/home/favoritesview.py:436
-msgid "Register"
-msgstr "Registra"
+# self._stop_item = MenuItem(_('Stop download'), 'stock-close')
+# TODO: Implement stopping downloads
+# self._stop_item.connect('activate', self._stop_item_activate_cb)
+# self.append_menu_item(self._stop_item)
+#: ../src/jarabe/desktop/homebox.py:73 ../src/jarabe/frame/clipboardmenu.py:62
+msgid "Keep"
+msgstr "Memorizza"
 
-#: ../src/view/palettes.py:42
-msgid "Starting..."
-msgstr "Inizio..."
+#: ../src/jarabe/desktop/homebox.py:76
+#: ../src/jarabe/journal/journaltoolbox.py:357
+#: ../src/jarabe/journal/palettes.py:97 ../src/jarabe/view/palettes.py:127
+msgid "Erase"
+msgstr "Elimina"
 
-#: ../src/view/palettes.py:72
-msgid "Stop"
-msgstr "Chiudi"
+#: ../src/jarabe/desktop/homebox.py:106
+msgid "Software Update"
+msgstr "Aggiornamento software"
 
-#. TRANS: Action label for starting an entry.
-#: ../src/view/palettes.py:104 ../src/journal/journaltoolbox.py:402
-#: ../src/journal/palettes.py:59
-msgid "Start"
-msgstr "Avvia"
+#: ../src/jarabe/desktop/homebox.py:107
+msgid "Update your activities to ensure compatibility with your new software"
+msgstr ""
+"Aggiorna le tue attività perchè siano compatibili con il tuo sistema "
+"aggiornato."
 
-#: ../src/view/palettes.py:138
-msgid "Remove favorite"
-msgstr "Rimuovi preferito"
+#: ../src/jarabe/desktop/homebox.py:116
+msgid "Check now"
+msgstr "Verifica adesso"
 
-#: ../src/view/palettes.py:142
-msgid "Make favorite"
-msgstr "Definisci preferito"
+#: ../src/jarabe/desktop/homebox.py:233
+msgid "List view"
+msgstr "Vista Elenco"
 
-#: ../src/view/palettes.py:191
-msgid "Show contents"
-msgstr "Mostra i contenuti"
+#: ../src/jarabe/desktop/homebox.py:234
+msgid "<Ctrl>2"
+msgstr "<Ctrl>2"
+
+#: ../src/jarabe/desktop/homebox.py:296
+msgid "Favorites view"
+msgstr "Visualizza i Preferiti"
+
+#: ../src/jarabe/desktop/homebox.py:297
+msgid "<Ctrl>1"
+msgstr "<Ctrl>1"
+
+#: ../src/jarabe/desktop/homebox.py:304
+msgid "Resume by default"
+msgstr "Riprendi per default"
+
+#: ../src/jarabe/desktop/keydialog.py:131
+msgid "Key Type:"
+msgstr "Tipo Chiave:"
+
+#: ../src/jarabe/desktop/keydialog.py:151
+msgid "Authentication Type:"
+msgstr "Tipo di Autenticazione:"
+
+#: ../src/jarabe/desktop/keydialog.py:215
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 Personal"
+
+#: ../src/jarabe/desktop/keydialog.py:224
+msgid "Wireless Security:"
+msgstr "Wireless Security:"
+
+#: ../src/jarabe/desktop/meshbox.py:130
+msgid "Connect"
+msgstr "Connetti"
+
+#: ../src/jarabe/desktop/meshbox.py:134
+msgid "Disconnect"
+msgstr "Disconnetti"
+
+# TRANS: Action label for resuming an activity.
+#. TRANS: Action label for resuming an activity.
+#: ../src/jarabe/desktop/meshbox.py:440
+#: ../src/jarabe/frame/activitiestray.py:707
+#: ../src/jarabe/journal/journaltoolbox.py:425
+#: ../src/jarabe/journal/palettes.py:63 ../src/jarabe/view/palettes.py:62
+msgid "Resume"
+msgstr "Riprendi"
+
+#: ../src/jarabe/desktop/meshbox.py:445
+#: ../src/jarabe/frame/activitiestray.py:221
+msgid "Join"
+msgstr "Associa"
 
-#: ../src/view/palettes.py:215
+#: ../src/jarabe/desktop/schoolserver.py:18
+msgid "Cannot obtain data needed for registration."
+msgstr "Non riesco ad ottenere i dati necessari alla registrazione."
+
+#: ../src/jarabe/desktop/schoolserver.py:35
+msgid "Cannot connect to the server."
+msgstr "Impossibile connettersi al server."
+
+#: ../src/jarabe/desktop/schoolserver.py:40
+msgid "The server could not complete the request."
+msgstr "Il server non può completare la richiesta."
+
+#: ../src/jarabe/frame/activitiestray.py:226
+#: ../src/jarabe/frame/activitiestray.py:655
+msgid "Decline"
+msgstr "Rinuncia"
+
+#: ../src/jarabe/frame/activitiestray.py:608
 #, python-format
-msgid "%(free_space)d MB Free"
-msgstr "%(free_space)d MB Liberi"
+msgid "%dB"
+msgstr "%dB"
+
+#: ../src/jarabe/frame/activitiestray.py:610
+#, python-format
+msgid "%dKB"
+msgstr "%dKB"
+
+#: ../src/jarabe/frame/activitiestray.py:612
+#, python-format
+msgid "%dMB"
+msgstr "%dMB"
+
+#: ../src/jarabe/frame/activitiestray.py:629
+#, python-format
+msgid "%s of %s"
+msgstr "%s di %s"
+
+#: ../src/jarabe/frame/activitiestray.py:640
+#, python-format
+msgid "Transfer from %r"
+msgstr "Trasferisci da %r"
+
+#: ../src/jarabe/frame/activitiestray.py:650
+msgid "Accept"
+msgstr "Accetta"
+
+#: ../src/jarabe/frame/activitiestray.py:673
+#: ../src/jarabe/frame/activitiestray.py:780
+#, python-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/jarabe/frame/activitiestray.py:751
+#, python-format
+msgid "Transfer to %r"
+msgstr "Trasferisci verso %r"
+
+#: ../src/jarabe/frame/clipboardmenu.py:52
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: ../src/jarabe/frame/clipboardmenu.py:57
+#: ../src/jarabe/frame/clipboardmenu.py:80
+msgid "Open"
+msgstr "Apri"
+
+#: ../src/jarabe/frame/clipboardmenu.py:85
+msgid "Open with"
+msgstr "Apri con"
+
+#: ../src/jarabe/frame/clipboardobject.py:47
+#, python-format
+msgid "%s clipping"
+msgstr "ritaglio %s"
+
+# Letterale "Vicinato",  sperimentale: I miei vicini
+#: ../src/jarabe/frame/zoomtoolbar.py:36
+msgid "Neighborhood"
+msgstr "I miei vicini"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:38
+msgid "Group"
+msgstr "Gruppo"
+
+#: ../src/jarabe/frame/zoomtoolbar.py:40
+msgid "Home"
+msgstr "Casa"
+
+#: ../src/jarabe/intro/window.py:124
+msgid "Click to change color:"
+msgstr "Seleziona per cambiare colore:"
 
-#: ../src/journal/journaltoolbox.py:62
+#: ../src/jarabe/intro/window.py:174 ../src/jarabe/journal/detailview.py:103
+msgid "Back"
+msgstr "Indietro"
+
+#: ../src/jarabe/intro/window.py:191
+msgid "Next"
+msgstr "Prossimo"
+
+#: ../src/jarabe/journal/collapsedentry.py:243
+#: ../src/jarabe/journal/expandedentry.py:159
+#: ../src/jarabe/journal/palettes.py:57
+msgid "Untitled"
+msgstr "Senza titolo"
+
+#: ../src/jarabe/journal/expandedentry.py:205
+msgid "No preview"
+msgstr "Nessuna anteprima"
+
+#: ../src/jarabe/journal/expandedentry.py:224
+msgid "Participants:"
+msgstr "Partecipanti:"
+
+#: ../src/jarabe/journal/expandedentry.py:247
+msgid "Description:"
+msgstr "Descrizione:"
+
+#: ../src/jarabe/journal/expandedentry.py:273
+msgid "Tags:"
+msgstr "Etichette:"
+
+#: ../src/jarabe/journal/journalactivity.py:108
+#: ../src/jarabe/journal/volumestoolbar.py:47
+msgid "Journal"
+msgstr "Diario"
+
+#: ../src/jarabe/journal/journaltoolbox.py:65
 msgid "Search"
 msgstr "Cerca"
 
-#: ../src/journal/journaltoolbox.py:119
+#: ../src/jarabe/journal/journaltoolbox.py:124
 msgid "Anytime"
 msgstr "Sempre"
 
-#: ../src/journal/journaltoolbox.py:121
+#: ../src/jarabe/journal/journaltoolbox.py:126
 msgid "Today"
 msgstr "Oggi"
 
-#: ../src/journal/journaltoolbox.py:123
+#: ../src/jarabe/journal/journaltoolbox.py:128
 msgid "Since yesterday"
 msgstr "Da ieri"
 
+# TRANS: Filter entries modified during the last 7 days.
 #. TRANS: Filter entries modified during the last 7 days.
-#: ../src/journal/journaltoolbox.py:125
+#: ../src/jarabe/journal/journaltoolbox.py:130
 msgid "Past week"
 msgstr "Settimana scorsa"
 
+# TRANS: Filter entries modified during the last 30 days.
 #. TRANS: Filter entries modified during the last 30 days.
-#: ../src/journal/journaltoolbox.py:127
+#: ../src/jarabe/journal/journaltoolbox.py:132
 msgid "Past month"
 msgstr "Mese scorso"
 
+# TRANS: Filter entries modified during the last 356 days.
 #. TRANS: Filter entries modified during the last 356 days.
-#: ../src/journal/journaltoolbox.py:129
+#: ../src/jarabe/journal/journaltoolbox.py:134
 msgid "Past year"
 msgstr "Anno scorso"
 
-#: ../src/journal/journaltoolbox.py:136
+#: ../src/jarabe/journal/journaltoolbox.py:141
 msgid "Anyone"
 msgstr "Tutti"
 
-#: ../src/journal/journaltoolbox.py:138
+#: ../src/jarabe/journal/journaltoolbox.py:143
 msgid "My friends"
 msgstr "I miei amici"
 
-#: ../src/journal/journaltoolbox.py:139
+#: ../src/jarabe/journal/journaltoolbox.py:144
 msgid "My class"
 msgstr "La mia classe"
 
+# TRANS: Item in a combo box that filters by entry type.
 #. TRANS: Item in a combo box that filters by entry type.
-#: ../src/journal/journaltoolbox.py:255
+#: ../src/jarabe/journal/journaltoolbox.py:271
 msgid "Anything"
 msgstr "Qualsiasi"
 
-#. TODO: Add "Start with" menu item
-#: ../src/journal/journaltoolbox.py:325 ../src/journal/palettes.py:67
+# TODO: Add "Start with" menu item
+#: ../src/jarabe/journal/journaltoolbox.py:347
+#: ../src/jarabe/journal/palettes.py:81
 msgid "Copy"
 msgstr "Copia"
 
-#: ../src/journal/collapsedentry.py:248 ../src/journal/expandedentry.py:176
-#: ../src/journal/palettes.py:51
-msgid "Untitled"
-msgstr "Senza titolo"
+# TRANS: Action label for starting an entry.
+#. TRANS: Action label for starting an entry.
+#: ../src/jarabe/journal/journaltoolbox.py:428
+#: ../src/jarabe/journal/palettes.py:66 ../src/jarabe/view/palettes.py:111
+msgid "Start"
+msgstr "Avvia"
 
-#: ../src/journal/journalactivity.py:119 ../src/journal/volumesmanager.py:57
-msgid "Journal"
-msgstr "Diario"
+#: ../src/jarabe/journal/listview.py:40
+msgid "Your Journal is empty"
+msgstr "Il tuo Diario è vuoto"
 
-#: ../src/journal/expandedentry.py:222
-msgid "No preview"
-msgstr "Nessuna anteprima"
+#: ../src/jarabe/journal/listview.py:41
+msgid "No matching entries "
+msgstr "Non ci sono dati corrispondenti "
 
-#: ../src/journal/expandedentry.py:241
-msgid "Participants:"
-msgstr "Partecipanti:"
+#: ../src/jarabe/journal/listview.py:369
+msgid "Clear search"
+msgstr "Annulla ricerca"
 
-#: ../src/journal/expandedentry.py:266
-msgid "Description:"
-msgstr "Descrizione:"
+#: ../src/jarabe/journal/misc.py:92
+msgid "No date"
+msgstr "Nessuna data"
 
-#: ../src/journal/expandedentry.py:292
-msgid "Tags:"
-msgstr "Etichette:"
+#: ../src/jarabe/journal/modalalert.py:63
+msgid "Your Journal is full"
+msgstr "Il tuo Diario è pieno"
+
+#: ../src/jarabe/journal/modalalert.py:67
+msgid "Please delete some old Journal entries to make space for new ones."
+msgstr ""
+"Per favore cancella alcune registrazioni vecchie dal Diario per far spazio "
+"alle nuove."
+
+#: ../src/jarabe/journal/modalalert.py:79
+msgid "Show Journal"
+msgstr "Apri il Diario"
 
-#: ../src/journal/objectchooser.py:134
+#: ../src/jarabe/journal/objectchooser.py:136
 msgid "Choose an object"
 msgstr "Scegli un oggetto"
 
-#: ../src/journal/objectchooser.py:139
-msgid "Close"
+#: ../src/jarabe/journal/palettes.py:64
+msgid "Resume with"
+msgstr "Riprendi con"
+
+#: ../src/jarabe/journal/palettes.py:67
+msgid "Start with"
+msgstr "Inizia con"
+
+#: ../src/jarabe/journal/palettes.py:89
+msgid "Send to"
+msgstr "Invia a"
+
+#: ../src/jarabe/journal/palettes.py:167
+msgid "No friends present"
+msgstr "Non ci sono amici presenti"
+
+#: ../src/jarabe/journal/palettes.py:172
+msgid "No valid connection found"
+msgstr "Connessione non trovata"
+
+#: ../src/jarabe/journal/palettes.py:200
+msgid "No activity to resume entry"
+msgstr "Sessione dell'Attività da riprendere non presente"
+
+#: ../src/jarabe/journal/palettes.py:202
+msgid "No activity to start entry"
+msgstr "Attività per riprendere la sessione non presente"
+
+#: ../src/jarabe/view/buddymenu.py:61
+msgid "Remove friend"
+msgstr "Rimuovi l'amico"
+
+#: ../src/jarabe/view/buddymenu.py:64
+msgid "Make friend"
+msgstr "Aggiungi agli amici"
+
+#: ../src/jarabe/view/buddymenu.py:81
+msgid "My Settings"
+msgstr "Le mie Preferenze"
+
+#: ../src/jarabe/view/buddymenu.py:86
+msgid "Logout"
+msgstr "Disconnessione"
+
+#: ../src/jarabe/view/buddymenu.py:91
+msgid "Restart"
+msgstr "Riavvia"
+
+#: ../src/jarabe/view/buddymenu.py:96
+msgid "Shutdown"
+msgstr "Spegni"
+
+#: ../src/jarabe/view/buddymenu.py:131
+#, python-format
+msgid "Invite to %s"
+msgstr "Invito per %s"
+
+#: ../src/jarabe/view/palettes.py:43
+msgid "Starting..."
+msgstr "Inizio..."
+
+#: ../src/jarabe/view/palettes.py:73
+msgid "Stop"
 msgstr "Chiudi"
 
-#: ../src/journal/volumestoolbar.py:93
+#: ../src/jarabe/view/palettes.py:145
+msgid "Remove favorite"
+msgstr "Rimuovi preferito"
+
+#: ../src/jarabe/view/palettes.py:149
+msgid "Make favorite"
+msgstr "Definisci preferito"
+
+#: ../src/jarabe/view/palettes.py:201
+msgid "Show contents"
+msgstr "Mostra i contenuti"
+
+#: ../src/jarabe/view/palettes.py:223 ../src/jarabe/view/palettes.py:272
+#, python-format
+msgid "%(free_space)d MB Free"
+msgstr "%(free_space)d MB Liberi"
+
+#: ../src/jarabe/view/palettes.py:248
 msgid "Unmount"
 msgstr "Rimuovi"
 
-#: ../src/journal/misc.py:95
-msgid "No date"
-msgstr "Nessuna data"
+#~ msgid "Encryption Type:"
+#~ msgstr "Tipo di Crittografia:"
 
-#: ../src/journal/listview.py:39
-msgid "Your Journal is empty"
-msgstr "Il tuo Diario è vuoto"
+# Only show disconnect when there's a mesh device, because mesh takes
+# priority over the normal wireless device.  NM doesn't have a "disconnect"
+# method for a device either (for various reasons) so this doesn't
+# have a good mapping
+#~ msgid "Disconnecting..."
+#~ msgstr "Disconnessione..."
 
-#: ../src/journal/listview.py:40
-msgid "No matching entries "
-msgstr "Non ci sono dati corrispondenti "
+# A complete translation in italian: "rete a maglie" becames a tautology
+#~ msgid "Mesh Network"
+#~ msgstr "Rete Mesh"
 
-#: ../src/journal/modalalert.py:59
-msgid "Your Journal is full"
-msgstr "Il tuo Diario è pieno"
+#~ msgid "Disconnected"
+#~ msgstr "Disconnesso"
 
-#: ../src/journal/modalalert.py:63
-msgid "Please delete some old Journal entries to make space for new ones."
-msgstr ""
-"Per favore cancella alcune registrazioni vecchie dal Diario per far spazio "
-"alle nuove."
+#~ msgid "About my XO"
+#~ msgstr "Informazioni sul mio XO"
 
-#: ../src/journal/modalalert.py:75
-msgid "Show Journal"
-msgstr "Apri il Diario"
+#~ msgid "Mesh"
+#~ msgstr "Mesh"
+
+#~ msgid "Connected to a School Mesh Portal"
+#~ msgstr "Connesso ad un Portale Mesh di scuola"
+
+#~ msgid "Looking for a School Mesh Portal..."
+#~ msgstr "Ricerca di un Portale Mesh di scuola..."
+
+#~ msgid "Connected to an XO Mesh Portal"
+#~ msgstr "Connesso ad un Portale Mesh XO"
+
+#~ msgid "Looking for an XO Mesh Portal..."
+#~ msgstr "Sto cercando un Portale Mesh XO..."
+
+# Diretto?
+#~ msgid "Connected to a Simple Mesh"
+#~ msgstr "Connesso ad un Mesh Semplice"
+
+# Diretto?
+#~ msgid "Starting a Simple Mesh"
+#~ msgstr "Attivazione Mesh Semplice"
+
+#~ msgid "Unknown Mesh"
+#~ msgstr "Mesh sconosciuto"
+
+#~ msgid "Settings"
+#~ msgstr "Configurazioni"
 
 #, python-format
 #~ msgid "Clipboard object: %s."