SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

neochat.notifyrc

@@ -133,6 +133,7 @@ Name[fr]=Nouvelle invitation
 Name[ia]=Nove invitation
 Name[ko]=새 초대장
 Name[nl]=Nieuwe uitnodiging
+Name[pl]=Nowe zaproszenie
 Name[pt]=Novo Convite
 Name[pt_BR]=Novo convite
 Name[sl]=Novo povabilo
@@ -148,6 +149,7 @@ Comment[fr]=Il y a une nouvelle invitation dans un salon.
 Comment[ia]=Il ha un nove invitation a un sala
 Comment[ko]=새로운 대화방 초대장을 받음
 Comment[nl]=Er is een nieuwe uitnodiging naar een room
+Comment[pl]=Dostępna jest nowe zaproszenie do pokoju
 Comment[pt]=Existe um novo convite para uma sala
 Comment[pt_BR]=Existe um novo convite para uma sala
 Comment[sl]=Tam je novo povabilo v sobo