Fix translation issues

Fix #35 

@DeepDiver1975 @wakeup @PVince81