merge translations from master, update .pot