update the Polish translation
fix a merge conflict

Conflicts:
	langs/pl.h
Merge branch 'translation-pl' of https://github.com/tsudoko/uTox

#
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.