--- a/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java Fri Apr 04 16:35:43 2014 +0200
+++ b/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java Fri Apr 04 19:27:17 2014 +0400
@@ -570,6 +570,9 @@
{"Antarctica/Syowa", new String[] {"Hora de Syowa", "SYOT",
"Hora de verano de Syowa", "SYOST",
"Hora de Syowa", "SYOT"}},
+ {"Antarctica/Troll", new String[] {"Hora Universal Coordinada", "UTC",
+ "Hora de verano de Europa Central", "CEST",
+ "Troll Time", "ATT"}},
{"Antarctica/Vostok", new String[] {"Hora de Vostok", "VOST",
"Hora de verano de Vostok", "VOSST",
"Hora de Vostok", "VOST"}},
@@ -838,7 +841,7 @@
"Hora de Samara", "SAMT"}},
{"Europe/San_Marino", CET},
{"Europe/Sarajevo", CET},
- {"Europe/Simferopol", EET},
+ {"Europe/Simferopol", MSK},
{"Europe/Skopje", CET},
{"Europe/Sofia", EET},
{"Europe/Stockholm", CET},