Permalink
Browse files

Merge branch 'MDL-38112-23' of git://github.com/danpoltawski/moodle i…

…nto MOODLE_23_STABLE
  • Loading branch information...
2 parents f24fb2f + 1947345 commit a88b558c834e96ec654134897563d2716706573d @stronk7 stronk7 committed Apr 3, 2013
Showing with 11 additions and 7 deletions.
  1. +11 −7 lang/en/countries.php
View
@@ -52,7 +52,8 @@
$string['BL'] = 'Saint Barthélemy';
$string['BM'] = 'Bermuda';
$string['BN'] = 'Brunei Darussalam';
-$string['BO'] = 'Bolivia';
+$string['BO'] = 'Bolivia, Plurinational State Of';
+$string['BQ'] = 'Bonaire, Sint Eustatius And Saba';
$string['BR'] = 'Brazil';
$string['BS'] = 'Bahamas';
$string['BT'] = 'Bhutan';
@@ -65,6 +66,7 @@
$string['CD'] = 'Congo, The Democratic Republic Of The';
$string['CF'] = 'Central African Republic';
$string['CG'] = 'Congo';
+$string['CH'] = 'Switzerland';
$string['CI'] = 'Côte D\'Ivoire';
$string['CK'] = 'Cook Islands';
$string['CL'] = 'Chile';
@@ -74,6 +76,7 @@
$string['CR'] = 'Costa Rica';
$string['CU'] = 'Cuba';
$string['CV'] = 'Cape Verde';
+$string['CW'] = 'Curaçao';
$string['CX'] = 'Christmas Island';
$string['CY'] = 'Cyprus';
$string['CZ'] = 'Czech Republic';
@@ -121,7 +124,6 @@
$string['HR'] = 'Croatia';
$string['HT'] = 'Haiti';
$string['HU'] = 'Hungary';
-$string['CH'] = 'Switzerland';
$string['ID'] = 'Indonesia';
$string['IE'] = 'Ireland';
$string['IL'] = 'Israel';
@@ -157,12 +159,12 @@
$string['LT'] = 'Lithuania';
$string['LU'] = 'Luxembourg';
$string['LV'] = 'Latvia';
-$string['LY'] = 'State of Libya';
+$string['LY'] = 'Libya';
$string['MA'] = 'Morocco';
$string['MC'] = 'Monaco';
$string['MD'] = 'Moldova, Republic Of';
$string['ME'] = 'Montenegro';
-$string['MF'] = 'Saint Martin';
+$string['MF'] = 'Saint Martin (French Part)';
$string['MG'] = 'Madagascar';
$string['MH'] = 'Marshall Islands';
$string['MK'] = 'Macedonia, The Former Yugoslav Republic Of';
@@ -204,7 +206,7 @@
$string['PM'] = 'Saint Pierre And Miquelon';
$string['PN'] = 'Pitcairn';
$string['PR'] = 'Puerto Rico';
-$string['PS'] = 'Palestinian Territory, Occupied';
+$string['PS'] = 'Palestine, State Of';
$string['PT'] = 'Portugal';
$string['PW'] = 'Palau';
$string['PY'] = 'Paraguay';
@@ -220,7 +222,7 @@
$string['SD'] = 'Sudan';
$string['SE'] = 'Sweden';
$string['SG'] = 'Singapore';
-$string['SH'] = 'Saint Helena';
+$string['SH'] = 'Saint Helena, Ascension And Tristan Da Cunha';
$string['SI'] = 'Slovenia';
$string['SJ'] = 'Svalbard And Jan Mayen';
$string['SK'] = 'Slovakia';
@@ -229,8 +231,10 @@
$string['SN'] = 'Senegal';
$string['SO'] = 'Somalia';
$string['SR'] = 'Suriname';
+$string['SS'] = 'South Sudan';
$string['ST'] = 'Sao Tome And Principe';
$string['SV'] = 'El Salvador';
+$string['SX'] = 'Sint Maarten (Dutch Part)';
$string['SY'] = 'Syrian Arab Republic';
$string['SZ'] = 'Swaziland';
$string['TC'] = 'Turks And Caicos Islands';
@@ -257,7 +261,7 @@
$string['UZ'] = 'Uzbekistan';
$string['VA'] = 'Holy See (Vatican City State)';
$string['VC'] = 'Saint Vincent And The Grenadines';
-$string['VE'] = 'Venezuela';
+$string['VE'] = 'Venezuela, Bolivarian Republic Of';
$string['VG'] = 'Virgin Islands, British';
$string['VI'] = 'Virgin Islands, U.S.';
$string['VN'] = 'Viet Nam';

0 comments on commit a88b558

Please sign in to comment.