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"

menu/desktop/kf5-games-kids.directory

@@ -11,7 +11,7 @@ Name[bn]=বাচ্চাদের খেলা
 Name[bn_IN]=ছোটদের খেলা
 Name[br]=C'hoarioù evit ar Bugale
 Name[bs]=Igre za djecu
-Name[ca]=Jocs per a nens
+Name[ca]=Jocs per a infants
 Name[ca@valencia]=Jocs per a nens
 Name[cs]=Hry pro děti
 Name[csb]=Grë dlô dzecë