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[de]=Fensterverwaltungs-Effekte
 Name[el]=Εφέ διαχειριστή παραθύρων
 Name[en_GB]=Window Manager Effects
 Name[es]=Efectos del gestor de ventanas
+Name[fi]=Ikkunaohjelman tehosteet
 Name[ia]=Gerente de effectos de fenestra
 Name[it]=Effetti del gestore delle finestre
 Name[ko]=창 관리자 효과

kcmkwin/kwinscripts/kwinscripts.knsrc

@@ -8,6 +8,7 @@ Name[de]=Fensterverwaltungs-Skripte
 Name[el]=Σενάρια διαχειριστή παραθύρων
 Name[en_GB]=Window Manager Scripts
 Name[es]=Guiones del gestor de ventanas
+Name[fi]=Ikkunaohjelman skriptit
 Name[ia]=Gerente de scripts de fenestra 
 Name[it]=Script del gestore delle finestre
 Name[ko]=창 관리자 스크립트

kcmkwin/kwintabbox/kwinswitcher.knsrc

@@ -8,6 +8,7 @@ Name[de]=Wechsel-Layout für Fensterverwaltung
 Name[el]=Διατάξεις εναλλαγής διαχειριστή παραθύρων
 Name[en_GB]=Window Manager Switching Layouts
 Name[es]=Esquemas de cambio del gestor de ventanas
+Name[fi]=Ikkunaohjelman vaihdon asettelut
 Name[ia]=Disposition de commutator de gerente de fenestra
 Name[it]=Disposizione scambiafinestre del gestore delle finestre
 Name[ko]=창 관리자 전환기 레이아웃

plugins/kdecorations/aurorae/src/aurorae.knsrc

@@ -8,6 +8,7 @@ Name[de]=Aurorae-Fensterdekoration
 Name[el]=Διακοσμήσεις παραθύρου Aurorae
 Name[en_GB]=Aurorae Window Decorations
 Name[es]=Decoración de ventanas Aurorae
+Name[fi]=Aurorae-ikkunakoristeet
 Name[ia]=Decorationes de fenestra Aurorae
 Name[it]=Decorazioni delle finestre Aurorae
 Name[ko]=Aurorae 창 장식