Fixing I18N issues caused by editing on-line