fix #90 merge locale fixes from rearrange-gui