complete commit 30b641d17007d67f1922ab9035740d40488f43b7 with corrections for other languages