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"
#: ../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
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"