tagged strings for i18n
Merge remote-tracking branch 'origin/master' into tagged-strings