Merge "Fix the ISO-8859-7 aliases in convrtrs.txt."