Update i18n for key storage

Merge from trunk