diff -r 81911f748777 -r 766fef71e8bb jdk/src/share/classes/sun/util/resources/TimeZoneNames.java --- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java Fri Nov 15 15:06:04 2013 +0400 +++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java Thu Nov 21 20:48:24 2013 +0000 @@ -44,6 +44,9 @@ protected final Object[][] getContents() { // Note: generic names came from CLDR with some adjustments. + String ACT[] = new String[] {"Acre Time", "ACT", + "Acre Summer Time", "ACST", + "Acre Time", "ACT"}; String ADELAIDE[] = new String[] {"Central Standard Time (South Australia)", "CST", "Central Summer Time (South Australia)", "CST", "Central Time (South Australia)", "CT"}; @@ -362,7 +365,7 @@ {"Africa/Porto-Novo", WAT}, {"Africa/Sao_Tome", GMT}, {"Africa/Timbuktu", GMT}, - {"Africa/Tripoli", CET}, + {"Africa/Tripoli", EET}, {"Africa/Tunis", CET}, {"Africa/Windhoek", WAT}, {"America/Adak", HAST}, @@ -424,7 +427,7 @@ {"America/Detroit", EST}, {"America/Dominica", AST}, {"America/Edmonton", MST}, - {"America/Eirunepe", AMT}, + {"America/Eirunepe", ACT}, {"America/El_Salvador", CST}, {"America/Ensenada", PST}, {"America/Fort_Wayne", EST}, @@ -510,7 +513,7 @@ "Suriname Time", "SRT"}}, {"America/Port-au-Prince", EST}, {"America/Port_of_Spain", AST}, - {"America/Porto_Acre", AMT}, + {"America/Porto_Acre", ACT}, {"America/Porto_Velho", AMT}, {"America/Puerto_Rico", AST}, {"America/Rainy_River", CST}, @@ -518,7 +521,7 @@ {"America/Recife", BRT}, {"America/Regina", CST}, {"America/Resolute", CST}, - {"America/Rio_Branco", AMT}, + {"America/Rio_Branco", ACT}, {"America/Rosario", AGT}, {"America/Santa_Isabel", PST}, {"America/Santarem", BRT}, @@ -765,7 +768,7 @@ {"Australia/Yancowinna", BROKEN_HILL}, {"BET", BRT}, {"BST", BDT}, - {"Brazil/Acre", AMT}, + {"Brazil/Acre", ACT}, {"Brazil/DeNoronha", NORONHA}, {"Brazil/East", BRT}, {"Brazil/West", AMT}, @@ -893,7 +896,7 @@ {"Jamaica", EST}, {"Japan", JST}, {"Kwajalein", MHT}, - {"Libya", CET}, + {"Libya", EET}, {"MET", new String[] {"Middle Europe Time", "MET", "Middle Europe Summer Time", "MEST", "Middle Europe Time", "MET"}},