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"

applets/activitybar/metadata.json

@@ -96,7 +96,7 @@
         "Name[ast]": "Barra d'actividaes",
         "Name[az]": "İş otağı paneli",
         "Name[be@latin]": "Panel zaniatkaŭ",
-        "Name[bg]": "Лента за активност",
+        "Name[bg]": "Лента на дейности",
         "Name[bs]": "Traka aktivnosti",
         "Name[ca@valencia]": "Barra d'activitat",
         "Name[ca]": "Barra d'activitat",