localization and improved error message
add retry on fail button
add make_admin button (and fix bug)
Merge pull request #689 from cloudedge/pull-req-master-17e9e52fd7146eaff3ce9d6bdb0771008f8e2e9f

https://github.com/crowbar/barclamp-crowbar/pull/689

Merged by devtool for VictorLowther