diff options
| author | krasimir <krasimir@chalmers.se> | 2010-09-18 17:29:02 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2010-09-18 17:29:02 +0000 |
| commit | ef3f1c38833e2fe8a2f21e78268a70904681b39b (patch) | |
| tree | 2a7da245e83a3d5cc41e99324eafaf0f0ad4a541 | |
| parent | 21445f9feafc896995c598f5f390a9df39dd6f28 (diff) | |
few more fixes in CountriesAndRegionsEng.gf
| -rw-r--r-- | examples/SUMO/CountriesAndRegionsEng.gf | 10 |
1 files 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") ;
|