diff options
author | Milo Casagrande <milo@ubuntu.com> | 2009-11-07 04:35:17 +0800 |
---|---|---|
committer | Milo Casagrande <milo@ubuntu.com> | 2009-11-07 04:42:56 +0800 |
commit | 72bf0c495eae881203eaa15ce839a77ce9034968 (patch) | |
tree | b790f6b9e65c9c2bcaa95ada9498c7c0f8eb12ec | |
parent | e2c78e7f0f11378774c4afe40fc796ccdbc32634 (diff) | |
download | gsoc2013-empathy-72bf0c495eae881203eaa15ce839a77ce9034968.tar gsoc2013-empathy-72bf0c495eae881203eaa15ce839a77ce9034968.tar.gz gsoc2013-empathy-72bf0c495eae881203eaa15ce839a77ce9034968.tar.bz2 gsoc2013-empathy-72bf0c495eae881203eaa15ce839a77ce9034968.tar.lz gsoc2013-empathy-72bf0c495eae881203eaa15ce839a77ce9034968.tar.xz gsoc2013-empathy-72bf0c495eae881203eaa15ce839a77ce9034968.tar.zst gsoc2013-empathy-72bf0c495eae881203eaa15ce839a77ce9034968.zip |
Updated Italian translation
-rw-r--r-- | po/it.po | 10 |
1 files changed, 0 insertions, 10 deletions
@@ -9,16 +9,10 @@ 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" @@ -1089,12 +1083,8 @@ msgstr "(%s)" msgid "%s has joined the room" 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 "Disconnessi" |