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"

shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop

@@ -19,6 +19,7 @@ Name[gl]=Aparencia e comportamento
 Name[he]=מראה ותחושה
 Name[hu]=Megjelenés
 Name[ia]=Semblantia
+Name[id]=Look and Feel
 Name[is]=Útlit og viðmót
 Name[it]=Aspetto
 Name[ja]=外観