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"

org.kde.audiotube.desktop

@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=AudioTube
 Name[ar]=تيوب الصوتي
+Name[ast]=AudioTube
 Name[az]=AudioTube
 Name[ca]=AudioTube
 Name[ca@valencia]=AudioTube