revert back to plain # and b in CPP files

but also make these strings translatable