From ef3f1c38833e2fe8a2f21e78268a70904681b39b Mon Sep 17 00:00:00 2001 From: krasimir Date: Sat, 18 Sep 2010 17:29:02 +0000 Subject: [PATCH] few more fixes in CountriesAndRegionsEng.gf --- examples/SUMO/CountriesAndRegionsEng.gf | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/examples/SUMO/CountriesAndRegionsEng.gf b/examples/SUMO/CountriesAndRegionsEng.gf index bf1de8e7d..fe425291b 100644 --- a/examples/SUMO/CountriesAndRegionsEng.gf +++ b/examples/SUMO/CountriesAndRegionsEng.gf @@ -523,8 +523,7 @@ lin TegucigalpaHonduras = UsePN (mkPN "Tegucigalpa") ; TeheranIran = UsePN (mkPN "Teheran") ; TekoaWestBank = UsePN (mkPN "Tekoa") ; - TelAvivIsrael = UsePN (mkPN "Tel Aviv") ; - --TelAvivIsrael = UsePN (mkPN "Tel-Aviv") ; + TelAvivIsrael = UsePN (mkPN "Tel Aviv" | mkPN "Tel-Aviv") ; TelHaShomerJunctionIsrael = UsePN (mkPN "Tel HaShomer Junction") ; TelQateifaGazaStrip = UsePN (mkPN "Tel Qateifa") ; TelRumeiydaIsrael = UsePN (mkPN "Tel Rumeiyda") ; @@ -704,9 +703,7 @@ lin IsleOfMan = UsePN (mkPN "Isle of Man") ; Monaco = UsePN (mkPN "Monaco") ; Netherlands = UsePN (mkPN "Netherlands") ; - UnitedKingdom = UsePN (mkPN "United Kingdom of Great Britain and Northern Ireland") ; - --UnitedKingdom = UsePN (mkPN "United Kingdom") ; - --UnitedKingdom = UsePN (mkPN "Great Britain") ; + UnitedKingdom = UsePN (mkPN "United Kingdom of Great Britain and Northern Ireland" | mkPN "United Kingdom" | mkPN "Great Britain") ; Albania = UsePN (mkPN "Albania") ; BosniaAndHerzegovina = UsePN (mkPN "Bosnia and Herzegovina") ; Bulgaria = UsePN (mkPN "Bulgaria") ; @@ -780,8 +777,7 @@ lin NorthKorea = UsePN (mkPN "NorthKorea") ; SouthKorea = UsePN (mkPN "SouthKorea") ; Macau = UsePN (mkPN "Macau") ; - Taiwan = UsePN (mkPN "Taiwan") ; - --Taiwan = UsePN (mkPN "Republic of China") ; + Taiwan = UsePN (mkPN "Taiwan" | mkPN "Republic of China") ; Mongolia = UsePN (mkPN "Mongolia") ; Russia = UsePN (mkPN "Russia") ; Afghanistan = UsePN (mkPN "Afghanistan") ;