Merge "(bug 40251) Added more languages to plural override"