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"

ksmserver/screenlocker/kcm/screenlocker.desktop

@@ -89,6 +89,7 @@ X-KDE-Keywords[fi]=lock,resume, screensaver, screenlock, lukko, lukitseminen, he
 X-KDE-Keywords[gl]=bloquear,desbloquear,salvapantallas,bloqueo de pantalla
 X-KDE-Keywords[it]=blocca, riprendi, salvaschermo, blocco dello schermo
 X-KDE-Keywords[nl]=grendel,hervatten, schermbeveiliging, schermbeveiliging
+X-KDE-Keywords[pl]=blokada, wznowienie, wygaszacz ekranu, blokada ekranu
 X-KDE-Keywords[pt]=bloquear,retomar,protector de ecrã,bloqueio do ecrã
 X-KDE-Keywords[pt_BR]=bloquear,continuar,retornar,protetor de tela,bloqueio de tela
 X-KDE-Keywords[sk]=zamknúť,obnoviť,šetrič obrazovky,zamknutie obrazovky