From fac98776b7032868976e03bd3c4f39135015842a Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Fri, 12 Apr 2013 17:29:29 +0000
Subject: [PATCH] Update Zenmap it.po translation.

By Giacomo.
http://seclists.org/nmap-dev/2013/q2/0

Recommitted after recovery from backup.
---
 CHANGELOG                        |  2 ++
 zenmap/share/zenmap/locale/it.po | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 806802ec1..4fc03d6f8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [Zenmap] Updated the Italian translation. [Giacomo]
+
 o Handle ICMP type 11 (Time Exceeded) responses to port scan probes.
   Ports will be reported as "filtered", to be consistent with existing
   Connect scan results, and will have a reason of time-exceeded.
diff --git a/zenmap/share/zenmap/locale/it.po b/zenmap/share/zenmap/locale/it.po
index a8cb75b7f..ba732a427 100644
--- a/zenmap/share/zenmap/locale/it.po
+++ b/zenmap/share/zenmap/locale/it.po
@@ -6,10 +6,9 @@ msgstr ""
 "Project-Id-Version: Zenmap\n"
 "Report-Msgid-Bugs-To: dev@nmap.org\n"
 "POT-Creation-Date: 2013-03-31 10:41-0700\n"
-"PO-Revision-Date: 2012-05-30 05:00+0100\n"
+"PO-Revision-Date: 2013-04-01 13:00+0100\n"
 "Last-Translator: Francesco Tombolini <tombo@adamantio.net>\n"
 "Language-Team: \n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -962,15 +961,19 @@ msgstr ""
 
 #: zenmapGUI/ScanInterface.py:583
 msgid "Cannot merge scan"
-msgstr ""
+msgstr "Impossibile incorporare scansione"
 
 #: zenmapGUI/ScanInterface.py:584
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "There was an error while merging the new scan's XML:\n"
 "\n"
 "%s"
 msgstr ""
+"Si è verificato un errore durante l'analisi del file XML generato dalla "
+"scansione:\n"
+"\n"
+"%s"
 
 #: zenmapGUI/ScanInterface.py:671
 #, python-format