Merge remote-tracking branch 'origin/master' into master

zengh

2020-11-13 8274f20d8093486dc3d54e074d25b6e412f4e4c7

1
2
//>>built
define({setButtonText:"\u062a\u062d\u062f\u064a\u062f",cancelButtonText:"\u0627\u0644\u063a\u0627\u0621"});