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

@@ -16,7 +16,7 @@ Name[eu]=Itxura eta Izaera
 Name[fi]=Ulkoasu ja tuntuma
 Name[fr]=Apparence
 Name[gl]=Aparencia e comportamento
-Name[he]=מראה והרגשה
+Name[he]=מראה ותחושה
 Name[hu]=Megjelenés
 Name[ia]=Semblantia
 Name[id]=Tampilan dan Rasa