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"

src/kcms/effects/kwineffect.knsrc

@@ -4,6 +4,7 @@ Name[ar]=تأثيرات سطح المكتب
 Name[az]=İş masası effektləri
 Name[bs]=Efekti površi
 Name[ca]=Efectes d'escriptori
+Name[ca@valencia]=Efectes de l'escriptori
 Name[da]=Skrivebordseffekter
 Name[de]=Arbeitsflächen-Effekte
 Name[el]=Εφέ επιφάνειας εργασίας
@@ -22,14 +23,17 @@ Name[it]=Effetti del desktop
 Name[ka]=სამუშაო მაგიდის ეფექტები
 Name[ko]=데스크톱 효과
 Name[lt]=Darbalaukio efektai
+Name[nb]=Skrivebordseffekter
 Name[nds]=Schriefdischeffekten
 Name[nl]=Bureaubladeffecten
+Name[nn]=Skrivebords­effektar
 Name[pa]=ਡੈਸਕਟਾਪ ਪਰਭਾਵ
 Name[pl]=Efekty pulpitu
 Name[pt]=Efeitos do Ecrã
 Name[pt_BR]=Efeitos da área de trabalho
 Name[ro]=Efecte de birou
 Name[ru]=Эффекты
+Name[se]=Čállinbeavdeeffeavttat
 Name[sk]=Efekty plochy
 Name[sl]=Učinki namizja
 Name[sr]=Ефекти површи