gettext fixes
popup works
Merge branch 'hotfix/paymentupdate' into develop