luigi1111 ping for merges

ErCiccione (temporary) there where merge conflicts with a localisation PR so ive combined commits inside 2074 - no conflicts after that i think

ok, I will take a look at open PRs tomorrow or wednesday

thanks!

it was a tiny 1~ line conflict, but annoying, nothing has changed really

2104 could use a looking at (pulls in new ru translations)