bugfix and translations