changed field translation
Show X_fields only when set
Merge branch 'rights' into develop