gettext fixes
meaningless change
fixed conflict