[DF-5048] fixed saving prototypes, localized strings
merge