BK-883 Some of the dialogs do not use specific names for buttons
Merge remote-tracking branch 'sf_booktype/2.0' into bojo