Index: includes/iso.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/iso.inc,v
retrieving revision 1.13
diff -r1.13 iso.inc
10c10
<  * Get an array of all country code => country name pairs.
---
>  * Returns an array of all country code => country name pairs.
12,14c12,17
<  * Get an array of all country code => country name pairs as laid out
<  * in ISO 3166-1 alpha-2.
<  * Grabbed from location project (http://drupal.org/project/location).
---
>  * Returns an array of all country code => country name pairs using country
>  * alpha2 codes and English short names as defined by the ISO 3166 standard.
>  *
>  * The original version of this function was derived from
>  * @link http://drupal.org/project/location the location project @endlink 
>  * 
16a20,21
>  *
>  * @see http://www.iso.org/iso/country_codes/iso_3166_code_lists.htm
34d38
<     'AN' => $t('Netherlands Antilles'),
42c46
<     'AX' => $t('Aland Islands'),
---
>     'AX' => $t('Åland Islands'),
55,56c59,61
<     'BN' => $t('Brunei'),
<     'BO' => $t('Bolivia'),
---
>     'BN' => $t('Brunei Darussalam'),
>     'BO' => $t('Bolivia, Plurinational State of'),
>     'BQ' => $t('Bonaire, Saint Eustatius and Saba'),
66c71
<     'CD' => $t('Congo (Kinshasa)'),
---
>     'CD' => $t('Congo, The Democratic Republic of the'),
68c73
<     'CG' => $t('Congo (Brazzaville)'),
---
>     'CG' => $t('Congo'),
70c75
<     'CI' => $t('Ivory Coast'),
---
>     'CI' => $t("Côte d'Ivoire"),
78a84
>     'CW' => $t('Curaçao'),
97,98c103,104
<     'FK' => $t('Falkland Islands'),
<     'FM' => $t('Micronesia'),
---
>     'FK' => $t('Falkland Islands (Malvinas)'),
>     'FM' => $t('Micronesia, Federated States of'),
120c126
<     'HK' => $t('Hong Kong S.A.R., China'),
---
>     'HK' => $t('Hong Kong'),
133c139
<     'IR' => $t('Iran'),
---
>     'IR' => $t('Iran, Islamic Republic of'),
146,147c152,153
<     'KP' => $t('North Korea'),
<     'KR' => $t('South Korea'),
---
>     'KP' => $t("Korea, Democratic People's Republic of"),
>     'KR' => $t('Korea, Republic of'),
151c157
<     'LA' => $t('Laos'),
---
>     'LA' => $t("Lao People's Democratic Republic"),
161c167
<     'LY' => $t('Libya'),
---
>     'LY' => $t('Libyan Arab Jamahiriya'),
164c170
<     'MD' => $t('Moldova'),
---
>     'MD' => $t('Moldova, Republic of'),
169c175
<     'MK' => $t('Macedonia'),
---
>     'MK' => $t('Macedonia, The Former Yugoslav Republic of'),
173c179
<     'MO' => $t('Macao S.A.R., China'),
---
>     'MO' => $t('Macao'),
208c214
<     'PS' => $t('Palestinian Territory'),
---
>     'PS' => $t('Palestinian Territory, Occupied'),
213c219
<     'RE' => $t('Reunion'),
---
>     'RE' => $t('Réunion'),
216c222
<     'RU' => $t('Russia'),
---
>     'RU' => $t('Russian Federation'),
224c230
<     'SH' => $t('Saint Helena'),
---
>     'SH' => $t('Saint Helena, Ascension and Tristan da Cunha'),
235c241,242
<     'SY' => $t('Syria'),
---
>     'SX' => $t('Sint Maarten (Dutch part)'),
>     'SY' => $t('Syrian Arab Republic'),
251,252c258,259
<     'TW' => $t('Taiwan'),
<     'TZ' => $t('Tanzania'),
---
>     'TW' => $t('Taiwan, Province of China'),
>     'TZ' => $t('Tanzania, United Republic of'),
259c266
<     'VA' => $t('Vatican'),
---
>     'VA' => $t('Holy See (Vatican City State)'),
261,264c268,271
<     'VE' => $t('Venezuela'),
<     'VG' => $t('British Virgin Islands'),
<     'VI' => $t('U.S. Virgin Islands'),
<     'VN' => $t('Vietnam'),
---
>     'VE' => $t('Venezuela, Bolivarian Republic of'),
>     'VG' => $t('Virgin Islands, British'),
>     'VI' => $t('Virgin Islands, U.S.'),
>     'VN' => $t('Viet Nam'),
287c294
<  * Some of the common languages with their English and native names
---
>  * Defines some common languages with their English and native names.
289c296,299
<  * Based on ISO 639 and http://people.w3.org/rishida/names/languages.html
---
>  * Based on ISO 639 and http://people.w3.org/rishida/names/languages.html.
>  *
>  * @return
>  *   An array containing language code => array(English name, native name).