Conflicts: source/resource/TextsWin1.rc (no real conflict) Source commit: b2ac0832a4da3e46f486fe08b48dfcb85b6bf2bb
Martin Prikryl