revert to short names for china/taiwan flag icons (bug 1041520)

remove fr.png from this PR

taking locale flags out of region folder

re-add the removed line that I shouldn't have added by now confuses git into deleting
Merge pull request #531 from dethe/duplicate_flags

revert to short names for china/taiwan flag icons (bug 1041520)