jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java
changeset 22262 949654c1c30e
parent 21843 766fef71e8bb
child 22616 2b4c9efdf2d7
--- a/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java	Fri Jan 10 09:24:47 2014 -0800
+++ b/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java	Mon Dec 30 16:46:55 2013 +0400
@@ -46,159 +46,235 @@
 
     protected final Object[][] getContents() {
         String ACT[] = new String[] {"Hora de Acre", "ACT",
-                                     "Hora de verano de Acre", "ACST"};
+                                     "Hora de verano de Acre", "ACST",
+                                     "Hora de Acre", "ACT"};
         String ADELAIDE[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia)", "CST",
-                                          "Hora de verano Central (Sur de Australia)", "CST"};
+                                          "Hora de verano Central (Sur de Australia)", "CST",
+                                          "Hora Central (Australia del Sur)", "CT"};
         String AGT[] = new String[] {"Hora de Argentina", "ART",
-                                     "Hora de verano de Argentina", "ARST"};
+                                     "Hora de verano de Argentina", "ARST",
+                                     "Hora de Argentina", "ART"};
         String AKST[] = new String[] {"Hora est\u00e1ndar de Alaska", "AKST",
-                                      "Hora de verano de Alaska", "AKDT"};
+                                      "Hora de verano de Alaska", "AKDT",
+                                      "Hora de Alaska", "AKT"};
         String AMT[] = new String[] {"Hora est\u00e1ndar de Amazonia", "AMT",
-                                     "Hora de verano de Amazonia", "AMST"};
+                                     "Hora de verano de Amazonia", "AMST",
+                                     "Hora est\u00E1ndar de Amazonia", "AMT"};
         String ARAST[] = new String[] {"Hora est\u00e1ndar de Arabia", "AST",
-                                       "Hora de verano de Arabia", "ADT"};
+                                       "Hora de verano de Arabia", "ADT",
+                                       "Hora de Arabia", "AT"};
         String ARMT[] = new String[] {"Hora de Armenia", "AMT",
-                                      "Hora de verano de Armenia", "AMST"};
+                                      "Hora de verano de Armenia", "AMST",
+                                      "Hora de Armenia", "AMT"};
         String AST[] = new String[] {"Hora est\u00e1ndar Atl\u00e1ntico", "AST",
-                                     "Hora de verano Atl\u00e1ntico", "ADT"};
+                                     "Hora de verano Atl\u00e1ntico", "ADT",
+                                     "Hora del Atl\u00E1ntico", "AT"};
         String BDT[] = new String[] {"Hora de Bangladesh", "BDT",
-                                     "Hora de verano de Bangladesh", "BDST"};
+                                     "Hora de verano de Bangladesh", "BDST",
+                                     "Hora de Bangladesh", "BDT"};
         String BRISBANE[] = new String[] {"Hora est\u00E1ndar del Este (Queensland)", "EST",
-                                          "Hora est\u00E1ndar de verano del Este (Queensland)", "EST"};
+                                          "Hora est\u00E1ndar de verano del Este (Queensland)", "EST",
+                                          "Hora Oriental (Queensland)", "ET"};
         String BROKEN_HILL[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia/Nueva Gales del Sur)", "CST",
-                                             "Hora de verano Central (Sur de Australia/Nueva Gales del Sur)", "CST"};
+                                             "Hora de verano Central (Sur de Australia/Nueva Gales del Sur)", "CST",
+                                             "Hora Central (Australia del Sur/Nueva Gales del Sur)", "CT"};
         String BRT[] = new String[] {"Hora de Brasil", "BRT",
-                                     "Hora de verano de Brasil", "BRST"};
+                                     "Hora de verano de Brasil", "BRST",
+                                     "Hora de Brasil", "BRT"};
         String BTT[] = new String[] {"Hora de But\u00e1n", "BTT",
-                                     "Hora de verano de But\u00e1n", "BTST"};
+                                     "Hora de verano de But\u00e1n", "BTST",
+                                     "Hora de But\u00E1n", "BTT"};
         String CAT[] = new String[] {"Hora de \u00c1frica Central", "CAT",
-                                     "Hora de verano de \u00c1frica Central", "CAST"};
+                                     "Hora de verano de \u00c1frica Central", "CAST",
+                                     "Hora de \u00C1frica Central", "CAT"};
         String CET[] = new String[] {"Hora de Europa Central", "CET",
-                                     "Hora de verano de Europa Central", "CEST"};
+                                     "Hora de verano de Europa Central", "CEST",
+                                     "Hora de Europa Central", "CET"};
         String CHAST[] = new String[] {"Hora est\u00e1ndar de Chatham", "CHAST",
-                                       "Hora de verano de Chatham", "CHADT"};
-        String CHUT[] = new String[] {"Chuuk Time", "CHUT",
-                                      "Chuuk Summer Time", "CHUST"};
+                                       "Hora de verano de Chatham", "CHADT",
+                                       "Hora de Chatam", "CHAT"};
+        String CHUT[] = new String[] {"Hora de Chuuk", "CHUT",
+                                      "Hora de verano de Chuuk", "CHUST",
+                                      "Hora de Chuuk", "CHUT"};
         String CIT[] = new String[] {"Hora de Indonesia Central", "WITA",
-                                     "Hora de verano de Indonesia Central", "CIST"};
+                                     "Hora de verano de Indonesia Central", "CIST",
+                                     "Hora de Indonesia Central", "WITA"};
         String CLT[] = new String[] {"Hora de Chile", "CLT",
-                                     "Hora de verano de Chile", "CLST"};
+                                     "Hora de verano de Chile", "CLST",
+                                     "Hora de Chile", "CLT"};
         String CST[] = new String[] {"Hora est\u00e1ndar Central", "CST",
-                                     "Hora de verano Central", "CDT"};
+                                     "Hora de verano Central", "CDT",
+                                     "Hora Central", "CT"};
         String CTT[] = new String[] {"Hora est\u00e1ndar de China", "CST",
-                                     "Hora de verano de China", "CDT"};
+                                     "Hora de verano de China", "CDT",
+                                     "Hora de China", "CT"};
         String CUBA[] = new String[] {"Hora est\u00e1ndar de Cuba", "CST",
-                                      "Hora de verano de Cuba", "CDT"};
+                                      "Hora de verano de Cuba", "CDT",
+                                      "Hora de Cuba", "CT"};
         String DARWIN[] = new String[] {"Hora est\u00E1ndar Central (territorio del Norte)", "CST",
-                                        "Hora de verano Central (territorio del Norte)", "CST"};
+                                        "Hora de verano Central (territorio del Norte)", "CST",
+                                        "Hora Central (Territorio Septentrional)", "CT"};
         String DUBLIN[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
-                                        "Hora de verano de Irlanda", "IST"};
+                                        "Hora de verano de Irlanda", "IST",
+                                        "Hora de Irlanda", "IT"};
         String EAT[] = new String[] {"Hora de \u00c1frica Oriental", "EAT",
-                                     "Hora de verano de \u00c1frica Oriental", "EAST"};
+                                     "Hora de verano de \u00c1frica Oriental", "EAST",
+                                     "Hora de \u00C1frica Oriental", "EAT"};
         String EASTER[] = new String[] {"Hora de la Isla de Pascua", "EAST",
-                                        "Hora de verano de la Isla de Pascua", "EASST"};
+                                        "Hora de verano de la Isla de Pascua", "EASST",
+                                        "Hora de la Isla de Pascua", "EAST"};
         String EET[] = new String[] {"Hora de Europa Oriental", "EET",
-                                     "Hora de verano de Europa Oriental", "EEST"};
+                                     "Hora de verano de Europa Oriental", "EEST",
+                                     "Hora de Europa Oriental", "EET"};
         String EGT[] = new String[] {"Hora de Groenlandia Oriental", "EGT",
-                                     "Hora de verano de Groenlandia Oriental", "EGST"};
+                                     "Hora de verano de Groenlandia Oriental", "EGST",
+                                     "Hora de Groenlandia Oriental", "EGT"};
         String EST[] = new String[] {"Hora est\u00e1ndar Oriental", "EST",
-                                     "Hora de verano Oriental", "EDT"};
+                                     "Hora de verano Oriental", "EDT",
+                                     "Hora Oriental", "ET"};
         String EST_NSW[] = new String[] {"Hora est\u00E1ndar Oriental (Nueva Gales del Sur)", "EST",
-                                         "Hora de verano Oriental (Nueva Gales del Sur)", "EST"};
+                                         "Hora de verano Oriental (Nueva Gales del Sur)", "EST",
+                                         "Hora Oriental (Nueva Gales del Sur)", "ET"};
         String FET[] = new String[] {"Hora de Europa m\u00E1s Oriental", "FET",
-                                     "Hora de verano de Europa m\u00E1s Oriental", "FEST"};
+                                     "Hora de verano de Europa m\u00E1s Oriental", "FEST",
+                                     "Hora de Europa m\u00E1s Oriental", "FET"};
         String GHMT[] = new String[] {"Hora central de Ghana", "GMT",
-                                      "Hora de verano de Ghana", "GHST"};
+                                      "Hora de verano de Ghana", "GHST",
+                                      "Hora central de Ghana", "GMT"};
         String GAMBIER[] =  new String[] {"Hora de Gambier", "GAMT",
-                                          "Hora de verano de Gambier", "GAMST"};
+                                          "Hora de verano de Gambier", "GAMST",
+                                          "Hora de Gambier", "GAMT"};
         String GMT[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
+                                     "Hora del Meridiano de Greenwich", "GMT",
                                      "Hora del Meridiano de Greenwich", "GMT"};
         String GMTBST[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
-                                        "Hora de verano de Gran Breta\u00f1a", "BST"};
+                                        "Hora de verano de Gran Breta\u00f1a", "BST",
+                                        "Hora de Gran Breta\u00F1a", "BT"};
         String GST[] = new String[] {"Hora est\u00e1ndar del Golfo", "GST",
-                                     "Hora de verano del Golfo", "GDT"};
+                                     "Hora de verano del Golfo", "GDT",
+                                     "Hora del Golfo", "GT"};
         String HAST[] = new String[] {"Hora est\u00e1ndar de Hawaii-Aleutianas", "HAST",
-                                      "Hora de verano de Hawaii-Aleutianas", "HADT"};
+                                      "Hora de verano de Hawaii-Aleutianas", "HADT",
+                                      "Hora de Hawaii-Aleutian", "HAT"};
         String HKT[] =  new String[] {"Hora de Hong Kong", "HKT",
-                                      "Hora de verano de Hong Kong", "HKST"};
+                                      "Hora de verano de Hong Kong", "HKST",
+                                      "Hora de Hong Kong", "HKT"};
         String HST[] = new String[] {"Hora est\u00e1ndar de Hawaii", "HST",
-                                     "Hora de verano de Hawaii", "HDT"};
+                                     "Hora de verano de Hawaii", "HDT",
+                                     "Hora de Hawaii", "HT"};
         String ICT[] = new String[] {"Hora de Indochina", "ICT",
-                                     "Hora de verano de Indochina", "ICST"};
+                                     "Hora de verano de Indochina", "ICST",
+                                     "Hora de Indochina", "ICT"};
         String IRT[] = new String[] {"Hora est\u00e1ndar de Ir\u00e1n", "IRST",
-                                     "Hora de verano de Ir\u00e1n", "IRDT"};
+                                     "Hora de verano de Ir\u00e1n", "IRDT",
+                                     "Hora de Ir\u00E1n", "IRT"};
         String ISRAEL[] = new String[] {"Hora est\u00e1ndar de Israel", "IST",
-                                        "Hora de verano de Israel", "IDT"};
+                                        "Hora de verano de Israel", "IDT",
+                                        "Hora de Israel", "IT"};
         String IST[] = new String[] {"Hora est\u00e1ndar de India", "IST",
-                                     "Hora de verano de India", "IDT"};
+                                     "Hora de verano de India", "IDT",
+                                     "Hora de India", "IT"};
         String JST[] = new String[] {"Hora est\u00e1ndar de Jap\u00f3n", "JST",
-                                     "Hora de verano de Jap\u00f3n", "JDT"};
+                                     "Hora de verano de Jap\u00f3n", "JDT",
+                                     "Hora de Jap\u00F3n", "JT"};
         String KST[] = new String[] {"Hora est\u00e1ndar de Corea", "KST",
-                                     "Hora de verano de Corea", "KDT"};
+                                     "Hora de verano de Corea", "KDT",
+                                     "Hora de Corea", "KT"};
         String LORD_HOWE[] = new String[] {"Hora est\u00e1ndar de Lord Howe", "LHST",
-                                           "Hora de verano de Lord Howe", "LHST"};
+                                           "Hora de verano de Lord Howe", "LHST",
+                                           "Hora de Lord Howe", "LHT"};
         String MHT[] = new String[] {"Hora de las Islas Marshall", "MHT",
-                                     "Hora de verano de las Islas Marshall", "MHST"};
+                                     "Hora de verano de las Islas Marshall", "MHST",
+                                     "Hora de Islas Marshall", "MHT"};
         String MSK[] = new String[] {"Hora est\u00e1ndar de Mosc\u00fa", "MSK",
-                                     "Hora de verano de Mosc\u00fa", "MSD"};
+                                     "Hora de verano de Mosc\u00fa", "MSD",
+                                     "Hora de Mosc\u00FA", "MT"};
         String MST[] = new String[] {"Hora est\u00e1ndar de las Rocosas", "MST",
-                                     "Hora de verano de las Rocosas", "MDT"};
+                                     "Hora de verano de las Rocosas", "MDT",
+                                     "Hora de las Monta\u00F1as Rocosas", "MT"};
         String MYT[] = new String[] {"Hora de Malasia", "MYT",
-                                     "Hora de verano de Malasia", "MYST"};
+                                     "Hora de verano de Malasia", "MYST",
+                                     "Hora de Malasia", "MYT"};
         String NORONHA[] = new String[] {"Hora de Fernando de Noronha", "FNT",
-                                         "Hora de verano de Fernando de Noronha", "FNST"};
+                                         "Hora de verano de Fernando de Noronha", "FNST",
+                                         "Hora de Fernando de Noronha", "FNT"};
         String NOVT[] = new String[] {"Hora de Novosibirsk", "NOVT",
-                                      "Hora de verano de Novosibirsk", "NOVST"};
+                                      "Hora de verano de Novosibirsk", "NOVST",
+                                      "Hora de Novosibirsk", "NOVT"};
         String NPT[] = new String[] {"Hora de Nepal", "NPT",
-                                     "Hora de verano de Nepal", "NPST"};
+                                     "Hora de verano de Nepal", "NPST",
+                                     "Hora de Nepal", "NPT"};
         String NST[] = new String[] {"Hora est\u00e1ndar de Terranova", "NST",
-                                     "Hora de verano de Terranova", "NDT"};
+                                     "Hora de verano de Terranova", "NDT",
+                                     "Hora de Terranova", "NT"};
         String NZST[] = new String[] {"Hora est\u00e1ndar de Nueva Zelanda", "NZST",
-                                      "Hora de verano de Nueva Zelanda", "NZDT"};
+                                      "Hora de verano de Nueva Zelanda", "NZDT",
+                                      "Hora de Nueva Zelanda", "NZT"};
         String PITCAIRN[] = new String[] {"Hora est\u00e1ndar de Pitcairn", "PST",
-                                          "Hora de verano de Pitcairn", "PDT"};
+                                          "Hora de verano de Pitcairn", "PDT",
+                                          "Hora de Islas Pitcairn", "PT"};
         String PKT[] = new String[] {"Hora de Pakist\u00e1n", "PKT",
-                                     "Hora de verano de Pakist\u00e1n", "PKST"};
-        String PONT[] = new String[] {"Pohnpei Time", "PONT",
-                                      "Pohnpei Summer Time", "PONST"};
+                                     "Hora de verano de Pakist\u00e1n", "PKST",
+                                     "Hora de Pakist\u00E1n", "PKT"};
+        String PONT[] = new String[] {"Hora de Pohnpei", "PONT",
+                                      "Hora de verano de Pohnpei", "PONST",
+                                      "Hora de Pohnpei", "PONT"};
         String PST[] = new String[] {"Hora est\u00e1ndar del Pac\u00edfico", "PST",
-                                     "Hora de verano del Pac\u00edfico", "PDT"};
+                                     "Hora de verano del Pac\u00edfico", "PDT",
+                                     "Hora del Pac\u00EDfico", "PT"};
         String SAST[] = new String[] {"Hora est\u00e1ndar de Sud\u00e1frica", "SAST",
-                                      "Hora de verano de Sud\u00e1frica", "SAST"};
+                                      "Hora de verano de Sud\u00e1frica", "SAST",
+                                      "Hora de Sud\u00E1frica", "SAT"};
         String SBT[] = new String[] {"Hora de las Islas Solomon", "SBT",
-                                     "Hora de verano de las Islas Solomon", "SBST"};
+                                     "Hora de verano de las Islas Solomon", "SBST",
+                                     "Hora de las Islas Solomon", "SBT"};
         String SGT[] = new String[] {"Hora de Singapur", "SGT",
-                                     "Hora de verano de  Singapur", "SGST"};
+                                     "Hora de verano de  Singapur", "SGST",
+                                     "Hora de Singapur", "SGT"};
         String SLST[] = new String[] {"Hora del Meridiano de Greenwich", "GMT",
-                                      "Hora de verano de Sierra Leona", "SLST"};
+                                      "Hora de verano de Sierra Leona", "SLST",
+                                      "Horario de Sierra Leona", "SLT"};
         String TASMANIA[] = new String[] {"Hora est\u00E1ndar del Este (Tasmania)", "EST",
-                                          "Hora de verano del Este (Tasmania)", "EST"};
+                                          "Hora de verano del Este (Tasmania)", "EST",
+                                          "Hora Oriental (Tasmania)", "ET"};
         String TMT[] = new String[] {"Hora de Turkmenist\u00e1n", "TMT",
-                                     "Hora de verano de Turkmenist\u00e1n", "TMST"};
+                                     "Hora de verano de Turkmenist\u00e1n", "TMST",
+                                     "Hora de Turkmenist\u00E1n", "TMT"};
         String ULAT[]= new String[] {"Hora de Ulan Bator", "ULAT",
-                                     "Hora de verano de Ulan Bator", "ULAST"};
+                                     "Hora de verano de Ulan Bator", "ULAST",
+                                     "Hora de Ulan Bator", "ULAT"};
         String WART[] = new String[] {"Hora de Argentina Occidental", "WART",
                                       "Hora de verano de Argentina Occidental", "WARST"};
         String WAT[] = new String[] {"Hora de \u00c1frica Occidental", "WAT",
-                                     "Hora de verano de \u00c1frica Occidental", "WAST"};
+                                     "Hora de verano de \u00c1frica Occidental", "WAST",
+                                     "Hora de \u00C1frica Occidental", "WAT"};
         String WET[] = new String[] {"Hora de Europa Occidental", "WET",
-                                     "Hora de verano de Europa Occidental", "WEST"};
+                                     "Hora de verano de Europa Occidental", "WEST",
+                                     "Hora de Europa Occidental", "WET"};
         String WIT[] = new String[] {"Hora de Indonesia Occidental", "WIB",
-                                     "Indonesia Hora de verano de Indonesia Occidental", "WIST"};
+                                     "Indonesia Hora de verano de Indonesia Occidental", "WIST",
+                                     "Hora de Indonesia Occidental", "WIB"};
         String WST_AUS[] = new String[] {"Hora est\u00E1ndar Occidental (Australia)", "WST",
-                                         "Hora de verano Occidental (Australia)", "WST"};
+                                         "Hora de verano Occidental (Australia)", "WST",
+                                         "Hora Occidental (Australia)", "WT"};
         String SAMOA[] = new String[] {"Hora est\u00e1ndar de Samoa", "SST",
-                                       "Hora de verano de Samoa", "SDT"};
+                                       "Hora de verano de Samoa", "SDT",
+                                       "Hora de Samoa", "ST"};
         String WST_SAMOA[] = new String[] {"Hora de Samoa Occidental", "WST",
-                                           "Hora de verano de Samoa Occidental", "WSDT"};
+                                           "Hora de verano de Samoa Occidental", "WSDT",
+                                           "Hora de Samoa Occidental", "WST"};
         String ChST[] = new String[] {"Hora est\u00e1ndar de Chamorro", "ChST",
-                                      "Hora de verano de Chamorro", "ChDT"};
+                                      "Hora de verano de Chamorro", "ChDT",
+                                      "Hora de Chamorro", "ChT"};
         String VICTORIA[] = new String[] {"Hora est\u00E1ndar del Este (Victoria)", "EST",
-                                          "Hora de verano del Este (Victoria)", "EST"};
+                                          "Hora de verano del Este (Victoria)", "EST",
+                                          "Hora Oriental (Victoria)", "ET"};
         String UTC[] = new String[] {"Hora Universal Coordinada", "UTC",
+                                     "Hora Universal Coordinada", "UTC",
                                      "Hora Universal Coordinada", "UTC"};
         String UZT[] = new String[] {"Hora de Uzbekist\u00e1n", "UZT",
-                                     "Hora de verano de Uzbekist\u00e1n", "UZST"};
+                                     "Hora de verano de Uzbekist\u00e1n", "UZST",
+                                     "Hora de Uzbekist\u00E1n", "UZT"};
 
         return new Object[][] {
             {"America/Los_Angeles", PST},
@@ -311,7 +387,8 @@
             {"America/Argentina/Ushuaia", AGT},
             {"America/Aruba", AST},
             {"America/Asuncion", new String[] {"Hora de Paraguay", "PYT",
-                                               "Hora de verano de Paraguay", "PYST"}},
+                                               "Hora de verano de Paraguay", "PYST",
+                                               "Hora de Paraguay", "PYT"}},
             {"America/Atikokan", EST},
             {"America/Atka", HAST},
             {"America/Bahia", BRT},
@@ -322,17 +399,20 @@
             {"America/Blanc-Sablon", AST},
             {"America/Boa_Vista", AMT},
             {"America/Bogota", new String[] {"Hora de Colombia", "COT",
-                                             "Hora de verano de Colombia", "COST"}},
+                                             "Hora de verano de Colombia", "COST",
+                                             "Hora de Colombia", "COT"}},
             {"America/Boise", MST},
             {"America/Buenos_Aires", AGT},
             {"America/Cambridge_Bay", MST},
             {"America/Campo_Grande", AMT},
             {"America/Cancun", CST},
             {"America/Caracas", new String[] {"Hora de Venezuela", "VET",
-                                              "Hora de verano de Venezuela", "VEST"}},
+                                              "Hora de verano de Venezuela", "VEST",
+                                              "Hora de Venezuela", "VET"}},
             {"America/Catamarca", AGT},
             {"America/Cayenne", new String[] {"Hora de la Guayana Francesa", "GFT",
-                                              "Hora de verano de la Guayana Francesa", "GFST"}},
+                                              "Hora de verano de la Guayana Francesa", "GFST",
+                                              "Hora de la Guayana Francesa", "GFT"}},
             {"America/Cayman", EST},
             {"America/Chihuahua", MST},
             {"America/Creston", MST},
@@ -354,16 +434,19 @@
             {"America/Fortaleza", BRT},
             {"America/Glace_Bay", AST},
             {"America/Godthab", new String[] {"Hora de Groenlandia Occidental", "WGT",
-                                              "Hora de verano de Groenlandia Occidental", "WGST"}},
+                                              "Hora de verano de Groenlandia Occidental", "WGST",
+                                              "Hora de Groenlandia Occidental", "WGT"}},
             {"America/Goose_Bay", AST},
             {"America/Grand_Turk", EST},
             {"America/Grenada", AST},
             {"America/Guadeloupe", AST},
             {"America/Guatemala", CST},
             {"America/Guayaquil", new String[] {"Hora de Ecuador", "ECT",
-                                                "Hora de verano de Ecuador", "ECST"}},
+                                                "Hora de verano de Ecuador", "ECST",
+                                                "Hora de Ecuador", "ECT"}},
             {"America/Guyana", new String[] {"Hora de Guyana", "GYT",
-                                             "Hora de verano de Guyana", "GYST"}},
+                                             "Hora de verano de Guyana", "GYST",
+                                             "Hora de Guyana", "GYT"}},
             {"America/Havana", CUBA},
             {"America/Hermosillo", MST},
             {"America/Indiana/Indianapolis", EST},
@@ -384,9 +467,11 @@
             {"America/Knox_IN", CST},
             {"America/Kralendijk", AST},
             {"America/La_Paz", new String[] {"Hora de Bolivia", "BOT",
-                                             "Hora de verano de Bolivia", "BOST"}},
+                                             "Hora de verano de Bolivia", "BOST",
+                                             "Hora de Bolivia", "BOT"}},
             {"America/Lima", new String[] {"Hora de Per\u00fa", "PET",
-                                           "Hora de verano de Per\u00fa", "PEST"}},
+                                           "Hora de verano de Per\u00fa", "PEST",
+                                           "Hora de Per\u00FA", "PET"}},
             {"America/Louisville", EST},
             {"America/Lower_Princes", AST},
             {"America/Maceio", BRT},
@@ -399,14 +484,17 @@
             {"America/Mendoza", AGT},
             {"America/Menominee", CST},
             {"America/Merida", CST},
-            {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST",
-                                                 "Metlakatla Daylight Time", "MeDT"}},
+            {"America/Metlakatla", new String[] {"Hora de Metlakatla", "MeST",
+                                                 "Hora de verano de Metlakatla", "MeDT",
+                                                 "Metlakatla Time", "MeT"}},
             {"America/Mexico_City", CST},
             {"America/Miquelon", new String[] {"Hora est\u00e1ndar de Pierre & Miquelon", "PMST",
-                                               "Hora de verano de Pierre & Miquelon", "PMDT"}},
+                                               "Hora de verano de Pierre & Miquelon", "PMDT",
+                                               "Hora de San Pedro y Miquel\u00F3n", "PMT"}},
             {"America/Moncton", AST},
             {"America/Montevideo", new String[] {"Hora de Uruguay", "UYT",
-                                                 "Hora de verano de Uruguay", "UYST"}},
+                                                 "Hora de verano de Uruguay", "UYST",
+                                                 "Hora de Uruguay", "UYT"}},
             {"America/Monterrey", CST},
             {"America/Montreal", EST},
             {"America/Montserrat", AST},
@@ -421,7 +509,8 @@
             {"America/Panama", EST},
             {"America/Pangnirtung", EST},
             {"America/Paramaribo", new String[] {"Hora de Surinam", "SRT",
-                                                 "Hora de verano de Surinam", "SRST"}},
+                                                 "Hora de verano de Surinam", "SRST",
+                                                 "Hora de Surinam", "SRT"}},
             {"America/Port-au-Prince", EST},
             {"America/Port_of_Spain", AST},
             {"America/Porto_Acre", ACT},
@@ -461,115 +550,146 @@
             {"America/Yellowknife", MST},
             {"Antarctica/Casey", WST_AUS},
             {"Antarctica/Davis", new String[] {"Hora de Davis", "DAVT",
-                                               "Hora de verano de Davis", "DAVST"}},
+                                               "Hora de verano de Davis", "DAVST",
+                                               "Hora de Davis", "DAVT"}},
             {"Antarctica/DumontDUrville", new String[] {"Hora de Dumont-d'Urville", "DDUT",
-                                                        "Hora de verano de Dumont-d'Urville", "DDUST"}},
-            {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST",
-                                                   "Macquarie Island Summer Time", "MIST"}},
+                                                        "Hora de verano de Dumont-d'Urville", "DDUST",
+                                                        "Hora de Dumont-d'Urville", "DDUT"}},
+            {"Antarctica/Macquarie", new String[] {"Hora de Isla Macquarie", "MIST",
+                                                   "Hora de verano de Isla Macquarie", "MIST",
+                                                   "Hora de Isla Macquarie", "MIST"}},
             {"Antarctica/Mawson", new String[] {"Hora de Mawson", "MAWT",
-                                                "Hora de verano de Mawson", "MAWST"}},
+                                                "Hora de verano de Mawson", "MAWST",
+                                                "Hora de Mawson", "MAWT"}},
             {"Antarctica/McMurdo", NZST},
             {"Antarctica/Palmer", CLT},
             {"Antarctica/Rothera", new String[] {"Hora de Rothera", "ROTT",
-                                                 "Hora de verano de Rothera", "ROTST"}},
+                                                 "Hora de verano de Rothera", "ROTST",
+                                                 "Hora de Rothera", "ROTT"}},
             {"Antarctica/South_Pole", NZST},
             {"Antarctica/Syowa", new String[] {"Hora de Syowa", "SYOT",
-                                               "Hora de verano de Syowa", "SYOST"}},
+                                               "Hora de verano de Syowa", "SYOST",
+                                               "Hora de Syowa", "SYOT"}},
             {"Antarctica/Vostok", new String[] {"Hora de Vostok", "VOST",
-                                                "Hora de verano de Vostok", "VOSST"}},
+                                                "Hora de verano de Vostok", "VOSST",
+                                                "Hora de Vostok", "VOST"}},
             {"Arctic/Longyearbyen", CET},
             {"Asia/Aden", ARAST},
             {"Asia/Almaty", new String[] {"Hora de Alma-Ata", "ALMT",
-                                          "Hora de verano de Alma-Ata", "ALMST"}},
+                                          "Hora de verano de Alma-Ata", "ALMST",
+                                          "Hora de Alma-Ata", "ALMT"}},
             {"Asia/Amman", ARAST},
             {"Asia/Anadyr", new String[] {"Hora de Anadyr", "ANAT",
-                                          "Hora de verano de Anadyr", "ANAST"}},
+                                          "Hora de verano de Anadyr", "ANAST",
+                                          "Hora de Anadyr", "ANAT"}},
             {"Asia/Aqtau", new String[] {"Hora de Aqtau", "AQTT",
-                                         "Hora de verano de Aqtau", "AQTST"}},
+                                         "Hora de verano de Aqtau", "AQTST",
+                                         "Hora de Aqtau", "AQTT"}},
             {"Asia/Aqtobe", new String[] {"Hora de Aqtobe", "AQTT",
-                                          "Hora de verano de Aqtobe", "AQTST"}},
+                                          "Hora de verano de Aqtobe", "AQTST",
+                                          "Hora de Aqtobe", "AQTT"}},
             {"Asia/Ashgabat", TMT},
             {"Asia/Ashkhabad", TMT},
             {"Asia/Baghdad", ARAST},
             {"Asia/Bahrain", ARAST},
             {"Asia/Baku", new String[] {"Hora de Azerbaiy\u00e1n", "AZT",
-                                        "Hora de verano de Azerbaiy\u00e1n", "AZST"}},
+                                        "Hora de verano de Azerbaiy\u00e1n", "AZST",
+                                        "Hora de Azerbaiy\u00E1n", "AZT"}},
             {"Asia/Bangkok", ICT},
             {"Asia/Beirut", EET},
             {"Asia/Bishkek", new String[] {"Hora de Kirguizist\u00e1n", "KGT",
-                                           "Hora de verano de Kirguizist\u00e1n", "KGST"}},
+                                           "Hora de verano de Kirguizist\u00e1n", "KGST",
+                                           "Hora de Kirguizist\u00E1n", "KGT"}},
             {"Asia/Brunei", new String[] {"Hora de Brunei", "BNT",
-                                          "Hora de verano de Brunei", "BNST"}},
+                                          "Hora de verano de Brunei", "BNST",
+                                          "Hora de Brunei", "BNT"}},
             {"Asia/Calcutta", IST},
             {"Asia/Choibalsan", new String[] {"Hora de Choibalsan", "CHOT",
-                                              "Hora de verano de Choibalsan", "CHOST"}},
+                                              "Hora de verano de Choibalsan", "CHOST",
+                                              "Hora de Choibalsan", "CHOT"}},
             {"Asia/Chongqing", CTT},
             {"Asia/Chungking", CTT},
             {"Asia/Colombo", IST},
             {"Asia/Dacca", BDT},
             {"Asia/Dhaka", BDT},
             {"Asia/Dili", new String[] {"Hora de Timor Leste", "TLT",
-                                        "Hora de verano de Timor Leste", "TLST"}},
+                                        "Hora de verano de Timor Leste", "TLST",
+                                        "Hora de Timor Leste", "TLT"}},
             {"Asia/Damascus", EET},
             {"Asia/Dubai", GST},
             {"Asia/Dushanbe", new String[] {"Hora de Tajikist\u00e1n", "TJT",
-                                            "Hora de verano de Tajikist\u00e1n", "TJST"}},
+                                            "Hora de verano de Tajikist\u00e1n", "TJST",
+                                            "Hora de Tajikist\u00E1n", "TJT"}},
             {"Asia/Gaza", EET},
             {"Asia/Harbin", CTT},
             {"Asia/Hebron", EET},
             {"Asia/Ho_Chi_Minh", ICT},
             {"Asia/Hong_Kong", HKT},
             {"Asia/Hovd", new String[] {"Hora de Hovd", "HOVT",
-                                        "Hora de verano de Hovd", "HOVST"}},
+                                        "Hora de verano de Hovd", "HOVST",
+                                        "Hora de Hovd", "HOVT"}},
             {"Asia/Irkutsk", new String[] {"Hora de Irkutsk", "IRKT",
-                                           "Hora de verano de Irkutsk", "IRKST"}},
+                                           "Hora de verano de Irkutsk", "IRKST",
+                                           "Hora de Irkutsk", "IRKT"}},
             {"Asia/Istanbul", EET},
             {"Asia/Jakarta", WIT},
             {"Asia/Jayapura", new String[] {"Hora de Indonesia Oriental", "WIT",
-                                            "Hora de verano de Indonesia Oriental", "EIST"}},
+                                            "Hora de verano de Indonesia Oriental", "EIST",
+                                            "Hora de Indonesia Oriental", "WIT"}},
             {"Asia/Kabul", new String[] {"Hora de Afganist\u00e1n", "AFT",
-                                         "Hora de verano de Afganist\u00e1n", "AFST"}},
+                                         "Hora de verano de Afganist\u00e1n", "AFST",
+                                         "Hora de Afganist\u00E1n", "AFT"}},
             {"Asia/Kamchatka", new String[] {"Hora de Petropavlovsk-Kamchatski", "PETT",
-                                             "Hora de verano de Petropavlovsk-Kamchatski", "PETST"}},
+                                             "Hora de verano de Petropavlovsk-Kamchatski", "PETST",
+                                             "Hora de Petropavlovsk-Kamchatski", "PETT"}},
             {"Asia/Karachi", PKT},
             {"Asia/Kashgar", CTT},
             {"Asia/Kathmandu", NPT},
             {"Asia/Katmandu", NPT},
             {"Asia/Khandyga", new String[] {"Hora de Khandyga", "YAKT",
-                                            "Hora de verano de Khandyga", "YAKST"}},
+                                            "Hora de verano de Khandyga", "YAKST",
+                                            "Hora de Khandyga", "YAKT"}},
             {"Asia/Kolkata", IST},
             {"Asia/Krasnoyarsk", new String[] {"Hora de Krasnoyarsk", "KRAT",
-                                               "Hora de verano de Krasnoyarsk", "KRAST"}},
+                                               "Hora de verano de Krasnoyarsk", "KRAST",
+                                               "Hora de Krasnoyarsk", "KRAT"}},
             {"Asia/Kuala_Lumpur", MYT},
             {"Asia/Kuching", MYT},
             {"Asia/Kuwait", ARAST},
             {"Asia/Macao", CTT},
             {"Asia/Macau", CTT},
             {"Asia/Magadan", new String[] {"Hora de Magad\u00e1n", "MAGT",
-                                           "Hora de verano de Magad\u00e1n", "MAGST"}},
+                                           "Hora de verano de Magad\u00e1n", "MAGST",
+                                           "Hora de Magad\u00E1n", "MAGT"}},
             {"Asia/Makassar", CIT},
             {"Asia/Manila", new String[] {"Hora de Filipinas", "PHT",
-                                          "Hora de verano de Filipinas", "PHST"}},
+                                          "Hora de verano de Filipinas", "PHST",
+                                          "Hora de Filipinas", "PHT"}},
             {"Asia/Muscat", GST},
             {"Asia/Nicosia", EET},
             {"Asia/Novokuznetsk", NOVT},
             {"Asia/Novosibirsk", NOVT},
             {"Asia/Oral", new String[] {"Hora de Uralsk", "ORAT",
-                                        "Hora de verano de Uralsk", "ORAST"}},
+                                        "Hora de verano de Uralsk", "ORAST",
+                                        "Hora de Uralsk", "ORAT"}},
             {"Asia/Omsk", new String[] {"Hora de Omsk", "OMST",
-                                        "Hora de verano de Omsk", "OMSST"}},
+                                        "Hora de verano de Omsk", "OMSST",
+                                        "Hora de Omsk", "OMST"}},
             {"Asia/Phnom_Penh", ICT},
             {"Asia/Pontianak", WIT},
             {"Asia/Pyongyang", KST},
             {"Asia/Qatar", ARAST},
             {"Asia/Qyzylorda", new String[] {"Hora de Qyzylorda", "QYZT",
-                                             "Hora de verano de Qyzylorda", "QYZST"}},
+                                             "Hora de verano de Qyzylorda", "QYZST",
+                                             "Hora de Qyzylorda", "QYZT"}},
             {"Asia/Rangoon", new String[] {"Hora de Myanmar", "MMT",
-                                           "Hora de verano de Myanmar", "MMST"}},
+                                           "Hora de verano de Myanmar", "MMST",
+                                           "Hora de Myanmar", "MMT"}},
             {"Asia/Riyadh", ARAST},
             {"Asia/Saigon", ICT},
             {"Asia/Sakhalin", new String[] {"Hora de Sajalin", "SAKT",
-                                            "Hora de verano de Sajalin", "SAKST"}},
+                                            "Hora de verano de Sajalin", "SAKST",
+                                            "Hora de Sajalin", "SAKT"}},
             {"Asia/Samarkand", UZT},
             {"Asia/Seoul", KST},
             {"Asia/Singapore", SGT},
@@ -577,7 +697,8 @@
             {"Asia/Tel_Aviv", ISRAEL},
             {"Asia/Tashkent", UZT},
             {"Asia/Tbilisi", new String[] {"Hora de Georgia", "GET",
-                                           "Hora de verano de Georgia", "GEST"}},
+                                           "Hora de verano de Georgia", "GEST",
+                                           "Hora de Georgia", "GET"}},
             {"Asia/Tehran", IRT},
             {"Asia/Thimbu", BTT},
             {"Asia/Thimphu", BTT},
@@ -586,31 +707,39 @@
             {"Asia/Ulan_Bator", ULAT},
             {"Asia/Urumqi", CTT},
             {"Asia/Ust-Nera", new String[] {"Hora de Ust-Nera", "VLAT",
-                                            "Hora de verano de Ust-Nera", "VLAST"}},
+                                            "Hora de verano de Ust-Nera", "VLAST",
+                                            "Hora de Ust-Nera", "VLAT"}},
             {"Asia/Vientiane", ICT},
             {"Asia/Vladivostok", new String[] {"Hora de Vladivostok", "VLAT",
-                                               "Hora de verano de Vladivostok", "VLAST"}},
+                                               "Hora de verano de Vladivostok", "VLAST",
+                                               "Hora de Vladivostok", "VLAT"}},
             {"Asia/Yakutsk", new String[] {"Hora de Yakutsk", "YAKT",
-                                           "Hora de verano de Yakutsk", "YAKST"}},
+                                           "Hora de verano de Yakutsk", "YAKST",
+                                           "Hora de Yakutsk", "YAKT"}},
             {"Asia/Yekaterinburg", new String[] {"Hora de Ekaterinburgo", "YEKT",
-                                                 "Hora de verano de Ekaterinburgo", "YEKST"}},
+                                                 "Hora de verano de Ekaterinburgo", "YEKST",
+                                                 "Hora de Ekaterinburgo", "YEKT"}},
             {"Asia/Yerevan", ARMT},
             {"Atlantic/Azores", new String[] {"Hora de Azores", "AZOT",
-                                              "Hora de verano de Azores", "AZOST"}},
+                                              "Hora de verano de Azores", "AZOST",
+                                              "Hora de Azores", "AZOT"}},
             {"Atlantic/Bermuda", AST},
             {"Atlantic/Canary", WET},
             {"Atlantic/Cape_Verde", new String[] {"Hora de Cabo Verde", "CVT",
-                                                  "Hora de verano de Cabo Verde", "CVST"}},
+                                                  "Hora de verano de Cabo Verde", "CVST",
+                                                  "Hora de Cabo Verde", "CVT"}},
             {"Atlantic/Faeroe", WET},
             {"Atlantic/Faroe", WET},
             {"Atlantic/Jan_Mayen", CET},
             {"Atlantic/Madeira", WET},
             {"Atlantic/Reykjavik", GMT},
             {"Atlantic/South_Georgia", new String[] {"Hora est\u00e1ndar de Georgia del Sur", "GST",
-                                                     "Hora de verano de Georgia del Sur", "GDT"}},
+                                                     "Hora de verano de Georgia del Sur", "GDT",
+                                                     "Hora de Georgia del Sur", "GT"}},
             {"Atlantic/St_Helena", GMT},
             {"Atlantic/Stanley", new String[] {"Hora de las islas Malvinas", "FKT",
-                                               "Hora de verano de las islas Malvinas", "FKST"}},
+                                               "Hora de verano de las islas Malvinas", "FKST",
+                                               "Hora de las islas Malvinas", "FKT"}},
             {"Australia/ACT", EST_NSW},
             {"Australia/Adelaide", ADELAIDE},
             {"Australia/Brisbane", BRISBANE},
@@ -619,7 +748,8 @@
             {"Australia/Currie", EST_NSW},
             {"Australia/Darwin", DARWIN},
             {"Australia/Eucla", new String[] {"Hora est\u00E1ndar de Australia Central y Occidental", "CWST",
-                                              "Hora est\u00E1ndar de verano de Australia Central y Occidental", "CWST"}},
+                                              "Hora est\u00E1ndar de verano de Australia Central y Occidental", "CWST",
+                                              "Hora de Australia Central y Occidental", "CWT"}},
             {"Australia/Hobart", TASMANIA},
             {"Australia/LHI", LORD_HOWE},
             {"Australia/Lindeman", BRISBANE},
@@ -704,7 +834,8 @@
             {"Europe/Riga", EET},
             {"Europe/Rome", CET},
             {"Europe/Samara", new String[] {"Hora de Samara", "SAMT",
-                                            "Hora de verano de Samara", "SAMST"}},
+                                            "Hora de verano de Samara", "SAMST",
+                                            "Hora de Samara", "SAMT"}},
             {"Europe/San_Marino", CET},
             {"Europe/Sarajevo", CET},
             {"Europe/Simferopol", EET},
@@ -720,7 +851,8 @@
             {"Europe/Vienna", CET},
             {"Europe/Vilnius", EET},
             {"Europe/Volgograd", new String[] {"Hora de Volgogrado", "VOLT",
-                                               "Hora de verano de Volgogrado", "VOLST"}},
+                                               "Hora de verano de Volgogrado", "VOLST",
+                                               "Hora de Volgogrado", "VOLT"}},
             {"Europe/Warsaw", CET},
             {"Europe/Zagreb", CET},
             {"Europe/Zaporozhye", EET},
@@ -734,30 +866,39 @@
             {"IST", IST},
             {"Indian/Antananarivo", EAT},
             {"Indian/Chagos", new String[] {"Hora del Territorio del Oc\u00e9ano \u00cdndico", "IOT",
-                                            "Hora de verano del Territorio del Oc\u00e9ano \u00cdndico", "IOST"}},
+                                            "Hora de verano del Territorio del Oc\u00e9ano \u00cdndico", "IOST",
+                                            "Hora del Territorio del Oc\u00E9ano \u00CDndico", "IOT"}},
             {"Indian/Christmas", new String[] {"Hora de la isla de Christmas", "CXT",
-                                               "Hora de verano de la isla de Christmas", "CXST"}},
+                                               "Hora de verano de la isla de Christmas", "CXST",
+                                               "Hora de la isla de Christmas", "CIT"}},
             {"Indian/Cocos", new String[] {"Hora de las islas Cocos", "CCT",
-                                           "Hora de verano de las islas Cocos", "CCST"}},
+                                           "Hora de verano de las islas Cocos", "CCST",
+                                           "Hora de las islas Cocos", "CCT"}},
             {"Indian/Comoro", EAT},
             {"Indian/Kerguelen", new String[] {"Hora de los Territorios Franceses del Sur y de la Ant\u00e1rtida", "TFT",
-                                               "Hora de verano de los Territorios Franceses del Sur y de la Ant\u00e1rtida", "TFST"}},
+                                               "Hora de verano de los Territorios Franceses del Sur y de la Ant\u00e1rtida", "TFST",
+                                               "Hora de los Territorios Franceses del Sur y de la Ant\u00E1rtida", "TFT"}},
             {"Indian/Mahe", new String[] {"Hora de Seychelles", "SCT",
-                                          "Hora de verano de Seychelles", "SCST"}},
+                                          "Hora de verano de Seychelles", "SCST",
+                                          "Hora de Seychelles", "SCT"}},
             {"Indian/Maldives", new String[] {"Hora de Maldivas", "MVT",
-                                              "Hora de verano de Maldivas", "MVST"}},
+                                              "Hora de verano de Maldivas", "MVST",
+                                              "Hora de Maldivas", "MVT"}},
             {"Indian/Mauritius", new String[] {"Hora de Mauricio", "MUT",
-                                               "Hora de verano de Mauricio", "MUST"}},
+                                               "Hora de verano de Mauricio", "MUST",
+                                               "Hora de Mauricio", "MUT"}},
             {"Indian/Mayotte", EAT},
             {"Indian/Reunion", new String[] {"Hora de Reuni\u00f3n", "RET",
-                                             "Hora de verano de Reuni\u00f3n", "REST"}},
+                                             "Hora de verano de Reuni\u00f3n", "REST",
+                                             "Hora de Reuni\u00F3n", "RET"}},
             {"Israel", ISRAEL},
             {"Jamaica", EST},
             {"Japan", JST},
             {"Kwajalein", MHT},
             {"Libya", EET},
             {"MET", new String[] {"Hora de Europa Central", "MET",
-                                  "Hora de verano de Europa Central", "MEST"}},
+                                  "Hora de verano de Europa Central", "MEST",
+                                  "MET", "MET"}},
             {"Mexico/BajaNorte", PST},
             {"Mexico/BajaSur", MST},
             {"Mexico/General", CST},
@@ -777,61 +918,82 @@
             {"Pacific/Chuuk", CHUT},
             {"Pacific/Easter", EASTER},
             {"Pacific/Efate", new String[] {"Hora de Vanuatu", "VUT",
-                                            "Hora de verano de Vanuatu", "VUST"}},
+                                            "Hora de verano de Vanuatu", "VUST",
+                                            "Hora de Vanuatu", "VUT"}},
             {"Pacific/Enderbury", new String[] {"Hora de la isla Phoenix", "PHOT",
-                                                "Hora de verano de la isla Phoenix", "PHOST"}},
+                                                "Hora de verano de la isla Phoenix", "PHOST",
+                                                "Hora de la isla Phoenix", "PHOT"}},
             {"Pacific/Fakaofo", new String[] {"Hora de Tokelau", "TKT",
-                                              "Hora de verano de Tokelau", "TKST"}},
+                                              "Hora de verano de Tokelau", "TKST",
+                                              "Hora de Tokelau", "TKT"}},
             {"Pacific/Fiji", new String[] {"Hora de Fiji", "FJT",
-                                           "Hora de verano de Fiji", "FJST"}},
+                                           "Hora de verano de Fiji", "FJST",
+                                           "Hora de Fiji", "FJT"}},
             {"Pacific/Funafuti", new String[] {"Hora de Tuvalu", "TVT",
-                                               "Hora de verano de Tuvalu", "TVST"}},
+                                               "Hora de verano de Tuvalu", "TVST",
+                                               "Hora de Tuvalu", "TVT"}},
             {"Pacific/Galapagos", new String[] {"Hora de Gal\u00e1pagos", "GALT",
-                                                "Hora de verano de Gal\u00e1pagos", "GALST"}},
+                                                "Hora de verano de Gal\u00e1pagos", "GALST",
+                                                "Hora de Gal\u00E1pagos", "GALT"}},
             {"Pacific/Gambier", GAMBIER},
             {"Pacific/Guadalcanal", SBT},
             {"Pacific/Guam", ChST},
             {"Pacific/Johnston", HST},
             {"Pacific/Kiritimati", new String[] {"Hora de las islas Line", "LINT",
-                                                 "Hora de verano de las islas Line", "LINST"}},
+                                                 "Hora de verano de las islas Line", "LINST",
+                                                 "Hora de las islas Line", "LINT"}},
             {"Pacific/Kosrae", new String[] {"Hora de Kosrae", "KOST",
-                                             "Hora de verano de Kosrae", "KOSST"}},
+                                             "Hora de verano de Kosrae", "KOSST",
+                                             "Hora de Kosrae", "KOST"}},
             {"Pacific/Kwajalein", MHT},
             {"Pacific/Majuro", MHT},
             {"Pacific/Marquesas", new String[] {"Hora de Marquesas", "MART",
-                                                "Hora de verano de Marquesas", "MARST"}},
+                                                "Hora de verano de Marquesas", "MARST",
+                                                "Hora de Marquesas", "MART"}},
             {"Pacific/Midway", SAMOA},
             {"Pacific/Nauru", new String[] {"Hora de Nauru", "NRT",
-                                            "Hora de verano de Nauru", "NRST"}},
+                                            "Hora de verano de Nauru", "NRST",
+                                            "Hora de Nauru", "NRT"}},
             {"Pacific/Niue", new String[] {"Hora de Niue", "NUT",
-                                           "Hora de verano de Niue", "NUST"}},
+                                           "Hora de verano de Niue", "NUST",
+                                           "Hora de Niue", "NUT"}},
             {"Pacific/Norfolk", new String[] {"Hora de Norfolk", "NFT",
-                                              "Hora de verano de Norfolk", "NFST"}},
+                                              "Hora de verano de Norfolk", "NFST",
+                                              "Hora de Norfolk", "NFT"}},
             {"Pacific/Noumea", new String[] {"Hora de Nueva Caledonia", "NCT",
-                                             "Hora de verano de Nueva Caledonia", "NCST"}},
+                                             "Hora de verano de Nueva Caledonia", "NCST",
+                                             "Hora de Nueva Caledonia", "NCT"}},
             {"Pacific/Pago_Pago", SAMOA},
             {"Pacific/Palau", new String[] {"Hora de Palau", "PWT",
-                                            "Hora de verano de Palau", "PWST"}},
+                                            "Hora de verano de Palau", "PWST",
+                                            "Hora de Palau", "PWT"}},
             {"Pacific/Pitcairn", PITCAIRN},
             {"Pacific/Pohnpei", PONT},
             {"Pacific/Ponape", PONT},
             {"Pacific/Port_Moresby", new String[] {"Hora de Pap\u00faa-Nueva Guinea", "PGT",
-                                                   "Hora de verano de Pap\u00faa-Nueva Guinea", "PGST"}},
+                                                   "Hora de verano de Pap\u00faa-Nueva Guinea", "PGST",
+                                                   "Hora de Pap\u00FAa-Nueva Guinea", "PGT"}},
             {"Pacific/Rarotonga", new String[] {"Hora de las islas Cook", "CKT",
-                                                "Hora de verano de las islas Cook", "CKHST"}},
+                                                "Hora de verano de las islas Cook", "CKHST",
+                                                "Hora de las islas Cook", "CKT"}},
             {"Pacific/Saipan", ChST},
             {"Pacific/Samoa", SAMOA},
             {"Pacific/Tahiti", new String[] {"Hora de Tahit\u00ed", "TAHT",
-                                             "Hora de verano de Tahit\u00ed", "TAHST"}},
+                                             "Hora de verano de Tahit\u00ed", "TAHST",
+                                             "Hora de Tahit\u00ED", "TAHT"}},
             {"Pacific/Tarawa", new String[] {"Hora de las islas Gilbert", "GILT",
-                                             "Hora de verano de las islas Gilbert", "GILST"}},
+                                             "Hora de verano de las islas Gilbert", "GILST",
+                                             "Hora de las islas Gilbert", "GILT"}},
             {"Pacific/Tongatapu", new String[] {"Hora de Tonga", "TOT",
-                                                "Hora de verano de Tonga", "TOST"}},
+                                                "Hora de verano de Tonga", "TOST",
+                                                "Hora de Tonga", "TOT"}},
             {"Pacific/Truk", CHUT},
             {"Pacific/Wake", new String[] {"Hora de Wake", "WAKT",
-                                           "Hora de verano de Wake", "WAKST"}},
+                                           "Hora de verano de Wake", "WAKST",
+                                           "Hora de Wake", "WAKT"}},
             {"Pacific/Wallis", new String[] {"Hora de Wallis y Futuna", "WFT",
-                                             "Hora de verano de Wallis y Futuna", "WFST"}},
+                                             "Hora de verano de Wallis y Futuna", "WFST",
+                                             "Hora de Wallis y Futuna", "WFT"}},
             {"Pacific/Yap", CHUT},
             {"Poland", CET},
             {"PRC", CTT},