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"

wallpapers/color/metadata.desktop

@@ -46,7 +46,7 @@ Name[sr@ijekavianlatin]=prosta boja
 Name[sr@latin]=prosta boja
 Name[sv]=Enkel färg
 Name[tr]=Düz Renk
-Name[uk]=Звичайні кольорові
+Name[uk]=Звичайний колір
 Name[x-test]=xxPlain Colorxx
 Name[zh_CN]=纯色
 Name[zh_TW]=普通顏色