Using headerCode; changed yes/no to use local translations.
Merge remote-tracking branch 'origin/master'