[empathy] Updated Italian translation

[Milo Casagrande <miloc src gnome org>]

commit e2c78e7f0f11378774c4afe40fc796ccdbc32634
Author: Milo Casagrande <milo ubuntu com>
Date:   Fri Nov 6 21:35:17 2009 +0100

    Updated Italian translation

 po/it.po |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/po/it.po b/po/it.po
index 37218b4..d7b9ef5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,9 +9,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Empathy\n"
+<<<<<<< HEAD
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-10-09 21:53+0200\n"
 "PO-Revision-Date: 2009-10-09 21:52+0200\n"
+=======
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=empathy&component=general\n"
+"POT-Creation-Date: 2009-10-02 16:41+0000\n"
+"PO-Revision-Date: 2009-11-06 21:34+0100\n"
+>>>>>>> 94c7648... Updated Italian translation
 "Last-Translator: Milo Casagrande <milo ubuntu com>\n"
 "Language-Team: Italian <tp lists linux it>\n"
 "MIME-Version: 1.0\n"
@@ -1064,7 +1071,7 @@ msgstr "%s è stato bandito"
 #: ../libempathy-gtk/empathy-chat.c:1202
 #, c-format
 msgid "%s has left the room"
-msgstr "%s ha lasciato la stanza"
+msgstr "%s lascia la stanza"
 
 #. Note to translators: this string is appended to
 #. * notifications like "foo has left the room", with the message
@@ -1076,15 +1083,20 @@ msgstr "%s ha lasciato la stanza"
 msgid " (%s)"
 msgstr "(%s)"
 
-# (ndt) come renderla asessuale?
+# (ndt) per renderla "asessuale", come quella poco sopra... non è il massimo certo...
 #: ../libempathy-gtk/empathy-chat.c:1234
 #, c-format
 msgid "%s has joined the room"
-msgstr "%s è entrato nella stanza"
+msgstr "%s entra nella stanza"
 
+<<<<<<< HEAD
 #: ../libempathy-gtk/empathy-chat.c:1366 ../src/empathy-call-window.c:1295
+=======
+# (ndt) plurale per comprendere uomini e donne
+#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1295
+>>>>>>> 94c7648... Updated Italian translation
 msgid "Disconnected"
-msgstr "Disconnesso"
+msgstr "Disconnessi"
 
 #: ../libempathy-gtk/empathy-chat.c:1802
 msgid "Connected"