Merged original files with updated version with gettext support