Make the version of gettext be more flexible
Add marks for inserting glclient custom build styles