Removed ##TODO## + translated two more strings