Fix typo in en.xml
Fix typo in AbstractDatabaseObjectAction
Merge branch '2.0'