Fixed Order edition translation and improved payment translation