beautify some stuff, change locale file to Chrome-i18n format
Merge remote-tracking branch 'cade/adapters' into plain-jane