Merge remote-tracking branch 'upstream/master'
do not let users switch to gtk/text from qt
move language list to i18n.py
Merge remote-tracking branch 'upstream/master'