Set placeholder text using localization
Merge remote-tracking branch 'upstream/master'