translation merge and Finnish added