Mercurial > hg > icedtea7-forest-aarch64 > jdk
changeset 8126:e8a342b73ad0
8025051: Update resource files for TimeZone display names
Reviewed-by: okutsu, mfang
| author | aefimov |
|---|---|
| date | Sun, 13 Jul 2014 22:42:00 +0400 |
| parents | 6722d3b23769 |
| children | 44be5963aee5 |
| files | src/share/classes/sun/util/resources/TimeZoneNames_de.java src/share/classes/sun/util/resources/TimeZoneNames_es.java src/share/classes/sun/util/resources/TimeZoneNames_sv.java test/sun/util/resources/TimeZone/Bug6317929.java |
| diffstat | 4 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/util/resources/TimeZoneNames_de.java Tue Jul 08 23:40:22 2014 +0100 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_de.java Sun Jul 13 22:42:00 2014 +0400 @@ -89,7 +89,7 @@ "Chinesische Sommerzeit", "CDT"}; String CUBA[] = new String[] {"Kubanische Normalzeit", "CST", "Kubanische Sommerzeit", "CDT"}; - String DARWIN[] = new String[] {"Central Normalzeit (Northern Territory)", "CST", + String DARWIN[] = new String[] {"Zentrale Normalzeit (Northern Territory)", "CST", "Zentrale Sommerzeit (Northern Territory)", "CST"}; String DUBLIN[] = new String[] {"Greenwich Zeit", "GMT", "Irische Sommerzeit", "IST"}; @@ -103,7 +103,7 @@ "Ostgr\u00f6nl\u00e4ndische Sommerzeit", "EGST"}; String EST[] = new String[] {"\u00d6stliche Normalzeit", "EST", "\u00d6stliche Sommerzeit", "EDT"}; - String EST_NSW[] = new String[] {"Eastern Normalzeit (Neus\u00FCdwales)", "EST", + String EST_NSW[] = new String[] {"\u00D6stliche Normalzeit (New South Wales)", "EST", "\u00D6stliche Sommerzeit (New South Wales)", "EST"}; String FET[] = new String[] {"Kaliningrader Zeit", "FET", "Kaliningrader Sommerzeit", "FEST"};
--- a/src/share/classes/sun/util/resources/TimeZoneNames_es.java Tue Jul 08 23:40:22 2014 +0100 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_es.java Sun Jul 13 22:42:00 2014 +0400 @@ -77,8 +77,8 @@ "Hora de verano de Chatham", "CHADT"}; String ChST[] = new String[] {"Hora est\u00e1ndar de Chamorro", "ChST", "Hora de verano de Chamorro", "ChDT"}; - String CHUT[] = new String[] {"Chuuk Time", "CHUT", - "Chuuk Summer Time", "CHUST"}; + String CHUT[] = new String[] {"Hora de Chuuk", "CHUT", + "Hora de verano de Chuuk", "CHUST"}; String CIT[] = new String[] {"Hora de Indonesia Central", "WITA", "Hora de verano de Indonesia Central", "CIST"}; String CLT[] = new String[] {"Hora de Chile", "CLT", @@ -159,8 +159,8 @@ "Hora de verano de Pitcairn", "PDT"}; 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"}; + String PONT[] = new String[] {"Hora de Pohnpei", "PONT", + "Hora de verano de Pohnpei", "PONST"}; String PST[] = new String[] {"Hora est\u00e1ndar del Pac\u00edfico", "PST", "Hora de verano del Pac\u00edfico", "PDT"}; String SAMOA[] = new String[] {"Hora est\u00e1ndar de Samoa", "SST", @@ -401,8 +401,8 @@ {"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"}}, {"America/Mexico_City", CST}, {"America/Miquelon", new String[] {"Hora est\u00e1ndar de Pierre & Miquelon", "PMST", "Hora de verano de Pierre & Miquelon", "PMDT"}}, @@ -466,8 +466,8 @@ "Hora de verano de Davis", "DAVST"}}, {"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"}}, + {"Antarctica/Macquarie", new String[] {"Hora de Isla Macquarie", "MIST", + "Hora de verano de Isla Macquarie", "MIST"}}, {"Antarctica/Mawson", new String[] {"Hora de Mawson", "MAWT", "Hora de verano de Mawson", "MAWST"}}, {"Antarctica/McMurdo", NZST},
--- a/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Tue Jul 08 23:40:22 2014 +0100 +++ b/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Sun Jul 13 22:42:00 2014 +0400 @@ -63,7 +63,7 @@ "Bangladesh, sommartid", "BDST"}; String BRISBANE[] = new String[] {"\u00D6stlig standardtid (Queensland)", "EST", "\u00D6stlig sommartid (Queensland)", "EST"}; - String BROKEN_HILL[] = new String[] {"Central standardtid (Sydaustralien)/New South Wales)", "CST", + String BROKEN_HILL[] = new String[] {"Central standardtid (Sydaustralien/New South Wales)", "CST", "Central sommartid (South Australia/New South Wales)", "CST"}; String BRT[] = new String[] {"Brasilien, normaltid", "BRT", "Brasilien, sommartid", "BRST"};
--- a/test/sun/util/resources/TimeZone/Bug6317929.java Tue Jul 08 23:40:22 2014 +0100 +++ b/test/sun/util/resources/TimeZone/Bug6317929.java Sun Jul 13 22:42:00 2014 +0400 @@ -130,12 +130,12 @@ "(New South Wales)\""); tzLocale = locales2Test[1]; if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals - ("Eastern Normalzeit (Neus\u00fcdwales)")) + ("\u00D6stliche Normalzeit (New South Wales)")) throw new RuntimeException("\n" + tzLocale + ": LONG, " + "non-daylight saving name for " + "Australia/Currie should be " + - "\"Eastern Normalzeit " + - "(Neus\u00fcdwales)\""); + "\"\u00D6stliche Normalzeit " + + "(New South Wales)\""); tzLocale = locales2Test[2]; if (!Currie.getDisplayName(false, TimeZone.LONG, tzLocale).equals ("Hora est\u00e1ndar Oriental (Nueva Gales del Sur)"))