Merge "Improve translation for bs namespaces"