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/layouttemplate/plasma-packagestructure-layouttemplate.desktop

@@ -46,7 +46,7 @@ Name[sv]=Layoutmall
 Name[ta]=தளவமைப்பு வார்ப்புரு
 Name[tr]=Yerleşim Şablonu
 Name[uk]=Шаблон компонування
-Name[vi]=Mẫu bố cục
+Name[vi]=Bản mẫu bố cục
 Name[x-test]=xxLayout Templatexx
 Name[zh_CN]=布局模板
 Name[zh_TW]=佈局樣本