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/kwinrules/kwinrules.desktop

@@ -35,7 +35,7 @@ Name[hi]=विंडो निय
 Name[hr]=Pravila prozora
 Name[hu]=Ablakszabályok
 Name[ia]=Regulas de fenestra
-Name[id]=Pengaturan Window
+Name[id]=Peraturan Window
 Name[is]=Gluggahegðunarreglur
 Name[it]=Regole delle finestre
 Name[ja]=ウィンドウルール
@@ -135,7 +135,7 @@ X-KDE-Keywords[ga]=méid,ionad,staid,oibriú na bhfuinneog,fuinneoga,sainiúil,r
 X-KDE-Keywords[gl]=tamaño,posición,estado,comportamento da xanela,xanelas,específico,regra
 X-KDE-Keywords[hu]=méret,elhelyezkedés,állapot,ablakműködés,ablakok,specifikus,kerülő megoldások,megjegyzés,szabályok
 X-KDE-Keywords[ia]=grandor,position,stato,comportamento de fenestra,fenestras,specific,workarounds,memora,regulas
-X-KDE-Keywords[id]=ukuran,posisi,kondisi,perilaku window,window,spesifik,sekeliling,ingat,aturan
+X-KDE-Keywords[id]=ukuran,posisi,kondisi,perilaku window,window,spesifik,sekeliling,ingat,peraturan
 X-KDE-Keywords[it]=dimensione,posizione,stato,comportamento della finestra,finestre,specifico,espedienti,ricorda,regole
 X-KDE-Keywords[kk]=size,position,state,window behavior,windows,specific,workarounds,remember,rules
 X-KDE-Keywords[km]=size,position,state,window behavior,windows,specific,workarounds,remember,rules