From owner-svn-src-head@FreeBSD.ORG Fri Mar 13 14:35:58 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 781671065677; Fri, 13 Mar 2009 14:35:58 +0000 (UTC) (envelope-from ru@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 65B3D8FC24; Fri, 13 Mar 2009 14:35:58 +0000 (UTC) (envelope-from ru@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2DEZwPU065476; Fri, 13 Mar 2009 14:35:58 GMT (envelope-from ru@svn.freebsd.org) Received: (from ru@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2DEZwek065475; Fri, 13 Mar 2009 14:35:58 GMT (envelope-from ru@svn.freebsd.org) Message-Id: <200903131435.n2DEZwek065475@svn.freebsd.org> From: Ruslan Ermilov Date: Fri, 13 Mar 2009 14:35:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189767 - head/share/misc X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2009 14:36:00 -0000 Author: ru Date: Fri Mar 13 14:35:58 2009 New Revision: 189767 URL: http://svn.freebsd.org/changeset/base/189767 Log: Switch to using official English short country names. Modified: head/share/misc/iso3166 Modified: head/share/misc/iso3166 ============================================================================== --- head/share/misc/iso3166 Fri Mar 13 10:52:22 2009 (r189766) +++ head/share/misc/iso3166 Fri Mar 13 14:35:58 2009 (r189767) @@ -13,7 +13,7 @@ # been deleted unless necessary to distinguish two countries. # # The ISO3166 Maintenance Agency can be found at: -# http://www.iso.ch/iso/en/prods-services/iso3166ma/index.html +# http://www.iso.org/iso/country_codes.htm # # two three number name AF AFG 004 Afghanistan @@ -43,7 +43,7 @@ BJ BEN 204 Benin BM BMU 060 Bermuda BT BTN 064 Bhutan BO BOL 068 Bolivia -BA BIH 070 Bosnia and Herzegowina +BA BIH 070 Bosnia and Herzegovina BW BWA 072 Botswana BV BVT 074 Bouvet Island BR BRA 076 Brazil @@ -65,8 +65,8 @@ CX CXR 162 Christmas Island CC CCK 166 Cocos (Keeling) Islands CO COL 170 Colombia KM COM 174 Comoros -CG COG 178 Congo (Rep.) -CD COD 180 Congo (Dem. Rep.) +CG COG 178 Congo +CD COD 180 Congo, the Democratic Republic of the CK COK 184 Cook Islands CR CRI 188 Costa Rica CI CIV 384 Cote d'Ivoire @@ -86,7 +86,7 @@ GQ GNQ 226 Equatorial Guinea ER ERI 232 Eritrea EE EST 233 Estonia ET ETH 231 Ethiopia -FK FLK 238 Falkland Islands +FK FLK 238 Falkland Islands (Malvinas) FO FRO 234 Faroe Islands FJ FJI 242 Fiji FI FIN 246 Finland @@ -111,14 +111,14 @@ GN GIN 324 Guinea GW GNB 624 Guinea-Bissau GY GUY 328 Guyana HT HTI 332 Haiti -HM HMD 334 Heard and McDonald Islands +HM HMD 334 Heard Island and McDonald Islands HN HND 340 Honduras HK HKG 344 Hong Kong HU HUN 348 Hungary IS ISL 352 Iceland IN IND 356 India ID IDN 360 Indonesia -IR IRN 364 Iran +IR IRN 364 Iran, Islamic Republic of IQ IRQ 368 Iraq IE IRL 372 Ireland IM IMN 833 Isle of Man @@ -131,8 +131,8 @@ JO JOR 400 Jordan KZ KAZ 398 Kazakhstan KE KEN 404 Kenya KI KIR 296 Kiribati -KP PRK 408 Korea (Democratic People's Republic of) -KR KOR 410 Korea (Republic of) +KP PRK 408 Korea, Democratic People's Republic of +KR KOR 410 Korea, Republic of KW KWT 414 Kuwait KG KGZ 417 Kyrgyzstan LA LAO 418 Lao People's Democratic Republic @@ -145,7 +145,7 @@ LI LIE 438 Liechtenstein LT LTU 440 Lithuania LU LUX 442 Luxembourg MO MAC 446 Macao -MK MKD 807 Macedonia (The Former Yugoslav Republic of) +MK MKD 807 Macedonia, the Former Yugoslav Republic of MG MDG 450 Madagascar MW MWI 454 Malawi MY MYS 458 Malaysia @@ -158,8 +158,8 @@ MR MRT 478 Mauritania MU MUS 480 Mauritius YT MYT 175 Mayotte MX MEX 484 Mexico -FM FSM 583 Micronesia (Federated States of) -MD MDA 498 Moldova +FM FSM 583 Micronesia, Federated States of +MD MDA 498 Moldova, Republic of MC MCO 492 Monaco MN MNG 496 Mongolia ME MNE 499 Montenegro @@ -184,9 +184,9 @@ NO NOR 578 Norway OM OMN 512 Oman PK PAK 586 Pakistan PW PLW 585 Palau -PS PSE 275 Occupied Palestinian Territory +PS PSE 275 Palestinian Territory, Occupied PA PAN 591 Panama -PG PNG 598 Papua-New Guinea +PG PNG 598 Papua New Guinea PY PRY 600 Paraguay PE PER 604 Peru PH PHL 608 Philippines @@ -202,7 +202,7 @@ RW RWA 646 Rwanda BL BLM 652 Saint Barthelemy KN KNA 659 Saint Kitts and Nevis LC LCA 662 Saint Lucia -MF MAF 663 Saint Martin (French part) +MF MAF 663 Saint Martin VC VCT 670 Saint Vincent and the Grenadines WS WSM 882 Samoa SM SMR 674 San Marino @@ -221,18 +221,18 @@ ZA ZAF 710 South Africa GS SGS 239 South Georgia and the South Sandwich Islands ES ESP 724 Spain LK LKA 144 Sri Lanka -SH SHN 654 St. Helena -PM SPM 666 St. Pierre and Miquelon +SH SHN 654 Saint Helena +PM SPM 666 Saint Pierre and Miquelon SD SDN 736 Sudan SR SUR 740 Suriname -SJ SJM 744 Svalbard and Jan Mayen Islands +SJ SJM 744 Svalbard and Jan Mayen SZ SWZ 748 Swaziland SE SWE 752 Sweden CH CHE 756 Switzerland SY SYR 760 Syrian Arab Republic -TW TWN 158 Taiwan +TW TWN 158 Taiwan, Province of China TJ TJK 762 Tajikistan -TZ TZA 834 Tanzania +TZ TZA 834 Tanzania, United Republic of TH THA 764 Thailand TG TGO 768 Togo TK TKL 772 Tokelau @@ -252,12 +252,12 @@ UM UMI 581 United States Minor Outlying UY URY 858 Uruguay UZ UZB 860 Uzbekistan VU VUT 548 Vanuatu -VA VAT 336 Vatican City State +VA VAT 336 Holy See (Vatican City State) VE VEN 862 Venezuela VN VNM 704 Viet Nam -VG VGB 092 Virgin Islands (British) -VI VIR 850 Virgin Islands (U.S.) -WF WLF 876 Wallis and Futuna Islands +VG VGB 092 Virgin Islands, British +VI VIR 850 Virgin Islands, U.S. +WF WLF 876 Wallis and Futuna EH ESH 732 Western Sahara YE YEM 887 Yemen ZM ZMB 894 Zambia