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"

kcmkwin/kwincompositing/kwineffect.knsrc

@@ -8,6 +8,7 @@ Name[es]=Efectos del gestor de ventanas
 Name[ia]=Gerente de effectos de fenestra
 Name[it]=Effetti del gestore delle finestre
 Name[nl]=Effecten van vensterbeheerder
+Name[nn]=Effektar for vindaugshandsamar
 Name[pl]=Efekty zarządzania oknami
 Name[pt]=Efeitos do Gestor de Janelas
 Name[sk]=Efekty správcu okien

kcmkwin/kwinscripts/kwinscripts.knsrc

@@ -8,6 +8,7 @@ Name[es]=Guiones del gestor de ventanas
 Name[ia]=Gerente de scripts de fenestra 
 Name[it]=Script del gestore delle finestre
 Name[nl]=Scripts van vensterbeheerder
+Name[nn]=Skript for vindaugshandsamar
 Name[pl]=Skrypty zarządzania oknami
 Name[pt]=Programas do Gestor de Janelas
 Name[sk]=Skripty správcu okien