Polish translation is broken in 20061112 snapshot
#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
msgid ""
msgstr ""
"Project-Id-Version: gajim 2\n"
"Report-Msgid-Bugs-To: \n"
\<\<\<\<\<\<\< .mine
"POT-Creation-Date: 2006-11-11 01:09+0100\n"
"PO-Revision-Date: 2006-10-17 11:03+0200\n"
=======
"POT-Creation-Date: 2006-11-11 08:53+0100\n"
"PO-Revision-Date: 2006-11-08 09:01+0100\n"
>>>>>>> .r7421