Switch to __field keys
Locale fixes
Partial updates on translation save