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"

krfb/org.kde.krfb.desktop

@@ -8,6 +8,7 @@ X-DocPath=krfb/index.html
 Terminal=false
 Name=Krfb
 Name[ar]=كرفب
+Name[ast]=Krfb
 Name[bg]=Krfb
 Name[bn]=কে-আর-এফ-বি
 Name[br]=Krfb