Improve translation and fix another problems

Improve translation and fix another problems which cause weird dialogs