--- location.uk.inc	2008-03-08 18:55:18.000000000 +0000
+++ location.uk.inc	2010-03-30 08:22:09.000000000 +0100
@@ -4,238 +4,130 @@
 // Great Britain
 
 function location_province_list_uk() {
-  return array('GSY' => "Guernsey",
-    'JSY' => "Jersey",
-    'BDG' => "Barking and Dagenham",
-    'BNE' => "Barnet",
-    'BNS' => "Barnsley",
-    'BAS' => "Bath and North East Somerset",
-    'BDF' => "Bedfordshire",
-    'BEX' => "Bexley",
-    'BIR' => "Birmingham",
-    'BBD' => "Blackburn with Darwen",
-    'BPL' => "Blackpool",
-    'BOL' => "Bolton",
-    'BMH' => "Bournemouth",
-    'BRC' => "Bracknell Forest",
-    'BRD' => "Bradford",
-    'BEN' => "Brent",
-    'BNH' => "Brighton and Hove",
-    'BST' => "Bristol City of",
-    'BRY' => "Bromley",
-    'BKM' => "Buckinghamshire",
-    'BUR' => "Bury",
-    'CLD' => "Calderdale",
-    'CAM' => "Cambridgeshire",
-    'CMD' => "Camden",
-    'CHS' => "Cheshire",
-    'CON' => "Cornwall",
-    'COV' => "Coventry (West Midlands district)",
-    'CRY' => "Croydon",
-    'CMA' => "Cumbria",
-    'DAL' => "Darlington",
-    'DER' => "Derby",
-    'DBY' => "Derbyshire",
-    'DEV' => "Devon",
-    'DNC' => "Doncaster",
-    'DOR' => "Dorset",
-    'DUD' => "Dudley (West Midlands district)",
-    'DUR' => "Durham",
-    'EAL' => "Ealing",
-    'ERY' => "East Riding of Yorkshire",
-    'ESX' => "East Sussex",
-    'ENF' => "Enfield",
-    'ESS' => "Essex",
-    'GAT' => "Gateshead (Tyne & Wear district)",
-    'GLS' => "Gloucestershire",
-    'GRE' => "Greenwich",
-    'HCK' => "Hackney",
-    'HAL' => "Halton",
-    'HMF' => "Hammersmith and Fulham",
-    'HAM' => "Hampshire",
-    'HRY' => "Haringey",
-    'HRW' => "Harrow",
-    'HPL' => "Hartlepool",
-    'HAV' => "Havering",
-    'HEF' => "Herefordshire County of",
-    'HRT' => "Hertfordshire",
-    'HIL' => "Hillingdon",
-    'HNS' => "Hounslow",
-    'IOW' => "Isle of Wight",
-    'IOS' => "Isles of Scilly",
-    'ISL' => "Islington",
-    'KEC' => "Kensington and Chelsea",
-    'KEN' => "Kent",
-    'KHL' => "Kingston upon Hull City of",
-    'KTT' => "Kingston upon Thames",
-    'KIR' => "Kirklees",
-    'KWL' => "Knowsley",
-    'LBH' => "Lambeth",
-    'LAN' => "Lancashire",
-    'LDS' => "Leeds",
-    'LCE' => "Leicester",
-    'LEC' => "Leicestershire",
-    'LEW' => "Lewisham",
-    'LIN' => "Lincolnshire",
-    'LIV' => "Liverpool",
-    'LND' => "London City of",
-    'LUT' => "Luton",
-    'MAN' => "Manchester",
-    'MDW' => "Medway",
-    'MRT' => "Merton",
-    'MDB' => "Middlesbrough",
-    'MIK' => "Milton Keynes",
-    'NET' => "Newcastle upon Tyne",
-    'NWM' => "Newham",
-    'NFK' => "Norfolk",
-    'NEL' => "North East Lincolnshire",
-    'NLN' => "North Lincolnshire",
-    'NSM' => "North Somerset",
-    'NTY' => "North Tyneside",
-    'NYK' => "North Yorkshire",
-    'NTH' => "Northamptonshire",
-    'NBL' => "Northumberland",
-    'NGM' => "Nottingham",
-    'NTT' => "Nottinghamshire",
-    'OLD' => "Oldham",
-    'OXF' => "Oxfordshire",
-    'PTE' => "Peterborough",
-    'PLY' => "Plymouth",
-    'POL' => "Poole",
-    'POR' => "Portsmouth",
-    'RDG' => "Reading",
-    'RDB' => "Redbridge",
-    'RCC' => "Redcar and Cleveland",
-    'RIC' => "Richmond upon Thames",
-    'RCH' => "Rochdale",
-    'ROT' => "Rotherham",
-    'RUT' => "Rutland",
-    'SHN' => "St Helens",
-    'SLF' => "Salford",
-    'SAW' => "Sandwell",
-    'SFT' => "Sefton",
-    'SHF' => "Sheffield",
-    'SHR' => "Shropshire",
-    'SLG' => "Slough",
-    'SOL' => "Solihull",
-    'SOM' => "Somerset",
-    'SGC' => "South Gloucestershire",
-    'STY' => "South Tyneside",
-    'STH' => "Southampton",
-    'SOS' => "Southend-on-Sea",
-    'SWK' => "Southwark",
-    'STS' => "Staffordshire",
-    'SKP' => "Stockport",
-    'STT' => "Stockton-on-Tees",
-    'STE' => "Stoke-on-Trent",
-    'SFK' => "Suffolk",
-    'SND' => "Sunderland",
-    'SRY' => "Surrey",
-    'STN' => "Sutton",
-    'SWD' => "Swindon",
-    'TAM' => "Tameside",
-    'TFW' => "Telford and Wrekin",
-    'THR' => "Thurrock",
-    'TOB' => "Torbay",
-    'TWH' => "Tower Hamlets",
-    'TRF' => "Trafford",
-    'WKF' => "Wakefield",
-    'WLL' => "Walsall",
-    'WFT' => "Waltham Forest",
-    'WND' => "Wandsworth",
-    'WRT' => "Warrington",
-    'WAR' => "Warwickshire",
-    'WBK' => "West Berkshire",
-    'WSX' => "West Sussex",
-    'WSM' => "Westminster",
-    'WGN' => "Wigan",
-    'WIL' => "Wiltshire",
-    'WNM' => "Windsor and Maidenhead",
-    'WRL' => "Wirral",
-    'WOK' => "Wokingham",
-    'WLV' => "Wolverhampton",
-    'WOR' => "Worcestershire",
-    'YOR' => "York",
-    'ANT' => "Antrim",
-    'ARD' => "Ards",
-    'ARM' => "Armagh",
-    'BLA' => "Ballymena",
-    'BLY' => "Ballymoney",
-    'BNB' => "Banbridge",
-    'BFS' => "Belfast",
-    'CKF' => "Carrickfergus",
-    'CSR' => "Castlereagh",
-    'CLR' => "Coleraine",
-    'CKT' => "Cookstown",
-    'CGV' => "Craigavon",
-    'DRY' => "Derry",
-    'DOW' => "Down",
-    'DGN' => "Dungannon and South Tyrone",
-    'FER' => "Fermanagh",
-    'LRN' => "Larne",
-    'LMV' => "Limavady",
-    'LSB' => "Lisburn",
-    'MFT' => "Magherafelt",
-    'MYL' => "Moyle",
-    'NYM' => "Newry and Mourne",
-    'NTA' => "Newtownabbey",
-    'NDN' => "North Down",
-    'OMH' => "Omagh",
-    'STB' => "Strabane",
-    'ABE' => "Aberdeen",
-    'ABD' => "Aberdeenshire",
-    'ANS' => "Angus",
-    'AGB' => "Argyll and Bute",
-    'CLK' => "Clackmannanshire",
-    'DGY' => "Dumfries and Galloway",
-    'DND' => "Dundee",
-    'EAY' => "East Ayrshire",
-    'EDU' => "East Dunbartonshire",
-    'ELN' => "East Lothian",
-    'ERW' => "East Renfrewshire",
-    'EDH' => "Edinburgh",
-    'ELS' => "Eilean Siar",
-    'FAL' => "Falkirk",
-    'FIF' => "Fife",
-    'GLG' => "Glasgow",
-    'HLD' => "Highland",
-    'IVC' => "Inverclyde",
-    'NAY' => "North Ayrshire",
-    'NLK' => "North Lanarkshire",
-    'ORK' => "Orkney Islands",
-    'PKN' => "Perth and Kinross",
-    'MLN' => "Midlothian",
-    'MRY' => "Moray",
-    'RFW' => "Renfrewshire",
-    'SCB' => "Scottish Borders The",
-    'ZET' => "Shetland Islands",
-    'SAY' => "South Ayrshire",
-    'SLK' => "South Lanarkshire",
-    'STG' => "Stirling",
-    'WDU' => "West Dunbartonshire",
-    'WLN' => "West Lothian",
-    'BGW' => "Blaenau Gwent",
-    'BGE' => "Bridgend",
-    'CAY' => "Caerphilly",
-    'CRF' => "Cardiff",
-    'CMN' => "Carmarthenshire",
-    'CGN' => "Ceredigion",
-    'CWY' => "Conwy",
-    'DEN' => "Denbighshire",
-    'FLN' => "Flintshire",
-    'GWN' => "Gwynedd",
-    'AGY' => "Isle of Anglesey",
-    'MTY' => "Merthyr Tydfil",
-    'MON' => "Monmouthshire",
-    'NTL' => "Neath Port Talbot",
-    'NWP' => "Newport",
-    'PEM' => "Pembrokeshire",
-    'POW' => "Powys",
-    'RCT' => "Rhondda Cynon Taf",
-    'SWA' => "Swansea",
-    'TOF' => "Torfaen",
-    'VGL' => "Vale of Glamorgan",
-    'WRX' => "Wrexham");
+  return array(
+    'ABD' => 'Aberdeenshire',
+    'AGB' => 'Argyll and Bute',
+    'AGY' => 'Anglesey (Isle of)',
+    'ALD' => 'Alderney',
+    'ANS' => 'Angus',
+    'ANT' => 'County Antrim',
+    'ARM' => 'County Armagh',
+    'AYR' => 'Ayrshire',
+    'BAN' => 'Banffshire',
+    'BDF' => 'Bedfordshire',
+    'BRK' => 'Berkshire',
+    'BEW' => 'Berwickshire',
+    'BGW' => 'Blaenau Gwent',
+    'BOR' => 'Borders',
+    'BGE' => 'Bridgend',
+    'BST' => 'Bristol',
+    'BKM' => 'Buckinghamshire',
+    'CAY' => 'Caerphilly',
+    'CAI' => 'Caithness',
+    'CAM' => 'Cambridgeshire',
+    'CRF' => 'Cardiff',
+    'CMN' => 'Carmarthenshire',
+    'CEN' => 'Central Scotland',
+    'CGN' => 'Ceredigion',
+    'CHI' => 'Channel Islands',
+    'CHS' => 'Cheshire',
+    'CLK' => 'Clackmannanshire',
+    'CWD' => 'Clwyd',
+    'CWY' => 'Conwy',
+    'CON' => 'Cornwall',
+    'DOW' => 'County Down',
+    'DUR' => 'County Durham',
+    'CMA' => 'Cumbria',
+    'DEN' => 'Denbighshire',
+    'DER' => 'Derbyshire',
+    'DEV' => 'Devon',
+    'DOR' => 'Dorset',
+    'DGY' => 'Dumfries & Galloway',
+    'DNB' => 'Dunbartonshire',
+    'DYD' => 'Dyfed',
+    'ELN' => 'East Lothian',
+    'ERY' => 'East Riding of Yorkshire',
+    'ESX' => 'East Sussex',
+    'ESS' => 'Essex',
+    'FER' => 'Fermanagh',
+    'FIF' => 'Fife',
+    'FLN' => 'Flintshire',
+    'GLA' => 'Glamorgan',
+    'GLS' => 'Gloucestershire',
+    'GMP' => 'Grampian',
+    'GTM' => 'Manchester (Greater)',
+    'GNT' => 'Gwent',
+    'GWN' => 'Gwynedd',
+    'HAM' => 'Hampshire',
+    'HEF' => 'Herefordshire',
+    'HRT' => 'Hertfordshire',
+    'HLD' => 'Highlands',
+    'INV' => 'Inverness-shire',
+    'IOM' => 'Isle of Man',
+    'IOW' => 'Isle of Wight',
+    'KEN' => 'Kent',
+    'KCD' => 'Kincardineshire',
+    'KRS' => 'Kinross-shire',
+    'KKD' => 'Kirkcudbrightshire',
+    'LKS' => 'Lanarkshire',
+    'LAN' => 'Lancashire',
+    'LEI' => 'Leicestershire',
+    'LIN' => 'Lincolnshire',
+    'LND' => 'London',
+    'LDY' => 'Londonderry',
+    'MSY' => 'Merseyside',
+    'MTY' => 'Merthyr Tydfil',
+    'MDX' => 'Middlesex',
+    'MLN' => 'Midlothian',
+    'MON' => 'Monmouthshire',
+    'MOR' => 'Moray',
+    'NAI' => 'Nairnshire',
+    'NTL' => 'Neath Port Talbot',
+    'NWP' => 'Newport',
+    'NFK' => 'Norfolk',
+    'NYK' => 'North Yorkshire',
+    'NTH' => 'Northamptonshire',
+    'NBL' => 'Northumberland',
+    'NTT' => 'Nottinghamshire',
+    'OKI' => 'Orkney',
+    'OXF' => 'Oxfordshire',
+    'PEE' => 'Peeblesshire',
+    'PEM' => 'Pembrokeshire',
+    'PER' => 'Perthshire',
+    'POW' => 'Powys',
+    'RFW' => 'Renfrewshire',
+    'RCT' => 'Rhondda Cynon Taff',
+    'ROC' => 'Ross and Cromarty',
+    'ROX' => 'Roxburghshire',
+    'SEL' => 'Selkirkshire',
+    'SHI' => 'Shetland',
+    'SHR' => 'Shropshire',
+    'SOM' => 'Somerset',
+    'SYK' => 'South Yorkshire',
+    'STS' => 'Staffordshire',
+    'STI' => 'Stirlingshire',
+    'STD' => 'Strathclyde',
+    'SFK' => 'Suffolk',
+    'SRY' => 'Surrey',
+    'SUT' => 'Sutherland',
+    'SWA' => 'Swansea',
+    'SXW' => 'West Sussex',
+    'TAY' => 'Tayside',
+    'TOF' => 'Torfaen',
+    'TWR' => 'Tyne & Wear',
+    'TYR' => 'County Tyrone',
+    'WAR' => 'Warwickshire',
+    'WLN' => 'West Lothian',
+    'WMD' => 'West Midlands',
+    'WYK' => 'West Yorkshire',
+    'WIS' => 'Western Isles',
+    'WIG' => 'Wigtownshire',
+    'WIL' => 'Wiltshire',
+    'WOR' => 'Worcestershire',
+    'WRX' => 'Wrexham',
+		);
 }
 
 function location_map_link_uk_providers() {