nvda

91c52da0 - incubates #6426

incubates #6426 Fixes issue #6333 Merge branch 'i6333_alignOkCancel' into next Conflicts: source/gui/guiHelper.py source/gui/settingsDialogs.py user_docs/en/userGuide.t2t