From 96c68a3f5ccc6ee920915f8148e40047dde5888d Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Tue, 15 Sep 2015 16:36:44 -0700 Subject: [PATCH] Backed out changeset cb711870d2b8 (bug 1203171) for browser_InlineSpellChecker.js failures --- .../chrome/global/regionNames.properties | 82 +++++++------------ 1 file changed, 28 insertions(+), 54 deletions(-) diff --git a/toolkit/locales/en-US/chrome/global/regionNames.properties b/toolkit/locales/en-US/chrome/global/regionNames.properties index 29287a65f84..11a6a79e4be 100644 --- a/toolkit/locales/en-US/chrome/global/regionNames.properties +++ b/toolkit/locales/en-US/chrome/global/regionNames.properties @@ -3,12 +3,13 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. ad = Andorra -ae = United Arab Emirates +ae = U.A.E. af = Afghanistan ag = Antigua and Barbuda ai = Anguilla al = Albania am = Armenia +an = Netherlands Antilles ao = Angola aq = Antarctica ar = Argentina @@ -16,6 +17,7 @@ as = American Samoa at = Austria au = Australia aw = Aruba +ax = \u00c5land Islands az = Azerbaijan ba = Bosnia and Herzegovina bb = Barbados @@ -26,13 +28,12 @@ bg = Bulgaria bh = Bahrain bi = Burundi bj = Benin -bl = Saint Barthelemy +bl = Saint Barth\u00e9lemy bm = Bermuda -bn = Brunei +bn = Brunei Darussalam bo = Bolivia -bq = Bonaire, Sint Eustatius, and Saba br = Brazil -bs = Bahamas, The +bs = Bahamas bt = Bhutan bv = Bouvet Island bw = Botswana @@ -40,26 +41,23 @@ by = Belarus bz = Belize ca = Canada cc = Cocos (Keeling) Islands -cd = Congo (Kinshasa) +cd = Congo-Kinshasa cf = Central African Republic -cg = Congo (Brazzaville) +cg = Congo-Brazzaville ch = Switzerland -ci = Côte d’Ivoire +ci = Ivory Coast ck = Cook Islands cl = Chile cm = Cameroon cn = China co = Colombia -cp = Clipperton Island cr = Costa Rica cu = Cuba -cv = Cabo Verde -cw = Curaçao +cv = Cape Verde cx = Christmas Island cy = Cyprus cz = Czech Republic de = Germany -dg = Diego Garcia dj = Djibouti dk = Denmark dm = Dominica @@ -74,8 +72,8 @@ es = Spain et = Ethiopia fi = Finland fj = Fiji -fk = Falkland Islands (Islas Malvinas) -fm = Micronesia, Federated States of +fk = Falkland Islands (Malvinas) +fm = Micronesia fo = Faroe Islands fr = France ga = Gabon @@ -87,12 +85,12 @@ gg = Guernsey gh = Ghana gi = Gibraltar gl = Greenland -gm = Gambia, The +gm = Gambia gn = Guinea gp = Guadeloupe gq = Equatorial Guinea gr = Greece -gs = South Georgia and South Sandwich Islands +gs = South Georgia and the South Sandwich Islands gt = Guatemala gu = Guam gw = Guinea-Bissau @@ -123,8 +121,8 @@ kh = Cambodia ki = Kiribati km = Comoros kn = Saint Kitts and Nevis -kp = Korea, North -kr = Korea, South +kp = North Korea +kr = South Korea kw = Kuwait ky = Cayman Islands kz = Kazakhstan @@ -146,11 +144,11 @@ me = Montenegro mf = Saint Martin mg = Madagascar mh = Marshall Islands -mk = Macedonia +mk = Macedonia, F.Y.R. of ml = Mali -mm = Burma +mm = Myanmar mn = Mongolia -mo = Macau +mo = Macao mp = Northern Mariana Islands mq = Martinique mr = Mauritania @@ -183,22 +181,17 @@ ph = Philippines pk = Pakistan pl = Poland pm = Saint Pierre and Miquelon -pn = Pitcairn Islands +pn = Pitcairn pr = Puerto Rico +ps = Occupied Palestinian Territory pt = Portugal pw = Palau py = Paraguay qa = Qatar -qm = Midway Islands -qs = Bassas da India -qu = Juan de Nova Island -qw = Wake Island -qx = Glorioso Islands -qz = Akrotiri re = Reunion ro = Romania rs = Serbia -ru = Russia +ru = Russian Federation rw = Rwanda sa = Saudi Arabia sb = Solomon Islands @@ -206,23 +199,22 @@ sc = Seychelles sd = Sudan se = Sweden sg = Singapore -sh = Saint Helena, Ascension, and Tristan da Cunha +sh = Saint Helena si = Slovenia +sj = Svalbard and Jan Mayen sk = Slovakia sl = Sierra Leone sm = San Marino sn = Senegal so = Somalia sr = Suriname -ss = South Sudan st = Sao Tome and Principe sv = El Salvador -sx = Sint Maarten sy = Syria sz = Swaziland tc = Turks and Caicos Islands td = Chad -tf = French Southern and Antarctic Lands +tf = French Southern Territories tg = Togo th = Thailand tj = Tajikistan @@ -238,37 +230,19 @@ tw = Taiwan tz = Tanzania ua = Ukraine ug = Uganda +um = United States Minor Outlying Islands us = United States uy = Uruguay uz = Uzbekistan va = Vatican City vc = Saint Vincent and the Grenadines ve = Venezuela -vg = Virgin Islands, British -vi = Virgin Islands, U.S. +vg = British Virgin Islands +vi = U.S. Virgin Islands vn = Vietnam vu = Vanuatu wf = Wallis and Futuna ws = Samoa -xa = Ashmore and Cartier Islands -xb = Baker Island -xc = Coral Sea Islands -xd = Dhekelia -xe = Europa Island -xg = Gaza Strip -xh = Howland Island -xj = Jan Mayen -xk = Kosovo -xl = Palmyra Atoll -xm = Kingman Reef -xp = Paracel Islands -xq = Jarvis Island -xr = Svalbard -xs = Spratly Islands -xt = Tromelin Island -xu = Johnston Atoll -xv = Navassa Island -xw = West Bank ye = Yemen yt = Mayotte za = South Africa