countries: further abbreviations

diff --git a/tools/mkcountries-geonames b/tools/mkcountries-geonames
index 99201b840c76347f865292610272b446a7ff011c..4e8069757987d0e2999b3ec2a9a49e5df2286232 100755 (executable)
--- a/tools/mkcountries-geonames
+++ b/tools/mkcountries-geonames
@@ -57,7 +57,9 @@ for (values %cc) {
                s/ islands?\b//gi;
                s/\bthe //g;
                s/ and / & /g and s/(?<=.)[a-z ]+//g;
-               s/\bsaint /st /gi;
+               s/ of / /g;
+               s/\bsa?int /st /gi;
+               s/United /Un. /gi;
                s/South(?:ern)? /S-/g;
                s/North(?:ern)? /N-/g;
                s/New /n./g;