Merge "[Panlingual] Make error message generic." into tm-dev