Mercurial > hg > icedtea6-hg
changeset 3170:ee1714db3b97
Bring in 2015/01/20 security update.
Upstream changes:
- OJ44: Add missing TimeZone test cases included in OpenJDK 7 revision 0.
- OJ45: Fix copyright headers on imported files
- OJ46: Fix lost Classpath exception
- OJ47: Remove @Override annotation on interfaces added by 2015/01/20 security fixes.
- OJ48: Fix substitution error.
- S4873188: Support TLS 1.1
- S6461635: [TESTBUG] BasicTests.sh test fails intermittently
- S6541350: TimeZone display names localization
- S6545422: [TESTBUG] NativeErrors.java uses wrong path name in exec
- S6578647: Undefined requesting URL in java.net.Authenticator.getPasswordAuthentication()
- S6587676: Krb5LoginModule failure if useTicketCache=true on Vista
- S6631048: Problem when writing on output stream of HttpURLConnection
- S6641309: Wrong Cookie separator used in HttpURLConnection
- S6641312: Fix krb5 codes indentation problems
- S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems
- S6659779: HttpURLConnections logger should log tunnel requests
- S6670362: HTTP/SPNEGO should work across realms
- S6706974: Add krb5 test infrastructure
- S6720866: Slow performance using HttpURLConnection for upload
- S6726695: HttpURLConnection shoul support 'Expect: 100-contimue' headers for PUT
- S6729881: Compiler warning in networking native code
- S6761072: new krb5 tests fail on multiple platforms
- S6765491: Krb5LoginModule a little too restrictive, and the doc is not clear.
- S6776102: sun/util/resources/TimeZone/Bug6317929.java test failed against 6u12b01 and passed against 6u11b03
- S6792180: Enhance to reject weak algorithms or conform to crypto recommendations
- S6811297: Add more logging to HTTP protocol handler
- S6821191: Timezone display name localization
- S6822460: support self-issued certificate
- S6830658: Changeset 67e5d3e41b5b breaks the fastdebug build in NativeCreds.c
- S6835668: Use of /usr/include/linux/ files creates a dependence on kernel-headers
- S6855297: Windows build breaks after 6811297
- S6856856: NPE in HTTP protocol handler logging
- S6868106: Ukrainian currency has wrong format
- S6870908: reopen bug 4244752: month names in Estonian should be lowercase
- S6873931: New Turkish currency since 2009
- S6882594: Remove static dependancy on NTLM authentication
- S6899503: Security code issue using Verisign root certificate
- S6910489: Slovenia Locale, wrong firstDayOfWeek number
- S6911104: Tests do not work with CYGWIN: tools, sun/tools, and com/sun/tools
- S6914413: abbreviation name for November is not correct in be_BY
- S6925851: Localize JRE into pt_BR
- S6931566: NetworkInterface is not working when interface name is more than 15 characters long
- S6945604: wrong error message in CardImpl.java
- S6962617: Testcase changes, cleanup of problem list for jdk_tools targets
- S6964714: NetworkInterface getInetAddresses enumerates IPv6 addresses if java.net.preferIPvStack property set
- S6967937: Scope id no longer being set after 6931566
- S6972374: NetworkInterface.getNetworkInterfaces throws "java.net.SocketException" on Solaris zone
- S6976117: SSLContext.getInstance("TLSv1.1") returns SSLEngines/SSLSockets without TLSv1.1 enabled
- S6977550: (tz) Support tzdata2010l
- S6996686: (tz) Support tzdata2010o
- S7001720: copyright templates not rebranded
- S7017800: (tz) Support tzdata2011b
- S7022269: clean up fscanf usage in Linux networking native code
- S7027387: (tz) Support tzdata2011d
- S7033174: (tz) Support tzdata2011e
- S7035073: Add missing timezones to TimeZoneNames_pt_BR.java
- S7035555: 4/4 attach/BasicTests.sh needs another tweak for Cygwin
- S7036025: java.security.AccessControlException when creating JFileChooser in signed applet
- S7039469: (tz) Support tzdata2011g
- S7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true
- S7079012: test/java/net/NetworkInterface/NetParamsTest.java fails with SocketException getting mac address
- S7090843: (tz) Support tzdata2011j
- S7103108: (tz) Support tzdata2011l
- S7103405: Correct display names for Pacific/Apia timezone
- S7104126: Insert openjdk copyright header back into TZdata files
- S7153184: NullPointerException when calling SSLEngineImpl.getSupportedCipherSuites
- S7158483: (tz) Support tzdata2012c
- S7174244: NPE in Krb5ProxyImpl.getServerKeys()
- S7198570: (tz) Support tzdata2012f
- S7199066: Typo in method name
- S8002225: (tz) Support tzdata2012i
- S8009987: (tz) Support tzdata2013b
- S8014469: (tz) Support tzdata2013c
- S8015421: NegativeArraySizeException occurs in ChunkedOutputStream() with Integer.MAX_VALUE
- S8015570: Use long comparison in Rule.getRules().
- S8020054: (tz) Support tzdata2013d
- S8021372: NetworkInterface.getNetworkInterfaces() returns duplicate hardware address
- S8023956: Provide a work-around to broken Linux 32 bit "Exec Shield" using CS for NX emulation (crashing with SI_KERNEL)
- S8025051: Update resource files for TimeZone display names
- S8025255: (tz) Support tzdata2013g
- S8026772: test/sun/util/resources/TimeZone/Bug6317929.java failing
- S8027359: XML parser returns incorrect parsing results
- S8027370: Support tzdata2013h
- S8028627: Unsynchronized code path from javax.crypto.Cipher to the WeakHashMap used by JceSecurity to store codebase mappings
- S8028726: (prefs) Check src/solaris/native/java/util/FileSystemPreferences.c for JNI pending exceptions
- S8029153: [TESTBUG] test/compiler/7141637/SpreadNullArg.java fails because it expects NullPointerException
- S8029318: Native Windows ccache still reads DES tickets
- S8030822: (tz) Support tzdata2013i
- S8031046: Native Windows ccache might still get unsupported ticket
- S8032788: ImageIcon constructor throws an NPE and hangs when passed a null String parameter
- S8032909: XSLT string-length returns incorrect length when string includes complementary chars
- S8035613: With active Securitymanager JAXBContext.newInstance fails
- S8037012: (tz) Support tzdata2014a
- S8038306: (tz) Support tzdata2014b
- S8040617: [macosx] Large JTable cell results in a OutOfMemoryException
- S8041990: [macosx] Language specific keys does not work in applets when opened outside the browser
- S8043012: (tz) Support tzdata2014c
- S8046343: (smartcardio) CardTerminal.connect('direct') does not work on MacOSX
- S8046656: Update protocol support
- S8047125: (ref) More phantom object references
- S8047130: Fewer escapes from escape analysis
- S8048035: Ensure proper proxy protocols
- S8049250: Need a flag to invert the Card.disconnect(reset) argument
- S8049253: Better GC validation
- S8049343: (tz) Support tzdata2014g
- S8050485: super() in a try block in a ctor causes VerifyError
- S8050807: Better performing performance data handling
- S8051012: Regression in verifier for <init> method call from inside of a branch
- S8051614: smartcardio TCK tests fail due to lack of 'reset' permission
- S8054367: More references for endpoints
- S8055304: More boxing for DirectoryComboBoxModel
- S8055309: RMI needs better transportation considerations
- S8055479: TLAB stability
- S8055489: Better substitution formats
- S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure
- S8056264: Multicast support improvements
- S8056276: Fontmanager feature improvements
- S8057555: Less cryptic cipher suite management
- S8058715: stability issues when being launched as an embedded JVM via JNI
- S8058982: Better verification of an exceptional invokespecial
- S8059206: (tz) Support tzdata2014i
- S8059485: Resolve parsing ambiguity
- S8060474: Resolve more parsing ambiguity
- S8061210: Issues in TLS
- S8061826: Part of JDK-8060474 should be reverted
- S8062561: Test bug8055304 fails if file system default directory has read access
- S8062807: Exporting RMI objects fails when run under restrictive SecurityManager
- S8064560: (tz) Support tzdata2014j
2015-01-19 Andrew John Hughes <gnu.andrew@member.fsf.org>
* patches/openjdk/6541350-tz_display_names_l10n.patch,
* patches/openjdk/6706974-krb5_test_infrastructure.patch,
* patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch,
* patches/openjdk/6821191-tz_display_names_l10n.patch,
* patches/openjdk/6925851-pt_br.patch,
* patches/openjdk/6977550-tzdata2010l.patch,
* patches/openjdk/6996686-tzdata2010o.patch,
* patches/openjdk/7017800-tzdata2011b.patch,
* patches/openjdk/7027387-tzdata2011d.patch,
* patches/openjdk/7033174-tzdata2011e.patch,
* patches/openjdk/7035073-missing_pt_br_timezones.patch,
* patches/openjdk/7039469-tzdata2011g.patch,
* patches/openjdk/7090843-tzdata2011j.patch,
* patches/openjdk/7103108-tzdata2011l.patch,
* patches/openjdk/7103405-correct_display_names.patch,
* patches/openjdk/7104126-headers_tzdata.patch,
* patches/openjdk/7158483-tzdata2012c.patch,
* patches/openjdk/7198570-tzdata2012f.patch,
* patches/openjdk/8002225-tzdata2012i.patch,
* patches/openjdk/8009987-tzdata2013b.patch,
* patches/openjdk/8014469-tzdata2013c.patch,
* patches/openjdk/8020054-tzdata2013d.patch,
* patches/openjdk/8025255-tzdata2013g.patch:
Remove patches included upstream.
* Makefile.am:
(ICEDTEA_PATCHES): Remove above patches.
* NEWS: Updated.
* patches/hotspot/hs23/remove_jsr292_tests.patch:
Regenerated.
* patches/hotspot/hs23/type_fixes.patch:
Remove threadLocalAllocBuffer.cpp hunk which is
no longer applicable.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Tue, 20 Jan 2015 04:38:55 +0000 |
| parents | ccfb83ff9e78 |
| children | 102b1e9b36a3 |
| files | ChangeLog Makefile.am NEWS patches/hotspot/hs23/remove_jsr292_tests.patch patches/hotspot/hs23/type_fixes.patch patches/openjdk/6541350-tz_display_names_l10n.patch patches/openjdk/6706974-krb5_test_infrastructure.patch patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch patches/openjdk/6821191-tz_display_names_l10n.patch patches/openjdk/6925851-pt_br.patch patches/openjdk/6977550-tzdata2010l.patch patches/openjdk/6996686-tzdata2010o.patch patches/openjdk/7017800-tzdata2011b.patch patches/openjdk/7027387-tzdata2011d.patch patches/openjdk/7033174-tzdata2011e.patch patches/openjdk/7035073-missing_pt_br_timezones.patch patches/openjdk/7039469-tzdata2011g.patch patches/openjdk/7090843-tzdata2011j.patch patches/openjdk/7103108-tzdata2011l.patch patches/openjdk/7103405-correct_display_names.patch patches/openjdk/7104126-headers_tzdata.patch patches/openjdk/7158483-tzdata2012c.patch patches/openjdk/7198570-tzdata2012f.patch patches/openjdk/8002225-tzdata2012i.patch patches/openjdk/8009987-tzdata2013b.patch patches/openjdk/8014469-tzdata2013c.patch patches/openjdk/8020054-tzdata2013d.patch patches/openjdk/8025255-tzdata2013g.patch |
| diffstat | 28 files changed, 192 insertions(+), 23349 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jan 19 17:52:30 2015 +0000 +++ b/ChangeLog Tue Jan 20 04:38:55 2015 +0000 @@ -1,3 +1,38 @@ +2015-01-19 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * patches/openjdk/6541350-tz_display_names_l10n.patch, + * patches/openjdk/6706974-krb5_test_infrastructure.patch, + * patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch, + * patches/openjdk/6821191-tz_display_names_l10n.patch, + * patches/openjdk/6925851-pt_br.patch, + * patches/openjdk/6977550-tzdata2010l.patch, + * patches/openjdk/6996686-tzdata2010o.patch, + * patches/openjdk/7017800-tzdata2011b.patch, + * patches/openjdk/7027387-tzdata2011d.patch, + * patches/openjdk/7033174-tzdata2011e.patch, + * patches/openjdk/7035073-missing_pt_br_timezones.patch, + * patches/openjdk/7039469-tzdata2011g.patch, + * patches/openjdk/7090843-tzdata2011j.patch, + * patches/openjdk/7103108-tzdata2011l.patch, + * patches/openjdk/7103405-correct_display_names.patch, + * patches/openjdk/7104126-headers_tzdata.patch, + * patches/openjdk/7158483-tzdata2012c.patch, + * patches/openjdk/7198570-tzdata2012f.patch, + * patches/openjdk/8002225-tzdata2012i.patch, + * patches/openjdk/8009987-tzdata2013b.patch, + * patches/openjdk/8014469-tzdata2013c.patch, + * patches/openjdk/8020054-tzdata2013d.patch, + * patches/openjdk/8025255-tzdata2013g.patch: + Remove patches included upstream. + * Makefile.am: + (ICEDTEA_PATCHES): Remove above patches. + * NEWS: Updated. + * patches/hotspot/hs23/remove_jsr292_tests.patch: + Regenerated. + * patches/hotspot/hs23/type_fixes.patch: + Remove threadLocalAllocBuffer.cpp hunk which is + no longer applicable. + 2015-01-19 Andrew John Hughes <gnu.andrew@member.fsf.org> * patches/clean-crypto.patch: Removed; replaced by
--- a/Makefile.am Mon Jan 19 17:52:30 2015 +0000 +++ b/Makefile.am Tue Jan 20 04:38:55 2015 +0000 @@ -453,9 +453,7 @@ patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch \ patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \ patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \ - patches/openjdk/6706974-krb5_test_infrastructure.patch \ patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \ - patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \ patches/ScriptEngineManager-doc.patch \ patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch \ patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch \ @@ -506,24 +504,6 @@ patches/openjdk/8014427-raster_regression.patch \ patches/openjdk/8014676-javadebugger_space_in_paths.patch \ patches/openjdk/8014968-OCSP_timeout_default.patch \ - patches/openjdk/6541350-tz_display_names_l10n.patch \ - patches/openjdk/6821191-tz_display_names_l10n.patch \ - patches/openjdk/6925851-pt_br.patch \ - patches/openjdk/6977550-tzdata2010l.patch \ - patches/openjdk/6996686-tzdata2010o.patch \ - patches/openjdk/7017800-tzdata2011b.patch \ - patches/openjdk/7027387-tzdata2011d.patch \ - patches/openjdk/7033174-tzdata2011e.patch \ - patches/openjdk/7035073-missing_pt_br_timezones.patch \ - patches/openjdk/7039469-tzdata2011g.patch \ - patches/openjdk/7090843-tzdata2011j.patch \ - patches/openjdk/7103108-tzdata2011l.patch \ - patches/openjdk/7104126-headers_tzdata.patch \ - patches/openjdk/7103405-correct_display_names.patch \ - patches/openjdk/7158483-tzdata2012c.patch \ - patches/openjdk/7198570-tzdata2012f.patch \ - patches/openjdk/8002225-tzdata2012i.patch \ - patches/openjdk/8009987-tzdata2013b.patch \ patches/openjdk/6636370-appcontext_simplification.patch \ patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch \ patches/sparc-ptracefix.patch \ @@ -544,8 +524,6 @@ patches/print_lsb_release.patch \ patches/alternative_krb5_cache.patch \ patches/alternative_krb5_cache_fixup.patch \ - patches/openjdk/8014469-tzdata2013c.patch \ - patches/openjdk/8020054-tzdata2013d.patch \ patches/imageiojpeg_sync.patch \ patches/openjdk/8005194-scale_memory_leak.patch \ patches/openjdk/6563752-ss12_support.patch \ @@ -599,7 +577,6 @@ patches/hotspot/hs23/arm-hsdis.patch \ patches/openjdk/7025066-embedded_build.patch \ patches/s390_casts.patch \ - patches/openjdk/8025255-tzdata2013g.patch \ patches/d729448-32_bit_alignment.patch \ patches/windows-awt.patch \ patches/windows-jdk-sizecalc.patch \
--- a/NEWS Mon Jan 19 17:52:30 2015 +0000 +++ b/NEWS Tue Jan 20 04:38:55 2015 +0000 @@ -14,52 +14,153 @@ New in release 1.14.0 (201X-XX-XX): +* Security fixes + - S8046656: Update protocol support + - S8047125, CVE-2015-0395: (ref) More phantom object references + - S8047130: Fewer escapes from escape analysis + - S8048035, CVE-2015-0400: Ensure proper proxy protocols + - S8049253: Better GC validation + - S8050807, CVE-2015-0383: Better performing performance data handling + - S8054367, CVE-2015-0412: More references for endpoints + - S8055304, CVE-2015-0407: More boxing for DirectoryComboBoxModel + - S8055309, CVE-2015-0408: RMI needs better transportation considerations + - S8055479: TLAB stability + - S8055489, CVE-2014-6585: Better substitution formats + - S8056264, CVE-2014-6587: Multicast support improvements + - S8056276, CVE-2014-6591: Fontmanager feature improvements + - S8057555, CVE-2014-6593: Less cryptic cipher suite management + - S8058982, CVE-2014-6601: Better verification of an exceptional invokespecial + - S8059485, CVE-2015-0410: Resolve parsing ambiguity + - S8061210, CVE-2014-3566: Issues in TLS * Import of OpenJDK6 b34 - OJ43: Backport JAX_WS-945; Socket backlog may be limiting lwhs performance + - OJ44: Add missing TimeZone test cases included in OpenJDK 7 revision 0. + - OJ45: Fix copyright headers on imported files + - OJ46: Fix lost Classpath exception + - OJ47: Remove @Override annotation on interfaces added by 2015/01/20 security fixes. + - OJ48: Fix substitution error. + - S4873188: Support TLS 1.1 - S6364329: jstat displays "invalid argument count" with usage + - S6461635: [TESTBUG] BasicTests.sh test fails intermittently - S6507067: TimeZone country/area message error + - S6545422: [TESTBUG] NativeErrors.java uses wrong path name in exec + - S6578647: Undefined requesting URL in java.net.Authenticator.getPasswordAuthentication() - S6585666: Spanish language names not compliant with CLDR + - S6587676: Krb5LoginModule failure if useTicketCache=true on Vista - S6608572: Currency change for Malta and Cyprus - S6610748: Dateformat - AM-PM indicator in Finnish appears to be from English - S6627549: ISO 3166 code addition: Saint Barthelemy and Saint Martin + - S6631048: Problem when writing on output stream of HttpURLConnection + - S6641309: Wrong Cookie separator used in HttpURLConnection + - S6641312: Fix krb5 codes indentation problems - S6645271: Wrong date format for Croatian (hr) locale - S6646611: Incorrect spelling of month name in locale for Belarusian language ("be", "BY") - S6647452: Remove obfuscation, framework and provider self-verification checking + - S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems + - S6659779: HttpURLConnections logger should log tunnel requests + - S6670362: HTTP/SPNEGO should work across realms - S6716626: Integrate contributed language and country names for NL + - S6720866: Slow performance using HttpURLConnection for upload + - S6726695: HttpURLConnection shoul support 'Expect: 100-continue' headers for PUT + - S6729881: Compiler warning in networking native code + - S6765491: Krb5LoginModule a little too restrictive, and the doc is not clear. + - S6776102: sun/util/resources/TimeZone/Bug6317929.java test failed against 6u12b01 and passed against 6u11b03 - S6786276: Locale.getISOCountries() still contains country code "CS" + - S6792180: Enhance to reject weak algorithms or conform to crypto recommendations + - S6811297: Add more logging to HTTP protocol handler + - S6822460: support self-issued certificate + - S6830658: Changeset 67e5d3e41b5b breaks the fastdebug build in NativeCreds.c + - S6835668: Use of /usr/include/linux/ files creates a dependence on kernel-headers + - S6855297: Windows build breaks after 6811297 + - S6856856: NPE in HTTP protocol handler logging - S6868106: Ukrainian currency has wrong format - S6870908: reopen bug 4244752: month names in Estonian should be lowercase - S6873931: New Turkish currency since 2009 + - S6882594: Remove static dependancy on NTLM authentication + - S6899503: Security code issue using Verisign root certificate - S6910489: Slovenia Locale, wrong firstDayOfWeek number + - S6911104: Tests do not work with CYGWIN: tools, sun/tools, and com/sun/tools - S6914413: abbreviation name for November is not correct in be_BY - S6916787: Ukrainian currency name needs to be fixed - S6919624: minimalDaysInFirstWeek ressource for hungarian is wrong - S6931564: Incorrect display name of Locale for south africa + - S6931566: NetworkInterface is not working when interface name is more than 15 characters long - S6938454: 2 new testcases for bug: Unable to determine generic type in program that compiles under Java 6 - S6938454: Unable to determine generic type in program that compiles under Java 6 + - S6945604: wrong error message in CardImpl.java + - S6962617: Testcase changes, cleanup of problem list for jdk_tools targets + - S6964714: NetworkInterface getInetAddresses enumerates IPv6 addresses if java.net.preferIPvStack property set + - S6967937: Scope id no longer being set after 6931566 + - S6972374: NetworkInterface.getNetworkInterfaces throws "java.net.SocketException" on Solaris zone + - S6976117: SSLContext.getInstance("TLSv1.1") returns SSLEngines/SSLSockets without TLSv1.1 enabled + - S7001720: copyright templates not rebranded - S7019267: Currency Display Names are not localized into pt_BR. - S7020583: Some currency names are missing in some locales - S7020960: CurrencyNames_sr_RS.properties is missing. + - S7022269: clean up fscanf usage in Linux networking native code - S7025837: fix plural currency display names in sr_Latn_(BA|ME|RS).properties - S7028073: The currency symbol for Peru is wrong + - S7035555: 4/4 attach/BasicTests.sh needs another tweak for Cygwin + - S7036025: java.security.AccessControlException when creating JFileChooser in signed applet - S7036905: [de] dem - the german mark display name is incorrect + - S7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true - S7066203: Update currency data to the latest ISO 4217 standard - S7077119: remove past transition dates from CurrencyData.properties file - S7085757: Currency Data: ISO 4217 Amendment 152 - S7122142, RH1151372: (ann) Race condition between isAnnotationPresent and getAnnotations + - S7153184: NullPointerException when calling SSLEngineImpl.getSupportedCipherSuites - S7161796, RH1151372: PhaseStringOpts::fetch_static_field tries to fetch field from the Klass instead of the mirror - S7171028: dots are missed in the datetime for Slovanian + - S7174244: NPE in Krb5ProxyImpl.getServerKeys() - S7185456: (ann) Optimize Annotation handling in java/sun.reflect.* code for small number of annotations - S7189611: Venezuela current Currency should be Bs.F. - S7195759: ISO 4217 Amendment 154 + - S7199066: Typo in method name - S7201205: Add Makefile configuration option to build with unlimited crypto in OpenJDK. - S8005232: (JEP-149) Class Instance size reduction - S8006748: getISO3Country() returns wrong value - S8013836: getFirstDayOfWeek reports wrong day for pt-BR locale + - S8015421: NegativeArraySizeException occurs in ChunkedOutputStream() with Integer.MAX_VALUE + - S8015570: Use long comparison in Rule.getRules(). - S8021121: ISO 4217 Amendment Number 156 + - S8021372: NetworkInterface.getNetworkInterfaces() returns duplicate hardware address - S8022721: TEST_BUG: AnnotationTypeDeadlockTest.java throws java.lang.IllegalStateException: unexpected condition + - S8023956: Provide a work-around to broken Linux 32 bit "Exec Shield" using CS for NX emulation (crashing with SI_KERNEL) + - S8025051: Update resource files for TimeZone display names + - S8026772: test/sun/util/resources/TimeZone/Bug6317929.java failing + - S8027359: XML parser returns incorrect parsing results + - S8027370: Support tzdata2013h - S8027695: There should be a space before % sign in Swedish locale + - S8028627: Unsynchronized code path from javax.crypto.Cipher to the WeakHashMap used by JceSecurity to store codebase mappings + - S8028726: (prefs) Check src/solaris/native/java/util/FileSystemPreferences.c for JNI pending exceptions + - S8029153: [TESTBUG] test/compiler/7141637/SpreadNullArg.java fails because it expects NullPointerException + - S8029318: Native Windows ccache still reads DES tickets + - S8030822: (tz) Support tzdata2013i + - S8031046: Native Windows ccache might still get unsupported ticket + - S8032788: ImageIcon constructor throws an NPE and hangs when passed a null String parameter + - S8032909: XSLT string-length returns incorrect length when string includes complementary chars + - S8035613: With active Securitymanager JAXBContext.newInstance fails + - S8037012: (tz) Support tzdata2014a + - S8038306: (tz) Support tzdata2014b + - S8040617: [macosx] Large JTable cell results in a OutOfMemoryException + - S8041990: [macosx] Language specific keys does not work in applets when opened outside the browser + - S8043012: (tz) Support tzdata2014c + - S8046343: (smartcardio) CardTerminal.connect('direct') does not work on MacOSX + - S8049250: Need a flag to invert the Card.disconnect(reset) argument + - S8049343: (tz) Support tzdata2014g + - S8050485: super() in a try block in a ctor causes VerifyError + - S8051012: Regression in verifier for <init> method call from inside of a branch + - S8051614: smartcardio TCK tests fail due to lack of 'reset' permission + - S8054367: More references for endpoints - S8055222: Currency update needed for ISO 4217 Amendment #159 + - S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure + - S8058715: stability issues when being launched as an embedded JVM via JNI + - S8059206: (tz) Support tzdata2014i + - S8060474: Resolve more parsing ambiguity + - S8061826: Part of JDK-8060474 should be reverted + - S8062561: Test bug8055304 fails if file system default directory has read access + - S8062807: Exporting RMI objects fails when run under restrictive SecurityManager + - S8064560: (tz) Support tzdata2014j * Backports - S6611637: NullPointerException in sun.font.GlyphLayout$EngineRecord.init - S6727719: Performance of TextLayout.getBounds()
--- a/patches/hotspot/hs23/remove_jsr292_tests.patch Mon Jan 19 17:52:30 2015 +0000 +++ b/patches/hotspot/hs23/remove_jsr292_tests.patch Tue Jan 20 04:38:55 2015 +0000 @@ -1,7 +1,6 @@ -diff --git a/test/compiler/6990212/Test6990212.java b/test/compiler/6990212/Test6990212.java -deleted file mode 100644 ---- openjdk/hotspot/test/compiler/6990212/Test6990212.java -+++ /dev/null +diff -r 0dd28ac12d7d test/compiler/6990212/Test6990212.java +--- openjdk/hotspot/test/compiler/6990212/Test6990212.java Mon Jan 19 07:36:09 2015 +0000 ++++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. @@ -59,11 +58,10 @@ - } - } -} -diff --git a/test/compiler/7141637/SpreadNullArg.java b/test/compiler/7141637/SpreadNullArg.java -deleted file mode 100644 ---- openjdk/hotspot/test/compiler/7141637/SpreadNullArg.java -+++ /dev/null -@@ -1,62 +0,0 @@ +diff -r 0dd28ac12d7d test/compiler/7141637/SpreadNullArg.java +--- openjdk/hotspot/test/compiler/7141637/SpreadNullArg.java Mon Jan 19 07:36:09 2015 +0000 ++++ /dev/null Thu Jan 01 00:00:00 1970 +0000 +@@ -1,66 +0,0 @@ -/* - * Copyright 2011 SAP AG. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -112,13 +110,17 @@ - mh_spread_target = - MethodHandles.lookup().findStatic(SpreadNullArg.class, "target_spread_arg", mt_ref_arg); - result = (int) mh_spreadInvoker.invokeExact(mh_spread_target, (Object[]) null); -- } catch(NullPointerException e) { -- // Expected exception - do nothing! -- } catch(Throwable e) { +- throw new Error("Expected IllegalArgumentException was not thrown"); +- } catch (IllegalArgumentException e) { +- System.out.println("Expected exception : " + e); +- } catch (Throwable e) { - throw new Error(e); - } - -- if (result != 42) throw new Error("Expected NullPointerException was not thrown"); +- if (result != 42) { +- throw new Error("result [" + result +- + "] != 42 : Expected IllegalArgumentException was not thrown?"); +- } - } - - public static int target_spread_arg(Integer i1) { @@ -126,10 +128,9 @@ - } - -} -diff --git a/test/compiler/7158807/Test7158807.java b/test/compiler/7158807/Test7158807.java -deleted file mode 100644 ---- openjdk/hotspot/test/compiler/7158807/Test7158807.java -+++ /dev/null +diff -r 0dd28ac12d7d test/compiler/7158807/Test7158807.java +--- openjdk/hotspot/test/compiler/7158807/Test7158807.java Mon Jan 19 07:36:09 2015 +0000 ++++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
--- a/patches/hotspot/hs23/type_fixes.patch Mon Jan 19 17:52:30 2015 +0000 +++ b/patches/hotspot/hs23/type_fixes.patch Tue Jan 20 04:38:55 2015 +0000 @@ -1,14 +1,6 @@ -# HG changeset patch -# User andrew -# Date 1316650188 -3600 -# Thu Sep 22 01:09:48 2011 +0100 -# Node ID e0155b0ad538da0ed3046127cf087dda042783e8 -# Parent d88eef905e3079c07507cf395d4cb12fa2981db4 -Use appropriate types in order to allow builds on more architectures. - -diff --git a/src/share/vm/asm/codeBuffer.hpp b/src/share/vm/asm/codeBuffer.hpp ---- openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp -+++ openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp +diff -Nru openjdk.orig/hotspot/src/share/vm/asm/codeBuffer.hpp openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp +--- openjdk.orig/hotspot/src/share/vm/asm/codeBuffer.hpp 2015-01-20 02:18:05.528822959 +0000 ++++ openjdk/hotspot/src/share/vm/asm/codeBuffer.hpp 2015-01-20 02:24:10.553291894 +0000 @@ -93,7 +93,7 @@ address _locs_point; // last relocated position (grows upward) bool _locs_own; // did I allocate the locs myself? @@ -18,10 +10,10 @@ CodeBuffer* _outer; // enclosing CodeBuffer // (Note: _locs_point used to be called _last_reloc_offset.) -diff --git a/src/share/vm/ci/ciTypeFlow.cpp b/src/share/vm/ci/ciTypeFlow.cpp ---- openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp -+++ openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp -@@ -403,7 +403,7 @@ +diff -Nru openjdk.orig/hotspot/src/share/vm/ci/ciTypeFlow.cpp openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp +--- openjdk.orig/hotspot/src/share/vm/ci/ciTypeFlow.cpp 2015-01-20 02:22:58.188406105 +0000 ++++ openjdk/hotspot/src/share/vm/ci/ciTypeFlow.cpp 2015-01-20 02:24:10.553291894 +0000 +@@ -406,7 +406,7 @@ // Set the rest of the locals to bottom. Cell cell = state->next_cell(state->tos()); state->set_stack_size(0); @@ -30,9 +22,9 @@ for (; cell < limit; cell = state->next_cell(cell)) { state->set_type_at(cell, state->bottom_type()); } -diff --git a/src/share/vm/compiler/methodLiveness.cpp b/src/share/vm/compiler/methodLiveness.cpp ---- openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp -+++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp +diff -Nru openjdk.orig/hotspot/src/share/vm/compiler/methodLiveness.cpp openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp +--- openjdk.orig/hotspot/src/share/vm/compiler/methodLiveness.cpp 2015-01-20 02:18:13.308918231 +0000 ++++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp 2015-01-20 02:24:10.553291894 +0000 @@ -572,15 +572,15 @@ @@ -63,10 +55,10 @@ _analyzer->bit_map_size_bits()); answer.set_is_valid(); -diff --git a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp -@@ -957,7 +957,7 @@ +diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2015-01-20 02:20:42.290742422 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2015-01-20 02:24:10.557291942 +0000 +@@ -963,7 +963,7 @@ if (free_percentage < desired_free_percentage) { size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage)); assert(desired_capacity >= capacity(), "invalid expansion size"); @@ -75,7 +67,7 @@ } if (expand_bytes > 0) { if (PrintGCDetails && Verbose) { -@@ -6253,7 +6253,7 @@ +@@ -6282,7 +6282,7 @@ HeapWord* curAddr = _markBitMap.startWord(); while (curAddr < _markBitMap.endWord()) { size_t remaining = pointer_delta(_markBitMap.endWord(), curAddr); @@ -84,7 +76,7 @@ _markBitMap.clear_large_range(chunk); if (ConcurrentMarkSweepThread::should_yield() && !foregroundGCIsActive() && -@@ -6546,7 +6546,7 @@ +@@ -6575,7 +6575,7 @@ return; } // Double capacity if possible @@ -93,9 +85,9 @@ // Do not give up existing stack until we have managed to // get the double capacity that we desired. ReservedSpace rs(ReservedSpace::allocation_align_size_up( -diff --git a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp +diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2015-01-20 02:18:02.044780293 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2015-01-20 02:24:10.557291942 +0000 @@ -897,8 +897,8 @@ void PSParallelCompact::initialize_dead_wood_limiter() { @@ -107,9 +99,9 @@ _dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev); DEBUG_ONLY(_dwl_initialized = true;) _dwl_adjustment = normal_distribution(1.0); -diff --git a/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp b/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp ---- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp -+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp +diff -Nru openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp +--- openjdk.orig/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2015-01-20 02:18:02.140781469 +0000 ++++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp 2015-01-20 02:24:10.557291942 +0000 @@ -69,7 +69,7 @@ _last_used = current_live; @@ -119,10 +111,10 @@ virtual_space()->alignment()); // Compute the desired size: -diff --git a/src/share/vm/memory/collectorPolicy.cpp b/src/share/vm/memory/collectorPolicy.cpp ---- openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp -+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp -@@ -327,7 +327,7 @@ +diff -Nru openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp +--- openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp 2015-01-20 02:18:07.024841278 +0000 ++++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp 2015-01-20 02:24:10.557291942 +0000 +@@ -330,7 +330,7 @@ // yield a size that is too small) and bound it by MaxNewSize above. // Ergonomics plays here by previously calculating the desired // NewSize and MaxNewSize. @@ -131,22 +123,10 @@ } assert(max_new_size > 0, "All paths should set max_new_size"); -diff --git a/src/share/vm/memory/threadLocalAllocBuffer.cpp b/src/share/vm/memory/threadLocalAllocBuffer.cpp ---- openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp -+++ openjdk/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp -@@ -240,7 +240,7 @@ - size_t init_sz; - - if (TLABSize > 0) { -- init_sz = MIN2(TLABSize / HeapWordSize, max_size()); -+ init_sz = MIN2((size_t) (TLABSize / HeapWordSize), max_size()); - } else if (global_stats() == NULL) { - // Startup issue - main thread initialized before heap initialized. - init_sz = min_size(); -diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp ---- openjdk/hotspot/src/share/vm/runtime/arguments.cpp -+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp -@@ -1143,7 +1143,7 @@ +diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp +--- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp 2015-01-20 02:22:59.128417610 +0000 ++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp 2015-01-20 02:24:10.557291942 +0000 +@@ -1168,7 +1168,7 @@ // NewSize was set on the command line and it is larger than // preferred_max_new_size. if (!FLAG_IS_DEFAULT(NewSize)) { // NewSize explicitly set at command-line @@ -155,7 +135,7 @@ } else { FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size); } -@@ -1172,8 +1172,8 @@ +@@ -1197,8 +1197,8 @@ // Unless explicitly requested otherwise, make young gen // at least min_new, and at most preferred_max_new_size. if (FLAG_IS_DEFAULT(NewSize)) { @@ -166,9 +146,9 @@ if (PrintGCDetails && Verbose) { // Too early to use gclog_or_tty tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize); -diff --git a/src/share/vm/utilities/bitMap.hpp b/src/share/vm/utilities/bitMap.hpp ---- openjdk/hotspot/src/share/vm/utilities/bitMap.hpp -+++ openjdk/hotspot/src/share/vm/utilities/bitMap.hpp +diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/bitMap.hpp openjdk/hotspot/src/share/vm/utilities/bitMap.hpp +--- openjdk.orig/hotspot/src/share/vm/utilities/bitMap.hpp 2015-01-20 02:18:09.404870423 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/bitMap.hpp 2015-01-20 02:24:10.557291942 +0000 @@ -79,7 +79,7 @@ // Set a word to a specified value or to all ones; clear a word. @@ -178,10 +158,10 @@ void clear_word(idx_t word) { _map[word] = 0; } // Utilities for ranges of bits. Ranges are half-open [beg, end). -diff --git a/src/share/vm/utilities/ostream.cpp b/src/share/vm/utilities/ostream.cpp ---- openjdk/hotspot/src/share/vm/utilities/ostream.cpp -+++ openjdk/hotspot/src/share/vm/utilities/ostream.cpp -@@ -961,7 +961,7 @@ +diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/ostream.cpp openjdk/hotspot/src/share/vm/utilities/ostream.cpp +--- openjdk.orig/hotspot/src/share/vm/utilities/ostream.cpp 2015-01-20 02:20:42.314742716 +0000 ++++ openjdk/hotspot/src/share/vm/utilities/ostream.cpp 2015-01-20 02:24:10.557291942 +0000 +@@ -1121,7 +1121,7 @@ server.sin_port = htons(port); server.sin_addr.s_addr = inet_addr(ip);
--- a/patches/openjdk/6541350-tz_display_names_l10n.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,300 +0,0 @@ -# HG changeset patch -# User yhuang -# Date 1261700777 28800 -# Node ID 1397ae8dc558c9128d84818afc9ec55d23714c35 -# Parent 7bf839e2e9ce58d5f205280bf5a06f00227f2240 -6541350: TimeZone display names localization -Reviewed-by: yhuang, peytoia - ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -@@ -83,8 +83,8 @@ - "Zentrale Sommerzeit", "CDT"}; - String CTT[] = new String[] {"Chinesische Normalzeit", "CST", - "Chinesische Sommerzeit", "CDT"}; -- String CUBA[] = new String[] {"Cuba Standard Time", "CST", -- "Cuba Daylight Time", "CDT"}; -+ String CUBA[] = new String[] {"Kubanische Normalzeit", "CST", -+ "Kubanische Sommerzeit", "CDT"}; - String DARWIN[] = new String[] {"Zentrale Normalzeit (Northern Territory)", "CST", - "Zentrale Sommerzeit (Northern Territory)", "CST"}; - String DUBLIN[] = new String[] {"Greenwich Zeit", "GMT", -@@ -594,8 +594,8 @@ - {"Australia/Canberra", EST_NSW}, - {"Australia/Currie", EST_NSW}, - {"Australia/Darwin", DARWIN}, -- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", -- "Central Western Summer Time (Australia)", "CWST"}}, -+ {"Australia/Eucla", new String[] {"Zentral-Westliche Normalzeit (Australien)", "CWST", -+ "Zentral-Westliche Sommerzeit (Australien)", "CWST"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -@@ -83,8 +83,8 @@ - "Hora de verano Central", "CDT"}; - String CTT[] = new String[] {"Hora est\u00e1ndar de China", "CST", - "Hora de verano de China", "CDT"}; -- String CUBA[] = new String[] {"Cuba Standard Time", "CST", -- "Cuba Daylight Time", "CDT"}; -+ String CUBA[] = new String[] {"Hora est\u00e1ndar de Cuba", "CST", -+ "Hora de verano de Cuba", "CDT"}; - String DARWIN[] = new String[] {"Hora est\u00e1ndar Central (territorio del Norte)", "CST", - "Hora de verano Central (territorio del Norte)", "CST"}; - String DUBLIN[] = new String[] {"Hora del Meridiano de Greenwich", "GMT", -@@ -595,8 +595,8 @@ - {"Australia/Canberra", EST_NSW}, - {"Australia/Currie", EST_NSW}, - {"Australia/Darwin", DARWIN}, -- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", -- "Central Western Summer Time (Australia)", "CWST"}}, -+ {"Australia/Eucla", new String[] {"Hora est\u00e1ndar de Australia Central y Occidental", "CWST", -+ "Hora de verano de Australia Central y Occidental", "CWST"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -@@ -83,8 +83,8 @@ - "Heure avanc\u00e9e du Centre", "CDT"} ; - String CTT[] = new String[] {"Heure normale de Chine", "CST", - "Heure avanc\u00e9e de Chine", "CDT"} ; -- String CUBA[] = new String[] {"Cuba Standard Time", "CST", -- "Cuba Daylight Time", "CDT"}; -+ String CUBA[] = new String[] {"Heure standard de Cuba", "CST", -+ "Heure d'\u00e9t\u00e9 de Cuba", "CDT"}; - String DARWIN[] = new String[] {"Heure standard d'Australie centrale (Territoire du Nord)", "CST", - "Heure d'\u00e9t\u00e9 d'Australie centrale (Territoire du Nord)", "CST"}; - String DUBLIN[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT", -@@ -594,8 +594,8 @@ - {"Australia/Canberra", EST_NSW}, - {"Australia/Currie", EST_NSW}, - {"Australia/Darwin", DARWIN}, -- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", -- "Central Western Summer Time (Australia)", "CWST"}}, -+ {"Australia/Eucla", new String[] {"Heure standard de l'Australie occidentale (centre)", "CWST", -+ "Heure d'\u00e9t\u00e9 de l'Australie occidentale (centre)", "CWST"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -@@ -83,8 +83,8 @@ - "Ora legale USA centrale", "CDT"}; - String CTT[] = new String[] {"Ora solare della Cina", "CST", - "Ora legale della Cina", "CDT"}; -- String CUBA[] = new String[] {"Cuba Standard Time", "CST", -- "Cuba Daylight Time", "CDT"}; -+ String CUBA[] = new String[] {"Ora solare Cuba", "CST", -+ "Ora legale Cuba", "CDT"}; - String DARWIN[] = new String[] {"Ora centrale standard (Territori del Nord)", "CST", - "Ora estiva centrale (Territori del Nord)", "CST"}; - String DUBLIN[] = new String[] {"Ora media di Greenwich", "GMT", -@@ -594,8 +594,8 @@ - {"Australia/Canberra", EST_NSW}, - {"Australia/Currie", EST_NSW}, - {"Australia/Darwin", DARWIN}, -- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", -- "Central Western Summer Time (Australia)", "CWST"}}, -+ {"Australia/Eucla", new String[] {"Ora solare Australia centrorientale", "CWST", -+ "Ora estiva Australia centrorientale", "CWST"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -@@ -83,8 +83,8 @@ - "\u4e2d\u90e8\u590f\u6642\u9593", "CDT"}; - String CTT[] = new String[] {"\u4e2d\u56fd\u6a19\u6e96\u6642", "CST", - "\u4e2d\u56fd\u590f\u6642\u9593", "CDT"}; -- String CUBA[] = new String[] {"Cuba Standard Time", "CST", -- "Cuba Daylight Time", "CDT"}; -+ String CUBA[] = new String[] {"\u30ad\u30e5\u30fc\u30d0\u6a19\u6e96\u6642", "CST", -+ "\u30ad\u30e5\u30fc\u30d0\u590f\u6642\u9593", "CDT"}; - String DARWIN[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642 (\u30ce\u30fc\u30b6\u30f3\u30c6\u30ea\u30c8\u30ea\u30fc)", "CST", - "\u4e2d\u90e8\u590f\u6642\u9593 (\u30ce\u30fc\u30b6\u30f3\u30c6\u30ea\u30c8\u30ea\u30fc)", "CST"}; - String DUBLIN[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT", -@@ -594,8 +594,8 @@ - {"Australia/Canberra", EST_NSW}, - {"Australia/Currie", EST_NSW}, - {"Australia/Darwin", DARWIN}, -- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", -- "Central Western Summer Time (Australia)", "CWST"}}, -+ {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6a19\u6e96\u6642 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CWST", -+ "\u4e2d\u897f\u90e8\u590f\u6642\u9593 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CWST"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -@@ -83,8 +83,8 @@ - "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"}; - String CTT[] = new String[] {"\uc911\uad6d \ud45c\uc900\uc2dc", "CST", - "\uc911\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"}; -- String CUBA[] = new String[] {"Cuba Standard Time", "CST", -- "Cuba Daylight Time", "CDT"}; -+ String CUBA[] = new String[] {"\ucfe0\ubc14 \ud45c\uc900\uc2dc", "CST", -+ "\ucfe0\ubc14 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"}; - String DARWIN[] = new String[] {"\uc911\ubd80 \ud45c\uc900\uc2dc(\ub178\ub358 \uc9c0\uc5ed)", "CST", - "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ub178\ub358 \uc9c0\uc5ed)", "CST"}; - String DUBLIN[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT", -@@ -594,8 +594,8 @@ - {"Australia/Canberra", EST_NSW}, - {"Australia/Currie", EST_NSW}, - {"Australia/Darwin", DARWIN}, -- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", -- "Central Western Summer Time (Australia)", "CWST"}}, -+ {"Australia/Eucla", new String[] {"\uc911\uc11c\ubd80 \ud45c\uc900\uc2dc(\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CWST", -+ "\uc911\uc11c\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CWST"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -@@ -45,8 +45,8 @@ - protected final Object[][] getContents() { - String ACT[] = new String[] {"Acre, normaltid", "ACT", - "Acre, sommartid", "ACST"}; -- String ADELAIDE[] = new String[] {"Central Standard Time (S\u00f6dra Australien)", "CST", -- "Central Summer Time (S\u00f6dra Australien)", "CST"}; -+ String ADELAIDE[] = new String[] {"Central normaltid (S\u00f6dra Australien)", "CST", -+ "Central sommartid (S\u00f6dra Australien)", "CST"}; - String AGT[] = new String[] {"Argentina, normaltid", "ART", - "Argentina, sommartid", "ARST"}; - String AKST[] = new String[] {"Alaska, normaltid", "AKST", -@@ -61,10 +61,10 @@ - "Atlantisk sommartid", "ADT"}; - String BDT[] = new String[] {"Bangladesh, normaltid", "BDT", - "Bangladesh, sommartid", "BDST"}; -- String BRISBANE[] = new String[] {"Eastern Standard Time (Queensland)", "EST", -- "Eastern Summer Time (Queensland)", "EST"}; -- String BROKEN_HILL[] = new String[] {"Central Standard Time (S\u00f6dra Australien/Nya Sydwales)", "CST", -- "Central Summer Time (S\u00f6dra Australien/Nya Sydwales)", "CST"}; -+ String BRISBANE[] = new String[] {"\u00d6stlig normaltid (Queensland)", "EST", -+ "\u00d6stlig sommartid (Queensland)", "EST"}; -+ String BROKEN_HILL[] = new String[] {"Central normaltid (S\u00f6dra Australien/Nya Sydwales)", "CST", -+ "Central sommartid (S\u00f6dra Australien/Nya Sydwales)", "CST"}; - String BRT[] = new String[] {"Brasilien, normaltid", "BRT", - "Brasilien, sommartid", "BRST"}; - String BTT[] = new String[] {"Bhutan, normaltid", "BTT", -@@ -83,10 +83,10 @@ - "Central sommartid", "CDT"}; - String CTT[] = new String[] {"Kina, normaltid", "CST", - "Kina, sommartid", "CDT"}; -- String CUBA[] = new String[] {"Cuba Standard Time", "CST", -- "Cuba Daylight Time", "CDT"}; -- String DARWIN[] = new String[] {"Central Standard Time (Nordterritoriet)", "CST", -- "Central Summer Time (Nordterritoriet)", "CST"}; -+ String CUBA[] = new String[] {"Kuba, normaltid", "CST", -+ "Kuba, sommartid", "CDT"}; -+ String DARWIN[] = new String[] {"Central normaltid (Nordterritoriet)", "CST", -+ "Central sommartid (Nordterritoriet)", "CST"}; - String DUBLIN[] = new String[] {"Greenwichtid", "GMT", - "Irland, sommartid", "IST"}; - String EAT[] = new String[] {"\u00d6stafrikansk tid", "EAT", -@@ -99,8 +99,8 @@ - "\u00d6stgr\u00f6nl\u00e4ndsk sommartid", "EGST"}; - String EST[] = new String[] {"Eastern, normaltid", "EST", - "Eastern, sommartid", "EDT"}; -- String EST_NSW[] = new String[] {"Eastern Standard Time (Nya Sydwales)", "EST", -- "Eastern Summer Time (Nya Sydwales)", "EST"}; -+ String EST_NSW[] = new String[] {"Eastern, normaltid (Nya Sydwales)", "EST", -+ "Eastern, sommartid (Nya Sydwales)", "EST"}; - String GHMT[] = new String[] {"Ghana, normaltid", "GMT", - "Ghana, sommartid", "GHST"}; - String GAMBIER[] = new String[] {"Gambier, normaltid", "GAMT", -@@ -163,10 +163,10 @@ - "Salomon\u00f6arna, sommartid", "SBST"}; - String SGT[] = new String[] {"Singapore, normaltid", "SGT", - "Singapore, sommartid", "SGST"}; -- String SLST[] = new String[] {"Greenwich Mean Time", "GMT", -+ String SLST[] = new String[] {"Greenwichtid", "GMT", - "Sierra Leone, sommartid", "SLST"}; -- String TASMANIA[] = new String[] {"Eastern Standard Time (Tasmanien)", "EST", -- "Eastern Summer Time (Tasmanien)", "EST"}; -+ String TASMANIA[] = new String[] {"Eastern, normaltid (Tasmanien)", "EST", -+ "Eastern, sommartid (Tasmanien)", "EST"}; - String TMT[] = new String[] {"Turkmenistan, normaltid", "TMT", - "Turkmenistan, sommartid", "TMST"}; - String TRUT[] = new String[] {"Truk, normaltid", "TRUT", -@@ -181,16 +181,16 @@ - "V\u00e4steuropeisk sommartid", "WEST"}; - String WIT[] = new String[] {"V\u00e4stindonesisk tid", "WIT", - "V\u00e4stindonesisk sommartid", "WIST"}; -- String WST_AUS[] = new String[] {"Western Standard Time (Australien)", "WST", -- "Western Summer Time (Australien)", "WST"}; -+ String WST_AUS[] = new String[] {"V\u00e4stlig normaltid (Australien)", "WST", -+ "V\u00e4stlig sommartid (Australien)", "WST"}; - String SAMOA[] = new String[] {"Samoa, normaltid", "SST", - "Samoa, sommartid", "SDT"}; - String WST_SAMOA[] = new String[] {"V\u00e4stsamoansk tid", "WST", - "V\u00e4stsamoansk sommartid", "WSST"}; - String ChST[] = new String[] {"Chamorro, normaltid", "ChST", - "Chamorro, sommartid", "ChDT"}; -- String VICTORIA[] = new String[] {"Eastern Standard Time (Victoria)", "EST", -- "Eastern Summer Time (Victoria)", "EST"}; -+ String VICTORIA[] = new String[] {"\u00d6stlig normaltid (Victoria)", "EST", -+ "\u00d6stlig sommartid (Victoria)", "EST"}; - String UTC[] = new String[] {"Koordinerad universell tid", "UTC", - "Koordinerad universell tid", "UTC"}; - String UZT[] = new String[] {"Uzbekistan, normaltid", "UZT", -@@ -594,8 +594,8 @@ - {"Australia/Canberra", EST_NSW}, - {"Australia/Currie", EST_NSW}, - {"Australia/Darwin", DARWIN}, -- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", -- "Central Western Summer Time (Australia)", "CWST"}}, -+ {"Australia/Eucla", new String[] {"Central v\u00e4stlig normaltid (Australien)", "CWST", -+ "Central v\u00e4stlig sommartid (Australien)", "CWST"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -@@ -83,8 +83,8 @@ - "\u4e2d\u592e\u590f\u4ee4\u65f6", "CDT"}; - String CTT[] = new String[] {"\u4e2d\u56fd\u6807\u51c6\u65f6\u95f4", "CST", - "\u4e2d\u56fd\u590f\u4ee4\u65f6", "CDT"}; -- String CUBA[] = new String[] {"Cuba Standard Time", "CST", -- "Cuba Daylight Time", "CDT"}; -+ String CUBA[] = new String[] {"\u53e4\u5df4\u6807\u51c6\u65f6\u95f4", "CST", -+ "\u53e4\u5df4\u590f\u4ee4\u65f6", "CDT"}; - String DARWIN[] = new String[] {"\u4e2d\u592e\u6807\u51c6\u65f6\u95f4\uff08\u5317\u9886\u5730\uff09", "CST", - "\u4e2d\u592e\u590f\u4ee4\u65f6\uff08\u5317\u9886\u5730\uff09", "CST"}; - String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT", -@@ -594,8 +594,8 @@ - {"Australia/Canberra", EST_NSW}, - {"Australia/Currie", EST_NSW}, - {"Australia/Darwin", DARWIN}, -- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", -- "Central Western Summer Time (Australia)", "CWST"}}, -+ {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "CWST", -+ "\u4e2d\u897f\u90e8\u590f\u4ee4\u65f6\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "CWST"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -@@ -83,8 +83,8 @@ - "\u4e2d\u592e\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"}; - String CTT[] = new String[] {"\u4e2d\u570b\u6a19\u6e96\u6642\u9593", "CST", - "\u4e2d\u570b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"}; -- String CUBA[] = new String[] {"Cuba Standard Time", "CST", -- "Cuba Daylight Time", "CDT"}; -+ String CUBA[] = new String[] {"\u53e4\u5df4\u6a19\u6e96\u6642\u9593", "CST", -+ "\u53e4\u5df4\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"}; - String DARWIN[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642\u9593 (\u5317\u90e8\u5404\u5730\u5340)", "CST", - "\u4e2d\u90e8\u590f\u4ee4\u6642\u9593 (\u5317\u90e8\u5404\u5730\u5340)", "CST"}; - String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT", -@@ -595,8 +595,8 @@ - {"Australia/Canberra", EST_NSW}, - {"Australia/Currie", EST_NSW}, - {"Australia/Darwin", DARWIN}, -- {"Australia/Eucla", new String[] {"Central Western Standard Time (Australia)", "CWST", -- "Central Western Summer Time (Australia)", "CWST"}}, -+ {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "CWST", -+ "\u4e2d\u897f\u90e8\u65e5\u5149\u7bc0\u7d04\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "CWST"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE},
--- a/patches/openjdk/6706974-krb5_test_infrastructure.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2090 +0,0 @@ -# HG changeset patch -# User weijun -# Date 1224219720 -28800 -# Node ID 3f051f3ba5bba355ddd6df6d0cb1528aef631a2d -# Parent 8b2d7e577d4a89fab8a892623cb4dff4e6fca0a6 -6706974: Add krb5 test infrastructure -Reviewed-by: valeriep - -diff -r 8b2d7e577d4a -r 3f051f3ba5bb test/sun/security/krb5/auto/Action.java ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/test/sun/security/krb5/auto/Action.java Fri Oct 17 13:02:00 2008 +0800 -@@ -0,0 +1,33 @@ -+/* -+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ */ -+ -+/** -+ * Action used in Context.doAs -+ */ -+public interface Action { -+ /** -+ * This method always reads a byte block and emits another one -+ */ -+ byte[] run(Context s, byte[] input) throws Exception; -+} -+ -diff -r 8b2d7e577d4a -r 3f051f3ba5bb test/sun/security/krb5/auto/BasicKrb5Test.java ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/test/sun/security/krb5/auto/BasicKrb5Test.java Fri Oct 17 13:02:00 2008 +0800 -@@ -0,0 +1,111 @@ -+/* -+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ */ -+ -+/* -+ * @test -+ * @bug 6706974 -+ * @summary Add krb5 test infrastructure -+ */ -+ -+import org.ietf.jgss.GSSName; -+import sun.security.jgss.GSSUtil; -+import sun.security.krb5.Config; -+import sun.security.krb5.internal.crypto.EType; -+ -+/** -+ * Basic JGSS/krb5 test with 3 parties: client, server, backend server. Each -+ * party uses JAAS login to get subjects and executes JGSS calls using -+ * Subject.doAs. -+ */ -+public class BasicKrb5Test { -+ -+ /** -+ * @param args empty or etype -+ */ -+ public static void main(String[] args) -+ throws Exception { -+ -+ String etype = null; -+ if (args.length > 0) { -+ etype = args[0]; -+ } -+ System.out.println("Testing etype " + etype); -+ if (etype != null && !EType.isSupported(Config.getInstance().getType(etype))) { -+ System.out.println("Not supported."); -+ System.exit(0); -+ } -+ -+ // Creates and starts the KDC -+ new OneKDC(etype).writeJAASConf(); -+ new BasicKrb5Test().go(OneKDC.SERVER, OneKDC.BACKEND); -+ } -+ -+ void go(final String server, final String backend) throws Exception { -+ Context c, s, s2, b; -+ c = Context.fromJAAS("client"); -+ s = Context.fromJAAS("server"); -+ b = Context.fromJAAS("backend"); -+ -+ c.startAsClient(server, GSSUtil.GSS_KRB5_MECH_OID); -+ c.x().requestCredDeleg(true); -+ s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); -+ -+ c.status(); -+ s.status(); -+ -+ Context.handshake(c, s); -+ GSSName client = c.x().getSrcName(); -+ -+ c.status(); -+ s.status(); -+ -+ Context.transmit("i say high --", c, s); -+ Context.transmit(" you say low", s, c); -+ -+ s2 = s.delegated(); -+ s.dispose(); -+ s = null; -+ -+ s2.startAsClient(backend, GSSUtil.GSS_KRB5_MECH_OID); -+ b.startAsServer(GSSUtil.GSS_KRB5_MECH_OID); -+ -+ s2.status(); -+ b.status(); -+ -+ Context.handshake(s2, b); -+ GSSName client2 = b.x().getSrcName(); -+ -+ if (!client.equals(client2)) { -+ throw new Exception("Delegation failed"); -+ } -+ -+ s2.status(); -+ b.status(); -+ -+ Context.transmit("you say hello --", s2, b); -+ Context.transmit(" i say goodbye", b, s2); -+ -+ s2.dispose(); -+ b.dispose(); -+ } -+} -diff -r 8b2d7e577d4a -r 3f051f3ba5bb test/sun/security/krb5/auto/CleanState.java ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/test/sun/security/krb5/auto/CleanState.java Fri Oct 17 13:02:00 2008 +0800 -@@ -0,0 +1,75 @@ -+/* -+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ */ -+ -+/* -+ * @test -+ * @bug 6716534 -+ * @summary Krb5LoginModule has not cleaned temp info between authentication attempts -+ */ -+import com.sun.security.auth.module.Krb5LoginModule; -+import java.util.HashMap; -+import java.util.Map; -+import javax.security.auth.Subject; -+import javax.security.auth.callback.Callback; -+import javax.security.auth.callback.CallbackHandler; -+import javax.security.auth.callback.NameCallback; -+import javax.security.auth.callback.PasswordCallback; -+ -+public class CleanState { -+ public static void main(String[] args) throws Exception { -+ CleanState x = new CleanState(); -+ new OneKDC(null); -+ x.go(); -+ } -+ -+ void go() throws Exception { -+ Krb5LoginModule krb5 = new Krb5LoginModule(); -+ -+ final String name = OneKDC.USER; -+ final char[] password = OneKDC.PASS; -+ char[] badpassword = "hellokitty".toCharArray(); -+ -+ Map<String,String> map = new HashMap<String,String>(); -+ map.put("useTicketCache", "false"); -+ map.put("doNotPrompt", "false"); -+ map.put("tryFirstPass", "true"); -+ Map<String,Object> shared = new HashMap<String,Object>(); -+ shared.put("javax.security.auth.login.name", name); -+ shared.put("javax.security.auth.login.password", badpassword); -+ -+ krb5.initialize(new Subject(), new CallbackHandler() { -+ @Override -+ public void handle(Callback[] callbacks) { -+ for(Callback callback: callbacks) { -+ if (callback instanceof NameCallback) { -+ ((NameCallback)callback).setName(name); -+ } -+ if (callback instanceof PasswordCallback) { -+ ((PasswordCallback)callback).setPassword(password); -+ } -+ } -+ } -+ }, shared, map); -+ krb5.login(); -+ } -+} -diff -r 8b2d7e577d4a -r 3f051f3ba5bb test/sun/security/krb5/auto/Context.java ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/test/sun/security/krb5/auto/Context.java Fri Oct 17 13:02:00 2008 +0800 -@@ -0,0 +1,386 @@ -+/* -+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ */ -+ -+import com.sun.security.auth.module.Krb5LoginModule; -+import java.security.PrivilegedActionException; -+import java.security.PrivilegedExceptionAction; -+import java.util.Arrays; -+import java.util.HashMap; -+import java.util.Map; -+import javax.security.auth.Subject; -+import javax.security.auth.kerberos.KerberosKey; -+import javax.security.auth.kerberos.KerberosTicket; -+import javax.security.auth.login.LoginContext; -+import org.ietf.jgss.GSSContext; -+import org.ietf.jgss.GSSCredential; -+import org.ietf.jgss.GSSException; -+import org.ietf.jgss.GSSManager; -+import org.ietf.jgss.GSSName; -+import org.ietf.jgss.MessageProp; -+import org.ietf.jgss.Oid; -+ -+/** -+ * Context of a JGSS subject, encapsulating Subject and GSSContext. -+ * -+ * Three "constructors", which acquire the (private) credentials and fill -+ * it into the Subject: -+ * -+ * 1. static fromJAAS(): Creates a Context using a JAAS login config entry -+ * 2. static fromUserPass(): Creates a Context using a username and a password -+ * 3. delegated(): A new context which uses the delegated credentials from a -+ * previously established acceptor Context -+ * -+ * Two context initiators, which create the GSSContext object inside: -+ * -+ * 1. startAsClient() -+ * 2. startAsServer() -+ * -+ * Privileged action: -+ * doAs(): Performs an action in the name of the Subject -+ * -+ * Handshake process: -+ * static handShake(initiator, acceptor) -+ * -+ * A four-phase typical data communication which includes all four GSS -+ * actions (wrap, unwrap, getMic and veryfyMiC): -+ * static transmit(message, from, to) -+ */ -+public class Context { -+ -+ private Subject s; -+ private GSSContext x; -+ private boolean f; // context established? -+ private String name; -+ private GSSCredential cred; // see static method delegated(). -+ -+ private Context() {} -+ -+ /** -+ * Using the delegated credentials from a previous acceptor -+ * @param c -+ */ -+ public Context delegated() throws Exception { -+ Context out = new Context(); -+ out.s = s; -+ out.cred = x.getDelegCred(); -+ out.name = name + " as " + out.cred.getName().toString(); -+ return out; -+ } -+ -+ /** -+ * Logins with a JAAS login config entry name -+ */ -+ public static Context fromJAAS(final String name) throws Exception { -+ Context out = new Context(); -+ out.name = name; -+ LoginContext lc = new LoginContext(name); -+ lc.login(); -+ out.s = lc.getSubject(); -+ return out; -+ } -+ -+ /** -+ * Logins with a username and a password, using Krb5LoginModule directly -+ * @param storeKey true if key should be saved, used on acceptor side -+ */ -+ public static Context fromUserPass(String user, char[] pass, boolean storeKey) throws Exception { -+ Context out = new Context(); -+ out.name = user; -+ out.s = new Subject(); -+ Krb5LoginModule krb5 = new Krb5LoginModule(); -+ Map<String, String> map = new HashMap<String, String>(); -+ map.put("tryFirstPass", "true"); -+ if (storeKey) { -+ map.put("storeKey", "true"); -+ } -+ Map<String, Object> shared = new HashMap<String, Object>(); -+ shared.put("javax.security.auth.login.name", user); -+ shared.put("javax.security.auth.login.password", pass); -+ -+ krb5.initialize(out.s, null, shared, map); -+ krb5.login(); -+ krb5.commit(); -+ return out; -+ } -+ -+ /** -+ * Starts as a client -+ * @param target communication peer -+ * @param mech GSS mech -+ * @throws java.lang.Exception -+ */ -+ public void startAsClient(final String target, final Oid mech) throws Exception { -+ doAs(new Action() { -+ @Override -+ public byte[] run(Context me, byte[] dummy) throws Exception { -+ GSSManager m = GSSManager.getInstance(); -+ me.x = m.createContext( -+ target.indexOf('@') < 0 ? -+ m.createName(target, null) : -+ m.createName(target, GSSName.NT_HOSTBASED_SERVICE), -+ mech, -+ cred, -+ GSSContext.DEFAULT_LIFETIME); -+ return null; -+ } -+ }, null); -+ f = false; -+ } -+ -+ /** -+ * Starts as a server -+ * @param mech GSS mech -+ * @throws java.lang.Exception -+ */ -+ public void startAsServer(final Oid mech) throws Exception { -+ doAs(new Action() { -+ @Override -+ public byte[] run(Context me, byte[] dummy) throws Exception { -+ GSSManager m = GSSManager.getInstance(); -+ me.x = m.createContext(m.createCredential( -+ null, -+ GSSCredential.INDEFINITE_LIFETIME, -+ mech, -+ GSSCredential.ACCEPT_ONLY)); -+ return null; -+ } -+ }, null); -+ f = false; -+ } -+ -+ /** -+ * Accesses the internal GSSContext object. Currently it's used for -- -+ * -+ * 1. calling requestXXX() before handshake -+ * 2. accessing source name -+ * -+ * Note: If the application needs to do any privileged call on this -+ * object, please use doAs(). Otherwise, it can be done directly. The -+ * methods listed above are all non-privileged calls. -+ * -+ * @return the GSSContext object -+ */ -+ public GSSContext x() { -+ return x; -+ } -+ -+ /** -+ * Disposes the GSSContext within -+ * @throws org.ietf.jgss.GSSException -+ */ -+ public void dispose() throws GSSException { -+ x.dispose(); -+ } -+ -+ /** -+ * Does something using the Subject inside -+ * @param action the action -+ * @param in the input byte -+ * @return the output byte -+ * @throws java.lang.Exception -+ */ -+ public byte[] doAs(final Action action, final byte[] in) throws Exception { -+ try { -+ return Subject.doAs(s, new PrivilegedExceptionAction<byte[]>() { -+ -+ @Override -+ public byte[] run() throws Exception { -+ return action.run(Context.this, in); -+ } -+ }); -+ } catch (PrivilegedActionException pae) { -+ throw pae.getException(); -+ } -+ } -+ -+ /** -+ * Prints status of GSSContext and Subject -+ * @throws java.lang.Exception -+ */ -+ public void status() throws Exception { -+ System.out.println("STATUS OF " + name.toUpperCase()); -+ try { -+ StringBuffer sb = new StringBuffer(); -+ if (x.getAnonymityState()) { -+ sb.append("anon, "); -+ } -+ if (x.getConfState()) { -+ sb.append("conf, "); -+ } -+ if (x.getCredDelegState()) { -+ sb.append("deleg, "); -+ } -+ if (x.getIntegState()) { -+ sb.append("integ, "); -+ } -+ if (x.getMutualAuthState()) { -+ sb.append("mutual, "); -+ } -+ if (x.getReplayDetState()) { -+ sb.append("rep det, "); -+ } -+ if (x.getSequenceDetState()) { -+ sb.append("seq det, "); -+ } -+ System.out.println("Context status of " + name + ": " + sb.toString()); -+ System.out.println(x.getSrcName() + " -> " + x.getTargName()); -+ } catch (Exception e) { -+ ;// Don't care -+ } -+ System.out.println("====================================="); -+ for (Object o : s.getPrivateCredentials()) { -+ System.out.println(" " + o.getClass()); -+ if (o instanceof KerberosTicket) { -+ KerberosTicket kt = (KerberosTicket) o; -+ System.out.println(" " + kt.getServer() + " for " + kt.getClient()); -+ } else if (o instanceof KerberosKey) { -+ KerberosKey kk = (KerberosKey) o; -+ System.out.print(" " + kk.getKeyType() + " " + kk.getVersionNumber() + " " + kk.getAlgorithm() + " "); -+ for (byte b : kk.getEncoded()) { -+ System.out.printf("%02X", b & 0xff); -+ } -+ System.out.println(); -+ } else if (o instanceof Map) { -+ Map map = (Map) o; -+ for (Object k : map.keySet()) { -+ System.out.println(" " + k + ": " + map.get(k)); -+ } -+ } -+ } -+ } -+ -+ /** -+ * Transmits a message from one Context to another. The sender wraps the -+ * message and sends it to the receiver. The receiver unwraps it, creates -+ * a MIC of the clear text and sends it back to the sender. The sender -+ * verifies the MIC against the message sent earlier. -+ * @param message the message -+ * @param s1 the sender -+ * @param s2 the receiver -+ * @throws java.lang.Exception If anything goes wrong -+ */ -+ static public void transmit(final String message, final Context s1, -+ final Context s2) throws Exception { -+ final byte[] messageBytes = message.getBytes(); -+ System.out.printf("-------------------- TRANSMIT from %s to %s------------------------\n", -+ s1.name, s2.name); -+ -+ byte[] t = s1.doAs(new Action() { -+ @Override -+ public byte[] run(Context me, byte[] dummy) throws Exception { -+ System.out.println("wrap"); -+ MessageProp p1 = new MessageProp(0, true); -+ byte[] out = me.x.wrap(messageBytes, 0, messageBytes.length, p1); -+ System.out.println(printProp(p1)); -+ return out; -+ } -+ }, null); -+ -+ t = s2.doAs(new Action() { -+ @Override -+ public byte[] run(Context me, byte[] input) throws Exception { -+ MessageProp p1 = new MessageProp(0, true); -+ byte[] bytes = me.x.unwrap(input, 0, input.length, p1); -+ if (!Arrays.equals(messageBytes, bytes)) -+ throw new Exception("wrap/unwrap mismatch"); -+ System.out.println("unwrap"); -+ System.out.println(printProp(p1)); -+ p1 = new MessageProp(0, true); -+ System.out.println("getMIC"); -+ bytes = me.x.getMIC(bytes, 0, bytes.length, p1); -+ System.out.println(printProp(p1)); -+ return bytes; -+ } -+ }, t); -+ // Re-unwrap should make p2.isDuplicateToken() returns true -+ s1.doAs(new Action() { -+ @Override -+ public byte[] run(Context me, byte[] input) throws Exception { -+ MessageProp p1 = new MessageProp(0, true); -+ System.out.println("verifyMIC"); -+ me.x.verifyMIC(input, 0, input.length, -+ messageBytes, 0, messageBytes.length, -+ p1); -+ System.out.println(printProp(p1)); -+ return null; -+ } -+ }, t); -+ } -+ -+ /** -+ * Returns a string description of a MessageProp object -+ * @param prop the object -+ * @return the description -+ */ -+ static public String printProp(MessageProp prop) { -+ StringBuffer sb = new StringBuffer(); -+ sb.append("MessagePop: "); -+ sb.append("QOP="+ prop.getQOP() + ", "); -+ sb.append(prop.getPrivacy()?"privacy, ":""); -+ sb.append(prop.isDuplicateToken()?"dup, ":""); -+ sb.append(prop.isGapToken()?"gap, ":""); -+ sb.append(prop.isOldToken()?"old, ":""); -+ sb.append(prop.isUnseqToken()?"unseq, ":""); -+ sb.append(prop.getMinorString()+ "(" + prop.getMinorStatus()+")"); -+ return sb.toString(); -+ } -+ -+ /** -+ * Handshake (security context establishment process) between two Contexts -+ * @param c the initiator -+ * @param s the acceptor -+ * @throws java.lang.Exception -+ */ -+ static public void handshake(final Context c, final Context s) throws Exception { -+ byte[] t = new byte[0]; -+ while (!c.f || !s.f) { -+ t = c.doAs(new Action() { -+ @Override -+ public byte[] run(Context me, byte[] input) throws Exception { -+ if (me.x.isEstablished()) { -+ me.f = true; -+ System.out.println(c.name + " side established"); -+ return null; -+ } else { -+ System.out.println(c.name + " call initSecContext"); -+ return me.x.initSecContext(input, 0, input.length); -+ } -+ } -+ }, t); -+ -+ t = s.doAs(new Action() { -+ @Override -+ public byte[] run(Context me, byte[] input) throws Exception { -+ if (me.x.isEstablished()) { -+ me.f = true; -+ System.out.println(s.name + " side established"); -+ return null; -+ } else { -+ System.out.println(s.name + " called acceptSecContext"); -+ return me.x.acceptSecContext(input, 0, input.length); -+ } -+ } -+ }, t); -+ } -+ } -+} -diff -r 8b2d7e577d4a -r 3f051f3ba5bb test/sun/security/krb5/auto/CrossRealm.java ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/test/sun/security/krb5/auto/CrossRealm.java Fri Oct 17 13:02:00 2008 +0800 -@@ -0,0 +1,101 @@ -+/* -+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ */ -+ -+/* -+ * @test -+ * @bug 6706974 -+ * @summary Add krb5 test infrastructure -+ */ -+import java.io.FileOutputStream; -+import java.io.IOException; -+import java.security.Security; -+import javax.security.auth.callback.Callback; -+import javax.security.auth.callback.CallbackHandler; -+import javax.security.auth.callback.NameCallback; -+import javax.security.auth.callback.PasswordCallback; -+import javax.security.auth.callback.UnsupportedCallbackException; -+import org.ietf.jgss.GSSContext; -+import org.ietf.jgss.GSSManager; -+import org.ietf.jgss.GSSName; -+import sun.security.jgss.GSSUtil; -+ -+public class CrossRealm implements CallbackHandler { -+ public static void main(String[] args) throws Exception { -+ startKDCs(); -+ xRealmAuth(); -+ } -+ -+ static void startKDCs() throws Exception { -+ // Create and start the KDC -+ KDC kdc1 = KDC.create("RABBIT.HOLE"); -+ kdc1.addPrincipal("dummy", "bogus".toCharArray()); -+ kdc1.addPrincipalRandKey("krbtgt/RABBIT.HOLE"); -+ kdc1.addPrincipal("krbtgt/SNAKE.HOLE", "sharedsec".toCharArray()); -+ -+ KDC kdc2 = KDC.create("SNAKE.HOLE"); -+ kdc2.addPrincipalRandKey("krbtgt/SNAKE.HOLE"); -+ kdc2.addPrincipal("krbtgt/RABBIT.HOLE", "sharedsec".toCharArray()); -+ kdc2.addPrincipalRandKey("host/www.snake.hole"); -+ -+ KDC.saveConfig("krb5-localkdc.conf", kdc1, kdc2, -+ "forwardable=true", -+ "[domain_realm]", -+ ".snake.hole=SNAKE.HOLE"); -+ System.setProperty("java.security.krb5.conf", "krb5-localkdc.conf"); -+ } -+ -+ static void xRealmAuth() throws Exception { -+ Security.setProperty("auth.login.defaultCallbackHandler", "CrossRealm"); -+ System.setProperty("java.security.auth.login.config", "jaas-localkdc.conf"); -+ System.setProperty("javax.security.auth.useSubjectCredsOnly", "false"); -+ FileOutputStream fos = new FileOutputStream("jaas-localkdc.conf"); -+ fos.write(("com.sun.security.jgss.krb5.initiate {\n" + -+ " com.sun.security.auth.module.Krb5LoginModule\n" + -+ " required\n" + -+ " principal=dummy\n" + -+ " doNotPrompt=false\n" + -+ " useTicketCache=false\n" + -+ " ;\n" + -+ "};").getBytes()); -+ fos.close(); -+ -+ GSSManager m = GSSManager.getInstance(); -+ m.createContext( -+ m.createName("host@www.snake.hole", GSSName.NT_HOSTBASED_SERVICE), -+ GSSUtil.GSS_KRB5_MECH_OID, -+ null, -+ GSSContext.DEFAULT_LIFETIME).initSecContext(new byte[0], 0, 0); -+ } -+ -+ @Override -+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { -+ for (Callback callback : callbacks) { -+ if (callback instanceof NameCallback) { -+ ((NameCallback) callback).setName("dummy"); -+ } -+ if (callback instanceof PasswordCallback) { -+ ((PasswordCallback) callback).setPassword("bogus".toCharArray()); -+ } -+ } -+ } -+} -diff -r 8b2d7e577d4a -r 3f051f3ba5bb test/sun/security/krb5/auto/KDC.java ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/test/sun/security/krb5/auto/KDC.java Fri Oct 17 13:02:00 2008 +0800 -@@ -0,0 +1,962 @@ -+/* -+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ */ -+ -+import java.lang.reflect.Constructor; -+import java.lang.reflect.Field; -+import java.lang.reflect.InvocationTargetException; -+import java.net.*; -+import java.io.*; -+import java.lang.reflect.Method; -+import java.security.SecureRandom; -+import java.util.*; -+import java.util.concurrent.*; -+import sun.security.krb5.*; -+import sun.security.krb5.internal.*; -+import sun.security.krb5.internal.crypto.KeyUsage; -+import sun.security.krb5.internal.ktab.KeyTab; -+import sun.security.util.DerInputStream; -+import sun.security.util.DerOutputStream; -+import sun.security.util.DerValue; -+ -+/** -+ * A KDC server. -+ * <p> -+ * Features: -+ * <ol> -+ * <li> Supports TCP and UDP -+ * <li> Supports AS-REQ and TGS-REQ -+ * <li> Principal db and other settings hard coded in application -+ * <li> Options, say, request preauth or not -+ * </ol> -+ * Side effects: -+ * <ol> -+ * <li> The Sun-internal class <code>sun.security.krb5.Config</code> is a -+ * singleton and initialized according to Kerberos settings (krb5.conf and -+ * java.security.krb5.* system properties). This means once it's initialized -+ * it will not automatically notice any changes to these settings (or file -+ * changes of krb5.conf). The KDC class normally does not touch these -+ * settings (except for the <code>writeKtab()</code> method). However, to make -+ * sure nothing ever goes wrong, if you want to make any changes to these -+ * settings after calling a KDC method, call <code>Config.refresh()</code> to -+ * make sure your changes are reflected in the <code>Config</code> object. -+ * </ol> -+ * Issues and TODOs: -+ * <ol> -+ * <li> Generates krb5.conf to be used on another machine, currently the kdc is -+ * always localhost -+ * <li> More options to KDC, say, error output, say, response nonce != -+ * request nonce -+ * </ol> -+ * Note: This program uses internal krb5 classes (including reflection to -+ * access private fields and methods). -+ * <p> -+ * Usages: -+ * <p> -+ * 1. Init and start the KDC: -+ * <pre> -+ * KDC kdc = KDC.create("REALM.NAME", port, isDaemon); -+ * KDC kdc = KDC.create("REALM.NAME"); -+ * </pre> -+ * Here, <code>port</code> is the UDP and TCP port number the KDC server -+ * listens on. If zero, a random port is chosen, which you can use getPort() -+ * later to retrieve the value. -+ * <p> -+ * If <code>isDaemon</code> is true, the KDC worker threads will be daemons. -+ * <p> -+ * The shortcut <code>KDC.create("REALM.NAME")</code> has port=0 and -+ * isDaemon=false, and is commonly used in an embedded KDC. -+ * <p> -+ * 2. Adding users: -+ * <pre> -+ * kdc.addPrincipal(String principal_name, char[] password); -+ * kdc.addPrincipalRandKey(String principal_name); -+ * </pre> -+ * A service principal's name should look like "host/f.q.d.n". The second form -+ * generates a random key. To expose this key, call <code>writeKtab()</code> to -+ * save the keys into a keytab file. -+ * <p> -+ * Note that you need to add the principal name krbtgt/REALM.NAME yourself. -+ * <p> -+ * Note that you can safely add a principal at any time after the KDC is -+ * started and before a user requests info on this principal. -+ * <p> -+ * 3. Other public methods: -+ * <ul> -+ * <li> <code>getPort</code>: Returns the port number the KDC uses -+ * <li> <code>getRealm</code>: Returns the realm name -+ * <li> <code>writeKtab</code>: Writes all principals' keys into a keytab file -+ * <li> <code>saveConfig</code>: Saves a krb5.conf file to access this KDC -+ * <li> <code>setOption</code>: Sets various options -+ * </ul> -+ * Read the javadoc for details. Lazy developer can use <code>OneKDC</code> -+ * directly. -+ */ -+public class KDC { -+ -+ // Under the hood. -+ -+ // The random generator to generate random keys (including session keys) -+ private static SecureRandom secureRandom = new SecureRandom(); -+ // Principal db -+ private Map<String,char[]> passwords = new HashMap<String,char[]>(); -+ // Realm name -+ private String realm; -+ // The request/response job queue -+ private BlockingQueue<Job> q = new ArrayBlockingQueue<Job>(100); -+ // Service port number -+ private int port; -+ // Options -+ private Map<Option,Object> options = new HashMap<Option,Object>(); -+ -+ /** -+ * Option names, to be expanded forever. -+ */ -+ public static enum Option { -+ /** -+ * Whether pre-authentication is required. Default Boolean.TRUE -+ */ -+ PREAUTH_REQUIRED, -+ }; -+ -+ /** -+ * A standalone KDC server. -+ * @param args -+ * @throws java.lang.Exception -+ */ -+ public static void main(String[] args) throws Exception { -+ if (args.length > 0) { -+ if (args[0].equals("-help") || args[0].equals("--help")) { -+ System.out.println("Usage:"); -+ System.out.println(" java " + KDC.class + " " + -+ "Start KDC on port 8888"); -+ return; -+ } -+ } -+ KDC kdc = create("RABBIT.HOLE", 8888, false); -+ kdc.addPrincipal("dummy", "bogus".toCharArray()); -+ kdc.addPrincipal("foo", "bar".toCharArray()); -+ kdc.addPrincipalRandKey("krbtgt/" + kdc.realm); -+ kdc.addPrincipalRandKey("server/localhost"); -+ kdc.addPrincipalRandKey("backend/localhost"); -+ } -+ -+ /** -+ * Creates and starts a KDC running as a daemon on a random port. -+ * @param realm the realm name -+ * @return the running KDC instance -+ * @throws java.io.IOException for any socket creation error -+ */ -+ public static KDC create(String realm) throws IOException { -+ return create(realm, 0, true); -+ } -+ -+ /** -+ * Creates and starts a KDC server. -+ * @param realm the realm name -+ * @param port the TCP and UDP port to listen to. A random port will to -+ * chosen if zero. -+ * @param asDaemon if true, KDC threads will be daemons. Otherwise, not. -+ * @return the running KDC instance -+ * @throws java.io.IOException for any socket creation error -+ */ -+ public static KDC create(String realm, int port, boolean asDaemon) throws IOException { -+ return new KDC(realm, port, asDaemon); -+ } -+ -+ /** -+ * Sets an option -+ * @param key the option name -+ * @param obj the value -+ */ -+ public void setOption(Option key, Object value) { -+ options.put(key, value); -+ } -+ -+ /** -+ * Write all principals' keys into a keytab file. Note that the keys for -+ * the krbtgt principal for this realm will not be written. -+ * <p> -+ * Attention: This method references krb5.conf settings. If you need to -+ * setup krb5.conf later, please call <code>Config.refresh()</code> after -+ * the new setting. For example: -+ * <pre> -+ * kdc.writeKtab("/etc/kdc/ktab"); // Config is initialized, -+ * System.setProperty("java.security.krb5.conf", "/home/mykrb5.conf"); -+ * Config.refresh(); -+ * </pre> -+ * -+ * Inside this method there are 2 places krb5.conf is used: -+ * <ol> -+ * <li> (Fatal) Generating keys: EncryptionKey.acquireSecretKeys -+ * <li> (Has workaround) Creating PrincipalName -+ * </ol> -+ * @param tab The keytab filename to write to. -+ * @throws java.io.IOException for any file output error -+ * @throws sun.security.krb5.KrbException for any realm and/or principal -+ * name error. -+ */ -+ public void writeKtab(String tab) throws IOException, KrbException { -+ KeyTab ktab = KeyTab.create(tab); -+ for (String name : passwords.keySet()) { -+ if (name.equals("krbtgt/" + realm)) { -+ continue; -+ } -+ ktab.addEntry(new PrincipalName(name + "@" + realm, -+ name.indexOf('/') < 0 ? -+ PrincipalName.KRB_NT_UNKNOWN : -+ PrincipalName.KRB_NT_SRV_HST), passwords.get(name)); -+ } -+ ktab.save(); -+ } -+ -+ /** -+ * Adds a new principal to this realm with a given password. -+ * @param user the principal's name. For a service principal, use the -+ * form of host/f.q.d.n -+ * @param pass the password for the principal -+ */ -+ public void addPrincipal(String user, char[] pass) { -+ passwords.put(user, pass); -+ } -+ -+ /** -+ * Adds a new principal to this realm with a random password -+ * @param user the principal's name. For a service principal, use the -+ * form of host/f.q.d.n -+ */ -+ public void addPrincipalRandKey(String user) { -+ passwords.put(user, randomPassword()); -+ } -+ -+ /** -+ * Returns the name of this realm -+ * @return the name of this realm -+ */ -+ public String getRealm() { -+ return realm; -+ } -+ -+ /** -+ * Writes a krb5.conf for one or more KDC that includes KDC locations for -+ * each realm and the default realm name. You can also add extra strings -+ * into the file. The method should be called like: -+ * <pre> -+ * KDC.saveConfig("krb5.conf", kdc1, kdc2, ..., line1, line2, ...); -+ * </pre> -+ * Here you can provide one or more kdc# and zero or more line# arguments. -+ * The line# will be put after [libdefaults] and before [realms]. Therefore -+ * you can append new lines into [libdefaults] and/or create your new -+ * stanzas as well. Note that a newline character will be appended to -+ * each line# argument. -+ * <p> -+ * For example: -+ * <pre> -+ * KDC.saveConfig("krb5.conf", this); -+ * </pre> -+ * generates: -+ * <pre> -+ * [libdefaults] -+ * default_realm = REALM.NAME -+ * -+ * [realms] -+ * REALM.NAME = { -+ * kdc = localhost:port_number -+ * } -+ * </pre> -+ * -+ * Another example: -+ * <pre> -+ * KDC.saveConfig("krb5.conf", kdc1, kdc2, "forwardable = true", "", -+ * "[domain_realm]", -+ * ".kdc1.com = KDC1.NAME"); -+ * </pre> -+ * generates: -+ * <pre> -+ * [libdefaults] -+ * default_realm = KDC1.NAME -+ * forwardable = true -+ * -+ * [domain_realm] -+ * .kdc1.com = KDC1.NAME -+ * -+ * [realms] -+ * KDC1.NAME = { -+ * kdc = localhost:port1 -+ * } -+ * KDC2.NAME = { -+ * kdc = localhost:port2 -+ * } -+ * </pre> -+ * @param file the name of the file to write into -+ * @param kdc the first (and default) KDC -+ * @param more more KDCs or extra lines (in their appearing order) to -+ * insert into the krb5.conf file. This method reads each argument's type -+ * to determine what it's for. This argument can be empty. -+ * @throws java.io.IOException for any file output error -+ */ -+ public static void saveConfig(String file, KDC kdc, Object... more) -+ throws IOException { -+ File f = new File(file); -+ StringBuffer sb = new StringBuffer(); -+ sb.append("[libdefaults]\ndefault_realm = "); -+ sb.append(kdc.realm); -+ sb.append("\n"); -+ for (Object o: more) { -+ if (o instanceof String) { -+ sb.append(o); -+ sb.append("\n"); -+ } -+ } -+ sb.append("\n[realms]\n"); -+ sb.append(realmLineForKDC(kdc)); -+ for (Object o: more) { -+ if (o instanceof KDC) { -+ sb.append(realmLineForKDC((KDC)o)); -+ } -+ } -+ FileOutputStream fos = new FileOutputStream(f); -+ fos.write(sb.toString().getBytes()); -+ fos.close(); -+ } -+ -+ /** -+ * Returns the service port of the KDC server. -+ * @return the KDC service port -+ */ -+ public int getPort() { -+ return port; -+ } -+ -+ // Private helper methods -+ -+ /** -+ * Private constructor, cannot be called outside. -+ * @param realm -+ */ -+ private KDC(String realm) { -+ this.realm = realm; -+ } -+ -+ /** -+ * A constructor that starts the KDC service also. -+ */ -+ protected KDC(String realm, int port, boolean asDaemon) -+ throws IOException { -+ this(realm); -+ startServer(port, asDaemon); -+ } -+ /** -+ * Generates a 32-char random password -+ * @return the password -+ */ -+ private static char[] randomPassword() { -+ char[] pass = new char[32]; -+ for (int i=0; i<32; i++) -+ pass[i] = (char)secureRandom.nextInt(); -+ return pass; -+ } -+ -+ /** -+ * Generates a random key for the given encryption type. -+ * @param eType the encryption type -+ * @return the generated key -+ * @throws sun.security.krb5.KrbException for unknown/unsupported etype -+ */ -+ private static EncryptionKey generateRandomKey(int eType) -+ throws KrbException { -+ // Is 32 enough for AES256? I should have generated the keys directly -+ // but different cryptos have different rules on what keys are valid. -+ char[] pass = randomPassword(); -+ String algo; -+ switch (eType) { -+ case EncryptedData.ETYPE_DES_CBC_MD5: algo = "DES"; break; -+ case EncryptedData.ETYPE_DES3_CBC_HMAC_SHA1_KD: algo = "DESede"; break; -+ case EncryptedData.ETYPE_AES128_CTS_HMAC_SHA1_96: algo = "AES128"; break; -+ case EncryptedData.ETYPE_ARCFOUR_HMAC: algo = "ArcFourHMAC"; break; -+ case EncryptedData.ETYPE_AES256_CTS_HMAC_SHA1_96: algo = "AES256"; break; -+ default: algo = "DES"; break; -+ } -+ return new EncryptionKey(pass, "NOTHING", algo); // Silly -+ } -+ -+ /** -+ * Returns the password for a given principal -+ * @param p principal -+ * @return the password -+ * @throws sun.security.krb5.KrbException when the principal is not inside -+ * the database. -+ */ -+ private char[] getPassword(PrincipalName p) throws KrbException { -+ char[] pass = passwords.get(p.getNameString()); -+ if (pass == null) { -+ throw new KrbException(Krb5.KDC_ERR_C_PRINCIPAL_UNKNOWN); -+ } -+ return pass; -+ } -+ -+ /** -+ * Returns the salt string for the principal. For normal users, the -+ * concatenation for the realm name and the sections of the principal; -+ * for krgtgt/A@B and krbtgt/B@A, always return AB (so that inter-realm -+ * principals have the same key). -+ * @param p principal -+ * @return the salt -+ */ -+ private String getSalt(PrincipalName p) { -+ String[] ns = p.getNameStrings(); -+ if (ns[0].equals("krbtgt") && ns.length > 1) { -+ // Shared cross-realm keys must be the same -+ if (ns[1].compareTo(realm) < 0) { -+ return ns[1] + realm; -+ } else { -+ return realm + ns[1]; -+ } -+ } else { -+ String s = getRealm(); -+ for (String n: p.getNameStrings()) { -+ s += n; -+ } -+ return s; -+ } -+ } -+ -+ /** -+ * Returns the key for a given principal of the given encryption type -+ * @param p the principal -+ * @param etype the encryption type -+ * @return the key -+ * @throws sun.security.krb5.KrbException for unknown/unsupported etype -+ */ -+ private EncryptionKey keyForUser(PrincipalName p, int etype) throws KrbException { -+ try { -+ // Do not call EncryptionKey.acquireSecretKeys(), otherwise -+ // the krb5.conf config file would be loaded. -+ Method stringToKey = EncryptionKey.class.getDeclaredMethod("stringToKey", char[].class, String.class, byte[].class, Integer.TYPE); -+ stringToKey.setAccessible(true); -+ return new EncryptionKey((byte[]) stringToKey.invoke(null, getPassword(p), getSalt(p), null, etype), etype, null); -+ } catch (InvocationTargetException ex) { -+ KrbException ke = (KrbException)ex.getCause(); -+ throw ke; -+ } catch (Exception e) { -+ throw new RuntimeException(e); // should not happen -+ } -+ } -+ -+ /** -+ * Processes an incoming request and generates a response. -+ * @param in the request -+ * @return the response -+ * @throws java.lang.Exception for various errors -+ */ -+ private byte[] processMessage(byte[] in) throws Exception { -+ if ((in[0] & 0x1f) == Krb5.KRB_AS_REQ) -+ return processAsReq(in); -+ else -+ return processTgsReq(in); -+ } -+ -+ /** -+ * Processes a TGS_REQ and generates a TGS_REP (or KRB_ERROR) -+ * @param in the request -+ * @return the response -+ * @throws java.lang.Exception for various errors -+ */ -+ private byte[] processTgsReq(byte[] in) throws Exception { -+ TGSReq tgsReq = new TGSReq(in); -+ try { -+ System.out.println(realm + "> " + tgsReq.reqBody.cname + -+ " sends TGS-REQ for " + -+ tgsReq.reqBody.sname); -+ KDCReqBody body = tgsReq.reqBody; -+ int etype = 0; -+ -+ // Reflection: PAData[] pas = tgsReq.pAData; -+ Field f = KDCReq.class.getDeclaredField("pAData"); -+ f.setAccessible(true); -+ PAData[] pas = (PAData[])f.get(tgsReq); -+ -+ Ticket tkt = null; -+ EncTicketPart etp = null; -+ if (pas == null || pas.length == 0) { -+ throw new KrbException(Krb5.KDC_ERR_PADATA_TYPE_NOSUPP); -+ } else { -+ for (PAData pa: pas) { -+ if (pa.getType() == Krb5.PA_TGS_REQ) { -+ APReq apReq = new APReq(pa.getValue()); -+ EncryptedData ed = apReq.authenticator; -+ tkt = apReq.ticket; -+ etype = tkt.encPart.getEType(); -+ EncryptionKey kkey = null; -+ if (!tkt.realm.toString().equals(realm)) { -+ if (tkt.sname.getNameString().equals("krbtgt/" + realm)) { -+ kkey = keyForUser(new PrincipalName("krbtgt/" + tkt.realm.toString(), realm), etype); -+ } -+ } else { -+ kkey = keyForUser(tkt.sname, etype); -+ } -+ byte[] bb = tkt.encPart.decrypt(kkey, KeyUsage.KU_TICKET); -+ DerInputStream derIn = new DerInputStream(bb); -+ DerValue der = derIn.getDerValue(); -+ etp = new EncTicketPart(der.toByteArray()); -+ } -+ } -+ if (tkt == null) { -+ throw new KrbException(Krb5.KDC_ERR_PADATA_TYPE_NOSUPP); -+ } -+ } -+ EncryptionKey skey = keyForUser(body.sname, etype); -+ if (skey == null) { -+ throw new KrbException(Krb5.KDC_ERR_SUMTYPE_NOSUPP); // TODO -+ } -+ -+ // Session key for original ticket, TGT -+ EncryptionKey ckey = etp.key; -+ -+ // Session key for session with the service -+ EncryptionKey key = generateRandomKey(etype); -+ -+ // Check time, TODO -+ KerberosTime till = body.till; -+ if (till == null) { -+ throw new KrbException(Krb5.KDC_ERR_NEVER_VALID); // TODO -+ } else if (till.isZero()) { -+ till = new KerberosTime(new Date().getTime() + 1000 * 3600 * 11); -+ } -+ -+ boolean[] bFlags = new boolean[Krb5.TKT_OPTS_MAX+1]; -+ if (body.kdcOptions.get(KDCOptions.FORWARDABLE)) { -+ bFlags[Krb5.TKT_OPTS_FORWARDABLE] = true; -+ } -+ if (body.kdcOptions.get(KDCOptions.FORWARDED) || -+ etp.flags.get(Krb5.TKT_OPTS_FORWARDED)) { -+ bFlags[Krb5.TKT_OPTS_FORWARDED] = true; -+ } -+ if (body.kdcOptions.get(KDCOptions.RENEWABLE)) { -+ bFlags[Krb5.TKT_OPTS_RENEWABLE] = true; -+ //renew = new KerberosTime(new Date().getTime() + 1000 * 3600 * 24 * 7); -+ } -+ if (body.kdcOptions.get(KDCOptions.PROXIABLE)) { -+ bFlags[Krb5.TKT_OPTS_PROXIABLE] = true; -+ } -+ if (body.kdcOptions.get(KDCOptions.POSTDATED)) { -+ bFlags[Krb5.TKT_OPTS_POSTDATED] = true; -+ } -+ if (body.kdcOptions.get(KDCOptions.ALLOW_POSTDATE)) { -+ bFlags[Krb5.TKT_OPTS_MAY_POSTDATE] = true; -+ } -+ bFlags[Krb5.TKT_OPTS_INITIAL] = true; -+ -+ TicketFlags tFlags = new TicketFlags(bFlags); -+ EncTicketPart enc = new EncTicketPart( -+ tFlags, -+ key, -+ etp.crealm, -+ etp.cname, -+ new TransitedEncoding(1, new byte[0]), // TODO -+ new KerberosTime(new Date()), -+ body.from, -+ till, body.rtime, -+ body.addresses, -+ null); -+ Ticket t = new Ticket( -+ body.crealm, -+ body.sname, -+ new EncryptedData(skey, enc.asn1Encode(), KeyUsage.KU_TICKET) -+ ); -+ EncTGSRepPart enc_part = new EncTGSRepPart( -+ key, -+ new LastReq(new LastReqEntry[]{ -+ new LastReqEntry(0, new KerberosTime(new Date().getTime() - 10000)) -+ }), -+ body.getNonce(), // TODO: detect replay -+ new KerberosTime(new Date().getTime() + 1000 * 3600 * 24), -+ // Next 5 and last MUST be same with ticket -+ tFlags, -+ new KerberosTime(new Date()), -+ body.from, -+ till, body.rtime, -+ body.crealm, -+ body.sname, -+ body.addresses -+ ); -+ EncryptedData edata = new EncryptedData(ckey, enc_part.asn1Encode(), KeyUsage.KU_ENC_TGS_REP_PART_SESSKEY); -+ TGSRep tgsRep = new TGSRep(null, -+ etp.crealm, -+ etp.cname, -+ t, -+ edata); -+ System.out.println(" Return " + tgsRep.cname -+ + " ticket for " + tgsRep.ticket.sname); -+ -+ DerOutputStream out = new DerOutputStream(); -+ out.write(DerValue.createTag(DerValue.TAG_APPLICATION, -+ true, (byte)Krb5.KRB_TGS_REP), tgsRep.asn1Encode()); -+ return out.toByteArray(); -+ } catch (KrbException ke) { -+ ke.printStackTrace(System.out); -+ KRBError kerr = ke.getError(); -+ KDCReqBody body = tgsReq.reqBody; -+ System.out.println(" Error " + ke.returnCode() -+ + " " +ke.returnCodeMessage()); -+ if (kerr == null) { -+ kerr = new KRBError(null, null, null, -+ new KerberosTime(new Date()), -+ 0, -+ ke.returnCode(), -+ body.crealm, body.cname, -+ new Realm(getRealm()), body.sname, -+ KrbException.errorMessage(ke.returnCode()), -+ null); -+ } -+ return kerr.asn1Encode(); -+ } -+ } -+ -+ /** -+ * Processes a AS_REQ and generates a AS_REP (or KRB_ERROR) -+ * @param in the request -+ * @return the response -+ * @throws java.lang.Exception for various errors -+ */ -+ private byte[] processAsReq(byte[] in) throws Exception { -+ ASReq asReq = new ASReq(in); -+ int[] eTypes = null; -+ try { -+ System.out.println(realm + "> " + asReq.reqBody.cname + -+ " sends AS-REQ for " + -+ asReq.reqBody.sname); -+ -+ KDCReqBody body = asReq.reqBody; -+ -+ // Reflection: int[] eType = body.eType; -+ Field f = KDCReqBody.class.getDeclaredField("eType"); -+ f.setAccessible(true); -+ eTypes = (int[])f.get(body); -+ int eType = eTypes[0]; -+ -+ EncryptionKey ckey = keyForUser(body.cname, eType); -+ EncryptionKey skey = keyForUser(body.sname, eType); -+ if (ckey == null) { -+ throw new KrbException(Krb5.KDC_ERR_ETYPE_NOSUPP); -+ } -+ if (skey == null) { -+ throw new KrbException(Krb5.KDC_ERR_SUMTYPE_NOSUPP); // TODO -+ } -+ -+ // Session key -+ EncryptionKey key = generateRandomKey(eType); -+ // Check time, TODO -+ KerberosTime till = body.till; -+ if (till == null) { -+ throw new KrbException(Krb5.KDC_ERR_NEVER_VALID); // TODO -+ } else if (till.isZero()) { -+ till = new KerberosTime(new Date().getTime() + 1000 * 3600 * 11); -+ } -+ //body.from -+ boolean[] bFlags = new boolean[Krb5.TKT_OPTS_MAX+1]; -+ if (body.kdcOptions.get(KDCOptions.FORWARDABLE)) { -+ bFlags[Krb5.TKT_OPTS_FORWARDABLE] = true; -+ } -+ if (body.kdcOptions.get(KDCOptions.RENEWABLE)) { -+ bFlags[Krb5.TKT_OPTS_RENEWABLE] = true; -+ //renew = new KerberosTime(new Date().getTime() + 1000 * 3600 * 24 * 7); -+ } -+ if (body.kdcOptions.get(KDCOptions.PROXIABLE)) { -+ bFlags[Krb5.TKT_OPTS_PROXIABLE] = true; -+ } -+ if (body.kdcOptions.get(KDCOptions.POSTDATED)) { -+ bFlags[Krb5.TKT_OPTS_POSTDATED] = true; -+ } -+ if (body.kdcOptions.get(KDCOptions.ALLOW_POSTDATE)) { -+ bFlags[Krb5.TKT_OPTS_MAY_POSTDATE] = true; -+ } -+ bFlags[Krb5.TKT_OPTS_INITIAL] = true; -+ -+ f = KDCReq.class.getDeclaredField("pAData"); -+ f.setAccessible(true); -+ PAData[] pas = (PAData[])f.get(asReq); -+ if (pas == null || pas.length == 0) { -+ Object preauth = options.get(Option.PREAUTH_REQUIRED); -+ if (preauth == null || preauth.equals(Boolean.TRUE)) { -+ throw new KrbException(Krb5.KDC_ERR_PREAUTH_REQUIRED); -+ } -+ } else { -+ try { -+ Constructor<EncryptedData> ctor = EncryptedData.class.getDeclaredConstructor(DerValue.class); -+ ctor.setAccessible(true); -+ EncryptedData data = ctor.newInstance(new DerValue(pas[0].getValue())); -+ data.decrypt(ckey, KeyUsage.KU_PA_ENC_TS); -+ } catch (Exception e) { -+ throw new KrbException(Krb5.KDC_ERR_PREAUTH_FAILED); -+ } -+ bFlags[Krb5.TKT_OPTS_PRE_AUTHENT] = true; -+ } -+ -+ TicketFlags tFlags = new TicketFlags(bFlags); -+ EncTicketPart enc = new EncTicketPart( -+ tFlags, -+ key, -+ body.crealm, -+ body.cname, -+ new TransitedEncoding(1, new byte[0]), -+ new KerberosTime(new Date()), -+ body.from, -+ till, body.rtime, -+ body.addresses, -+ null); -+ Ticket t = new Ticket( -+ body.crealm, -+ body.sname, -+ new EncryptedData(skey, enc.asn1Encode(), KeyUsage.KU_TICKET) -+ ); -+ EncASRepPart enc_part = new EncASRepPart( -+ key, -+ new LastReq(new LastReqEntry[]{ -+ new LastReqEntry(0, new KerberosTime(new Date().getTime() - 10000)) -+ }), -+ body.getNonce(), // TODO: detect replay? -+ new KerberosTime(new Date().getTime() + 1000 * 3600 * 24), -+ // Next 5 and last MUST be same with ticket -+ tFlags, -+ new KerberosTime(new Date()), -+ body.from, -+ till, body.rtime, -+ body.crealm, -+ body.sname, -+ body.addresses -+ ); -+ EncryptedData edata = new EncryptedData(ckey, enc_part.asn1Encode(), KeyUsage.KU_ENC_AS_REP_PART); -+ ASRep asRep = new ASRep(null, -+ body.crealm, -+ body.cname, -+ t, -+ edata); -+ -+ System.out.println(" Return " + asRep.cname -+ + " ticket for " + asRep.ticket.sname); -+ -+ DerOutputStream out = new DerOutputStream(); -+ out.write(DerValue.createTag(DerValue.TAG_APPLICATION, -+ true, (byte)Krb5.KRB_AS_REP), asRep.asn1Encode()); -+ return out.toByteArray(); -+ } catch (KrbException ke) { -+ ke.printStackTrace(System.out); -+ KRBError kerr = ke.getError(); -+ KDCReqBody body = asReq.reqBody; -+ System.out.println(" Error " + ke.returnCode() -+ + " " +ke.returnCodeMessage()); -+ byte[] eData = null; -+ if (kerr == null) { -+ if (ke.returnCode() == Krb5.KDC_ERR_PREAUTH_REQUIRED || -+ ke.returnCode() == Krb5.KDC_ERR_PREAUTH_FAILED) { -+ PAData pa; -+ -+ ETypeInfo2 ei2 = new ETypeInfo2(eTypes[0], null, null); -+ DerOutputStream eid = new DerOutputStream(); -+ eid.write(DerValue.tag_Sequence, ei2.asn1Encode()); -+ -+ pa = new PAData(Krb5.PA_ETYPE_INFO2, eid.toByteArray()); -+ -+ DerOutputStream bytes = new DerOutputStream(); -+ bytes.write(new PAData(Krb5.PA_ENC_TIMESTAMP, new byte[0]).asn1Encode()); -+ bytes.write(pa.asn1Encode()); -+ -+ boolean allOld = true; -+ for (int i: eTypes) { -+ if (i == EncryptedData.ETYPE_AES128_CTS_HMAC_SHA1_96 || -+ i == EncryptedData.ETYPE_AES256_CTS_HMAC_SHA1_96) { -+ allOld = false; -+ break; -+ } -+ } -+ if (allOld) { -+ ETypeInfo ei = new ETypeInfo(eTypes[0], null); -+ eid = new DerOutputStream(); -+ eid.write(DerValue.tag_Sequence, ei.asn1Encode()); -+ pa = new PAData(Krb5.PA_ETYPE_INFO, eid.toByteArray()); -+ bytes.write(pa.asn1Encode()); -+ } -+ DerOutputStream temp = new DerOutputStream(); -+ temp.write(DerValue.tag_Sequence, bytes); -+ eData = temp.toByteArray(); -+ } -+ kerr = new KRBError(null, null, null, -+ new KerberosTime(new Date()), -+ 0, -+ ke.returnCode(), -+ body.crealm, body.cname, -+ new Realm(getRealm()), body.sname, -+ KrbException.errorMessage(ke.returnCode()), -+ eData); -+ } -+ return kerr.asn1Encode(); -+ } -+ } -+ -+ /** -+ * Generates a line for a KDC to put inside [realms] of krb5.conf -+ * @param kdc the KDC -+ * @return REALM.NAME = { kdc = localhost:port } -+ */ -+ private static String realmLineForKDC(KDC kdc) { -+ return String.format(" %s = {\n kdc = localhost:%d\n }\n", kdc.realm, kdc.port); -+ } -+ -+ /** -+ * Start the KDC service. This server listens on both UDP and TCP using -+ * the same port number. It uses three threads to deal with requests. -+ * They can be set to daemon threads if requested. -+ * @param port the port number to listen to. If zero, a random available -+ * port no less than 8000 will be chosen and used. -+ * @param asDaemon true if the KDC threads should be daemons -+ * @throws java.io.IOException for any communication error -+ */ -+ protected void startServer(int port, boolean asDaemon) throws IOException { -+ DatagramSocket u1 = null; -+ ServerSocket t1 = null; -+ if (port > 0) { -+ u1 = new DatagramSocket(port, InetAddress.getByName("127.0.0.1")); -+ t1 = new ServerSocket(port); -+ } else { -+ while (true) { -+ // Try to find a port number that's both TCP and UDP free -+ try { -+ port = 8000 + new java.util.Random().nextInt(10000); -+ u1 = null; -+ u1 = new DatagramSocket(port, InetAddress.getByName("127.0.0.1")); -+ t1 = new ServerSocket(port); -+ break; -+ } catch (Exception e) { -+ if (u1 != null) u1.close(); -+ } -+ } -+ } -+ final DatagramSocket udp = u1; -+ final ServerSocket tcp = t1; -+ System.out.println("Start KDC on " + port); -+ -+ this.port = port; -+ -+ // The UDP consumer -+ Thread thread = new Thread() { -+ public void run() { -+ while (true) { -+ try { -+ byte[] inbuf = new byte[8192]; -+ DatagramPacket p = new DatagramPacket(inbuf, inbuf.length); -+ udp.receive(p); -+ System.out.println("-----------------------------------------------"); -+ System.out.println(">>>>> UDP packet received"); -+ q.put(new Job(processMessage(Arrays.copyOf(inbuf, p.getLength())), udp, p)); -+ } catch (Exception e) { -+ e.printStackTrace(); -+ } -+ } -+ } -+ }; -+ thread.setDaemon(asDaemon); -+ thread.start(); -+ -+ // The TCP consumer -+ thread = new Thread() { -+ public void run() { -+ while (true) { -+ try { -+ Socket socket = tcp.accept(); -+ System.out.println("-----------------------------------------------"); -+ System.out.println(">>>>> TCP connection established"); -+ DataInputStream in = new DataInputStream(socket.getInputStream()); -+ DataOutputStream out = new DataOutputStream(socket.getOutputStream()); -+ byte[] token = new byte[in.readInt()]; -+ in.readFully(token); -+ q.put(new Job(processMessage(token), socket, out)); -+ } catch (Exception e) { -+ e.printStackTrace(); -+ } -+ } -+ } -+ }; -+ thread.setDaemon(asDaemon); -+ thread.start(); -+ -+ // The dispatcher -+ thread = new Thread() { -+ public void run() { -+ while (true) { -+ try { -+ q.take().send(); -+ } catch (Exception e) { -+ } -+ } -+ } -+ }; -+ thread.setDaemon(true); -+ thread.start(); -+ } -+ -+ /** -+ * Helper class to encapsulate a job in a KDC. -+ */ -+ private static class Job { -+ byte[] token; // The received request at creation time and -+ // the response at send time -+ Socket s; // The TCP socket from where the request comes -+ DataOutputStream out; // The OutputStream of the TCP socket -+ DatagramSocket s2; // The UDP socket from where the request comes -+ DatagramPacket dp; // The incoming UDP datagram packet -+ boolean useTCP; // Whether TCP or UDP is used -+ -+ // Creates a job object for TCP -+ Job(byte[] token, Socket s, DataOutputStream out) { -+ useTCP = true; -+ this.token = token; -+ this.s = s; -+ this.out = out; -+ } -+ -+ // Creates a job object for UDP -+ Job(byte[] token, DatagramSocket s2, DatagramPacket dp) { -+ useTCP = false; -+ this.token = token; -+ this.s2 = s2; -+ this.dp = dp; -+ } -+ -+ // Sends the output back to the client -+ void send() { -+ try { -+ if (useTCP) { -+ System.out.println(">>>>> TCP request honored"); -+ out.writeInt(token.length); -+ out.write(token); -+ s.close(); -+ } else { -+ System.out.println(">>>>> UDP request honored"); -+ s2.send(new DatagramPacket(token, token.length, dp.getAddress(), dp.getPort())); -+ } -+ } catch (Exception e) { -+ e.printStackTrace(); -+ } -+ } -+ } -+} -diff -r 8b2d7e577d4a -r 3f051f3ba5bb test/sun/security/krb5/auto/KerberosHashEqualsTest.java ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/test/sun/security/krb5/auto/KerberosHashEqualsTest.java Fri Oct 17 13:02:00 2008 +0800 -@@ -0,0 +1,173 @@ -+/* -+ * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ */ -+ -+/* -+ * @test -+ * @bug 4641821 -+ * @summary hashCode() and equals() for KerberosKey and KerberosTicket -+ */ -+ -+import java.net.InetAddress; -+import java.util.Date; -+import javax.security.auth.kerberos.KerberosKey; -+import javax.security.auth.kerberos.KerberosPrincipal; -+import javax.security.auth.kerberos.KerberosTicket; -+ -+public class KerberosHashEqualsTest { -+ public static void main(String[] args) throws Exception { -+ new OneKDC(null); -+ new KerberosHashEqualsTest().check(); -+ } -+ -+ void checkSame(Object o1, Object o2) { -+ if(!o1.equals(o2)) { -+ throw new RuntimeException("equals() fails"); -+ } -+ if(o1.hashCode() != o2.hashCode()) { -+ throw new RuntimeException("hashCode() not same"); -+ } -+ } -+ -+ void checkNotSame(Object o1, Object o2) { -+ if(o1.equals(o2)) { -+ throw new RuntimeException("equals() succeeds"); -+ } -+ } -+ -+ void check() throws Exception { -+ -+ // The key part: -+ // new KerberosKey(principal, bytes, keyType, version) -+ -+ KerberosKey k1, k2; -+ KerberosPrincipal CLIENT = new KerberosPrincipal("client"); -+ KerberosPrincipal SERVER = new KerberosPrincipal("server"); -+ byte[] PASS = "pass".getBytes(); -+ -+ k1 = new KerberosKey(CLIENT, PASS, 1, 1); -+ k2 = new KerberosKey(CLIENT, PASS, 1, 1); -+ checkSame(k1, k1); // me is me -+ checkSame(k1, k2); // same -+ -+ // A destroyed key doesn't equal to any key -+ k2.destroy(); -+ checkNotSame(k1, k2); -+ checkNotSame(k2, k1); -+ k1.destroy(); -+ checkNotSame(k1, k2); // even if they are both destroyed -+ checkNotSame(k2, k1); -+ checkSame(k2, k2); -+ -+ // a little difference means not equal -+ k1 = new KerberosKey(CLIENT, PASS, 1, 1); -+ k2 = new KerberosKey(SERVER, PASS, 1, 1); -+ checkNotSame(k1, k2); // Different principal name -+ -+ k2 = new KerberosKey(CLIENT, "ssap".getBytes(), 1, 1); -+ checkNotSame(k1, k2); // Different password -+ -+ k2 = new KerberosKey(CLIENT, PASS, 2, 1); -+ checkNotSame(k1, k2); // Different keytype -+ -+ k2 = new KerberosKey(CLIENT, PASS, 1, 2); -+ checkNotSame(k1, k2); // Different version -+ -+ k2 = new KerberosKey(null, PASS, 1, 2); -+ checkNotSame(k1, k2); // null is not non-null -+ -+ k1 = new KerberosKey(null, PASS, 1, 2); -+ checkSame(k1, k2); // null is null -+ -+ checkNotSame(k1, "Another Object"); -+ -+ // The ticket part: -+ // new KerberosTicket(asn1 bytes, client, server, session key, type, flags, -+ // auth, start, end, renewUntil times, address) -+ -+ KerberosTicket t1, t2; -+ -+ byte[] ASN1 = "asn1".getBytes(); -+ boolean[] FORWARDABLE = new boolean[] {true, true}; -+ boolean[] ALLTRUE = new boolean[] {true, true, true, true, true, true, true, true, true, true}; -+ Date D0 = new Date(0); -+ -+ t1 = new KerberosTicket(ASN1, CLIENT, SERVER, PASS, 1, FORWARDABLE, D0, D0, D0, D0, null); -+ t2 = new KerberosTicket(ASN1, CLIENT, SERVER, PASS, 1, FORWARDABLE, D0, D0, D0, D0, null); -+ checkSame(t1, t1); -+ checkSame(t1, t2); -+ -+ // destroyed tickets doesn't equal to each other -+ t1.destroy(); -+ checkNotSame(t1, t2); -+ checkNotSame(t2, t1); -+ -+ t2.destroy(); -+ checkNotSame(t1, t2); // even if they are both destroyed -+ checkNotSame(t2, t1); -+ -+ checkSame(t2, t2); // unless they are the same object -+ -+ // a little difference means not equal -+ t1 = new KerberosTicket(ASN1, CLIENT, SERVER, PASS, 1, FORWARDABLE, D0, D0, D0, D0, null); -+ t2 = new KerberosTicket("asn11".getBytes(), CLIENT, SERVER, PASS, 1, FORWARDABLE, D0, D0, D0, D0, null); -+ checkNotSame(t1, t2); // Different ASN1 encoding -+ -+ t2 = new KerberosTicket(ASN1, new KerberosPrincipal("client1"), SERVER, PASS, 1, FORWARDABLE, D0, D0, D0, D0, null); -+ checkNotSame(t1, t2); // Different client -+ -+ t2 = new KerberosTicket(ASN1, CLIENT, new KerberosPrincipal("server1"), PASS, 1, FORWARDABLE, D0, D0, D0, D0, null); -+ checkNotSame(t1, t2); // Different server -+ -+ t2 = new KerberosTicket(ASN1, CLIENT, SERVER, "pass1".getBytes(), 1, FORWARDABLE, D0, D0, D0, D0, null); -+ checkNotSame(t1, t2); // Different session key -+ -+ t2 = new KerberosTicket(ASN1, CLIENT, SERVER, PASS, 2, FORWARDABLE, D0, D0, D0, D0, null); -+ checkNotSame(t1, t2); // Different key type -+ -+ t2 = new KerberosTicket(ASN1, CLIENT, SERVER, PASS, 1, new boolean[] {true, false}, D0, D0, D0, D0, null); -+ checkNotSame(t1, t2); // Different flags, not FORWARDABLE -+ -+ t2 = new KerberosTicket(ASN1, CLIENT, SERVER, PASS, 1, FORWARDABLE, new Date(1), D0, D0, D0, null); -+ checkNotSame(t1, t2); // Different authtime -+ -+ t2 = new KerberosTicket(ASN1, CLIENT, SERVER, PASS, 1, FORWARDABLE, D0, new Date(1), D0, D0, null); -+ checkNotSame(t1, t2); // Different starttime -+ -+ t2 = new KerberosTicket(ASN1, CLIENT, SERVER, PASS, 1, FORWARDABLE, D0, D0, new Date(1), D0, null); -+ checkNotSame(t1, t2); // Different endtime -+ -+ t2 = new KerberosTicket(ASN1, CLIENT, SERVER, PASS, 1, FORWARDABLE, D0, D0, D0, D0, new InetAddress[2]); -+ checkNotSame(t1, t2); // Different client addresses -+ -+ t2 = new KerberosTicket(ASN1, CLIENT, SERVER, PASS, 1, FORWARDABLE, D0, D0, D0, new Date(1), null); -+ t1 = new KerberosTicket(ASN1, CLIENT, SERVER, PASS, 1, FORWARDABLE, D0, D0, D0, new Date(2), null); -+ checkSame(t1, t2); // renewtill is ignored when RENEWABLE ticket flag is not set. -+ -+ t2 = new KerberosTicket(ASN1, CLIENT, SERVER, PASS, 1, ALLTRUE, D0, D0, D0, new Date(1), null); -+ t1 = new KerberosTicket(ASN1, CLIENT, SERVER, PASS, 1, ALLTRUE, D0, D0, D0, new Date(2), null); -+ checkNotSame(t1, t2); // renewtill is used when RENEWABLE is set. -+ -+ checkNotSame(t1, "Another Object"); -+ System.out.println("Good!"); -+ } -+} -diff -r 8b2d7e577d4a -r 3f051f3ba5bb test/sun/security/krb5/auto/OneKDC.java ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/test/sun/security/krb5/auto/OneKDC.java Fri Oct 17 13:02:00 2008 +0800 -@@ -0,0 +1,140 @@ -+/* -+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+ * CA 95054 USA or visit www.sun.com if you need additional information or -+ * have any questions. -+ */ -+ -+import java.io.File; -+import java.io.FileOutputStream; -+import java.io.IOException; -+import java.security.Security; -+import javax.security.auth.callback.Callback; -+import javax.security.auth.callback.CallbackHandler; -+import javax.security.auth.callback.NameCallback; -+import javax.security.auth.callback.PasswordCallback; -+import sun.security.krb5.Config; -+ -+/** -+ * This class starts a simple KDC with one realm, several typical principal -+ * names, generates delete-on-exit krb5.conf and keytab files, and setup -+ * system properties for them. There's also a helper method to generate a -+ * JAAS login config file that can be used for JAAS or JGSS apps. -+ * <p> -+ * Just call this line to start everything: -+ * <pre> -+ * new OneKDC(null).writeJaasConf(); -+ * </pre> -+ */ -+public class OneKDC extends KDC { -+ -+ public static final String USER = "dummy"; -+ public static final char[] PASS = "bogus".toCharArray(); -+ public static final String SERVER = "server/localhost"; -+ public static final String BACKEND = "backend/localhost"; -+ public static final String KRB5_CONF = "localkdc-krb5.conf"; -+ public static final String KTAB = "localkdc.ktab"; -+ public static final String JAAS_CONF = "localkdc-jaas.conf"; -+ public static final String REALM = "RABBIT.HOLE"; -+ -+ /** -+ * Creates the KDC and starts it. -+ * @param etype Encryption type, null if not specified -+ * @throws java.lang.Exception if there's anything wrong -+ */ -+ public OneKDC(String etype) throws Exception { -+ super(REALM, 0, true); -+ addPrincipal(USER, PASS); -+ addPrincipalRandKey("krbtgt/" + REALM); -+ addPrincipalRandKey(SERVER); -+ addPrincipalRandKey(BACKEND); -+ KDC.saveConfig(KRB5_CONF, this, -+ "forwardable = true", -+ "default_keytab_name = " + KTAB, -+ etype == null ? "" : "default_tkt_enctypes=" + etype + "\ndefault_tgs_enctypes=" + etype); -+ System.setProperty("java.security.krb5.conf", KRB5_CONF); -+ // Whatever krb5.conf had been loaded before, we reload ours now. -+ Config.refresh(); -+ -+ writeKtab(KTAB); -+ new File(KRB5_CONF).deleteOnExit(); -+ new File(KTAB).deleteOnExit(); -+ } -+ -+ /** -+ * Writes a JAAS login config file, which contains as many as useful -+ * entries, including JGSS style initiator/acceptor and normal JAAS -+ * entries with names using existing OneKDC principals. -+ * @throws java.lang.Exception if anything goes wrong -+ */ -+ public void writeJAASConf() throws IOException { -+ System.setProperty("java.security.auth.login.config", JAAS_CONF); -+ File f = new File(JAAS_CONF); -+ FileOutputStream fos = new FileOutputStream(f); -+ fos.write(( -+ "com.sun.security.jgss.krb5.initiate {\n" + -+ " com.sun.security.auth.module.Krb5LoginModule required;\n};\n" + -+ "com.sun.security.jgss.krb5.accept {\n" + -+ " com.sun.security.auth.module.Krb5LoginModule required\n" + -+ " principal=\"" + SERVER + "\"\n" + -+ " useKeyTab=true\n" + -+ " isInitiator=false\n" + -+ " storeKey=true;\n};\n" + -+ "client {\n" + -+ " com.sun.security.auth.module.Krb5LoginModule required;\n};\n" + -+ "server {\n" + -+ " com.sun.security.auth.module.Krb5LoginModule required\n" + -+ " principal=\"" + SERVER + "\"\n" + -+ " useKeyTab=true\n" + -+ " storeKey=true;\n};\n" + -+ "backend {\n" + -+ " com.sun.security.auth.module.Krb5LoginModule required\n" + -+ " principal=\"" + BACKEND + "\"\n" + -+ " useKeyTab=true\n" + -+ " storeKey=true\n" + -+ " isInitiator=false;\n};\n" -+ ).getBytes()); -+ fos.close(); -+ f.deleteOnExit(); -+ Security.setProperty("auth.login.defaultCallbackHandler", "OneKDC$CallbackForClient"); -+ } -+ -+ /** -+ * The default callback handler for JAAS login. Note that this handler is -+ * hard coded to provide only info for USER1. If you need to provide info -+ * for another principal, please use Context.fromUserPass() instead. -+ */ -+ public static class CallbackForClient implements CallbackHandler { -+ public void handle(Callback[] callbacks) { -+ String user = OneKDC.USER; -+ char[] pass = OneKDC.PASS; -+ for (Callback callback : callbacks) { -+ if (callback instanceof NameCallback) { -+ System.out.println("Callback for name: " + user); -+ ((NameCallback) callback).setName(user); -+ } -+ if (callback instanceof PasswordCallback) { -+ System.out.println("Callback for pass: " -+ + new String(pass)); -+ ((PasswordCallback) callback).setPassword(pass); -+ } -+ } -+ } -+ } -+} -diff -r 8b2d7e577d4a -r 3f051f3ba5bb test/sun/security/krb5/auto/basic.sh ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/test/sun/security/krb5/auto/basic.sh Fri Oct 17 13:02:00 2008 +0800 -@@ -0,0 +1,65 @@ -+# -+# Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+# CA 95054 USA or visit www.sun.com if you need additional information or -+# have any questions. -+# -+ -+# @test -+# @bug 6706974 -+# @summary Add krb5 test infrastructure -+# @run shell/timeout=300 basic.sh -+# -+ -+if [ "${TESTSRC}" = "" ] ; then -+ TESTSRC="." -+fi -+if [ "${TESTJAVA}" = "" ] ; then -+ echo "TESTJAVA not set. Test cannot execute." -+ echo "FAILED!!!" -+ exit 1 -+fi -+ -+# set platform-dependent variables -+OS=`uname -s` -+case "$OS" in -+ Windows_* ) -+ FS="\\" -+ ;; -+ * ) -+ FS="/" -+ ;; -+esac -+ -+${TESTJAVA}${FS}bin${FS}javac -d . \ -+ ${TESTSRC}${FS}BasicKrb5Test.java \ -+ ${TESTSRC}${FS}KDC.java \ -+ ${TESTSRC}${FS}OneKDC.java \ -+ ${TESTSRC}${FS}Action.java \ -+ ${TESTSRC}${FS}Context.java \ -+ || exit 10 -+${TESTJAVA}${FS}bin${FS}java -Dtest.src=$TESTSRC BasicKrb5Test || exit 100 -+${TESTJAVA}${FS}bin${FS}java -Dtest.src=$TESTSRC BasicKrb5Test des-cbc-crc || exit 1 -+${TESTJAVA}${FS}bin${FS}java -Dtest.src=$TESTSRC BasicKrb5Test des-cbc-md5 || exit 3 -+${TESTJAVA}${FS}bin${FS}java -Dtest.src=$TESTSRC BasicKrb5Test des3-cbc-sha1 || exit 16 -+${TESTJAVA}${FS}bin${FS}java -Dtest.src=$TESTSRC BasicKrb5Test aes128-cts || exit 17 -+${TESTJAVA}${FS}bin${FS}java -Dtest.src=$TESTSRC BasicKrb5Test aes256-cts || exit 18 -+${TESTJAVA}${FS}bin${FS}java -Dtest.src=$TESTSRC BasicKrb5Test rc4-hmac || exit 23 -+ -+exit 0
--- a/patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,94 +0,0 @@ -# HG changeset patch -# User weijun -# Date 1224469953 -28800 -# Node ID 0bf6c9c6fdc55ec5867a9c892b6a9408b8253198 -# Parent 064e6a087f775f1850e68c569e7adf092bcb1c30 -6761072: new krb5 tests fail on multiple platforms -Reviewed-by: xuelei - -diff -r 064e6a087f77 -r 0bf6c9c6fdc5 test/sun/security/krb5/auto/BasicKrb5Test.java ---- openjdk.orig/jdk/test/sun/security/krb5/auto/BasicKrb5Test.java Fri Oct 17 00:51:59 2008 -0700 -+++ openjdk/jdk/test/sun/security/krb5/auto/BasicKrb5Test.java Mon Oct 20 10:32:33 2008 +0800 -@@ -49,14 +49,17 @@ - if (args.length > 0) { - etype = args[0]; - } -+ -+ // Creates and starts the KDC. This line must be put ahead of etype check -+ // since the check needs a krb5.conf. -+ new OneKDC(etype).writeJAASConf(); -+ - System.out.println("Testing etype " + etype); - if (etype != null && !EType.isSupported(Config.getInstance().getType(etype))) { - System.out.println("Not supported."); - System.exit(0); - } - -- // Creates and starts the KDC -- new OneKDC(etype).writeJAASConf(); - new BasicKrb5Test().go(OneKDC.SERVER, OneKDC.BACKEND); - } - -diff -r 064e6a087f77 -r 0bf6c9c6fdc5 test/sun/security/krb5/auto/KDC.java ---- openjdk.orig/jdk/test/sun/security/krb5/auto/KDC.java Fri Oct 17 00:51:59 2008 -0700 -+++ openjdk/jdk/test/sun/security/krb5/auto/KDC.java Mon Oct 20 10:32:33 2008 +0800 -@@ -152,12 +152,19 @@ - return; - } - } -+ String localhost = "localhost"; -+ try { -+ localhost = InetAddress.getByName(localhost) -+ .getCanonicalHostName(); -+ } catch (UnknownHostException uhe) { -+ ; // Ignore, localhost is still "localhost" -+ } - KDC kdc = create("RABBIT.HOLE", 8888, false); - kdc.addPrincipal("dummy", "bogus".toCharArray()); - kdc.addPrincipal("foo", "bar".toCharArray()); - kdc.addPrincipalRandKey("krbtgt/" + kdc.realm); -- kdc.addPrincipalRandKey("server/localhost"); -- kdc.addPrincipalRandKey("backend/localhost"); -+ kdc.addPrincipalRandKey("server/" + localhost); -+ kdc.addPrincipalRandKey("backend/" + localhost); - } - - /** -diff -r 064e6a087f77 -r 0bf6c9c6fdc5 test/sun/security/krb5/auto/OneKDC.java ---- openjdk.orig/jdk/test/sun/security/krb5/auto/OneKDC.java Fri Oct 17 00:51:59 2008 -0700 -+++ openjdk/jdk/test/sun/security/krb5/auto/OneKDC.java Mon Oct 20 10:32:33 2008 +0800 -@@ -24,6 +24,8 @@ - import java.io.File; - import java.io.FileOutputStream; - import java.io.IOException; -+import java.net.InetAddress; -+import java.net.UnknownHostException; - import java.security.Security; - import javax.security.auth.callback.Callback; - import javax.security.auth.callback.CallbackHandler; -@@ -44,10 +46,23 @@ - */ - public class OneKDC extends KDC { - -+ // The krb5 codes would try to canonicalize hostnames before creating -+ // a service principal name, so let's find out the canonicalized form -+ // of localhost first. The following codes mimic the process inside -+ // PrincipalName.java. -+ static String localhost = "localhost"; -+ static { -+ try { -+ localhost = InetAddress.getByName(localhost) -+ .getCanonicalHostName(); -+ } catch (UnknownHostException uhe) { -+ ; // Ignore, localhost is still "localhost" -+ } -+ } - public static final String USER = "dummy"; - public static final char[] PASS = "bogus".toCharArray(); -- public static final String SERVER = "server/localhost"; -- public static final String BACKEND = "backend/localhost"; -+ public static String SERVER = "server/" + localhost; -+ public static String BACKEND = "backend/" + localhost; - public static final String KRB5_CONF = "localkdc-krb5.conf"; - public static final String KTAB = "localkdc.ktab"; - public static final String JAAS_CONF = "localkdc-jaas.conf";
--- a/patches/openjdk/6821191-tz_display_names_l10n.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,125 +0,0 @@ -# HG changeset patch -# User yhuang -# Date 1262835175 28800 -# Node ID eea1cc096889cec5151c08de842a5493724cdc1c -# Parent 8bf6b2173e9f5b54ecf393e24b23d3f79968c6da -6821191: Timezone display name localization -Reviewed-by: yhuang, ogino - ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -@@ -173,8 +173,8 @@ - "Truk Sommerzeit", "TRUST"}; - String ULAT[]= new String[] {"Ulaanbaatar Zeit", "ULAT", - "Ulaanbaatar Sommerzeit", "ULAST"}; -- String WART[] = new String[] {"Argentinische Zeit", "WART", -- "Argentinische Sommerzeit", "WARST"}; -+ String WART[] = new String[] {"Westargentinische Zeit", "WART", -+ "Westargentinische Sommerzeit", "WARST"}; - String WAT[] = new String[] {"Westafrikanische Zeit", "WAT", - "Westafrikanische Sommerzeit", "WAST"}; - String WET[] = new String[] {"Westeurop\u00e4ische Zeit", "WEZ", ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -@@ -173,8 +173,8 @@ - "Hora de verano de Truk", "TRUST"}; - String ULAT[]= new String[] {"Hora de Ulan Bator", "ULAT", - "Hora de verano de Ulan Bator", "ULAST"}; -- String WART[] = new String[] {"Hora de Argentina", "WART", -- "Hora de verano de Argentina", "WARST"}; -+ 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"}; - String WET[] = new String[] {"Hora de Europa Occidental", "WET", ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -@@ -173,8 +173,8 @@ - "Heure d'\u00e9t\u00e9 de Truk", "TRUST"}; - String ULAT[]= new String[] {"Heure de l'Ulaanbaatar", "ULAT", - "Heure d'\u00e9t\u00e9 de l'Ulaanbaatar", "ULAST"} ; -- String WART[] = new String[] {"Heure D'Argentine", "WART", -- "Heure d'\u00e9t\u00e9 D'Argentine", "WARST"} ; -+ String WART[] = new String[] {"Heure D'Argentine de l'Ouest", "WART", -+ "Heure d'\u00e9t\u00e9 D'Argentine de l'Ouest", "WARST"} ; - String WAT[] = new String[] {"Heure d'Afrique de l'Ouest", "WAT", - "Heure d'\u00e9t\u00e9 d'Afrique de l'Ouest", "WAST"} ; - String WET[] = new String[] {"Heure d'Europe de l'Ouest", "WET", ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -@@ -173,8 +173,8 @@ - "Ora estiva di Truk", "TRUST"}; - String ULAT[]= new String[] {"Ora di Ulaanbaatar", "ULAT", - "Ora estiva di Ulaanbaatar", "ULAST"}; -- String WART[] = new String[] {"Ora dell'Argentina", "WART", -- "Ora estiva dell'Argentina", "WARST"}; -+ String WART[] = new String[] {"Ora dell'Argentina occidentale", "WART", -+ "Ora estiva dell'Argentina occidentale", "WARST"}; - String WAT[] = new String[] {"Ora dell'Africa occidentale", "WAT", - "Ora estiva dell'Africa occidentale", "WAST"}; - String WET[] = new String[] {"Ora dell'Europa occidentale", "WET", ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -@@ -173,8 +173,8 @@ - "\u30c8\u30e9\u30c3\u30af\u590f\u6642\u9593", "TRUST"}; - String ULAT[]= new String[] {"\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u6642\u9593", "ULAT", - "\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u590f\u6642\u9593", "ULAST"}; -- String WART[] = new String[] {"\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "WART", -- "\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "WARST"}; -+ String WART[] = new String[] {"\u897f\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "WART", -+ "\u897f\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "WARST"}; - String WAT[] = new String[] {"\u897f\u30a2\u30d5\u30ea\u30ab\u6642\u9593", "WAT", - "\u897f\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "WAST"}; - String WET[] = new String[] {"\u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "WET", ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -@@ -173,8 +173,8 @@ - "\ud2b8\ub8e8\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TRUST"}; - String ULAT[]= new String[] {"\uc6b8\ub780\ubc14\ud0c0\ub974 \uc2dc\uac04", "ULAT", - "\uc6b8\ub780\ubc14\ud0c0\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ULAST"}; -- String WART[] = new String[] {"\uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "WART", -- "\uc544\ub974\ud5e8\ud2f0\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WARST"}; -+ String WART[] = new String[] {"\uc11c\ubd80 \uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "WART", -+ "\uc11c\ubd80 \uc544\ub974\ud5e8\ud2f0\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WARST"}; - String WAT[] = new String[] {"\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc2dc\uac04", "WAT", - "\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WAST"}; - String WET[] = new String[] {"\uc11c\uc720\ub7fd \uc2dc\uac04", "WET", ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -@@ -173,8 +173,8 @@ - "Truk, sommartid", "TRUST"}; - String ULAT[]= new String[] {"Ulaanbaatar, normaltid", "ULAT", - "Ulaanbaatar, sommartid", "ULAST"}; -- String WART[] = new String[] {"Argentina, normaltid", "WART", -- "Argentina, sommartid", "WARST"}; -+ String WART[] = new String[] {"V\u00e4stargentina, normaltid", "WART", -+ "V\u00e4stargentina, sommartid", "WARST"}; - String WAT[] = new String[] {"V\u00e4stafrikansk tid", "WAT", - "V\u00e4stafrikansk sommartid", "WAST"}; - String WET[] = new String[] {"V\u00e4steuropeisk tid", "WET", ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -@@ -173,8 +173,8 @@ - "\u7279\u9c81\u514b\u590f\u4ee4\u65f6", "TRUST"}; - String ULAT[]= new String[] {"\u5e93\u4f26\u65f6\u95f4", "ULAT", - "\u5e93\u4f26\u590f\u4ee4\u65f6", "ULAST"}; -- String WART[] = new String[] {"\u963f\u6839\u5ef7\u65f6\u95f4", "WART", -- "\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "WARST"}; -+ String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u65f6\u95f4", "WART", -+ "\u897f\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "WARST"}; - String WAT[] = new String[] {"\u897f\u975e\u65f6\u95f4", "WAT", - "\u897f\u975e\u590f\u4ee4\u65f6", "WAST"}; - String WET[] = new String[] {"\u897f\u6b27\u65f6\u95f4", "WET", ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -@@ -173,8 +173,8 @@ - "\u7279\u9b6f\u514b\u590f\u4ee4\u6642\u9593", "TRUST"}; - String ULAT[]= new String[] {"\u5eab\u502b\u6642\u9593", "ULAT", - "\u5eab\u502b\u590f\u4ee4\u6642\u9593", "ULAST"}; -- String WART[] = new String[] {"\u963f\u6839\u5ef7\u6642\u9593", "WART", -- "\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "WARST"}; -+ String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u6642\u9593", "WART", -+ "\u897f\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "WARST"}; - String WAT[] = new String[] {"\u897f\u975e\u6642\u9593", "WAT", - "\u897f\u975e\u590f\u4ee4\u6642\u9593", "WAST"}; - String WET[] = new String[] {"\u897f\u6b50\u6642\u9593", "WET",
--- a/patches/openjdk/6925851-pt_br.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3651 +0,0 @@ -# HG changeset patch -# User yhuang -# Date 1291285057 28800 -# Thu Dec 02 02:17:37 2010 -0800 -# Node ID e3ecd9555ff01afd93f9aed6f883eb32f71c0505 -# Parent b357910aa04aead2a16b6d6ff395a8df4b51d1dd -6925851: Localize JRE into pt_BR -Reviewed-by: mfang, psun - -diff -r b357910aa04a -r e3ecd9555ff0 make/common/Defs.gmk ---- openjdk/jdk/make/common/Defs.gmk Wed Nov 10 20:40:19 2010 -0800 -+++ openjdk/jdk/make/common/Defs.gmk Thu Dec 02 02:17:37 2010 -0800 -@@ -246,8 +246,8 @@ - # Localizations for the different parts of the product beyond English - # - --JRE_LOCALES = de es fr it ja ko sv zh_CN zh_TW zh_HK --PLUGIN_LOCALES = de es fr it ja ko sv zh_CN zh_TW zh_HK -+JRE_LOCALES = de es fr it ja ko pt_BR sv zh_CN zh_TW zh_HK -+PLUGIN_LOCALES = de es fr it ja ko pt_BR sv zh_CN zh_TW zh_HK - JDK_LOCALES = ja zh_CN - - # -diff -r b357910aa04a -r e3ecd9555ff0 make/java/util/FILES_java.gmk ---- openjdk/jdk/make/java/util/FILES_java.gmk Wed Nov 10 20:40:19 2010 -0800 -+++ openjdk/jdk/make/java/util/FILES_java.gmk Thu Dec 02 02:17:37 2010 -0800 -@@ -37,4 +37,5 @@ - sun/util/resources/TimeZoneNames_es.java \ - sun/util/resources/TimeZoneNames_fr.java \ - sun/util/resources/TimeZoneNames_it.java \ -+ sun/util/resources/TimeZoneNames_pt_BR.java \ - sun/util/resources/TimeZoneNames_sv.java -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,146 @@ -+# -+# This properties file is used to create a PropertyResourceBundle -+# It contains Locale specific strings used be the Accessibility package. -+# -+# When this file is read in, the strings are put into the -+# defaults table. This is an implementation detail of the current -+# workings of Accessibility. DO NOT DEPEND ON THIS. -+# This may change in future versions of Accessibility as we improve -+# localization support. -+# -+# @author Lynn Monsanto -+ -+# -+# accessible roles -+# -+alert=alerta -+awtcomponent=componente AWT -+checkbox=caixa de sele\u00e7\u00e3o -+colorchooser=seletor de cores -+columnheader=cabe\u00e7alho da coluna -+combobox=caixa de combina\u00e7\u00e3o -+canvas=tela -+desktopicon=\u00edcone da \u00e1rea de trabalho -+desktoppane=painel da \u00e1rea de trabalho -+dialog=caixa de di\u00e1logo -+directorypane=painel do diret\u00f3rio -+glasspane=painel transparente -+filechooser=seletor de arquivos -+filler=preenchimento -+frame=quadro -+internalframe=quadro interno -+label=r\u00f3tulo -+layeredpane=painel em camadas -+list=lista -+listitem=item da lista -+menubar=barra de menus -+menu=menu -+menuitem=item do menu -+optionpane=painel de op\u00e7\u00f5es -+pagetab=aba da p\u00e1gina -+pagetablist=lista de abas da p\u00e1gina -+panel=painel -+passwordtext=texto da senha -+popupmenu=menu pop-up -+progressbar=barra de progresso -+pushbutton=bot\u00e3o de a\u00e7\u00e3o -+radiobutton=bot\u00e3o de op\u00e7\u00e3o -+rootpane=painel base -+rowheader=cabe\u00e7alho da linha -+scrollbar=barra de rolagem -+scrollpane=painel de rolagem -+separator=separador -+slider=controle deslizante -+splitpane=painel dividido -+swingcomponent=componente swing -+table=tabela -+text=texto -+tree=\u00e1rvore -+togglebutton=bot\u00e3o de altern\u00e2ncia -+toolbar=barra de ferramentas -+tooltip=dica de ferramenta -+unknown=desconhecido -+viewport=janela de visualiza\u00e7\u00e3o -+window=janela -+# -+# accessible relations -+# -+labelFor=r\u00f3tulo de -+labeledBy=rotulado por -+memberOf=membro de -+controlledBy=controlledBy -+controllerFor=controllerFor -+# -+# accessible states -+# -+active=ativo -+armed=armado -+busy=ocupado -+checked=selecionado -+collapsed=recolhido -+editable=edit\u00e1vel -+expandable=expans\u00edvel -+expanded=expandido -+enabled=habilitado -+focusable=focaliz\u00e1vel -+focused=focalizado -+iconified=iconizado -+modal=modal -+multiline=v\u00e1rias linhas -+multiselectable=m\u00faltipla escolha -+opaque=opaco -+pressed=pressionado -+resizable=redimension\u00e1vel -+selectable=selecion\u00e1vel -+selected=selecionado -+showing=exibindo -+singleline=linha \u00fanica -+transient=transit\u00f3rio -+visible=vis\u00edvel -+vertical=vertical -+horizontal=horizontal -+# -+# accessible actions -+# -+toggle expandir=alternar expandir -+ -+# new relations, roles and states for J2SE 1.5.0 -+ -+# -+# accessible relations -+# -+flowsTo=fluxos para -+flowsFrom=fluxos de -+subwindowOf=subjanela de -+parentWindowOf=janela pai de -+embeds=integra -+embeddedBy=integrado por -+childNodeOf=n\u00f3 filho de -+ -+# -+# accessible roles -+# -+header=cabe\u00e7alho -+footer=rodap\u00e9 -+paragraph=par\u00e1grafo -+ruler=r\u00e9gua -+editbar=barra de edi\u00e7\u00e3o -+progressMonitor=monitor de progresso -+ -+# -+# accessible states -+# -+managesDescendants=gerencia descendentes -+indeterminate=indeterminado -+truncated=truncado -+ -+# new for J2SE 1.6.0 -+ -+# -+# accessible roles -+# -+htmlcontainer=cont\u00eainer HTML -+ -+# -+# END OF MATERIAL TO LOCALIZE -+# -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,81 @@ -+# Refer to the note in basic.properties for a description as to what -+# the mnemonics correspond to and how to calculate them. -+ -+ -+ -+# GTK specific properties -+ -+# GTK color chooser properties: -+GTKColorChooserPanel.nameText=Seletor de cores do GTK -+# mnemonic as a VK_ constant -+GTKColorChooserPanel.mnemonic=71 -+# Can also define GTKColorChooserPanel.dispalyedMnemonicIndex if you -+# want an index other than would normally be underlined by -+# GTKColorChooserPanel.mnemonic to be underlined. This is only useful -+# if GTKColorChooserPanel.nameText defines the mnemonic character more -+# than once and you want a character other than the first underlined. -+ -+# Text and mnemonics for the spinner. You can also defined a different -+# index for the mnemonic via xxxMnemonicIndex, for example -+# GTKColorChooserPanel.hueMnemonicIndex=1 would indicate the second -+# character of GTKColorChooserPanel.hueText should be underlined to -+# represent the mnemonic. -+GTKColorChooserPanel.hueText=Matiz: -+GTKColorChooserPanel.hueMnemonic=72 -+ -+GTKColorChooserPanel.redText=Vermelho: -+GTKColorChooserPanel.redMnemonic=69 -+ -+GTKColorChooserPanel.saturationText=Satura\u00e7\u00e3o: -+GTKColorChooserPanel.saturationMnemonic=83 -+ -+GTKColorChooserPanel.greenText=Verde: -+GTKColorChooserPanel.greenMnemonic=71 -+ -+GTKColorChooserPanel.valueText=Valor: -+GTKColorChooserPanel.valueMnemonic=86 -+ -+GTKColorChooserPanel.blueText=Azul: -+GTKColorChooserPanel.blueMnemonic=66 -+ -+GTKColorChooserPanel.colorNameText=Nome da cor: -+GTKColorChooserPanel.colorNameMnemonic=78 -+ -+ -+ -+############ FILE CHOOSER STRINGS ############# -+ -+FileChooser.acceptAllFileFilterText=Todos os arquivos -+FileChooser.newFolderButtonText=Nova pasta -+FileChooser.newFolderButtonMnemonic=78 -+FileChooser.newFolderDialogText=Nome da pasta: -+FileChooser.deleteFileButtonText=Excluir arquivo -+FileChooser.deleteFileButtonMnemonic=76 -+FileChooser.renameFileButtonText=Renomear arquivo -+FileChooser.renameFileButtonMnemonic=82 -+FileChooser.cancelButtonText=Cancelar -+FileChooser.cancelButtonMnemonic=67 -+FileChooser.saveButtonText=OK -+FileChooser.saveButtonMnemonic=79 -+FileChooser.openButtonText=OK -+FileChooser.openButtonMnemonic=79 -+FileChooser.saveDialogTitleText=Salvar -+FileChooser.openDialogTitleText=Abrir -+FileChooser.pathLabelText=Sele\u00e7\u00e3o: -+FileChooser.filterLabelText=Filtro: -+FileChooser.pathLabelMnemonic=83 -+FileChooser.foldersLabelText=Pastas -+FileChooser.foldersLabelMnemonic=68 -+FileChooser.filesLabelText=Arquivos -+FileChooser.filesLabelMnemonic=70 -+ -+FileChooser.cancelButtonToolTipText=Anular caixa de di\u00e1logo do seletor de arquivos. -+FileChooser.saveButtonToolTipText=Salvar arquivo selecionado. -+FileChooser.openButtonToolTipText=Abrir arquivo selecionado. -+ -+FileChooser.renameFileDialogText=Renomear arquivo "{0}" por -+FileChooser.renameFileErrorTitle=Erro -+FileChooser.renameFileErrorText=Erro ao renomear o arquivo "{0}" por "{1}" -+ -+OptionPane.okButtonMnemonic=79 -+OptionPane.cancelButtonMnemonic=67 -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,39 @@ -+# This properties file is used to create a PropertyResourceBundle -+# It contains Locale specific strings used be the Motif Look and Feel. -+# Currently, the following components need this for support: -+# -+# FileChooser -+# -+# When this file is read in, the strings are put into the -+# defaults table. This is an implementation detail of the current -+# workings of Swing. DO NOT DEPEND ON THIS. -+# This may change in future versions of Swing as we improve localization -+# support. -+# -+# Refer to the note in basic.properties for a description as to what -+# the mnemonics correspond to and how to calculate them. -+# -+# @author Steve Wilson -+ -+ -+############ FILE CHOOSER STRINGS ############# -+ -+FileChooser.acceptAllFileFilterText=* -+FileChooser.cancelButtonText=Cancelar -+FileChooser.saveButtonText=Salvar -+FileChooser.openButtonText=OK -+FileChooser.saveDialogTitleText=Salvar -+FileChooser.openDialogTitleText=Abrir -+FileChooser.updateButtonText=Atualizar -+FileChooser.helpButtonText=Ajuda -+FileChooser.pathLabelText=Inserir caminho ou nome da pasta: -+FileChooser.filterLabelText=Filtro -+FileChooser.foldersLabelText=Pastas -+FileChooser.filesLabelText=Arquivos -+FileChooser.enterFileNameLabelText=Inserir nome de arquivo: -+ -+FileChooser.cancelButtonToolTipText=Anular caixa de di\u00e1logo do seletor de arquivos. -+FileChooser.saveButtonToolTipText=Salvar arquivo selecionado. -+FileChooser.openButtonToolTipText=Abrir arquivo selecionado. -+FileChooser.updateButtonToolTipText=Atualizar lista de diret\u00f3rios. -+FileChooser.helpButtonToolTipText=Ajuda do FileChooser. -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,44 @@ -+# This properties file is used to create a PropertyResourceBundle -+# It contains Locale specific strings used be the Windows Look and Feel. -+# Currently, the following components need this for support: -+# -+# FileChooser -+# -+# When this file is read in, the strings are put into the -+# defaults table. This is an implementation detail of the current -+# workings of Swing. DO NOT DEPEND ON THIS. -+# This may change in future versions of Swing as we improve localization -+# support. -+# -+# Refer to the note in basic.properties for a description as to what -+# the mnemonics correspond to and how to calculate them. -+# -+# @author Steve Wilson -+ -+ -+############ FILE CHOOSER STRINGS ############# -+ -+FileChooser.lookInLabelText=Consultar em: -+FileChooser.saveInLabelText=Salvar em: -+FileChooser.fileNameLabelText=Nome de arquivo: -+FileChooser.filesOfTypeLabelText=Arquivos de tipo: -+FileChooser.upFolderToolTipText=Um n\u00edvel acima -+FileChooser.upFolderAccessibleName=Acima -+FileChooser.homeFolderToolTipText=In\u00edcio -+FileChooser.homeFolderAccessibleName=In\u00edcio -+FileChooser.newFolderToolTipText=Criar nova pasta -+FileChooser.newFolderAccessibleName=Nova pasta -+FileChooser.newFolderActionLabelText=Nova pasta -+FileChooser.listViewButtonToolTipText=Lista -+FileChooser.listViewButtonAccessibleName=Lista -+FileChooser.listViewActionLabelText=Lista -+FileChooser.detailsViewButtonToolTipText=Detalhes -+FileChooser.detailsViewButtonAccessibleName=Detalhes -+FileChooser.detailsViewActionLabelText=Detalhes -+FileChooser.refreshActionLabelText=Atualizar -+FileChooser.viewMenuLabelText=Exibir -+FileChooser.fileNameHeaderText=Nome -+FileChooser.fileSizeHeaderText=Tamanho -+FileChooser.fileTypeHeaderText=Tipo -+FileChooser.fileDateHeaderText=Modificado -+FileChooser.fileAttrHeaderText=Atributos -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,170 @@ -+# -+# Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# -+ -+# CacheRowSetImpl exceptions -+cachedrowsetimpl.populate = Objeto ResultSet inv\u00e1lido fornecido para preencher o m\u00e9todo -+cachedrowsetimpl.invalidp = Fornecedor de persist\u00eancias inv\u00e1lido gerado -+cachedrowsetimpl.nullhash = N\u00e3o \u00e9 poss\u00edvel instanciar a inst\u00e2ncia CachedRowSetImpl. Hashtable nulo fornecido ao construtor -+cachedrowsetimpl.invalidop = Opera\u00e7\u00e3o inv\u00e1lida durante a inser\u00e7\u00e3o de linha -+cachedrowsetimpl.accfailed = acceptChanges falho -+cachedrowsetimpl.invalidcp = Posi\u00e7\u00e3o inv\u00e1lida do cursor -+cachedrowsetimpl.illegalop = Opera\u00e7\u00e3o ilegal em linha n\u00e3o inserida -+cachedrowsetimpl.clonefail = Clone falho: {0} -+cachedrowsetimpl.invalidcol = \u00cdndice de coluna inv\u00e1lido -+cachedrowsetimpl.invalcolnm = Nome de coluna inv\u00e1lido -+cachedrowsetimpl.boolfail = getBoolen falhou no valor ( {0} ) na coluna {1} -+cachedrowsetimpl.bytefail = getByte falhou no valor ( {0} ) na coluna {1} -+cachedrowsetimpl.shortfail = getShort falhou no valor ( {0} ) na coluna {1} -+cachedrowsetimpl.intfail = getInt falhou no valor ( {0} ) na coluna {1} -+cachedrowsetimpl.longfail = getLong falhou no valor ( {0} ) na coluna {1} -+cachedrowsetimpl.floatfail = getFloat falhou no valor ( {0} ) na coluna {1} -+cachedrowsetimpl.doublefail = getDouble falhou no valor ( {0} ) na coluna {1} -+cachedrowsetimpl.dtypemismt = Tipo de dados incompat\u00edvel -+cachedrowsetimpl.datefail = getDate falhou no valor ( {0} ) na coluna {1} sem convers\u00e3o dispon\u00edvel -+cachedrowsetimpl.timefail = getTime falhou no valor ( {0} ) na coluna {1} sem convers\u00e3o dispon\u00edvel -+cachedrowsetimpl.posupdate = Atualiza\u00e7\u00f5es posicionadas n\u00e3o suportadas -+cachedrowsetimpl.unableins = N\u00e3o \u00e9 poss\u00edvel instanciar: {0} -+cachedrowsetimpl.beforefirst = beforeFirst : posi\u00e7\u00e3o inv\u00e1lida do cursor -+cachedrowsetimpl.first = First : opera\u00e7\u00e3o inv\u00e1lida do cursor -+cachedrowsetimpl.last = last : TYPE_FORWARD_ONLY -+cachedrowsetimpl.absolute = absolute : posi\u00e7\u00e3o inv\u00e1lida do cursor -+cachedrowsetimpl.relative = relative : posi\u00e7\u00e3o inv\u00e1lida do cursor -+cachedrowsetimpl.asciistream = leitura falha do fluxo ascii -+cachedrowsetimpl.binstream = leitura falha em fluxo bin\u00e1rio -+cachedrowsetimpl.failedins = Falha ao inserir linha -+cachedrowsetimpl.updateins = updateRow chamado durante a inser\u00e7\u00e3o de linha -+cachedrowsetimpl.movetoins = moveToInsertRow : CONCUR_READ_ONLY -+cachedrowsetimpl.movetoins1 = moveToInsertRow : sem metadados -+cachedrowsetimpl.movetoins2 = moveToInsertRow : n\u00famero de colunas inv\u00e1lido -+cachedrowsetimpl.tablename = O nome da tabela n\u00e3o pode ser nulo -+cachedrowsetimpl.keycols = Colunas de chaves inv\u00e1lidas -+cachedrowsetimpl.invalidcol = \u00cdndice de coluna inv\u00e1lido -+cachedrowsetimpl.opnotsupp = Opera\u00e7\u00e3o n\u00e3o suportada pelo banco de dados -+cachedrowsetimpl.matchcols = As colunas correspondentes n\u00e3o s\u00e3o iguais \u00e0s colunas definidas -+cachedrowsetimpl.setmatchcols = Definir colunas correspondentes antes de obt\u00ea-las -+cachedrowsetimpl.matchcols1 = As colunas correspondentes devem ser maior do que 0 -+cachedrowsetimpl.matchcols2 = As colunas correspondentes devem ser sequ\u00eancias vazias ou nulas -+cachedrowsetimpl.unsetmatch = As colunas n\u00e3o definidas n\u00e3o s\u00e3o iguais \u00e0s colunas definidas -+cachedrowsetimpl.unsetmatch1 = Usar o nome da coluna como argumento para unsetMatchColumn -+cachedrowsetimpl.unsetmatch2 = Usar o ID da coluna como argumento para unsetMatchColumn -+cachedrowsetimpl.numrows = O n\u00famero de linhas \u00e9 menor do que zero ou menor do que o tamanho obtido -+cachedrowsetimpl.startpos = A posi\u00e7\u00e3o de in\u00edcio n\u00e3o pode ser negativa -+cachedrowsetimpl.nextpage = Preencher dados antes de chamar -+cachedrowsetimpl.pagesize = O tamanho da p\u00e1gina n\u00e3o pode ser menor do que zero -+cachedrowsetimpl.pagesize1 = O tamanho da p\u00e1gina n\u00e3o pode ser maior do que maxRows -+cachedrowsetimpl.fwdonly = ResultSet \u00e9 somente para frente -+cachedrowsetimpl.type = O tipo \u00e9 : {0} -+cachedrowsetimpl.opnotysupp = Opera\u00e7\u00e3o ainda n\u00e3o suportada -+cachedrowsetimpl.featnotsupp = Recurso n\u00e3o suportado -+ -+# WebRowSetImpl exceptions -+webrowsetimpl.nullhash = N\u00e3o \u00e9 poss\u00edvel instanciar a inst\u00e2ncia WebRowSetImpl. Hashtable nulo fornecido ao construtor -+webrowsetimpl.invalidwr = Gravador inv\u00e1lido -+webrowsetimpl.invalidrd = Leitor inv\u00e1lido -+ -+#FilteredRowSetImpl exceptions -+filteredrowsetimpl.relative = relative : opera\u00e7\u00e3o inv\u00e1lida do cursor -+filteredrowsetimpl.absolute = absolute : opera\u00e7\u00e3o inv\u00e1lida do cursor -+filteredrowsetimpl.notallowed = Este valor n\u00e3o \u00e9 permitido no filtro -+ -+#JoinRowSetImpl exceptions -+joinrowsetimpl.notinstance = N\u00e3o \u00e9 uma inst\u00e2ncia do conjunto de linhas -+joinrowsetimpl.matchnotset = Coluna correspondente n\u00e3o definida para jun\u00e7\u00e3o -+joinrowsetimpl.numnotequal = N\u00famero de elementos no conjunto de linhas diferente da coluna correspondente -+joinrowsetimpl.notdefined = N\u00e3o \u00e9 um tipo definido de jun\u00e7\u00e3o -+joinrowsetimpl.notsupported = Este tipo de jun\u00e7\u00e3o n\u00e3o \u00e9 suportada -+joinrowsetimpl.initerror = Erro de inicializa\u00e7\u00e3o do JoinRowSet -+joinrowsetimpl.genericerr = Erro inicial de joinrowset gen\u00e9rico -+joinrowsetimpl.emptyrowset = O conjunto de linha vazio n\u00e3o pode ser adicionado a este JoinRowSet -+ -+#JdbcRowSetImpl exceptions -+jdbcrowsetimpl.invalstate = Estado inv\u00e1lido -+jdbcrowsetimpl.connect = N\u00e3o \u00e9 poss\u00edvel conectar JdbcRowSet (connect) a JNDI -+jdbcrowsetimpl.paramtype = N\u00e3o \u00e9 poss\u00edvel deduzir o tipo de par\u00e2metro -+jdbcrowsetimpl.matchcols = As colunas correspondentes n\u00e3o s\u00e3o iguais \u00e0s colunas definidas -+jdbcrowsetimpl.setmatchcols = Definir as colunas correspondentes antes de obt\u00ea-las -+jdbcrowsetimpl.matchcols1 = As colunas correspondentes devem ser maior do que 0 -+jdbcrowsetimpl.matchcols2 = As colunas correspondentes n\u00e3o podem ser sequ\u00eancias vazias ou nulas -+jdbcrowsetimpl.unsetmatch = As colunas n\u00e3o definidas n\u00e3o s\u00e3o iguais \u00e0s colunas definidas -+jdbcrowsetimpl.usecolname = Usar o nome da coluna como argumento para unsetMatchColumn -+jdbcrowsetimpl.usecolid = Usar o ID da coluna como argumento para unsetMatchColumn -+jdbcrowsetimpl.resnotupd = ResultSet n\u00e3o \u00e9 atualiz\u00e1vel -+jdbcrowsetimpl.opnotysupp = Opera\u00e7\u00e3o ainda n\u00e3o suportada -+jdbcrowsetimpl.featnotsupp = Recurso n\u00e3o suportado -+ -+#CachedRowSetReader exceptions -+crsreader.connect = (JNDI) N\u00e3o \u00e9 poss\u00edvel conectar -+crsreader.paramtype = N\u00e3o \u00e9 poss\u00edvel deduzir o tipo de par\u00e2metro -+crsreader.connecterr = Erro interno no RowSetReader: sem conex\u00e3o ou comando -+crsreader.datedetected = Data detectada -+crsreader.caldetected = Calend\u00e1rio detectado -+ -+#CachedRowSetWriter exceptions -+crswriter.connect = N\u00e3o \u00e9 poss\u00edvel obter a conex\u00e3o -+crswriter.tname = writeData n\u00e3o pode determinar o nome da tabela -+crswriter.params1 = Valor de params1 : {0} -+crswriter.params2 = Valor de params2 : {0} -+crswriter.conflictsno = conflitos durante a sincroniza\u00e7\u00e3o -+ -+#InsertRow exceptions -+insertrow.novalue = Nenhum valor foi inserido -+ -+#SyncResolverImpl exceptions -+syncrsimpl.indexval = Valor de \u00edndice fora do intervalo -+syncrsimpl.noconflict = Est\u00e1 coluna n\u00e3o est\u00e1 em conflito -+syncrsimpl.syncnotpos = A sincroniza\u00e7\u00e3o n\u00e3o \u00e9 poss\u00edvel -+syncrsimpl.valtores = O valor a ser decidido pode estar no banco de dados ou no conjunto de linhas armazenado em cache -+ -+#WebRowSetXmlReader exception -+wrsxmlreader.invalidcp = Fim de RowSet atingido. Posi\u00e7\u00e3o inv\u00e1lida do cursor -+wrsxmlreader.readxml = readXML : {0} -+wrsxmlreader.parseerr = ** Analisando erro : {0} , linha : {1} , uri : {2} -+ -+#WebRowSetXmlWriter exceptions -+wrsxmlwriter.ioex = IOException : {0} -+wrsxmlwriter.sqlex = SQLException : {0} -+wrsxmlwriter.failedwrite = Falha ao gravar valor -+wsrxmlwriter.notproper = N\u00e3o \u00e9 um tipo adequado -+ -+#XmlReaderContentHandler exceptions -+xmlrch.errmap = Erro ao definir mapa : {0} -+xmlrch.errmetadata = Erro ao definir metadados : {0} -+xmlrch.errinsert = Erro ao inserir valores : {0} -+xmlrch.errconstr = Erro ao construir linha : {0} -+xmlrch.errdel = Erro ao excluir linha : {0} -+xmlrch.errinsert = Erro ao construir linha de inser\u00e7\u00e3o : {0} -+xmlrch.errinsdel = Erro ao construir linha insdel : {0} -+xmlrch.errupdate = Erro ao construir linha de atualiza\u00e7\u00e3o : {0} -+xmlrch.errupdrow = Erro ao atualizar linha : {0} -+xmlrch.chars = caracteres : -+xmlrch.badvalue = Valor incorreto ; propriedade n\u00e3o anul\u00e1vel -+xmlrch.badvalue1 = Valor incorreto ; metadado n\u00e3o anul\u00e1vel -+xmlrch.warning = ** Aviso : {0} , linha : {1} , uri : {2} -+ -+#RIOptimisticProvider Exceptions -+riop.locking = O bloqueio de classifica\u00e7\u00e3o n\u00e3o \u00e9 suportado -+ -+#RIXMLProvider exceptions -+rixml.unsupp = N\u00e3o suportado com RIXMLProvider -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,209 @@ -+# This properties file is used to create a PropertyResourceBundle -+# It contains Locale specific strings used in Swing -+# Currently, the following components need this for support: -+# -+# ColorChooser -+# FileChooser -+# OptionPane -+# -+# When this file is read in, the strings are put into the -+# defaults table. This is an implementation detail of the current -+# workings of Swing. DO NOT DEPEND ON THIS. -+# This may change in future versions of Swing as we improve localization -+# support. -+# -+# MNEMONIC NOTE: -+# Many of strings in this file are used by widgets that have a -+# mnemonic, for example: -+# ColorChooser.rgbNameText=RGB -+# ColorChooser.rgbMnemonic=71 -+# ColorChooser.rgbDisplayedMnemonicIndex=1 -+# Indicates that the tab in the ColorChooser for RGB colors will have -+# the text 'RGB', further the mnemonic character will be 'g' and that -+# a decoration will be provided under the 'G'. This will typically -+# look like: RGB -+# - -+# 71 corresponds to the decimal value of the VK constant defined -+# in java/awt/KeyEvent.java. VK_G is defined as: -+# -+# public static final int VK_G = 0x47; -+# -+# 0x47 is a hex number and needs to be converted to decimal. -+# A simple way to calculate this for a-z is to add 64 to the index of -+# the letter in the alphabet. As 'a' is in the 1st letter the mnemonic -+# for 'a' is 65, 'b' is 66... -+# -+# The xxDisplayedMnemonicIndex is used to indicate the index of the -+# character that should be underlined in the String, with 0 -+# corresponding to the first character in the String. -+# -+# One important thing to remember is that the mnemonic MUST exist in -+# the String, if it does not exist you should add text that makes it -+# exist. This will typically take the form 'XXXX (M)' where M is the -+# character for the mnemonic. -+# -+# @author Steve Wilson -+ -+############ FILE CHOOSER STRINGS ############# -+FileChooser.fileDescriptionText=Arquivo gen\u00e9rico -+FileChooser.directoryDescriptionText=Diret\u00f3rio -+FileChooser.newFolderErrorText=Erro ao criar nova pasta -+FileChooser.newFolderErrorSeparator= : -+FileChooser.acceptAllFileFilterText=Todos os arquivos -+FileChooser.cancelButtonText=Cancelar -+FileChooser.cancelButtonMnemonic=67 -+FileChooser.saveButtonText=Salvar -+FileChooser.saveButtonMnemonic=83 -+FileChooser.openButtonText=Abrir -+FileChooser.openButtonMnemonic=79 -+FileChooser.saveDialogTitleText=Salvar -+FileChooser.openDialogTitleText=Abrir -+FileChooser.updateButtonText=Atualizar -+FileChooser.updateButtonMnemonic=85 -+FileChooser.helpButtonText=Ajuda -+FileChooser.helpButtonMnemonic=72 -+FileChooser.directoryOpenButtonText=Abrir -+FileChooser.directoryOpenButtonMnemonic=79 -+ -+# File Size Units -+FileChooser.fileSizeKiloBytes={0} KB -+FileChooser.fileSizeMegaBytes={0} MB -+FileChooser.fileSizeGigaBytes={0} GB -+ -+# These strings are platform dependent not look and feel dependent. -+FileChooser.win32.newFolder=Nova pasta -+FileChooser.win32.newFolder.subsequent=Nova pasta ({0}) -+FileChooser.other.newFolder=NewFolder -+FileChooser.other.newFolder.subsequent=NewFolder.{0} -+ -+ -+## file chooser tooltips ### -+FileChooser.cancelButtonToolTipText=Anular caixa de di\u00e1logo do seletor de arquivos -+FileChooser.saveButtonToolTipText=Salvar arquivo selecionado -+FileChooser.openButtonToolTipText=Abrir arquivo selecionado -+FileChooser.updateButtonToolTipText=Atualizar lista de diret\u00f3rios -+FileChooser.helpButtonToolTipText=Ajuda do FileChooser -+FileChooser.directoryOpenButtonToolTipText=Abrir diret\u00f3rio selecionado -+ -+############ COLOR CHOOSER STRINGS ############# -+ColorChooser.previewText=Visualizar -+ColorChooser.okText=OK -+ColorChooser.cancelText=Cancelar -+ColorChooser.resetText=Redefinir -+# VK_XXX constant for 'ColorChooser.resetText' button to make mnemonic -+ColorChooser.resetMnemonic=82 -+ColorChooser.sampleText=Texto de amostra Texto de amostra -+ColorChooser.swatchesNameText=Amostras -+ColorChooser.swatchesMnemonic=83 -+ColorChooser.swatchesDisplayedMnemonicIndex=0 -+ColorChooser.swatchesRecentText=Recente: -+ColorChooser.hsbNameText=HSB -+# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX -+# constant, and an index into the text to render the mnemonic as. The -+# mnemonic is xxxMnemonic and the index of the character to underline is -+# xxxDisplayedMnemonicIndex. -+ColorChooser.hsbMnemonic=72 -+ColorChooser.hsbDisplayedMnemonicIndex=0 -+ColorChooser.hsbHueText=H -+ColorChooser.hsbSaturationText=S -+ColorChooser.hsbBrightnessText=B -+ColorChooser.hsbRedText=R -+ColorChooser.hsbGreenText=G -+ColorChooser.hsbBlueText=B -+ColorChooser.rgbNameText=RGB -+ColorChooser.rgbMnemonic=71 -+ColorChooser.rgbDisplayedMnemonicIndex=1 -+ColorChooser.rgbRedText=Vermelho -+ColorChooser.rgbRedMnemonic=68 -+ColorChooser.rgbGreenText=Verde -+ColorChooser.rgbGreenMnemonic=78 -+ColorChooser.rgbBlueText=Azul -+ColorChooser.rgbBlueMnemonic=66 -+ -+############ OPTION PANE STRINGS ############# -+# Mnemonic keys correspond to KeyEvent.VK_XXX constant -+# We only define mnemonics for YES/NO, but for completeness you can -+# define mnemonics for any of the buttons. -+OptionPane.yesButtonText=Sim -+OptionPane.yesButtonMnemonic=89 -+OptionPane.noButtonText=N\u00e3o -+OptionPane.noButtonMnemonic=78 -+OptionPane.okButtonText=OK -+OptionPane.okButtonMnemonic=0 -+OptionPane.cancelButtonText=Cancelar -+OptionPane.cancelButtonMnemonic=0 -+OptionPane.titleText=Selecionar uma op\u00e7\u00e3o -+# Title for the dialog for the showInputDialog methods. Only used if -+# the developer uses one of the variants that doesn't take a title. -+OptionPane.inputDialogTitle=Entrada -+# Title for the dialog for the showMessageDialog methods. Only used if -+# the developer uses one of the variants that doesn't take a title. -+OptionPane.messageDialogTitle=Mensagem -+ -+############ Printing Dialog Strings ############ -+PrintingDialog.titleProgressText=Impress\u00e3o -+PrintingDialog.titleAbortingText=Impress\u00e3o (Anulando) -+ -+PrintingDialog.contentInitialText=Impress\u00e3o em andamento... -+ -+# The following string will be formatted by a MessageFormat -+# and {0} will be replaced by page number being printed -+PrintingDialog.contentProgressText=P\u00e1gina imprimida {0}... -+ -+PrintingDialog.contentAbortingText=Anulando impress\u00e3o... -+ -+PrintingDialog.abortButtonText=Anular -+PrintingDialog.abortButtonMnemonic=65 -+PrintingDialog.abortButtonDisplayedMnemonicIndex=0 -+PrintingDialog.abortButtonToolTipText=Anular impress\u00e3o -+ -+############ Internal Frame Strings ############ -+InternalFrame.iconButtonToolTip=Minimizar -+InternalFrame.maxButtonToolTip=Maximizar -+InternalFrame.restoreButtonToolTip=Restaurar -+InternalFrame.closeButtonToolTip=Fechar -+ -+############ Internal Frame Title Pane Strings ############ -+InternalFrameTitlePane.restoreButtonText=Restaurar -+InternalFrameTitlePane.moveButtonText=Mover -+InternalFrameTitlePane.sizeButtonText=Tamanho -+InternalFrameTitlePane.minimizeButtonText=Minimizar -+InternalFrameTitlePane.maximizeButtonText=Maximizar -+InternalFrameTitlePane.closeButtonText=Fechar -+ -+############ Text strings ############# -+# Used for html forms -+FormView.submitButtonText=Enviar consulta -+FormView.resetButtonText=Redefinir -+FormView.browseFileButtonText=Explorar... -+ -+############ Abstract Document Strings ############ -+AbstractDocument.styleChangeText=altera\u00e7\u00e3o de estilo -+AbstractDocument.additionText=adi\u00e7\u00e3o -+AbstractDocument.deletionText=exclus\u00e3o -+AbstractDocument.undoText=Desfazer -+AbstractDocument.redoText=Refazer -+ -+############ Abstract Button Strings ############ -+AbstractButton.clickText=clicar -+ -+############ Abstract Undoable Edit Strings ############ -+AbstractUndoableEdit.undoText=Desfazer -+AbstractUndoableEdit.redoText=Refazer -+ -+############ Combo Box Strings ############ -+ComboBox.togglePopupText=togglePopup -+ -+############ Progress Monitor Strings ############ -+ProgressMonitor.progressText=Progresso... -+ -+############ Split Pane Strings ############ -+SplitPane.leftButtonText=bot\u00e3o esquerdo -+SplitPane.rightButtonText=bot\u00e3o direito -+# Used for Isindex -+IsindexView.prompt=Trata-se de um \u00edndice pesquis\u00e1vel. Insira as palavras-chave de pesquisa: -+ -+############ InternalFrameTitlePane Strings ############ -+InternalFrameTitlePane.iconifyButtonAccessibleName=Iconificar -+InternalFrameTitlePane.maximizeButtonAccessibleName=Maximizar -+InternalFrameTitlePane.closeButtonAccessibleName=Fechar -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,55 @@ -+# This properties file is used to create a PropertyResourceBundle -+# It contains Locale specific strings used be the Metal Look and Feel. -+# Currently, the following components need this for support: -+# -+# FileChooser -+# -+# When this file is read in, the strings are put into the -+# defaults table. This is an implementation detail of the current -+# workings of Swing. DO NOT DEPEND ON THIS. -+# This may change in future versions of Swing as we improve localization -+# support. -+# -+# Refer to the note in basic.properties for a description as to what -+# the mnemonics correspond to and how to calculate them. -+# -+# @author Steve Wilson -+ -+ -+############ FILE CHOOSER STRINGS ############# -+ -+FileChooser.lookInLabelText=Consultar em: -+FileChooser.saveInLabelText=Salvar em: -+FileChooser.fileNameLabelText=Nome de arquivo: -+FileChooser.filesOfTypeLabelText=Arquivos de tipo: -+FileChooser.upFolderToolTipText=Um n\u00edvel acima -+FileChooser.upFolderAccessibleName=Acima -+FileChooser.homeFolderToolTipText=In\u00edcio -+FileChooser.homeFolderAccessibleName=In\u00edcio -+FileChooser.newFolderToolTipText=Criar nova pasta -+FileChooser.newFolderAccessibleName=Nova pasta -+FileChooser.newFolderActionLabelText=Nova pasta -+FileChooser.listViewButtonToolTipText=Lista -+FileChooser.listViewButtonAccessibleName=Lista -+FileChooser.listViewActionLabelText=Lista -+FileChooser.detailsViewButtonToolTipText=Detalhes -+FileChooser.detailsViewButtonAccessibleName=Detalhes -+FileChooser.detailsViewActionLabelText=Detalhes -+FileChooser.refreshActionLabelText=Atualizar -+FileChooser.viewMenuLabelText=Exibir -+FileChooser.fileNameHeaderText=Nome -+FileChooser.fileSizeHeaderText=Tamanho -+FileChooser.fileTypeHeaderText=Tipo -+FileChooser.fileDateHeaderText=Modificado -+FileChooser.fileAttrHeaderText=Atributos -+ -+############ Used by MetalTitlePane if rendering window decorations############ -+# All mnemonics are KeyEvent.VK_XXX as integers -+MetalTitlePane.restoreTitle=Restaurar -+MetalTitlePane.restoreMnemonic=82 -+MetalTitlePane.iconifyTitle=Minimizar -+MetalTitlePane.iconifyMnemonic=69 -+MetalTitlePane.maximizeTitle=Maximizar -+MetalTitlePane.maximizeMnemonic=88 -+MetalTitlePane.closeTitle=Fechar -+MetalTitlePane.closeMnemonic=67 -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,41 @@ -+# This properties file is used to create a PropertyResourceBundle -+# It contains Locale specific strings used be the Synth Look and Feel. -+# Currently, the following components need this for support: -+# -+# FileChooser -+# -+# When this file is read in, the strings are put into the -+# defaults table. This is an implementation detail of the current -+# workings of Swing. DO NOT DEPEND ON THIS. -+# This may change in future versions of Swing as we improve localization -+# support. -+# -+# @author Steve Wilson -+ -+ -+############ FILE CHOOSER STRINGS ############# -+ -+FileChooser.lookInLabelText=Consultar em: -+FileChooser.saveInLabelText=Salvar em: -+FileChooser.fileNameLabelText=Nome de arquivo: -+FileChooser.filesOfTypeLabelText=Arquivos de tipo: -+FileChooser.upFolderToolTipText=Um n\u00edvel acima -+FileChooser.upFolderAccessibleName=Acima -+FileChooser.homeFolderToolTipText=In\u00edcio -+FileChooser.homeFolderAccessibleName=In\u00edcio -+FileChooser.newFolderToolTipText=Criar nova pasta -+FileChooser.newFolderAccessibleName=Nova pasta -+FileChooser.newFolderActionLabelText=Nova pasta -+FileChooser.listViewButtonToolTipText=Lista -+FileChooser.listViewButtonAccessibleName=Lista -+FileChooser.listViewActionLabelText=Lista -+FileChooser.detailsViewButtonToolTipText=Detalhes -+FileChooser.detailsViewButtonAccessibleName=Detalhes -+FileChooser.detailsViewActionLabelText=Detalhes -+FileChooser.refreshActionLabelText=Atualizar -+FileChooser.viewMenuLabelText=Exibir -+FileChooser.fileNameHeaderText=Nome -+FileChooser.fileSizeHeaderText=Tamanho -+FileChooser.fileTypeHeaderText=Tipo -+FileChooser.fileDateHeaderText=Modificado -+FileChooser.fileAttrHeaderText=Atributos -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,201 @@ -+/* -+ * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. Oracle designates this -+ * particular file as subject to the "Classpath" exception as provided -+ * by Oracle in the LICENSE file that accompanied this code. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+package sun.applet.resources; -+ -+import java.util.ListResourceBundle; -+ -+public class MsgAppletViewer_pt_BR extends ListResourceBundle { -+ -+ public Object[][] getContents() { -+ return new Object[][] { -+ {"textframe.button.dismiss", "Rejeitar"}, -+ {"appletviewer.tool.title", "Visualizador de applet: {0}"}, -+ {"appletviewer.menu.applet", "Applet"}, -+ {"appletviewer.menuitem.restart", "Reiniciar"}, -+ {"appletviewer.menuitem.reload", "Recarregar"}, -+ {"appletviewer.menuitem.stop", "Parar"}, -+ {"appletviewer.menuitem.save", "Salvar..."}, -+ {"appletviewer.menuitem.start", "Iniciar"}, -+ {"appletviewer.menuitem.clone", "Clonar..."}, -+ {"appletviewer.menuitem.tag", "Marca..."}, -+ {"appletviewer.menuitem.info", "Info..."}, -+ {"appletviewer.menuitem.edit", "Editar"}, -+ {"appletviewer.menuitem.encoding", "Codifica\u00e7\u00e3o de caracteres"}, -+ {"appletviewer.menuitem.print", "Imprimir..."}, -+ {"appletviewer.menuitem.props", "Propriedades..."}, -+ {"appletviewer.menuitem.close", "Fechar"}, -+ {"appletviewer.menuitem.quit", "Sair"}, -+ {"appletviewer.label.hello", "Ol\u00e1..."}, -+ {"appletviewer.status.start", "iniciando applet..."}, -+ {"appletviewer.appletsave.filedialogtitle","Serializar applet no arquivo"}, -+ {"appletviewer.appletsave.err1", "serializando um {0} para {1}"}, -+ {"appletviewer.appletsave.err2", "em appletSave: {0}"}, -+ {"appletviewer.applettag", "Marca exibida"}, -+ {"appletviewer.applettag.textframe", "Marca HTML do applet"}, -+ {"appletviewer.appletinfo.applet", "-- sem informa\u00e7\u00f5es do applet --"}, -+ {"appletviewer.appletinfo.param", "-- sem informa\u00e7\u00f5es do par\u00e2metro --"}, -+ {"appletviewer.appletinfo.textframe", "Informa\u00e7\u00f5es do applet"}, -+ {"appletviewer.appletprint.fail", "Falha na impress\u00e3o."}, -+ {"appletviewer.appletprint.finish", "Impress\u00e3o finalizada."}, -+ {"appletviewer.appletprint.cancel", "Impress\u00e3o cancelada."}, -+ {"appletviewer.appletencoding", "Codifica\u00e7\u00e3o de caracteres: {0}"}, -+ {"appletviewer.parse.warning.requiresname", "Aviso: a marca <param name=... value=...> requer nome do atributo."}, -+ {"appletviewer.parse.warning.paramoutside", "Aviso: marca <param> fora de <applet> ... </applet>."}, -+ {"appletviewer.parse.warning.applet.requirescode", "Aviso: marca <applet> requer c\u00f3digo de atributo."}, -+ {"appletviewer.parse.warning.applet.requiresheight", "Aviso: marca <applet> requer atributo de altura."}, -+ {"appletviewer.parse.warning.applet.requireswidth", "Aviso: marca <applet> requer atributo de largura."}, -+ {"appletviewer.parse.warning.object.requirescode", "Aviso: marca <object> requer c\u00f3digo de atributo."}, -+ {"appletviewer.parse.warning.object.requiresheight", "Aviso: marca <object> requer atributo de altura."}, -+ {"appletviewer.parse.warning.object.requireswidth", "Aviso: marca <object> requer atributo de largura."}, -+ {"appletviewer.parse.warning.embed.requirescode", "Aviso: marca <embed> requer c\u00f3digo de atributo."}, -+ {"appletviewer.parse.warning.embed.requiresheight", "Aviso: marca <embed> requer atributo de altura."}, -+ {"appletviewer.parse.warning.embed.requireswidth", "Aviso: marca <embed> requer atributo de largura."}, -+ {"appletviewer.parse.warning.appnotLongersupported", "Aviso: marca <app> n\u00e3o mais suportada, usar <applet> em seu lugar:"}, -+ {"appletviewer.usage", "Uso: url(s) de <options> do visualizador de applets\n\nem que <options> inclui:\n -debug inicia o visualizador de applet no depurador Java\n -encoding <encoding> especifica a codifica\u00e7\u00e3o de caracteres usada pelos arquivos HTML\n -J<runtime flag> passa o argumento para o int\u00e9rprete de java\n\nA op\u00e7\u00e3o -J n\u00e3o \u00e9 padr\u00e3o e est\u00e1 sujeita a altera\u00e7\u00f5es sem aviso."}, -+ {"appletviewer.main.err.unsupportedopt", "Op\u00e7\u00e3o n\u00e3o suportada: {0}"}, -+ {"appletviewer.main.err.unrecognizedarg", "Argumento n\u00e3o reconhecido: {0}"}, -+ {"appletviewer.main.err.dupoption", "Uso duplicado da op\u00e7\u00e3o: {0}"}, -+ {"appletviewer.main.err.inputfile", "Nenhum arquivo de entrada especificado."}, -+ {"appletviewer.main.err.badurl", "URL incorreto: {0} ( {1} )"}, -+ {"appletviewer.main.err.io", "Exce\u00e7\u00e3o de E/S durante a leitura: {0}"}, -+ {"appletviewer.main.err.readablefile", "Certifique-se de que {0} seja um arquivo e seja leg\u00edvel."}, -+ {"appletviewer.main.err.correcturl", "{0} \u00e9 o URL correto?"}, -+ {"appletviewer.main.prop.store", "Propriedades espec\u00edficas do usu\u00e1rio para AppletViewer"}, -+ {"appletviewer.main.err.prop.cantread", "N\u00e3o \u00e9 poss\u00edvel ler o arquivo de propriedades do usu\u00e1rio: {0}"}, -+ {"appletviewer.main.err.prop.cantsave", "N\u00e3o \u00e9 poss\u00edvel salvar o arquivo de propriedades do usu\u00e1rio: {0}"}, -+ {"appletviewer.main.warn.nosecmgr", "Aviso: desabilitando a seguran\u00e7a."}, -+ {"appletviewer.main.debug.cantfinddebug", "N\u00e3o \u00e9 poss\u00edvel localizar o depurador!"}, -+ {"appletviewer.main.debug.cantfindmain", "N\u00e3o \u00e9 poss\u00edvel localizar o m\u00e9todo principal no depurador!"}, -+ {"appletviewer.main.debug.exceptionindebug", "Exce\u00e7\u00e3o no depurador!"}, -+ {"appletviewer.main.debug.cantaccess", "N\u00e3o \u00e9 poss\u00edvel acessar o depurador!"}, -+ {"appletviewer.main.nosecmgr", "Aviso: SecurityManager n\u00e3o instalado!"}, -+ {"appletviewer.main.warning", "Aviso: nenhum applet foi iniciado. Certifique-se de que a entrada contenha uma marca <applet>."}, -+ {"appletviewer.main.warn.prop.overwrite", "Aviso: substituindo temporariamente a propriedade do sistema em solicita\u00e7\u00e3o do usu\u00e1rio: chave: {0} valor antigo: {1} valor novo: {2}"}, -+ {"appletviewer.main.warn.cantreadprops", "Aviso: n\u00e3o \u00e9 poss\u00edvel ler o arquivo de propriedades do AppletViewer: {0} usando padr\u00f5es."}, -+ {"appletioexception.loadclass.throw.interrupted", "carregamento de classe interrompido: {0}"}, -+ {"appletioexception.loadclass.throw.notloaded", "classe n\u00e3o carregada: {0}"}, -+ {"appletclassloader.loadcode.verbose", "Abrindo fluxo para: {0} para obter {1}"}, -+ {"appletclassloader.filenotfound", "Arquivo n\u00e3o encontrado ao procurar por: {0}"}, -+ {"appletclassloader.fileformat", "Exce\u00e7\u00e3o de formato de arquivo ao carregar: {0}"}, -+ {"appletclassloader.fileioexception", "Exce\u00e7\u00e3o de E/S ao carregar: {0}"}, -+ {"appletclassloader.fileexception", "Exce\u00e7\u00e3o {0} ao carregar: {0}"}, -+ {"appletclassloader.filedeath", "{0} eliminado ao carregar: {1}"}, -+ {"appletclassloader.fileerror", "Erro {0} ao carregar: {1}"}, -+ {"appletclassloader.findclass.verbose.findclass", "{0} encontra classe {1}"}, -+ {"appletclassloader.findclass.verbose.openstream", "Abrindo fluxo para: {0} para obter {1}"}, -+ {"appletclassloader.getresource.verbose.forname", "AppletClassLoader.getResource do nome: {0}"}, -+ {"appletclassloader.getresource.verbose.found", "Recurso encontrado: {0} como um recurso do sistema"}, -+ {"appletclassloader.getresourceasstream.verbose", "Recurso encontrado: {0} como um recurso do sistema"}, -+ {"appletpanel.runloader.err", "Par\u00e2metro de c\u00f3digo ou objeto!"}, -+ {"appletpanel.runloader.exception", "exce\u00e7\u00e3o ao desserializar {0}"}, -+ {"appletpanel.destroyed", "Applet destru\u00eddo."}, -+ {"appletpanel.loaded", "Applet carregado."}, -+ {"appletpanel.started", "Applet iniciado."}, -+ {"appletpanel.inited", "Applet inicializado."}, -+ {"appletpanel.stopped", "Applet interrompido."}, -+ {"appletpanel.disposed", "Applet descartado."}, -+ {"appletpanel.nocode", "Marca APPLET ausente no par\u00e2metro CODE."}, -+ {"appletpanel.notfound", "carregar: classe {0} n\u00e3o encontrada."}, -+ {"appletpanel.nocreate", "carregar: {0} n\u00e3o pode ser instanciado."}, -+ {"appletpanel.noconstruct", "carregar: {0} n\u00e3o \u00e9 p\u00fablico ou n\u00e3o possui um construtor p\u00fablico."}, -+ {"appletpanel.death", "eliminado"}, -+ {"appletpanel.exception", "exce\u00e7\u00e3o: {0}."}, -+ {"appletpanel.exception2", "exce\u00e7\u00e3o: {0}: {1}."}, -+ {"appletpanel.error", "erro: {0}."}, -+ {"appletpanel.error2", "erro: {0}: {1}."}, -+ {"appletpanel.notloaded", "Inicializar: applet n\u00e3o carregado."}, -+ {"appletpanel.notinited", "Iniciar: applet n\u00e3o inicializado."}, -+ {"appletpanel.notstarted", "Parar: applet n\u00e3o iniciado."}, -+ {"appletpanel.notstopped", "Destruir: applet n\u00e3o interrompido."}, -+ {"appletpanel.notdestroyed", "Descartar: applet n\u00e3o destru\u00eddo."}, -+ {"appletpanel.notdisposed", "Carregar: applet n\u00e3o descartado."}, -+ {"appletpanel.bail", "Interrompido: salvando."}, -+ {"appletpanel.filenotfound", "Arquivo n\u00e3o encontrado ao procurar por: {0}"}, -+ {"appletpanel.fileformat", "Exce\u00e7\u00e3o de formato de arquivo ao carregar: {0}"}, -+ {"appletpanel.fileioexception", "Exce\u00e7\u00e3o de E/S ao carregar: {0}"}, -+ {"appletpanel.fileexception", "Exce\u00e7\u00e3o {0} ao carregar: {0}"}, -+ {"appletpanel.filedeath", "{0} eliminado ao carregar: {1}"}, -+ {"appletpanel.fileerror", "Erro {0} ao carregar: {1}"}, -+ {"appletpanel.badattribute.exception", "An\u00e1lise de HTML: valor incorreto do atributo de largura/altura"}, -+ {"appletillegalargumentexception.objectinputstream", "AppletObjectInputStream requer carregador n\u00e3o nulo"}, -+ {"appletprops.title", "Propriedades do AppletViewer"}, -+ {"appletprops.label.http.server", "Servidor proxy de http:"}, -+ {"appletprops.label.http.proxy", "Porta do proxy de http:"}, -+ {"appletprops.label.network", "Acesso \u00e0 rede:"}, -+ {"appletprops.choice.network.item.none", "Nenhum"}, -+ {"appletprops.choice.network.item.applethost", "Host do applet"}, -+ {"appletprops.choice.network.item.unrestricted", "N\u00e3o registrado"}, -+ {"appletprops.label.class", "Acesso \u00e0 classe:"}, -+ {"appletprops.choice.class.item.restricted", "Restrito"}, -+ {"appletprops.choice.class.item.unrestricted", "N\u00e3o registrado"}, -+ {"appletprops.label.unsignedapplet", "Permitir applets n\u00e3o assinados:"}, -+ {"appletprops.choice.unsignedapplet.no", "N\u00e3o"}, -+ {"appletprops.choice.unsignedapplet.yes", "Sim"}, -+ {"appletprops.button.apply", "Aplicar"}, -+ {"appletprops.button.cancel", "Cancelar"}, -+ {"appletprops.button.reset", "Redefinir"}, -+ {"appletprops.apply.exception", "Falha ao salvar propriedades: {0}"}, -+ /* 4066432 */ -+ {"appletprops.title.invalidproxy", "Entrada inv\u00e1lida"}, -+ {"appletprops.label.invalidproxy", "A porta do proxy deve ser um valor inteiro positivo."}, -+ {"appletprops.button.ok", "OK"}, -+ /* end 4066432 */ -+ {"appletprops.prop.store", "Propriedades espec\u00edficas do usu\u00e1rio para AppletViewer"}, -+ {"appletsecurityexception.checkcreateclassloader", "Exce\u00e7\u00e3o de seguran\u00e7a: classloader"}, -+ {"appletsecurityexception.checkaccess.thread", "Exce\u00e7\u00e3o de seguran\u00e7a: thread"}, -+ {"appletsecurityexception.checkaccess.threadgroup", "Exce\u00e7\u00e3o de seguran\u00e7a: threadgroup: {0}"}, -+ {"appletsecurityexception.checkexit", "Exce\u00e7\u00e3o de seguran\u00e7a: exit: {0}"}, -+ {"appletsecurityexception.checkexec", "Exce\u00e7\u00e3o de seguran\u00e7a: exec: {0}"}, -+ {"appletsecurityexception.checklink", "Exce\u00e7\u00e3o de seguran\u00e7a: link: {0}"}, -+ {"appletsecurityexception.checkpropsaccess", "Exce\u00e7\u00e3o de seguran\u00e7a: properties"}, -+ {"appletsecurityexception.checkpropsaccess.key", "Exce\u00e7\u00e3o de seguran\u00e7a: properties access {0}"}, -+ {"appletsecurityexception.checkread.exception1", "Exce\u00e7\u00e3o de seguran\u00e7a: {0}, {1}"}, -+ {"appletsecurityexception.checkread.exception2", "Exce\u00e7\u00e3o de seguran\u00e7a: file.read: {0}"}, -+ {"appletsecurityexception.checkread", "Exce\u00e7\u00e3o de seguran\u00e7a: file.read: {0} == {1}"}, -+ {"appletsecurityexception.checkwrite.exception", "Exce\u00e7\u00e3o de seguran\u00e7a: {0}, {1}"}, -+ {"appletsecurityexception.checkwrite", "Exce\u00e7\u00e3o de seguran\u00e7a: file.write: {0} == {1}"}, -+ {"appletsecurityexception.checkread.fd", "Exce\u00e7\u00e3o de seguran\u00e7a: fd.read"}, -+ {"appletsecurityexception.checkwrite.fd", "Exce\u00e7\u00e3o de seguran\u00e7a: fd.write"}, -+ {"appletsecurityexception.checklisten", "Exce\u00e7\u00e3o de seguran\u00e7a: socket.listen: {0}"}, -+ {"appletsecurityexception.checkaccept", "Exce\u00e7\u00e3o de seguran\u00e7a: socket.accept: {0} == {1}"}, -+ {"appletsecurityexception.checkconnect.networknone", "Exce\u00e7\u00e3o de seguran\u00e7a: socket.connect: {0} == {1}"}, -+ {"appletsecurityexception.checkconnect.networkhost1", "Exce\u00e7\u00e3o de seguran\u00e7a: n\u00e3o foi poss\u00edvel conectar a {0} com a origem de {1}."}, -+ {"appletsecurityexception.checkconnect.networkhost2", "Exce\u00e7\u00e3o de seguran\u00e7a: n\u00e3o foi poss\u00edvel resolver o IP para o host {0} ou para {1}. "}, -+ {"appletsecurityexception.checkconnect.networkhost3", "Exce\u00e7\u00e3o de seguran\u00e7a: n\u00e3o foi poss\u00edvel resolver o IP para o host {0}. Consulte a propriedade trustProxy."}, -+ {"appletsecurityexception.checkconnect", "Exce\u00e7\u00e3o de seguran\u00e7a: connect: {0}->{1}"}, -+ {"appletsecurityexception.checkpackageaccess", "Exce\u00e7\u00e3o de seguran\u00e7a: n\u00e3o \u00e9 poss\u00edvel acessar o pacote: {0}"}, -+ {"appletsecurityexception.checkpackagedefinition", "Exce\u00e7\u00e3o de seguran\u00e7a: n\u00e3o \u00e9 poss\u00edvel definir o pacote: {0}"}, -+ {"appletsecurityexception.cannotsetfactory", "Exce\u00e7\u00e3o de seguran\u00e7a: n\u00e3o \u00e9 poss\u00edvel definir a f\u00e1brica"}, -+ {"appletsecurityexception.checkmemberaccess", "Exce\u00e7\u00e3o de seguran\u00e7a: verificar acesso de membro"}, -+ {"appletsecurityexception.checkgetprintjob", "Exce\u00e7\u00e3o de seguran\u00e7a: getPrintJob"}, -+ {"appletsecurityexception.checksystemclipboardaccess", "Exce\u00e7\u00e3o de seguran\u00e7a: getSystemClipboard"}, -+ {"appletsecurityexception.checkawteventqueueaccess", "Exce\u00e7\u00e3o de seguran\u00e7a: getEventQueue"}, -+ {"appletsecurityexception.checksecurityaccess", "Exce\u00e7\u00e3o de seguran\u00e7a: opera\u00e7\u00e3o de seguran\u00e7a: {0}"}, -+ {"appletsecurityexception.getsecuritycontext.unknown", "tipo desconhecido de carregador de classe. n\u00e3o \u00e9 poss\u00edvel verificar para getContext"}, -+ {"appletsecurityexception.checkread.unknown", "tipo desconhecido de carregador de classe. n\u00e3o \u00e9 poss\u00edvel verificar para verifica\u00e7\u00e3o de leitura {0}"}, -+ {"appletsecurityexception.checkconnect.unknown", "tipo desconhecido de carregador de classe. n\u00e3o \u00e9 poss\u00edvel verificar para verifica\u00e7\u00e3o de conex\u00e3o"}, -+ }; -+ } -+} -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/sun/awt/resources/awt_pt_BR.properties ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,191 @@ -+# -+# AWT-specific properties -+# -+ -+# Modifier names -+AWT.shift=Shift -+AWT.control=Ctrl -+AWT.alt=Alt -+AWT.meta=Meta -+AWT.altGraph=Alt Graph -+ -+# Key names -+AWT.enter=Enter -+AWT.backSpace=Backspace -+AWT.tab=Tab -+AWT.cancel=Cancelar -+AWT.clear=Limpar -+AWT.pause=Pausar -+AWT.capsLock=Caps Lock -+AWT.escape=Escape -+AWT.space=Barra de espa\u00e7o -+AWT.pgup=P\u00e1gina acima -+AWT.pgdn=P\u00e1gina abaixo -+AWT.end=Fim -+AWT.home=In\u00edcio -+AWT.left=Esquerda -+AWT.up=Acima -+AWT.right=Direita -+AWT.down=Abaixo -+AWT.begin=Come\u00e7ar -+AWT.comma=V\u00edrgula -+AWT.period=Ponto final -+AWT.slash=Barra -+AWT.semicolon=Ponto-e-v\u00edrgula -+AWT.equals=Igual -+AWT.openBracket=Abrir par\u00eantese -+AWT.backSlash=Barra invertida -+AWT.closeBracket=Fechar par\u00eantese -+AWT.multiply=Teclado num\u00e9rico * -+AWT.add=Teclado num\u00e9rico + -+AWT.separator=Teclado num\u00e9rico , -+AWT.separater=Teclado num\u00e9rico , -+AWT.subtract=Teclado num\u00e9rico - -+AWT.decimal=Teclado num\u00e9rico . -+AWT.divide=Teclado num\u00e9rico / -+AWT.delete=Excluir -+AWT.numLock=Num Lock -+AWT.scrollLock=Scroll Lock -+AWT.f1=F1 -+AWT.f2=F2 -+AWT.f3=F3 -+AWT.f4=F4 -+AWT.f5=F5 -+AWT.f6=F6 -+AWT.f7=F7 -+AWT.f8=F8 -+AWT.f9=F9 -+AWT.f10=F10 -+AWT.f11=F11 -+AWT.f12=F12 -+AWT.f13=F13 -+AWT.f14=F14 -+AWT.f15=F15 -+AWT.f16=F16 -+AWT.f17=F17 -+AWT.f18=F18 -+AWT.f19=F19 -+AWT.f20=F20 -+AWT.f21=F21 -+AWT.f22=F22 -+AWT.f23=F23 -+AWT.f24=F24 -+AWT.printScreen=Imprimir tela -+AWT.insert=Inserir -+AWT.help=Ajuda -+AWT.windows=Windows -+AWT.context=Menu de contexto -+AWT.backQuote=Crase -+AWT.quote=Aspas -+AWT.deadGrave=Acento grave -+AWT.deadAcute=Acento agudo -+AWT.deadCircumflex=Acento circunflexo -+AWT.deadTilde=Til -+AWT.deadMacron=M\u00e1cron -+AWT.deadBreve=Braquia -+AWT.deadAboveDot=Ponto em cima -+AWT.deadDiaeresis=Trema -+AWT.deadAboveRing=S\u00edmbolo do grau -+AWT.deadDoubleAcute=Acento agudo duplo -+AWT.deadCaron=Acento circunflexo invertido -+AWT.deadCedilla=Cedilha -+AWT.deadOgonek=Ogonek -+AWT.deadIota=Iota -+AWT.deadVoicedSound=Som sonoro -+AWT.deadSemivoicedSound=Som surdo -+AWT.ampersand=E comercial -+AWT.asterisk=Asterisco -+AWT.quoteDbl=Aspas duplas -+AWT.Less=Menos -+AWT.greater=Maior -+AWT.braceLeft=Chave esquerda -+AWT.braceRight=Chave direta -+AWT.at=Arroba -+AWT.colon=V\u00edrgula -+AWT.circumflex=Circunflexo -+AWT.dollar=D\u00f3lar -+AWT.euro=Euro -+AWT.exclamationMark=Ponto de exclama\u00e7\u00e3o -+AWT.invertedExclamationMark=Ponto de exclama\u00e7\u00e3o invertido -+AWT.leftParenthesis=Par\u00eantese esquerdo -+AWT.numberSign=Sinal num\u00e9rico -+AWT.plus=Mais -+AWT.minus=Menos -+AWT.rightParenthesis=Par\u00eantese direito -+AWT.underscore=Sublinhado -+AWT.final=Final -+AWT.convert=Converter -+AWT.noconvert=N\u00e3o converter -+AWT.accept=Aceitar -+AWT.modechange=Altera\u00e7\u00e3o de modo -+AWT.kana=Kana -+AWT.kanji=Kanji -+AWT.alphanumeric=Alfanum\u00e9rico -+AWT.katakana=Katakana -+AWT.hiragana=Hiragana -+AWT.fullWidth=Largura total -+AWT.halfWidth=Meia largura -+AWT.romanCharacters=Caracteres romanos -+AWT.allCandidates=Todos os candidatos -+AWT.previousCandidate=Candidato anterior -+AWT.codeInput=Entrada de c\u00f3digo -+AWT.japaneseKatakana=Katakana japon\u00eas -+AWT.japaneseHiragana=Hiragana japon\u00eas -+AWT.japaneseRoman=Romano japon\u00eas -+AWT.kanaLock=Kana Lock -+AWT.inputMethodOnOff=M\u00e9todo de entrada ativado/desativado -+AWT.again=Novamente -+AWT.undo=Desfazer -+AWT.copy=Copiar -+AWT.paste=Colar -+AWT.cut=Recortar -+AWT.find=Localizar -+AWT.props=Props -+AWT.stop=Parar -+AWT.compose=Compor -+ -+# Numeric Keypad -+AWT.numpad=Teclado num\u00e9rico -+AWT.unknown=Desconhecido -+AWT.undefined=Indefinido -+ -+# Predefined cursor names -+AWT.DefaultCursor=Cursor padr\u00e3o -+AWT.CrosshairCursor=Cursor em forma de cruz -+AWT.TextCursor=Cursor de texto -+AWT.WaitCursor=Cursor em forma de ampulheta -+AWT.SWResizeCursor=Cursor de seta que aponta para sudoeste -+AWT.SEResizeCursor=Cursor de seta que aponta para sudeste -+AWT.NWResizeCursor=Cursor de seta que aponta para noroeste -+AWT.NEResizeCursor=Cursor de seta que aponta para nordeste -+AWT.NResizeCursor=Cursor de seta que aponta para cima -+AWT.SResizeCursor=Cursor de seta que aponta para baixo -+AWT.WResizeCursor=Cursor de seta que aponta \u00e0 esquerda -+AWT.EResizeCursor=Cursor de seta que aponta \u00e0 direita -+AWT.HandCursor=Cursor em forma de m\u00e3o -+AWT.MoveCursor=Cursor de movimento -+AWT.DefaultDragCursor=Cursor padr\u00e3o de arrastar -+AWT.DefaultNoDropCursor=Cursor padr\u00e3o sem arrasto -+AWT.DefaultDropCursor=Cursor padr\u00e3o de soltar -+ -+# Input method related strings -+AWT.CompositionWindowTitle=Janela de entrada -+AWT.InputMethodSelectionMenu=Selecionar m\u00e9todo de entrada -+AWT.HostInputMethodDisplayName=M\u00e9todos de entrada do sistema -+AWT.InputMethodLanguage.ja=Japon\u00eas -+AWT.InputMethodLanguage.ko=Coreano -+AWT.InputMethodLanguage.zh=Chin\u00eas -+AWT.InputMethodLanguage.zh_CN=Chin\u00eas simplificado -+AWT.InputMethodLanguage.zh_TW=Chin\u00eas tradicional -+AWT.InputMethodCreationFailed=N\u00e3o foi poss\u00edvel criar {0}. Raz\u00e3o: {1} -+ -+# Property to select between on-the-spot and below-the-spot -+# composition with input methods. Valid values: -+# "on-the-spot", "below-the-spot". -+# May be overridden from command line. -+java.awt.im.style=no momento -+java.awt.def.delay=30 -+ -+# Warnings -+AWT.InconsistentDLLsWarning=As opera\u00e7\u00f5es baseadas em texto podem n\u00e3o funcionar corretamente devido a um conjunto incoerente de bibliotecas de vincula\u00e7\u00e3o din\u00e2mica (DLLs) instalado no seu sistema. Para obter mais informa\u00e7\u00f5es sobre este problema e uma solu\u00e7\u00e3o recomendada, consulte as Notas de vers\u00e3o do Java(TM) 2 SDK, Standard Edition em java.sun.com. -+ -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/sun/launcher/resources/launcher_pt_BR.properties ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,116 @@ -+# -+# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# -+ -+# Translators please note do not translate the options themselves -+java.launcher.opt.header = Usage: {0} [-options] class [args...]\n\ -+\ (to execute a class)\n or {0} [-options] -jar jarfile [args...]\n\ -+\ (to execute a jar file)\n\ -+where options include:\n -+ -+java.launcher.opt.datamodel =\ -d{0}\t use a {0}-bit data model if available\n -+java.launcher.opt.vmselect =\ {0}\t to select the "{1}" VM\n -+java.launcher.opt.hotspot =\ {0}\t is a synonym for the "{1}" VM [deprecated]\n -+ -+java.launcher.ergo.message1 =\ The default VM is {0} -+java.launcher.ergo.message2 =\ because you are running on a server-class machine.\n -+ -+# Translators please note do not translate the options themselves -+java.launcher.opt.footer =\ -cp <class search path of directories and zip/jar files>\n\ -+\ -classpath <class search path of directories and zip/jar files>\n\ -+\ A {0} separated list of directories, JAR archives,\n\ -+\ and ZIP archives to search for class files.\n\ -+\ -D<name>=<value>\n\ -+\ set a system property\n\ -+\ -verbose[:class|gc|jni]\n\ -+\ enable verbose output\n\ -+\ -version print product version and exit\n\ -+\ -version:<value>\n\ -+\ require the specified version to run\n\ -+\ -showversion print product version and continue\n\ -+\ -jre-restrict-search | -no-jre-restrict-search\n\ -+\ include/exclude user private JREs in the version search\n\ -+\ -? -help print this help message\n\ -+\ -X print help on non-standard options\n\ -+\ -ea[:<packagename>...|:<classname>]\n\ -+\ -enableassertions[:<packagename>...|:<classname>]\n\ -+\ enable assertions with specified granularity\n\ -+\ -da[:<packagename>...|:<classname>]\n\ -+\ -disableassertions[:<packagename>...|:<classname>]\n\ -+\ disable assertions with specified granularity\n\ -+\ -esa | -enablesystemassertions\n\ -+\ enable system assertions\n\ -+\ -dsa | -disablesystemassertions\n\ -+\ disable system assertions\n\ -+\ -agentlib:<libname>[=<options>]\n\ -+\ load native agent library <libname>, e.g. -agentlib:hprof\n\ -+\ see also, -agentlib:jdwp=help and -agentlib:hprof=help\n\ -+\ -agentpath:<pathname>[=<options>]\n\ -+\ load native agent library by full pathname\n\ -+\ -javaagent:<jarpath>[=<options>]\n\ -+\ load Java programming language agent, see java.lang.instrument\n\ -+\ -splash:<imagepath>\n\ -+\ show splash screen with specified image\n\ -+See http://java.sun.com/javase/reference for more details. -+ -+# Translators please note do not translate the options themselves -+java.launcher.X.usage=\ -+\ -Xmixed mixed mode execution (default)\n\ -+\ -Xint interpreted mode execution only\n\ -+\ -Xbootclasspath:<directories and zip/jar files separated by {0}>\n\ -+\ set search path for bootstrap classes and resources\n\ -+\ -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n\ -+\ append to end of bootstrap class path\n\ -+\ -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n\ -+\ prepend in front of bootstrap class path\n\ -+\ -Xnoclassgc disable class garbage collection\n\ -+\ -Xincgc enable incremental garbage collection\n\ -+\ -Xloggc:<file> log GC status to a file with time stamps\n\ -+\ -Xbatch disable background compilation\n\ -+\ -Xms<size> set initial Java heap size\n\ -+\ -Xmx<size> set maximum Java heap size\n\ -+\ -Xss<size> set java thread stack size\n\ -+\ -Xprof output cpu profiling data\n\ -+\ -Xfuture enable strictest checks, anticipating future default\n\ -+\ -Xrs reduce use of OS signals by Java/VM (see documentation)\n\ -+\ -Xcheck:jni perform additional checks for JNI functions\n\ -+\ -Xshare:off do not attempt to use shared class data\n\ -+\ -Xshare:auto use shared class data if possible (default)\n\ -+\ -Xshare:on require using shared class data, otherwise fail.\n\n\ -+The -X options are non-standard and subject to change without notice.\n -+ -+java.launcher.cls.error1=\ -+ Error: Could not find main class {0} -+java.launcher.cls.error2=\ -+ Error: Main method is not {0} in class {1}, please define the main method as:\n\ -+\ public static void main(String[] args) -+java.launcher.cls.error3=\ -+ Error: Main method must return a value of type void in class {0}, please \n\ -+ define the main method as:\n\ -+\ public static void main(String[] args) -+java.launcher.cls.error4=\ -+ Error: Main method not found in class {0}, please define the main method as:\n\ -+\ public static void main(String[] args) -+ -+ -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/sun/management/resources/agent_pt_BR.properties ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/sun/management/resources/agent_pt_BR.properties Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,92 @@ -+# -+# -+# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# -+ -+# Localizations for Level names. For the US locale -+# these are the same as the non-localized level name. -+ -+agent.err.error = Erro -+agent.err.exception = Exce\u00e7\u00e3o lan\u00e7ada pelo agente -+agent.err.warning = Aviso -+ -+agent.err.configfile.notfound = Arquivo de configura\u00e7\u00e3o n\u00e3o encontrado -+agent.err.configfile.failed = Falha ao ler o arquivo de configura\u00e7\u00e3o -+agent.err.configfile.closed.failed = Falha ao fechar o arquivo de configura\u00e7\u00e3o -+agent.err.configfile.access.denied = Acesso negado ao arquivo de configura\u00e7\u00e3o -+ -+agent.err.exportaddress.failed = Falha na exporta\u00e7\u00e3o do endere\u00e7o do conector JMX para o buffer de instrumenta\u00e7\u00e3o -+ -+agent.err.agentclass.notfound = Classe do agente de gerenciamento n\u00e3o encontrada -+agent.err.agentclass.failed = Classe do agente de gerenciamento falha -+agent.err.premain.notfound = premain(String) n\u00e3o existe na classe do agente -+agent.err.agentclass.access.denied = Acesso negado a premain(String) -+agent.err.invalid.agentclass = Valor inv\u00e1lido da propriedade com.sun.management.agent.class -+ -+agent.err.invalid.jmxremote.port = N\u00famero inv\u00e1lido de com.sun.management.jmxremote.port -+ -+agent.err.file.not.set = Arquivo n\u00e3o especificado -+agent.err.file.not.readable = Arquivo ileg\u00edvel -+agent.err.file.read.failed = Falha ao ler o arquivo -+agent.err.file.not.found = Arquivo n\u00e3o encontrado -+agent.err.file.access.not.restricted = O acesso de leitura do arquivo deve ser limitado -+ -+agent.err.password.file.notset = O arquivo de senha n\u00e3o est\u00e1 especificado, mas com.sun.management.jmxremote.authenticate=true -+agent.err.password.file.not.readable = Arquivo de senha ileg\u00edvel -+agent.err.password.file.read.failed = Falha ao ler o arquivo de senha -+agent.err.password.file.notfound = Arquivo de senha n\u00e3o encontrado -+agent.err.password.file.access.notrestricted = O acesso de leitura do arquivo de senha deve ser limitado -+ -+agent.err.access.file.notset = O arquivo de acesso n\u00e3o est\u00e1 especificado, mas com.sun.management.jmxremote.authenticate=true -+agent.err.access.file.not.readable = Arquivo de acesso ileg\u00edvel -+agent.err.access.file.read.failed = Falha ao ler o arquivo de acesso -+agent.err.access.file.notfound = Arquivo de acesso n\u00e3o encontrado -+ -+agent.err.connector.server.io.error = Erro de comunica\u00e7\u00e3o do servidor do conector JMX -+ -+agent.err.invalid.option = Op\u00e7\u00e3o especificada inv\u00e1lida -+agent.err.invalid.snmp.port = N\u00famero inv\u00e1lido de com.sun.management.snmp.port -+agent.err.invalid.snmp.trap.port = N\u00famero inv\u00e1lido de com.sun.management.snmp.trap -+agent.err.unknown.snmp.interface = Interface SNMP desconhecida -+agent.err.acl.file.notset = N\u00e3o h\u00e1 nenhum arquivo ACL SNMP especificado, mas com.sun.management.snmp.acl=true -+agent.err.acl.file.notfound = Arquivo ACL SNMP n\u00e3o encontrado -+agent.err.acl.file.not.readable = Arquivo ACL SNMP ileg\u00edvel -+agent.err.acl.file.read.failed = Falha ao ler o arquivo ACL SNMP -+agent.err.acl.file.access.notrestricted = O acesso de leitura do arquivo de senha deve ser limitado -+ -+agent.err.snmp.adaptor.start.failed = Falha ao iniciar o adaptador SNMP com endere\u00e7o -+agent.err.snmp.mib.init.failed = Falha ao inicializar o MIB SNMP com erro -+ -+jmxremote.ConnectorBootstrap.initialize = Iniciando o servidor do conector JMX: -+jmxremote.ConnectorBootstrap.initialize.noAuthentication = Sem autentica\u00e7\u00e3o -+jmxremote.ConnectorBootstrap.initialize.ready = Conector JMX pronto em: {0} -+jmxremote.ConnectorBootstrap.initialize.password.readonly = O acesso de leitura do arquivo de senha deve ser limitado: {0} -+jmxremote.ConnectorBootstrap.initialize.file.readonly = O acesso de leitura do arquivo deve ser limitado: {0} -+ -+jmxremote.AdaptorBootstrap.getTargetList.processing = Processando ACL -+jmxremote.AdaptorBootstrap.getTargetList.adding = Adicionando destino: {0} -+jmxremote.AdaptorBootstrap.getTargetList.starting = Iniciando o servidor do adaptador: -+jmxremote.AdaptorBootstrap.getTargetList.initialize1 = Adaptador pronto. -+jmxremote.AdaptorBootstrap.getTargetList.initialize2 = Adaptador SNMP pronto em: {0}:{1} -+jmxremote.AdaptorBootstrap.getTargetList.terminate = conclu\u00eddo {0} -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/sun/misc/resources/Messages_pt_BR.java ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/sun/misc/resources/Messages_pt_BR.java Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,53 @@ -+/* -+ * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. Oracle designates this -+ * particular file as subject to the "Classpath" exception as provided -+ * by Oracle in the LICENSE file that accompanied this code. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+package sun.misc.resources; -+ -+/** -+ * <p> This class represents the <code>ResourceBundle</code> -+ * for sun.misc. -+ * -+ * @author Michael Colburn -+ * @version 1.5, 11/17/05 -+ */ -+ -+public class Messages_pt_BR extends java.util.ListResourceBundle { -+ -+ /** -+ * Returns the contents of this <code>ResourceBundle</code>. -+ * <p> -+ * @return the contents of this <code>ResourceBundle</code>. -+ */ -+ public Object[][] getContents() { -+ return contents; -+ } -+ -+ private static final Object[][] contents = { -+ { "optpkg.versionerror", "ERRO: formato de vers\u00e3o inv\u00e1lido usado no arquivo jar {0}. Verifique a documenta\u00e7\u00e3o para obter o formato de vers\u00e3o suportado." }, -+ { "optpkg.attributeerror", "ERRO: o atributo de manifesto JAR {0} necess\u00e1rio n\u00e3o est\u00e1 definido no arquivo JAR {1}." }, -+ { "optpkg.attributeserror", "ERRO: alguns atributos de manifesto JAR necess\u00e1rios n\u00e3o est\u00e3o definidos no arquivo JAR {0}." } -+ }; -+ -+} -\ No newline at end of file -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/sun/print/resources/serviceui_pt_BR.properties ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,214 @@ -+# -+# -+border.chromaticity=Apar\u00eancia da cor -+border.copies=C\u00f3pias -+border.jobattributes=Atributos do trabalho -+border.media=M\u00eddia -+border.orientation=Orienta\u00e7\u00e3o -+border.printrange=Intervalo de impress\u00e3o -+border.printservice=Servi\u00e7o de impress\u00e3o -+border.quality=Qualidade -+border.sides=Lados -+border.margins=Margens -+# -+button.cancel=Cancelar -+button.ok=OK -+button.print=Imprimir -+button.properties=Propriedades... -+button.properties.mnemonic=R -+# -+checkbox.collate=Agrupar -+checkbox.collate.mnemonic=C -+checkbox.jobsheets=P\u00e1gina com cabe\u00e7alho -+checkbox.jobsheets.mnemonic=B -+checkbox.printtofile=Imprimir em arquivo -+checkbox.printtofile.mnemonic=F -+# -+dialog.printtitle=Imprimir -+dialog.pstitle=Configurar p\u00e1gina -+dialog.overwrite=Este arquivo j\u00e1 existe. Deseja substituir o arquivo existente? -+dialog.owtitle=Imprimir em arquivo -+dialog.printtofile=Imprimir em arquivo -+dialog.noprintermsg=Nenhum servi\u00e7o de impress\u00e3o encontrado. -+dialog.writeerror=N\u00e3o \u00e9 poss\u00edvel gravar no arquivo: -+# -+label.info=Info: -+label.jobname=Nome do trabalho: -+label.jobname.mnemonic=J -+label.numcopies=N\u00famero de c\u00f3pias: -+label.numcopies.mnemonic=O -+label.priority=Prioridade: -+label.priority.mnemonic=R -+label.psname=Nome: -+label.psname.mnemonic=N -+label.pstype=Tipo: -+label.rangeto=Para -+label.size=Tamanho: -+label.size.mnemonic=Z -+label.source=Fonte: -+label.source.mnemonic=C -+label.status=Status: -+label.username=Nome de usu\u00e1rio: -+label.username.mnemonic=U -+label.millimetres=(mm) -+label.inches=(pol) -+label.topmargin=superior -+label.topmargin.mnemonic=T -+label.bottommargin=inferior -+label.bottommargin.mnemonic=B -+label.leftmargin=esquerda -+label.leftmargin.mnemonic=F -+label.rightmargin=direita -+label.rightmargin.mnemonic=R -+# -+radiobutton.color=Cor -+radiobutton.color.mnemonic=C -+radiobutton.draftq=Rascunho -+radiobutton.draftq.mnemonic=F -+radiobutton.duplex=Duplex -+radiobutton.duplex.mnemonic=D -+radiobutton.highq=Alto -+radiobutton.highq.mnemonic=H -+radiobutton.landscape=Paisagem -+radiobutton.landscape.mnemonic=L -+radiobutton.monochrome=Monocrom\u00e1tico -+radiobutton.monochrome.mnemonic=M -+radiobutton.normalq=Normal -+radiobutton.normalq.mnemonic=N -+radiobutton.oneside=Um lado -+radiobutton.oneside.mnemonic=O -+radiobutton.portrait=Retrato -+radiobutton.portrait.mnemonic=P -+radiobutton.rangeall=Todas -+radiobutton.rangeall.mnemonic=L -+radiobutton.rangepages=P\u00e1ginas -+radiobutton.rangepages.mnemonic=E -+radiobutton.revlandscape=Paisagem invertida -+radiobutton.revlandscape.mnemonic=N -+radiobutton.revportrait=Retrato invertido -+radiobutton.revportrait.mnemonic=I -+radiobutton.tumble=Duplex horizontal -+radiobutton.tumble.mnemonic=T -+# The vkMnemonics correspond with the constants defined in KeyEvent, eg -+# 65 = KeyEvent.VK_A -+tab.appearance=Apar\u00eancia -+tab.appearance.vkMnemonic=65 -+tab.general=Geral -+tab.general.vkMnemonic=71 -+tab.pagesetup=Configurar p\u00e1gina -+tab.pagesetup.vkMnemonic=83 -+# -+error.pagerange=Intervalo de p\u00e1ginas inv\u00e1lido; insira novamente os valores (por exemplo, 1-3,5,7-10) -+error.destination=Nome de arquivo inv\u00e1lido; tente novamente -+# -+# The following keys match the Strings returned by MediaSizeName.toString() -+# (in some cases the space character is replaced by '-' and the pound -+# character is replaced with 'n') -+# -+iso-4a0=4A0 (ISO/DIN & JIS) -+iso-2a0=2A0 (ISO/DIN & JIS) -+iso-a0=A0 (ISO/DIN & JIS) -+iso-a1=A1 (ISO/DIN & JIS) -+iso-a2=A2 (ISO/DIN & JIS) -+iso-a3=A3 (ISO/DIN & JIS) -+iso-a4=A4 (ISO/DIN & JIS) -+iso-a5=A5 (ISO/DIN & JIS) -+iso-a6=A6 (ISO/DIN & JIS) -+iso-a7=A7 (ISO/DIN & JIS) -+iso-a8=A8 (ISO/DIN & JIS) -+iso-a9=A9 (ISO/DIN & JIS) -+iso-a10=A10 (ISO/DIN & JIS) -+iso-b0=B0 (ISO/DIN) -+iso-b1=B1 (ISO/DIN) -+iso-b2=B2 (ISO/DIN) -+iso-b3=B3 (ISO/DIN) -+iso-b4=B4 (ISO/DIN) -+iso-b5=B5 (ISO/DIN) -+iso-b6=B6 (ISO/DIN) -+iso-b7=B7 (ISO/DIN) -+iso-b8=B8 (ISO/DIN) -+iso-b9=B9 (ISO/DIN) -+iso-b10=B10 (ISO/DIN) -+jis-b0=B0 (JIS) -+jis-b1=B1 (JIS) -+jis-b2=B2 (JIS) -+jis-b3=B3 (JIS) -+jis-b4=B4 (JIS) -+jis-b5=B5 (JIS) -+jis-b6=B6 (JIS) -+jis-b7=B7 (JIS) -+jis-b8=B8 (JIS) -+jis-b9=B9 (JIS) -+jis-b10=B10 (JIS) -+iso-c0=C0 (ISO/DIN) -+iso-c1=C1 (ISO/DIN) -+iso-c2=C2 (ISO/DIN) -+iso-c3=C3 (ISO/DIN) -+iso-c4=C4 (ISO/DIN) -+iso-c5=C5 (ISO/DIN) -+iso-c6=C6 (ISO/DIN) -+iso-c7=C7 (ISO/DIN) -+iso-c8=C8 (ISO/DIN) -+iso-c9=C9 (ISO/DIN) -+iso-c10=C10 (ISO/DIN) -+na-letter=Carta -+na-legal=Of\u00edcio -+executive=Executivo -+ledger=Livro-raz\u00e3o -+tabloid=Tabl\u00f3ide -+invoice=Fatura -+folio=F\u00f3lio -+quarto=Quarto -+japanese-postcard=Cart\u00e3o-postal (JIS) -+oufuko-postcard=Cart\u00e3o-postal (JIS) -+a=Engenharia A -+b=Engenharia B -+c=Engenharia C -+d=Engenharia D -+e=Engenharia E -+iso-designated-long=Longo designado ISO -+italian-envelope=Envelope italiano -+italy-envelope=Envelope italiano -+invite-envelope=Envelope de convite -+monarch-envelope=Envelope monarca -+personal-envelope=Envelope personalizado -+na-number-9-envelope=Envelope n\u00ba 9 -+na-number-10-envelope=Envelope n\u00ba 10 -+na-number-11-envelope=Envelope n\u00ba 11 -+na-number-12-envelope=Envelope n\u00ba 12 -+na-number-14-envelope=Envelope n\u00ba 14 -+na-6x9-envelope=Envelope 6x9 -+na-7x9-envelope=Envelope 6x7 -+na-9x11-envelope=Envelope 9x11 -+na-9x12-envelope=Envelope 9x12 -+na-10x13-envelope=Envelope 10x15 -+na-10x14-envelope=Envelope 10x15 -+na-10x15-envelope=Envelope 10x15 -+na-5x7=Papel 5" x 7" -+na-8x10=Papel 8" x 10" -+# -+# The following keys match the Strings returned by MediaTray.toString() -+# -+auto-select=Selecionar automaticamente -+top=Superior -+middle=Meio -+bottom=Inferior -+envelope=Envelope -+manual=Manual -+large-capacity=Grande capacidade -+main=Principal -+side=Lado -+# Add the additional standard bins defined by win32 -+Manual-Envelope=Envelope manual -+Automatic-Feeder=Alimentador autom\u00e1tico -+Tractor-Feeder=Alimentador por tracionador -+Small-Format=Formato pequeno -+Large-Format=Formato grande -+Cassette=Cassete -+Form-Source=Fonte do formul\u00e1rio -+# -+# The following keys match the Strings returned by -+# PrinterIsAcceptingJobs.toString() -+# -+accepting-jobs=Aceitando trabalhos -+not-accepting-jobs=N\u00e3o aceitando trabalhos -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,28 @@ -+# -+# -+# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# -+ -+rmiregistry.usage=Uso: {0} <options> <port>\n\nem que <options> inclui:\n -J<runtime flag> passa o argumento para o int\u00e9rprete de java -+rmiregistry.port.badnumber=o argumento da porta, {0}, n\u00e3o \u00e9 um n\u00famero. -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,96 @@ -+# -+# -+# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# -+ -+# "rmid", inetd", and "wait" should not be translated. -+rmid.syntax.exec.invalid=rmid foi iniciado de inetd com um status inv\u00e1lido (deve estar em espera) -+ -+# "rmid" and "inetd" should not be translated. -+rmid.syntax.port.badarg=a porta n\u00e3o pode ser especificada se rmid for iniciado de inetd -+ -+# "port" here refers to a TCP port for the server to listen on. -+rmid.syntax.port.badnumber=a porta n\u00e3o \u00e9 um n\u00famero -+ -+# "-port" should not be translated, because it's part of command syntax. -+rmid.syntax.port.missing=a op\u00e7\u00e3o -port requer argumento -+ -+# "-log" should not be translated, because it's part of command syntax. -+rmid.syntax.log.missing=a op\u00e7\u00e3o -log requer argumento -+ -+# "-log" should not be translated, because it's part of command syntax. -+rmid.syntax.log.required=op\u00e7\u00e3o -log necess\u00e1ria -+ -+# {0} = the (string) illegal argument in question -+rmid.syntax.illegal.option=op\u00e7\u00e3o ilegal: {0} -+ -+# {0} = the (string) reason text that came with a thrown exception -+# "Activation.main" should not be translated, because it's a codepoint -+rmid.unexpected.exception=Activation.main: ocorreu uma exce\u00e7\u00e3o: {0} -+ -+# "java.home" should not be translated, because it's a property name -+# "ActivatorImpl" should not be translated, because it's a codepoint -+rmid.unfound.java.home.property=ActivatorImpl: n\u00e3o \u00e9 poss\u00edvel localizar java.home -+ -+# "rmid" should not be translated -+rmid.inherited.channel.info=inicializa\u00e7\u00e3o de rmid com canal legado -+ -+# "Activation.main" should not be translated, because it's a codepoint -+rmid.exec.policy.invalid=Activation.main: classe de pol\u00edtica de execu\u00e7\u00e3o inv\u00e1lida -+ -+# "rmid" should not be translated -+rmid.exec.policy.exception=rmid: a tentativa de obter a pol\u00edtica de execu\u00e7\u00e3o gera: -+ -+# "rmid" should not be translated -+rmid.exec.command=rmid: debugExec: executando "{0}" -+ -+# "rmid" should not be translated -+rmid.group.inactive=rmid: grupo de ativa\u00e7\u00e3o inativo: {0} -+ -+# "Activation.main", "sun.rmi.activation.execPolicy", "ExecPermission" and -+# "ExecOptionPermission" should not be translated, since they refer to -+# class/permission names. -+rmid.exec.perms.inadequate=Activation.main: aviso: propriedade do sistema sun.rmi.activation.execPolicy\nn\u00e3o registrada e nenhuma ExecPermission/ExecOptionPermission\nconcedida; as tentativas de ativa\u00e7\u00e3o seguintes podem falhar devido a verifica\u00e7\u00f5es mal sucedidas da permiss\u00e3o\nExecPermission/ExecOptionPermission. Para obter\ndocumenta\u00e7\u00e3o sobre como configurar a seguran\u00e7a rmid, conculte:\n\nhttp://java.sun.com/j2se/1.4/docs/tooldocs/solaris/rmid.html\nhttp://java.sun.com/j2se/1.4/docs/tooldocs/win32/rmid.html\n -+ -+# "rmid", "-port", "-log", "-stop", "-C" and "-J" should not be translated, -+# because they are syntax -+rmid.usage=Uso: {0} <options>\n\nem que <options> inclui:\n -port <port> especifica a porta que rmid usar\u00e1\n -log <directory> especifica o diret\u00f3rio no qual o rmid grava o registro\n -stop para a chamada atual de rmid (para a porta especificada)\n -C<runtime flag> passa o argumento para cada processo filho (grupo de ativa\u00e7\u00e3o)\n -J<runtime flag> passa o argumento para o int\u00e9rprete de java\n -+# This means "The currently running activation daemon has been shut down, -+# and is about to exit". -+rmid.daemon.shutdown=encerramento do daemon de ativa\u00e7\u00e3o -+ -+# "rmid" should not be translated -+rmid.restart.group.warning=\nrmid: (AVISO) reiniciar grupo gera: -+ -+# "rmid" should not be translated -+rmid.restart.service.warning=\nrmid: (AVISO) reiniciar servi\u00e7o gera: -+ -+# "rmid" should not be translated -+rmid.log.update.warning=\nrmid: (AVISO) registrar atualiza\u00e7\u00e3o gera: -+ -+# "rmid" should not be translated -+rmid.log.snapshot.warning=\nrmid: (GRAVE) registrar instant\u00e2neo gera: -+ -+# "rmid" should not be translated -+rmid.log.recover.warning=\nrmid: (AVISO) {0}: ignorando registro durante a recupera\u00e7\u00e3o: -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/sun/security/util/AuthResources_pt_BR.java ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/sun/security/util/AuthResources_pt_BR.java Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,154 @@ -+/* -+ * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. Oracle designates this -+ * particular file as subject to the "Classpath" exception as provided -+ * by Oracle in the LICENSE file that accompanied this code. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+package sun.security.util; -+ -+/** -+ * <p> This class represents the <code>ResourceBundle</code> -+ * for the following packages: -+ * -+ * <ol> -+ * <li> com.sun.security.auth -+ * <li> com.sun.security.auth.login -+ * </ol> -+ * -+ * @version 1.6, 01/23/01 -+ */ -+public class AuthResources_pt_BR extends java.util.ListResourceBundle { -+ -+ private static final Object[][] contents = { -+ -+ // NT principals -+ {"invalid null input: value", "entrada nula inv\u00e1lida: {0}"}, -+ {"NTDomainPrincipal: name", "NTDomainPrincipal: {0}"}, -+ {"NTNumericCredential: name", "NTNumericCredential: {0}"}, -+ {"Invalid NTSid value", "Valor de NTSid inv\u00e1lido"}, -+ {"NTSid: name", "NTSid: {0}"}, -+ {"NTSidDomainPrincipal: name", "NTSidDomainPrincipal: {0}"}, -+ {"NTSidGroupPrincipal: name", "NTSidGroupPrincipal: {0}"}, -+ {"NTSidPrimaryGroupPrincipal: name", "NTSidPrimaryGroupPrincipal: {0}"}, -+ {"NTSidUserPrincipal: name", "NTSidUserPrincipal: {0}"}, -+ {"NTUserPrincipal: name", "NTUserPrincipal: {0}"}, -+ -+ // UnixPrincipals -+ {"UnixNumericGroupPrincipal [Primary Group]: name", -+ "UnixNumericGroupPrincipal [grupo principal]: {0}"}, -+ {"UnixNumericGroupPrincipal [Supplementary Group]: name", -+ "UnixNumericGroupPrincipal [grupo complement\u00e1rio]: {0}"}, -+ {"UnixNumericUserPrincipal: name", "UnixNumericUserPrincipal: {0}"}, -+ {"UnixPrincipal: name", "UnixPrincipal: {0}"}, -+ -+ // com.sun.security.auth.login.ConfigFile -+ {"Unable to properly expand config", "N\u00e3o \u00e9 poss\u00edvel expandir corretamente {0}"}, -+ {"extra_config (No such file or directory)", -+ "{0} (tal arquivo ou diret\u00f3rio n\u00e3o existe)"}, -+ {"Unable to locate a login configuration", -+ "N\u00e3o \u00e9 poss\u00edvel localizar uma configura\u00e7\u00e3o de logon"}, -+ {"Configuration Error:\n\tInvalid control flag, flag", -+ "Erro de configura\u00e7\u00e3o:\n\tSinalizador de controle inv\u00e1lido, {0}"}, -+ {"Configuration Error:\n\tCan not specify multiple entries for appName", -+ "Erro de configura\u00e7\u00e3o:\n\tN\u00e3o \u00e9 poss\u00edvel especificar v\u00e1rias entradas para {0}"}, -+ {"Configuration Error:\n\texpected [expect], read [end of file]", -+ "Erro de configura\u00e7\u00e3o:\n\tesperado [{0}], lido [fim do arquivo]"}, -+ {"Configuration Error:\n\tLine line: expected [expect], found [value]", -+ "Erro de configura\u00e7\u00e3o:\n\tlinha {0}: esperado [{1}], encontrado [{2}]"}, -+ {"Configuration Error:\n\tLine line: expected [expect]", -+ "Erro de configura\u00e7\u00e3o:\n\tlinha {0}: esperado [{1}]"}, -+ {"Configuration Error:\n\tLine line: system property [value] expanded to empty value", -+ "Erro de configura\u00e7\u00e3o:\n\tlinha {0}: propriedade do sistema [{1}] expandida para valor vazio"}, -+ -+ // com.sun.security.auth.module.JndiLoginModule -+ {"username: ","nome de usu\u00e1rio: "}, -+ {"password: ","senha: "}, -+ -+ // com.sun.security.auth.module.KeyStoreLoginModule -+ {"Please enter keystore information", -+ "Insira as informa\u00e7\u00f5es do armazenamento de chaves"}, -+ {"Keystore alias: ","Alias do armazenamento de chaves: "}, -+ {"Keystore password: ","Senha do armazenamento de chaves: "}, -+ {"Private key password (optional): ", -+ "Senha da chave privada (opcional): "}, -+ -+ // com.sun.security.auth.module.Krb5LoginModule -+ {"Kerberos username [[defUsername]]: ", -+ "Nome de usu\u00e1rio de Kerberos [{0}]: "}, -+ {"Kerberos password for [username]: ", -+ "Senha de Kerberos de {0}: "}, -+ -+ /*** EVERYTHING BELOW IS DEPRECATED ***/ -+ -+ // com.sun.security.auth.PolicyFile -+ {": error parsing ", ": erro ao analisar "}, -+ {": ", ": "}, -+ {": error adding Permission ", ": erro ao adicionar permiss\u00e3o "}, -+ {" ", " "}, -+ {": error adding Entry ", ": erro ao adicionar entrada "}, -+ {"(", "("}, -+ {")", ")"}, -+ {"attempt to add a Permission to a readonly PermissionCollection", -+ "tentativa de adicionar uma permiss\u00e3o ao um PermissionCollection de somente leitura"}, -+ -+ // com.sun.security.auth.PolicyParser -+ {"expected keystore type", "tipo de armazenamento de chaves esperado"}, -+ {"can not specify Principal with a ", -+ "n\u00e3o \u00e9 poss\u00edvel especificar um principal com uma "}, -+ {"wildcard class without a wildcard name", -+ "de coringa sem um nome de coringa"}, -+ {"expected codeBase or SignedBy", "CodeBase ou SignedBy esperado"}, -+ {"only Principal-based grant entries permitted", -+ "somente \u00e9 permitido conceder entradas com base no principal"}, -+ {"expected permission entry", "entrada de permiss\u00e3o esperada"}, -+ {"number ", "n\u00famero "}, -+ {"expected ", "esperado "}, -+ {", read end of file", ", fim de arquivo lido"}, -+ {"expected ';', read end of file", "esperado ';', fim de arquivo lido"}, -+ {"line ", "linha "}, -+ {": expected '", ": esperado '"}, -+ {"', found '", "', encontrado '"}, -+ {"'", "'"}, -+ -+ // SolarisPrincipals -+ {"SolarisNumericGroupPrincipal [Primary Group]: ", -+ "SolarisNumericGroupPrincipal [grupo principal]: "}, -+ {"SolarisNumericGroupPrincipal [Supplementary Group]: ", -+ "SolarisNumericGroupPrincipal [grupo complement\u00e1rio]: "}, -+ {"SolarisNumericUserPrincipal: ", -+ "SolarisNumericUserPrincipal: "}, -+ {"SolarisPrincipal: ", "SolarisPrincipal: "}, -+ {"provided null name", "nome nulo fornecido"} -+ -+ }; -+ -+ /** -+ * Returns the contents of this <code>ResourceBundle</code>. -+ * -+ * <p> -+ * -+ * @return the contents of this <code>ResourceBundle</code>. -+ */ -+ public Object[][] getContents() { -+ return contents; -+ } -+} -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/sun/security/util/Resources_pt_BR.java ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/sun/security/util/Resources_pt_BR.java Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,646 @@ -+/* -+ * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. Oracle designates this -+ * particular file as subject to the "Classpath" exception as provided -+ * by Oracle in the LICENSE file that accompanied this code. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+package sun.security.util; -+ -+/** -+ * <p> This class represents the <code>ResourceBundle</code> -+ * for javax.security.auth and sun.security. -+ * -+ * @version 1.33, 12/06/05 -+ */ -+public class Resources_pt_BR extends java.util.ListResourceBundle { -+ -+ private static final Object[][] contents = { -+ -+ // shared (from jarsigner) -+ {" ", " "}, -+ {" ", " "}, -+ {" ", " "}, -+ {", ", ", "}, -+ // shared (from keytool) -+ {"\n", "\n"}, -+ {"*******************************************", -+ "*******************************************"}, -+ {"*******************************************\n\n", -+ "*******************************************\n\n"}, -+ -+ // keytool -+ {"keytool error: ", "erro de keytool: "}, -+ {"Illegal option: ", "Op\u00e7\u00e3o ilegal: "}, -+ {"Try keytool -help","Tentar keytool -help"}, -+ {"Command option <flag> needs an argument.", "A op\u00e7\u00e3o de comando {0} precisa de um argumento."}, -+ {"Warning: Different store and key passwords not supported for PKCS12 KeyStores. Ignoring user-specified <command> value.", -+ "Aviso: senhas de chave e de armazenamento diferentes n\u00e3o suportadas para KeyStores PKCS12. Ignorando valor {0} especificado pelo usu\u00e1rio."}, -+ {"-keystore must be NONE if -storetype is {0}", -+ "-keystore deve ser NONE se -storetype for {0}"}, -+ {"Too may retries, program terminated", -+ "N\u00famero de tentativas excedido, programa finalizado"}, -+ {"-storepasswd and -keypasswd commands not supported if -storetype is {0}", -+ "comandos -storepasswd e -keypasswd n\u00e3o suportados se -storetype for {0}"}, -+ {"-keypasswd commands not supported if -storetype is PKCS12", -+ "comandos -keypasswd n\u00e3o suportados se -storetype for PKCS12"}, -+ {"-keypass and -new can not be specified if -storetype is {0}", -+ "-keypass e -new n\u00e3o podem ser especificados se -storetype for {0}"}, -+ {"if -protected is specified, then -storepass, -keypass, and -new must not be specified", -+ "se -protected estiver especificado, ent\u00e3o -storepass, -keypass e -new n\u00e3o devem ser especificados"}, -+ {"if -srcprotected is specified, then -srcstorepass and -srckeypass must not be specified", -+ "se -srcprotected estiver especificado, ent\u00e3o -srcstorepass e -srckeypass n\u00e3o devem ser especificados"}, -+ {"if keystore is not password protected, then -storepass, -keypass, and -new must not be specified", -+ "se o armazenamento de chaves n\u00e3o estiver protegido por senha, ent\u00e3o -storepass, -keypass e -new n\u00e3o devem ser especificados"}, -+ {"if source keystore is not password protected, then -srcstorepass and -srckeypass must not be specified", -+ "se o armazenamento de chaves de origem n\u00e3o estiver protegido por senha, ent\u00e3o -srcstorepass e -srckeypass n\u00e3o devem ser especificados"}, -+ {"Validity must be greater than zero", -+ "A validade deve ser maior do que zero"}, -+ {"provName not a provider", "{0} n\u00e3o \u00e9 um fornecedor"}, -+ {"Usage error: no command provided", "Erro de uso: nenhum comando fornecido"}, -+ {"Usage error, <arg> is not a legal command", "Erro de uso, {0} n\u00e3o \u00e9 um comando legal"}, -+ {"Source keystore file exists, but is empty: ", "O arquivo de armazenamento de chaves de origem existe, mas est\u00e1 vazio: "}, -+ {"Please specify -srckeystore", "Especifique -srckeystore"}, -+ {"Must not specify both -v and -rfc with 'list' command", -+ "N\u00e3o devem ser especificados -v e -rfc com o comando 'list'"}, -+ {"Key password must be at least 6 characters", -+ "A senha da chave deve ter como m\u00ednimo 6 caracteres"}, -+ {"New password must be at least 6 characters", -+ "A nova senha deve ter como m\u00ednimo 6 caracteres"}, -+ {"Keystore file exists, but is empty: ", -+ "O arquivo de armazenamento de chaves existe, mas est\u00e1 vazio: "}, -+ {"Keystore file does not exist: ", -+ "O arquivo de armazenamento de chaves n\u00e3o existe. "}, -+ {"Must specify destination alias", "Deve ser especificado um alias de destino"}, -+ {"Must specify alias", "Deve ser especificado um alias"}, -+ {"Keystore password must be at least 6 characters", -+ "A senha do armazenamento de chaves deve ter como m\u00ednimo 6 caracteres"}, -+ {"Enter keystore password: ", "Insira a senha do armazenamento de chaves: "}, -+ {"Enter source keystore password: ", "Insira a senha do armazenamento de chaves de origem: "}, -+ {"Enter destination keystore password: ", "Insira a senha do armazenamento de chaves de destino: "}, -+ {"Keystore password is too short - must be at least 6 characters", -+ "A senha do armazenamento de chaves \u00e9 muito curta - deve ter como m\u00ednimo 6 caracteres"}, -+ {"Unknown Entry Type", "Tipo de entrada desconhecido"}, -+ {"Too many failures. Alias not changed", "Excesso de falhas. Alias n\u00e3o alterado"}, -+ {"Entry for alias <alias> successfully imported.", -+ "Entrada do alias {0} importada com \u00eaxito."}, -+ {"Entry for alias <alias> not imported.", "Entrada do alias {0} n\u00e3o importada."}, -+ {"Problem importing entry for alias <alias>: <exception>.\nEntry for alias <alias> not imported.", -+ "Problema ao importar a entrada do {0}: {1}.\nEntrada do alias {0} n\u00e3o importada."}, -+ {"Import command completed: <ok> entries successfully imported, <fail> entries failed or cancelled", -+ "Comando de importa\u00e7\u00e3o conclu\u00eddo: {0} entradas importadas com \u00eaxito, {1} entradas falhas ou canceladas"}, -+ {"Warning: Overwriting existing alias <alias> in destination keystore", -+ "Aviso: substitui\u00e7\u00e3o de alias {0} existente no armazenamento de chaves de destino"}, -+ {"Existing entry alias <alias> exists, overwrite? [no]: ", -+ "Entrada j\u00e1 existente no alias {0}, substituir? [n\u00e3o]: "}, -+ {"Too many failures - try later", "Excesso de falhas - tentar mais tarde"}, -+ {"Certification request stored in file <filename>", -+ "Solicita\u00e7\u00e3o de certificado armazenada no arquivo <{0}>"}, -+ {"Submit this to your CA", "Enviar \u00e0 CA"}, -+ {"if alias not specified, destalias, srckeypass, and destkeypass must not be specified", -+ "se o alias n\u00e3o estiver especificado, destalias, srckeypass e destkeypass n\u00e3o devem ser especificados"}, -+ {"Certificate stored in file <filename>", -+ "Certificado armazenado no arquivo <{0}>"}, -+ {"Certificate reply was installed in keystore", -+ "Resposta do certificado foi instalada no armazenamento de chaves"}, -+ {"Certificate reply was not installed in keystore", -+ "Resposta do certificado n\u00e3o foi instalada no armazenamento de chaves"}, -+ {"Certificate was added to keystore", -+ "O certificado foi adicionado ao armazenamento de chaves"}, -+ {"Certificate was not added to keystore", -+ "O certificado n\u00e3o foi adicionado ao armazenamento de chaves"}, -+ {"[Storing ksfname]", "[Armazenando {0}]"}, -+ {"alias has no public key (certificate)", -+ "{0} n\u00e3o possui chave p\u00fablica (certificado)"}, -+ {"Cannot derive signature algorithm", -+ "N\u00e3o \u00e9 poss\u00edvel obter algoritmo de assinatura"}, -+ {"Alias <alias> does not exist", -+ "O alias <{0}> n\u00e3o existe"}, -+ {"Alias <alias> has no certificate", -+ "O alias <{0}> n\u00e3o possui certificado"}, -+ {"Key pair not generated, alias <alias> already exists", -+ "Par de chaves n\u00e3o gerado, o alias <{0}> j\u00e1 existe"}, -+ {"Cannot derive signature algorithm", -+ "N\u00e3o \u00e9 poss\u00edvel obter algoritmo de assinatura"}, -+ {"Generating keysize bit keyAlgName key pair and self-signed certificate (sigAlgName) with a validity of validality days\n\tfor: x500Name", -+ "Gerando o par de chaves {1} de {0} bit e o certificado autoassinado ({2}) com uma validade de {3} dias\n\tpara: {4}"}, -+ {"Enter key password for <alias>", "Inserir a senha da chave de <{0}>"}, -+ {"\t(RETURN if same as keystore password): ", -+ "\t(RETURN se for igual \u00e0 senha do armazenamento de chaves): "}, -+ {"Key password is too short - must be at least 6 characters", -+ "A senha da chave \u00e9 muito curta - deve ter como m\u00ednimo 6 caracteres"}, -+ {"Too many failures - key not added to keystore", -+ "Excesso de falhas - chave n\u00e3o adicionada ao armazenamento de chaves"}, -+ {"Destination alias <dest> already exists", -+ "O alias de destino <{0}> j\u00e1 existe"}, -+ {"Password is too short - must be at least 6 characters", -+ "A senha \u00e9 muito curta - deve ter como m\u00ednimo 6 caracteres"}, -+ {"Too many failures. Key entry not cloned", -+ "Excesso de falhas. Entrada da chave n\u00e3o clonada"}, -+ {"key password for <alias>", "senha da chave de <{0}>"}, -+ {"Keystore entry for <id.getName()> already exists", -+ "A entrada do armazenamento de chaves de <{0}> j\u00e1 existe"}, -+ {"Creating keystore entry for <id.getName()> ...", -+ "Criando entrada do armazenamento de chaves para <{0}> ..."}, -+ {"No entries from identity database added", -+ "Nenhuma entrada adicionada do banco de dados de identidades"}, -+ {"Alias name: alias", "Nome do alias: {0}"}, -+ {"Creation date: keyStore.getCreationDate(alias)", -+ "Data de cria\u00e7\u00e3o: {0,data}"}, -+ {"alias, keyStore.getCreationDate(alias), ", -+ "{0}, {1,data}, "}, -+ {"alias, ", "{0}, "}, -+ {"Entry type: <type>", "Tipo de entrada: {0}"}, -+ {"Certificate chain length: ", "Comprimento da cadeia de certificados: "}, -+ {"Certificate[(i + 1)]:", "Certificado[{0,n\u00famero,inteiro}]:"}, -+ {"Certificate fingerprint (MD5): ", "Fingerprint (MD5) do certificado: "}, -+ {"Entry type: trustedCertEntry\n", "Tipo de entrada: trustedCertEntry\n"}, -+ {"trustedCertEntry,", "trustedCertEntry,"}, -+ {"Keystore type: ", "Tipo de armazenamento de chaves: "}, -+ {"Keystore provider: ", "Fornecedor de armazenamento de chaves: "}, -+ {"Your keystore contains keyStore.size() entry", -+ "Seu armazenamento de chaves cont\u00e9m {0,n\u00famero,inteiro} entrada"}, -+ {"Your keystore contains keyStore.size() entries", -+ "Seu armazenamento de chaves cont\u00e9m {0,n\u00famero,inteiro} entradas"}, -+ {"Failed to parse input", "Falha ao analisar a entrada"}, -+ {"Empty input", "Entrada vazia"}, -+ {"Not X.509 certificate", "N\u00e3o \u00e9 um certificado X.509"}, -+ {"Cannot derive signature algorithm", -+ "N\u00e3o \u00e9 poss\u00edvel obter algoritmo de assinatura"}, -+ {"alias has no public key", "{0} n\u00e3o possui chave p\u00fablica"}, -+ {"alias has no X.509 certificate", "{0} n\u00e3o possui certificado X.509"}, -+ {"New certificate (self-signed):", "Novo certificado (autoassinado):"}, -+ {"Reply has no certificates", "A resposta n\u00e3o possui certificado"}, -+ {"Certificate not imported, alias <alias> already exists", -+ "Certificado n\u00e3o importado, o alias <{0}> j\u00e1 existe"}, -+ {"Input not an X.509 certificate", "A entrada n\u00e3o \u00e9 um certificado X.509"}, -+ {"Certificate already exists in keystore under alias <trustalias>", -+ "O certificado j\u00e1 existe no armazenamento de chaves no alias <{0}>"}, -+ {"Do you still want to add it? [no]: ", -+ "Ainda deseja adicion\u00e1-lo? [n\u00e3o]: "}, -+ {"Certificate already exists in system-wide CA keystore under alias <trustalias>", -+ "O certificado j\u00e1 existe no armazenamento de chaves de CA em todo o sistema no alias <{0}>"}, -+ {"Do you still want to add it to your own keystore? [no]: ", -+ "Ainda deseja adicion\u00e1-lo ao seu pr\u00f3prio armazenamento de chaves? [n\u00e3o]: "}, -+ {"Trust this certificate? [no]: ", "Confiar neste certificado? [n\u00e3o]: "}, -+ {"YES", "SIM"}, -+ {"New prompt: ", "Nova {0}: "}, -+ {"Passwords must differ", "As senhas devem ser diferentes"}, -+ {"Re-enter new prompt: ", "Insira novamente a nova {0}: "}, -+ {"Re-enter new password: ", "Insira novamente a nova senha: "}, -+ {"They don't match. Try again", "Elas n\u00e3o correspondem. Tente novamente"}, -+ {"Enter prompt alias name: ", "Insira o nome do alias {0}: "}, -+ {"Enter new alias name\t(RETURN to cancel import for this entry): ", -+ "Insira o novo nome do alias\t(RETURN para cancelar a importa\u00e7\u00e3o desta entrada): "}, -+ {"Enter alias name: ", "Insira o nome do alias: "}, -+ {"\t(RETURN if same as for <otherAlias>)", -+ "\t(RETURN se for igual ao de <{0}>)"}, -+ {"*PATTERN* printX509Cert", -+ "Propriet\u00e1rio: {0}\nEmissor: {1}\nN\u00famero de s\u00e9rie: {2}\nV\u00e1lido de: {3} a: {4}\nFingerprints do certificado:\n\t MD5: {5}\n\t SHA1: {6}\n\t Nome do algoritmo de assinatura: {7}\n\t Vers\u00e3o: {8}"}, -+ {"What is your first and last name?", -+ "Qual \u00e9 o seu nome e o seu sobrenome?"}, -+ {"What is the name of your organizational unit?", -+ "Qual \u00e9 o nome da sua unidade organizacional?"}, -+ {"What is the name of your organization?", -+ "Qual \u00e9 o nome da sua empresa?"}, -+ {"What is the name of your City or Locality?", -+ "Qual \u00e9 o nome da sua cidade ou localidade?"}, -+ {"What is the name of your State or Province?", -+ "Qual \u00e9 o nome do seu estado ou munic\u00edpio?"}, -+ {"What is the two-letter country code for this unit?", -+ "Quais s\u00e3o as duas letras do c\u00f3digo do pa\u00eds desta unidade?"}, -+ {"Is <name> correct?", "{0} \u00e9 correto?"}, -+ {"no", "n\u00e3o"}, -+ {"yes", "sim"}, -+ {"y", "s"}, -+ {" [defaultValue]: ", " [{0}]: "}, -+ {"Alias <alias> has no key", -+ "O alias <{0}> n\u00e3o possui chave"}, -+ {"Alias <alias> references an entry type that is not a private key entry. The -keyclone command only supports cloning of private key entries", -+ "O alias <{0}> faz refer\u00eancia a um tipo de entrada que n\u00e3o \u00e9 uma entrada de chave privada. O comando -keyclone oferece suporte somente \u00e0 clonagem de entradas de chave privada"}, -+ -+ {"***************** WARNING WARNING WARNING *****************", -+ "***************** AVISO AVISO AVISO *****************"}, -+ -+ // Translators of the following 5 pairs, ATTENTION: -+ // the next 5 string pairs are meant to be combined into 2 paragraphs, -+ // 1+3+4 and 2+3+5. make sure your translation also does. -+ {"* The integrity of the information stored in your keystore *", -+ "* A integridade das informa\u00e7\u00f5es armazenadas no seu armazenamento de chaves *"}, -+ {"* The integrity of the information stored in the srckeystore*", -+ "* A integridade das informa\u00e7\u00f5es armazenadas no srckeystore*"}, -+ {"* has NOT been verified! In order to verify its integrity, *", -+ "* N\u00c3O foi verificada! Para verificar a integridade destas informa\u00e7\u00f5es, *"}, -+ {"* you must provide your keystore password. *", -+ "* voc\u00ea deve fornecer a senha do seu armazenamento de chaves. *"}, -+ {"* you must provide the srckeystore password. *", -+ "* voc\u00ea deve fornecer a senha do srckeystore. *"}, -+ -+ -+ {"Certificate reply does not contain public key for <alias>", -+ "A resposta do certificado n\u00e3o cont\u00e9m a chave p\u00fablica de <{0}>"}, -+ {"Incomplete certificate chain in reply", -+ "Cadeia de certificados incompleta na resposta"}, -+ {"Certificate chain in reply does not verify: ", -+ "A cadeia de certificados da resposta n\u00e3o verifica: "}, -+ {"Top-level certificate in reply:\n", -+ "Certificado de n\u00edvel superior na resposta:\n"}, -+ {"... is not trusted. ", "... n\u00e3o \u00e9 confi\u00e1vel. "}, -+ {"Install reply anyway? [no]: ", "Instalar resposta assim mesmo? [n\u00e3o]: "}, -+ {"NO", "N\u00c3O"}, -+ {"Public keys in reply and keystore don't match", -+ "As chaves p\u00fablicas da resposta e do armazenamento de chaves n\u00e3o correspondem"}, -+ {"Certificate reply and certificate in keystore are identical", -+ "O certificado da resposta e o certificado do armazenamento de chaves s\u00e3o id\u00eanticos"}, -+ {"Failed to establish chain from reply", -+ "Falha ao estabelecer a cadeia a partir da resposta"}, -+ {"n", "n"}, -+ {"Wrong answer, try again", "Resposta errada, tente novamente"}, -+ {"Secret key not generated, alias <alias> already exists", -+ "Chave secreta n\u00e3o gerada, o alias <{0}> j\u00e1 existe"}, -+ {"Please provide -keysize for secret key generation", -+ "Forne\u00e7a o -keysize para a gera\u00e7\u00e3o da chave secreta"}, -+ {"keytool usage:\n", "uso de keytool:\n"}, -+ -+ {"Extensions: ", "Extens\u00f5es: "}, -+ -+ {"-certreq [-v] [-protected]", -+ "-certreq [-v] [-protected]"}, -+ {"\t [-alias <alias>] [-sigalg <sigalg>]", -+ "\t [-alias <alias>] [-sigalg <sigalg>]"}, -+ {"\t [-file <csr_file>] [-keypass <keypass>]", -+ "\t [-file <csr_file>] [-keypass <keypass>]"}, -+ {"\t [-keystore <keystore>] [-storepass <storepass>]", -+ "\t [-keystore <keystore>] [-storepass <storepass>]"}, -+ {"\t [-storetype <storetype>] [-providername <name>]", -+ "\t [-storetype <storetype>] [-providername <name>]"}, -+ {"\t [-providerclass <provider_class_name> [-providerarg <arg>]] ...", -+ "\t [-providerclass <provider_class_name> [-providerarg <arg>]] ..."}, -+ {"\t [-providerpath <pathlist>]", -+ "\t [-providerpath <pathlist>]"}, -+ {"-delete [-v] [-protected] -alias <alias>", -+ "-delete [-v] [-protected] -alias <alias>"}, -+ /** rest is same as -certreq starting from -keystore **/ -+ -+ //{"-export [-v] [-rfc] [-protected]", -+ // "-export [-v] [-rfc] [-protected]"}, -+ {"-exportcert [-v] [-rfc] [-protected]", -+ "-exportcert [-v] [-rfc] [-protected]"}, -+ {"\t [-alias <alias>] [-file <cert_file>]", -+ "\t [-alias <alias>] [-file <cert_file>]"}, -+ /** rest is same as -certreq starting from -keystore **/ -+ -+ //{"-genkey [-v] [-protected]", -+ // "-genkey [-v] [-protected]"}, -+ {"-genkeypair [-v] [-protected]", -+ "-genkeypair [-v] [-protected]"}, -+ {"\t [-alias <alias>]", "\t [-alias <alias>]"}, -+ {"\t [-keyalg <keyalg>] [-keysize <keysize>]", -+ "\t [-keyalg <keyalg>] [-keysize <keysize>]"}, -+ {"\t [-sigalg <sigalg>] [-dname <dname>]", -+ "\t [-sigalg <sigalg>] [-dname <dname>]"}, -+ {"\t [-validity <valDays>] [-keypass <keypass>]", -+ "\t [-validity <valDays>] [-keypass <keypass>]"}, -+ /** rest is same as -certreq starting from -keystore **/ -+ -+ {"-genseckey [-v] [-protected]", -+ "-genseckey [-v] [-protected]"}, -+ /** rest is same as -certreq starting from -keystore **/ -+ -+ {"-help", "-help"}, -+ //{"-identitydb [-v] [-protected]", -+ // "-identitydb [-v] [-protected]"}, -+ //{"\t [-file <idb_file>]", "\t [-file <idb_file>]"}, -+ /** rest is same as -certreq starting from -keystore **/ -+ -+ //{"-import [-v] [-noprompt] [-trustcacerts] [-protected]", -+ // "-import [-v] [-noprompt] [-trustcacerts] [-protected]"}, -+ {"-importcert [-v] [-noprompt] [-trustcacerts] [-protected]", -+ "-importcert [-v] [-noprompt] [-trustcacerts] [-protected]"}, -+ {"\t [-alias <alias>]", "\t [-alias <alias>]"}, -+ {"\t [-alias <alias>] [-keypass <keypass>]", -+ "\t [-alias <alias>] [-keypass <keypass>]"}, -+ {"\t [-file <cert_file>] [-keypass <keypass>]", -+ "\t [-file <cert_file>] [-keypass <keypass>]"}, -+ /** rest is same as -certreq starting from -keystore **/ -+ -+ {"-importkeystore [-v] ", -+ "-importkeystore [-v] "}, -+ {"\t [-srckeystore <srckeystore>] [-destkeystore <destkeystore>]", -+ "\t [-srckeystore <srckeystore>] [-destkeystore <destkeystore>]"}, -+ {"\t [-srcstoretype <srcstoretype>] [-deststoretype <deststoretype>]", -+ "\t [-srcstoretype <srcstoretype>] [-deststoretype <deststoretype>]"}, -+ {"\t [-srcprotected] [-destprotected]", -+ "\t [-srcprotected] [-destprotected]"}, -+ {"\t [-srcstorepass <srcstorepass>] [-deststorepass <deststorepass>]", -+ "\t [-srcstorepass <srcstorepass>] [-deststorepass <deststorepass>]"}, -+ {"\t [-srcprovidername <srcprovidername>]\n\t [-destprovidername <destprovidername>]", // line too long, split to 2 -+ "\t [-srcprovidername <srcprovidername>]\n\t [-destprovidername <destprovidername>]"}, -+ {"\t [-srcalias <srcalias> [-destalias <destalias>]", -+ "\t [-srcalias <srcalias> [-destalias <destalias>]"}, -+ {"\t [-srckeypass <srckeypass>] [-destkeypass <destkeypass>]]", -+ "\t [-srckeypass <srckeypass>] [-destkeypass <destkeypass>]]"}, -+ {"\t [-noprompt]", "\t [-noprompt]"}, -+ /** rest is same as -certreq starting from -keystore **/ -+ -+ {"-changealias [-v] [-protected] -alias <alias> -destalias <destalias>", -+ "-changealias [-v] [-protected] -alias <alias> -destalias <destalias>"}, -+ {"\t [-keypass <keypass>]", "\t [-keypass <keypass>]"}, -+ -+ //{"-keyclone [-v] [-protected]", -+ // "-keyclone [-v] [-protected]"}, -+ //{"\t [-alias <alias>] -dest <dest_alias>", -+ // "\t [-alias <alias>] -dest <dest_alias>"}, -+ //{"\t [-keypass <keypass>] [-new <new_keypass>]", -+ // "\t [-keypass <keypass>] [-new <new_keypass>]"}, -+ /** rest is same as -certreq starting from -keystore **/ -+ -+ {"-keypasswd [-v] [-alias <alias>]", -+ "-keypasswd [-v] [-alias <alias>]"}, -+ {"\t [-keypass <old_keypass>] [-new <new_keypass>]", -+ "\t [-keypass <old_keypass>] [-new <new_keypass>]"}, -+ /** rest is same as -certreq starting from -keystore **/ -+ -+ {"-list [-v | -rfc] [-protected]", -+ "-list [-v | -rfc] [-protected]"}, -+ {"\t [-alias <alias>]", "\t [-alias <alias>]"}, -+ /** rest is same as -certreq starting from -keystore **/ -+ -+ {"-printcert [-v] [-file <cert_file>]", -+ "-printcert [-v] [-file <cert_file>]"}, -+ -+ //{"-selfcert [-v] [-protected]", -+ // "-selfcert [-v] [-protected]"}, -+ {"\t [-alias <alias>]", "\t [-alias <alias>]"}, -+ //{"\t [-dname <dname>] [-validity <valDays>]", -+ // "\t [-dname <dname>] [-validity <valDays>]"}, -+ //{"\t [-keypass <keypass>] [-sigalg <sigalg>]", -+ // "\t [-keypass <keypass>] [-sigalg <sigalg>]"}, -+ /** rest is same as -certreq starting from -keystore **/ -+ -+ {"-storepasswd [-v] [-new <new_storepass>]", -+ "-storepasswd [-v] [-new <new_storepass>]"}, -+ /** rest is same as -certreq starting from -keystore **/ -+ -+ // policytool -+ {"Warning: A public key for alias 'signers[i]' does not exist. Make sure a KeyStore is properly configured.", -+ "Aviso: n\u00e3o existe uma chave p\u00fablica para o alias {0}. Certifique-se de que um KeyStore esteja configurado adequadamente."}, -+ {"Warning: Class not found: class", "Aviso: classe n\u00e3o encontrada: {0}"}, -+ {"Warning: Invalid argument(s) for constructor: arg", -+ "Aviso: argumento(s) inv\u00e1lido(s) para o construtor: {0}"}, -+ {"Illegal Principal Type: type", "Tipo principal ilegal: {0}"}, -+ {"Illegal option: option", "Op\u00e7\u00e3o ilegal: {0}"}, -+ {"Usage: policytool [options]", "Uso: policytool [op\u00e7\u00f5es]"}, -+ {" [-file <file>] policy file location", -+ " [-file <file>] local do arquivo de pol\u00edtica"}, -+ {"New", "Novo"}, -+ {"Open", "Abrir"}, -+ {"Save", "Salvar"}, -+ {"Save As", "Salvar como"}, -+ {"View Warning Log", "Visualizar registro de avisos"}, -+ {"Exit", "Sair"}, -+ {"Add Policy Entry", "Adicionar entrada de pol\u00edtica"}, -+ {"Edit Policy Entry", "Editar entrada de pol\u00edtica"}, -+ {"Remove Policy Entry", "Remover entrada de pol\u00edtica"}, -+ {"Edit", "Editar"}, -+ {"Retain", "Conservar"}, -+ -+ {"Warning: File name may include escaped backslash characters. " + -+ "It is not necessary to escape backslash characters " + -+ "(the tool escapes characters as necessary when writing " + -+ "the policy contents to the persistent store).\n\n" + -+ "Click on Retain to retain the entered name, or click on " + -+ "Edit to edit the name.", -+ "Aviso: o nome do arquivo pode incluir caracteres de escape barra invertida. N\u00e3o \u00e9 necess\u00e1rio fazer o escape dos caracteres de barra invertida (a ferramenta faz o escape dos caracteres conforme necess\u00e1rio ao gravar o conte\u00fado da pol\u00edtica no armazenamento persistente).\n\nClique em Conservar para conservar o nome da entrada ou clique em Editar para edit\u00e1-lo."}, -+ -+ {"Add Public Key Alias", "Adicionar alias de chave p\u00fablica"}, -+ {"Remove Public Key Alias", "Remover alias de chave p\u00fablica"}, -+ {"File", "Arquivo"}, -+ {"KeyStore", "KeyStore"}, -+ {"Policy File:", "Arquivo de pol\u00edtica:"}, -+ {"Could not open policy file: policyFile: e.toString()", -+ "N\u00e3o foi poss\u00edvel abrir o arquivo de pol\u00edtica: {0}: {1}"}, -+ {"Policy Tool", "Ferramenta de pol\u00edtica"}, -+ {"Errors have occurred while opening the policy configuration. View the Warning Log for more information.", -+ "Ocorreram erros ao abrir a configura\u00e7\u00e3o da pol\u00edtica. Consulte o registro de avisos para obter mais informa\u00e7\u00f5es."}, -+ {"Error", "Erro"}, -+ {"OK", "OK"}, -+ {"Status", "Status"}, -+ {"Warning", "Aviso"}, -+ {"Permission: ", -+ "Permiss\u00e3o: "}, -+ {"Principal Type:", "Tipo do principal:"}, -+ {"Principal Name:", "Nome do principal:"}, -+ {"Target Name: ", -+ "Nome de destino: "}, -+ {"Actions: ", -+ "A\u00e7\u00f5es: "}, -+ {"OK to overwrite existing file filename?", -+ "OK para substituir o arquivo existente {0}?"}, -+ {"Cancel", "Cancelar"}, -+ {"CodeBase:", "CodeBase:"}, -+ {"SignedBy:", "SignedBy:"}, -+ {"Add Principal", "Adicionar principal"}, -+ {"Edit Principal", "Editar principal"}, -+ {"Remove Principal", "Remover principal"}, -+ {"Principals:", "Principais:"}, -+ {" Add Permission", " Adicionar permiss\u00e3o"}, -+ {" Edit Permission", " Editar permiss\u00e3o"}, -+ {"Remove Permission", "Remover permiss\u00e3o"}, -+ {"Done", "Conclu\u00eddo"}, -+ {"KeyStore URL:", "URL do KeyStore:"}, -+ {"KeyStore Type:", "Tipo de KeyStore:"}, -+ {"KeyStore Provider:", "Fornecedor de KeyStore:"}, -+ {"KeyStore Password URL:", "URL da senha do KeyStore:"}, -+ {"Principals", "Principais"}, -+ {" Edit Principal:", " Editar principal:"}, -+ {" Add New Principal:", " Adicionar novo principal:"}, -+ {"Permissions", "Permiss\u00f5es"}, -+ {" Edit Permission:", " Editar permiss\u00e3o:"}, -+ {" Add New Permission:", " Adicionar nova permiss\u00e3o:"}, -+ {"Signed By:", "Assinado por:"}, -+ {"Cannot Specify Principal with a Wildcard Class without a Wildcard Name", -+ "N\u00e3o \u00e9 poss\u00edvel especificar principal com uma classe de coringa sem um nome de coringa"}, -+ {"Cannot Specify Principal without a Name", -+ "N\u00e3o \u00e9 poss\u00edvel especificar principal sem um nome"}, -+ {"Permission and Target Name must have a value", -+ "O nome de destino e a permiss\u00e3o devem ter um valor"}, -+ {"Remove this Policy Entry?", "Remover esta entrada de pol\u00edtica?"}, -+ {"Overwrite File", "Substituir arquivo"}, -+ {"Policy successfully written to filename", -+ "Pol\u00edtica gravada com \u00eaxito em {0}"}, -+ {"null filename", "nome de arquivo nulo"}, -+ {"Save changes?", "Salvar altera\u00e7\u00f5es?"}, -+ {"Yes", "Sim"}, -+ {"No", "N\u00e3o"}, -+ {"Policy Entry", "Entrada de pol\u00edtica"}, -+ {"Save Changes", "Salvar altera\u00e7\u00f5es"}, -+ {"No Policy Entry selected", "Nenhuma entrada de pol\u00edtica selecionada"}, -+ {"Unable to open KeyStore: ex.toString()", -+ "N\u00e3o \u00e9 poss\u00edvel abrir o KeyStore: {0}"}, -+ {"No principal selected", "Nenhum principal selecionado"}, -+ {"No permission selected", "Nenhuma permiss\u00e3o selecionada"}, -+ {"name", "nome"}, -+ {"configuration type", "tipo de configura\u00e7\u00e3o"}, -+ {"environment variable name", "nome da vari\u00e1vel de ambiente"}, -+ {"library name", "nome da biblioteca"}, -+ {"package name", "nome do pacote"}, -+ {"policy type", "tipo de pol\u00edtica"}, -+ {"property name", "nome da propriedade"}, -+ {"provider name", "nome do fornecedor"}, -+ {"Principal List", "Lista de principais"}, -+ {"Permission List", "Lista de permiss\u00f5es"}, -+ {"Code Base", "Base de c\u00f3digo"}, -+ {"KeyStore U R L:", "U R L do KeyStore:"}, -+ {"KeyStore Password U R L:", "U R L da senha do KeyStore:"}, -+ -+ -+ // javax.security.auth.PrivateCredentialPermission -+ {"invalid null input(s)", "entrada(s) nula(s) inv\u00e1lida(s)"}, -+ {"actions can only be 'read'", "as a\u00e7\u00f5es podem ser somente 'lidas'"}, -+ {"permission name [name] syntax invalid: ", -+ "sintaxe inv\u00e1lida do nome da permiss\u00e3o [{0}]: "}, -+ {"Credential Class not followed by a Principal Class and Name", -+ "Classe da credencial n\u00e3o seguida por um nome e classe do principal"}, -+ {"Principal Class not followed by a Principal Name", -+ "Classe do principal n\u00e3o seguida por um nome do principal"}, -+ {"Principal Name must be surrounded by quotes", -+ "O nome do principal deve estar entre aspas"}, -+ {"Principal Name missing end quote", -+ "Faltam as aspas finais no nome do principal "}, -+ {"PrivateCredentialPermission Principal Class can not be a wildcard (*) value if Principal Name is not a wildcard (*) value", -+ "A classe do principal PrivateCredentialPermission n\u00e3o pode ser um valor coringa (*) se o nome do principal n\u00e3o for um valor coringa (*)"}, -+ {"CredOwner:\n\tPrincipal Class = class\n\tPrincipal Name = name", -+ "CredOwner:\n\tClasse do principal = {0}\n\tNome do principal = {1}"}, -+ -+ // javax.security.auth.x500 -+ {"provided null name", "nome nulo fornecido"}, -+ {"provided null keyword map", "mapa de palavra-chave nulo fornecido"}, -+ {"provided null OID map", "mapa OID nulo fornecido"}, -+ -+ // javax.security.auth.Subject -+ {"invalid null AccessControlContext provided", -+ "AccessControlContext nulo inv\u00e1lido fornecido"}, -+ {"invalid null action provided", "a\u00e7\u00e3o nula inv\u00e1lida fornecida"}, -+ {"invalid null Class provided", "classe nula inv\u00e1lida fornecida"}, -+ {"Subject:\n", "Subject:\n"}, -+ {"\tPrincipal: ", "\tPrincipal: "}, -+ {"\tPublic Credential: ", "\tCredencial p\u00fablica: "}, -+ {"\tPrivate Credentials inaccessible\n", -+ "\tCredenciais privadas inacess\u00edveis\n"}, -+ {"\tPrivate Credential: ", "\tCredencial privada: "}, -+ {"\tPrivate Credential inaccessible\n", -+ "\tCredencial privada inacess\u00edvel\n"}, -+ {"Subject is read-only", "O Subject \u00e9 de somente leitura"}, -+ {"attempting to add an object which is not an instance of java.security.Principal to a Subject's Principal Set", -+ "tentativa de adicionar um objeto que n\u00e3o \u00e9 uma inst\u00e2ncia de java.security.Principal a um conjunto de principais do Subject"}, -+ {"attempting to add an object which is not an instance of class", -+ "tentativa de adicionar um objeto que n\u00e3o \u00e9 uma inst\u00e2ncia de {0}"}, -+ -+ // javax.security.auth.login.AppConfigurationEntry -+ {"LoginModuleControlFlag: ", "LoginModuleControlFlag: "}, -+ -+ // javax.security.auth.login.LoginContext -+ {"Invalid null input: name", "Entrada nula inv\u00e1lida: nome"}, -+ {"No LoginModules configured for name", -+ "Nenhum LoginModule configurado para {0}"}, -+ {"invalid null Subject provided", "Subject nulo inv\u00e1lido fornecido"}, -+ {"invalid null CallbackHandler provided", -+ "CallbackHandler nulo inv\u00e1lido fornecido"}, -+ {"null subject - logout called before login", -+ "Subject nulo - logoff chamado antes do logon"}, -+ {"unable to instantiate LoginModule, module, because it does not provide a no-argument constructor", -+ "n\u00e3o \u00e9 poss\u00edvel instanciar LoginModule, {0}, porque n\u00e3o fornece um construtor sem argumento"}, -+ {"unable to instantiate LoginModule", -+ "n\u00e3o \u00e9 poss\u00edvel instanciar LoginModule"}, -+ {"unable to instantiate LoginModule: ", -+ "n\u00e3o \u00e9 poss\u00edvel instanciar LoginModule: "}, -+ {"unable to find LoginModule class: ", -+ "n\u00e3o \u00e9 poss\u00edvel localizar a classe LoginModule: "}, -+ {"unable to access LoginModule: ", -+ "n\u00e3o \u00e9 poss\u00edvel acessar LoginModule: "}, -+ {"Login Failure: all modules ignored", -+ "Falha de logon: todos os m\u00f3dulos ignorados"}, -+ -+ // sun.security.provider.PolicyFile -+ -+ {"java.security.policy: error parsing policy:\n\tmessage", -+ "java.security.policy: erro ao analisar {0}:\n\t{1}"}, -+ {"java.security.policy: error adding Permission, perm:\n\tmessage", -+ "java.security.policy: erro ao adicionar permiss\u00e3o, {0}:\n\t{1}"}, -+ {"java.security.policy: error adding Entry:\n\tmessage", -+ "java.security.policy: erro ao adicionar entrada:\n\t{0}"}, -+ {"alias name not provided (pe.name)", "nome de alias n\u00e3o fornecido ({0})"}, -+ {"unable to perform substitution on alias, suffix", -+ "n\u00e3o \u00e9 poss\u00edvel realizar a substitui\u00e7\u00e3o no alias, {0}"}, -+ {"substitution value, prefix, unsupported", -+ "valor da substitui\u00e7\u00e3o, {0}, n\u00e3o suportado"}, -+ {"(", "("}, -+ {")", ")"}, -+ {"type can't be null","o tipo n\u00e3o pode ser nulo"}, -+ -+ // sun.security.provider.PolicyParser -+ {"keystorePasswordURL can not be specified without also specifying keystore", -+ "keystorePasswordURL n\u00e3o pode ser especificado sem que o armazenamento de chaves tamb\u00e9m seja especificado"}, -+ {"expected keystore type", "tipo de armazenamento de chaves esperado"}, -+ {"expected keystore provider", "fornecedor de armazenamento de chaves esperado"}, -+ {"multiple Codebase expressions", -+ "v\u00e1rias express\u00f5es CodeBase"}, -+ {"multiple SignedBy expressions","v\u00e1rias express\u00f5es SignedBy"}, -+ {"SignedBy has empty alias","SignedBy possui alias vazio"}, -+ {"can not specify Principal with a wildcard class without a wildcard name", -+ "n\u00e3o \u00e9 poss\u00edvel especificar principal com uma classe de coringa sem um nome de coringa"}, -+ {"expected codeBase or SignedBy or Principal", -+ "CodeBase ou SignedBy ou Principal esperado"}, -+ {"expected permission entry", "entrada de permiss\u00e3o esperada"}, -+ {"number ", "n\u00famero "}, -+ {"expected [expect], read [end of file]", -+ "esperado [{0}], lido [fim do arquivo]"}, -+ {"expected [;], read [end of file]", -+ "esperado [;], lido [fim do arquivo]"}, -+ {"line number: msg", "linha {0}: {1}"}, -+ {"line number: expected [expect], found [actual]", -+ "linha {0}: esperado [{1}], encontrado [{2}]"}, -+ {"null principalClass or principalName", -+ "principalClass ou principalName nulo "}, -+ -+ // sun.security.pkcs11.SunPKCS11 -+ {"PKCS11 Token [providerName] Password: ", -+ "Senha PKCS11 Token [{0}]: "}, -+ -+ /* --- DEPRECATED --- */ -+ // javax.security.auth.Policy -+ {"unable to instantiate Subject-based policy", -+ "n\u00e3o \u00e9 poss\u00edvel instanciar a pol\u00edtica com base em Subject"} -+ }; -+ -+ -+ /** -+ * Returns the contents of this <code>ResourceBundle</code>. -+ * -+ * <p> -+ * -+ * @return the contents of this <code>ResourceBundle</code>. -+ */ -+ public Object[][] getContents() { -+ return contents; -+ } -+} -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,47 @@ -+# -+# Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# -+ -+error.cant.open=n\u00e3o \u00e9 poss\u00edvel abrir: {0} -+error.illegal.option=Op\u00e7\u00e3o ilegal: {0} -+error.bad.option=Uma das op\u00e7\u00f5es -{ctxu} deve ser especificada. -+error.bad.cflag=sinalizador 'c' requer que os arquivos de manifesto ou entrada sejam especificados! -+error.bad.uflag=sinalizador 'u' requer os arquivos de manifesto, o sinalizador 'e' ou os arquivos de entrada sejam especificados! -+error.bad.eflag=sinalizador 'e' manifesto com o atributo 'Main-Class' n\u00e3o podem ser especificados \njuntos! -+error.nosuch.fileordir={0} : n\u00e3o h\u00e1 tal arquivo ou diret\u00f3rio -+error.write.file=Erro ao gravar o arquivo jar existente -+error.create.dir={0} : n\u00e3o foi poss\u00edvel gravar o diret\u00f3rio -+error.incorrect.length=largura incorreta durante processamento: {0} -+out.added.manifest=manifesto adicionado -+out.update.manifest=manifesto atualizado -+out.ignore.entry=ignorando entrada {0} -+out.adding=adicionando: {0} -+out.deflated=(vazio {0}%) -+out.stored=(armazenado 0%) -+out.create=\ \ criando: {0} -+out.extracted=extra\u00eddo: {0} -+out.inflated=\ \cheio: {0} -+out.size=(dento = {0}) (fora= {1}) -+ -+usage=Uso: arquivos jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] ...\nOp\u00e7\u00f5es:\n\ \ -c cria novo arquivo de armazenamento\n\ \ -t lista o sum\u00e1rio do arquivo de armazenamento\n\ \ -x extrai arquivos nomeados (ou todos) do arquivo de armazenamento\n\ \ -u atualizar o arquivo de armazenamento existente\n\ \ -v gera sa\u00edda detalhada na sa\u00edda padr\u00e3o\n\ \ -f especifica o nome do arquivo do arquivo de armazenamento\n\ \ -m inclui as informa\u00e7\u00f5es do manifesto do arquivo de manifesto especificado\n\ \ -e especifica o ponto de entrada do aplicativo para aplicativo independente \n\ \ empacotando em um arquivo jar execut\u00e1vel\n\ \ -0 armazena somente; n\u00e3o usa compacta\u00e7\u00e3o ZIP\n\ \ -M n\u00e3o cria um arquivo de manifesto para as entradas\n\ \ -i gera informa\u00e7\u00f5es de \u00edndice para os arquivos especificados\n\ \ -C altera para o diret\u00f3rio e inclui o arquivo seguinte\nSe nenhum arquivo for um diret\u00f3rio, ent\u00e3o \u00e9 processado repetidamente.\nO nome do arquivo de manifesto, o nome do arquivo de armazenamento e o nome do ponto de entrada s\u00e3o\nespecificados na mesma ordem dos sinalizadores 'm', 'f' e 'e'.\n\nExemplo 1: para arquivar dois arquivos de classe em um arquivo de armazenamento denominado classes.jar: \n\ \ jar cvf classes.jar Foo.class Bar.class \nExemplo 2: use um arquivo de manifesto existente 'mymanifest' e arquive todos os\n\ \ arquivos no diret\u00f3rio foo/ na 'classes.jar': \n\ \ jar cvfm classes.jar mymanifest -C foo/ .\n -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/sun/util/logging/resources/logging_pt_BR.properties ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,37 @@ -+# -+# Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved. -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# -+ -+# Localizations for Level names. For the US locale -+# these are the same as the non-localized level name. -+ALL=TODOS -+SEVERE=GRAVE -+WARNING=AVISO -+INFO=INFO -+CONFIG= CONFIG -+FINE=BOM -+FINER=MUITO BOM -+FINEST=EXCELENTE -+OFF=OFF -+ -diff -r b357910aa04a -r e3ecd9555ff0 src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,860 @@ -+/* -+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+ * published by the Free Software Foundation. Oracle designates this -+ * particular file as subject to the "Classpath" exception as provided -+ * by Oracle in the LICENSE file that accompanied this code. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ * version 2 for more details (a copy is included in the LICENSE file that -+ * accompanied this code). -+ * -+ * You should have received a copy of the GNU General Public License version -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+ * or visit www.oracle.com if you need additional information or have any -+ * questions. -+ */ -+ -+/* -+ * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved -+ * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved -+ * -+ * The original version of this source code and documentation -+ * is copyrighted and owned by Taligent, Inc., a wholly-owned -+ * subsidiary of IBM. These materials are provided under terms -+ * of a License Agreement between Taligent and Sun. This technology -+ * is protected by multiple US and International patents. -+ * -+ * This notice and attribution to Taligent may not be removed. -+ * Taligent is a registered trademark of Taligent, Inc. -+ * -+ */ -+ -+package sun.util.resources; -+ -+public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle { -+ -+ protected final Object[][] getContents() { -+ String ACT[] = new String[] {"Fuso hor\u00e1rio do Acre", "ACT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Acre", "ACST"}; -+ String ADELAIDE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Austr\u00e1lia do Sul)", "CST", -+ "Fuso hor\u00e1rio de ver\u00e3o central (Austr\u00e1lia do Sul)", "CST"}; -+ String AGT[] = new String[] {"Fuso hor\u00e1rio da Argentina", "ART", -+ "Fuso hor\u00e1rio de ver\u00e3o da Argentina", "ARST"}; -+ String AKST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Alaska", "AKST", -+ "Hor\u00e1rio de luz natural do Alaska", "AKDT"}; -+ String AMT[] = new String[] {"Fuso hor\u00e1rio do Amazonas", "AMT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Amazonas", "AMST"}; -+ String ARAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da Ar\u00e1bia", "AST", -+ "Hor\u00e1rio de luz natural da Ar\u00e1bia", "ADT"}; -+ String ARMT[] = new String[] {"Fuso hor\u00e1rio da Arm\u00eania", "AMT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Arm\u00eania", "AMST"}; -+ String AST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Atl\u00e2ntico", "AST", -+ "Hor\u00e1rio de luz natural do Atl\u00e2ntico", "ADT"}; -+ String BDT[] = new String[] {"Fuso hor\u00e1rio de Bangladesh", "BDT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Bangladesh", "BDST"}; -+ String BRISBANE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Queensland)", "EST", -+ "Fuso hor\u00e1rio de ver\u00e3o oriental (Queensland)", "EST"}; -+ String BROKEN_HILL[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Austr\u00e1lia do Sul/Nova Gales do Sul)", "CST", -+ "Fuso hor\u00e1rio de ver\u00e3o central (Austr\u00e1lia do Sul/Nova Gales do Sul)", "CST"}; -+ String BRT[] = new String[] {"Fuso hor\u00e1rio de Bras\u00edlia", "BRT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Bras\u00edlia", "BRST"}; -+ String BTT[] = new String[] {"Fuso hor\u00e1rio de But\u00e3o", "BTT", -+ "Fuso hor\u00e1rio de ver\u00e3o de But\u00e3o", "BTST"}; -+ String CAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Central", "CAT", -+ "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica Central", "CAST"}; -+ String CET[] = new String[] {"Fuso hor\u00e1rio da Europa Central", "CET", -+ "Fuso hor\u00e1rio de ver\u00e3o da Europa Central", "CEST"}; -+ String CHAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chatham", "CHAST", -+ "Hor\u00e1rio de luz natural de Chatham", "CHADT"}; -+ String CIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Central", "CIT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Central", "CIST"}; -+ String CLT[] = new String[] {"Fuso hor\u00e1rio do Chile", "CLT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Chile", "CLST"}; -+ String CST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central", "CST", -+ "Hor\u00e1rio de luz natural central", "CDT"}; -+ String CTT[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da China", "CST", -+ "Hor\u00e1rio de luz natural da China", "CDT"}; -+ String CUBA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Cuba", "CST", -+ "Hor\u00e1rio de luz natural de Cuba", "CDT"}; -+ String DARWIN[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Territ\u00f3rio do Norte)", "CST", -+ "Fuso hor\u00e1rio de ver\u00e3o central (Territ\u00f3rio do Norte)", "CST"}; -+ String DUBLIN[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Irlanda", "IST"}; -+ String EAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Oriental", "EAT", -+ "Fuso hor\u00e1rio padr\u00e3o da \u00c1frica Oriental", "EAST"}; -+ String EASTER[] = new String[] {"Fuso hor\u00e1rio da Ilha de P\u00e1scoa", "EAST", -+ "Fuso hor\u00e1rio de ver\u00e3o da Ilha de P\u00e1scoa", "EASST"}; -+ String EET[] = new String[] {"Fuso hor\u00e1rio da Europa Oriental", "EET", -+ "Fuso hor\u00e1rio de ver\u00e3o da Europa Oriental", "EEST"}; -+ String EGT[] = new String[] {"Fuso hor\u00e1rio da Groenl\u00e2ndia Oriental", "EGT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Groenl\u00e2ndia Oriental", "EGST"}; -+ String EST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental", "EST", -+ "Hor\u00e1rio de luz natural oriental", "EDT"}; -+ String EST_NSW[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Nova Gales do Sul)", "EST", -+ "Fuso hor\u00e1rio de ver\u00e3o oriental (Nova Gales do Sul)", "EST"}; -+ String GHMT[] = new String[] {"Fuso hor\u00e1rio do meridiano de Gana", "GMT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Gana", "GHST"}; -+ String GAMBIER[] = new String[] {"Fuso hor\u00e1rio de Gambier", "GAMT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Gambier", "GAMST"}; -+ String GMT[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT", -+ "Fuso hor\u00e1rio do meridiano de Greenwich", "GMT"}; -+ String GMTBST[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Gr\u00e3-Bretanha", "BST"}; -+ String GST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do golfo", "GST", -+ "Hor\u00e1rio de luz natural do golfo", "GDT"}; -+ String HAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Hava\u00ed-Aleutian", "HAST", -+ "Hor\u00e1rio de luz natural do Hava\u00ed-Aleutian", "HADT"}; -+ String HKT[] = new String[] {"Fuso hor\u00e1rio de Hong Kong", "HKT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Hong Kong", "HKST"}; -+ String HST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Hava\u00ed", "HST", -+ "Hor\u00e1rio de luz natural do Hava\u00ed", "HDT"}; -+ String ICT[] = new String[] {"Fuso hor\u00e1rio da Indochina", "ICT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Indochina", "ICST"}; -+ String IRT[] = new String[] {"Fuso hor\u00e1rio do Ir\u00e3", "IRST", -+ "Hor\u00e1rio de luz natural do Ir\u00e3", "IRDT"}; -+ String ISRAEL[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Israel", "IST", -+ "Hor\u00e1rio de luz natural de Israel", "IDT"}; -+ String IST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da \u00cdndia", "IST", -+ "Hor\u00e1rio de luz natural da \u00cdndia", "IDT"}; -+ String JST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Jap\u00e3o", "JST", -+ "Hor\u00e1rio de luz natural do Jap\u00e3o", "JDT"}; -+ String KST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da Coreia", "KST", -+ "Hor\u00e1rio de luz natural da Coreia", "KDT"}; -+ String LORD_HOWE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Lord Howe", "LHST", -+ "Fuso hor\u00e1rio de ver\u00e3o de Lord Howe", "LHST"}; -+ String MHT[] = new String[] {"Fuso hor\u00e1rio das Ilhas Marshall", "MHT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Marshall", "MHST"}; -+ String MSK[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Moscou", "MSK", -+ "Hor\u00e1rio de luz natural de Moscou", "MSD"}; -+ String MST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o das montanhas", "MST", -+ "Hor\u00e1rio de luz natural das montanhas", "MDT"}; -+ String MYT[] = new String[] {"Fuso hor\u00e1rio da Mal\u00e1sia", "MYT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Mal\u00e1sia", "MYST"}; -+ String NORONHA[] = new String[] {"Fuso hor\u00e1rio de Fernando de Noronha", "FNT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Fernando de Noronha", "FNST"}; -+ String NOVT[] = new String[] {"Fuso hor\u00e1rio de Novosibirsk", "NOVT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Novosibirsk", "NOVST"}; -+ String NPT[] = new String[] {"Fuso hor\u00e1rio do Nepal", "NPT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Nepal", "NPST"}; -+ String NST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Terra Nova", "NST", -+ "Hor\u00e1rio de luz natural de Terra Nova", "NDT"}; -+ String NZST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da Nova Zel\u00e2ndia", "NZST", -+ "Hor\u00e1rio de luz natural da Nova Zel\u00e2ndia", "NZDT"}; -+ String PITCAIRN[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Pitcairn", "PST", -+ "Hor\u00e1rio de luz natural de Pitcairn", "PDT"}; -+ String PKT[] = new String[] {"Fuso hor\u00e1rio do Paquist\u00e3o", "PKT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Paquist\u00e3o", "PKST"}; -+ String PONT[] = new String[] {"Fuso hor\u00e1rio de Pohnpei", "PONT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Pohnpei", "PONST"}; -+ String PST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Pac\u00edfico", "PST", -+ "Hor\u00e1rio de luz natural do Pac\u00edfico", "PDT"}; -+ String RST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental", "EST", -+ "Hor\u00e1rio de luz natural central", "CDT"}; -+ String SAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da \u00c1frica do Sul", "SAST", -+ "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica do Sul", "SAST"}; -+ String SBT[] = new String[] {"Fuso hor\u00e1rio das Ilhas Salom\u00e3o", "SBT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Salom\u00e3o", "SBST"}; -+ String SGT[] = new String[] {"Fuso hor\u00e1rio de Cingapura", "SGT", -+ "Fuso hor\u00e1rio de ver\u00e1 de Cingapura", "SGST"}; -+ String SLST[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Serra Leoa", "SLST"}; -+ String TASMANIA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Tasm\u00e2nia)", "EST", -+ "Fuso hor\u00e1rio de ver\u00e3o oriental (Tasm\u00e2nia)", "EST"}; -+ String TMT[] = new String[] {"Fuso hor\u00e1rio do Turcomenist\u00e3o", "TMT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Turcomenist\u00e3o", "TMST"}; -+ String TRUT[] = new String[] {"Fuso hor\u00e1rio de Chuuk", "CHUT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Chuuk", "CHUST"}; -+ String ULAT[]= new String[] {"Fuso hor\u00e1rio de Ulan Bator", "ULAT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Ulan Bator", "ULAST"}; -+ String WAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Ocidental", "WAT", -+ "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica Ocidental", "WAST"}; -+ String WET[] = new String[] {"Fuso hor\u00e1rio da Europa Ocidental", "WET", -+ "Fuso hor\u00e1rio de ver\u00e3o da Europa Ocidental", "WEST"}; -+ String WIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Ocidental", "WIT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Ocidental", "WIST"}; -+ String WST_AUS[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o ocidental (Austr\u00e1lia)", "WST", -+ "Fuso hor\u00e1rio de ver\u00e3o ocidental (Austr\u00e1lia)", "WST"}; -+ String SAMOA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Samoa", "SST", -+ "Hor\u00e1rio de luz natural de Samoa", "SDT"}; -+ String WST_SAMOA[] = new String[] {"Fuso hor\u00e1rio de Samoa Ocidental", "WST", -+ "Fuso hor\u00e1rio de ver\u00e3o de Samoa Ocidental", "WSST"}; -+ String ChST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chamorro", "ChST", -+ "Hor\u00e1rio de luz natural de Chamorro", "ChDT"}; -+ String VICTORIA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Victoria)", "EST", -+ "Fuso hor\u00e1rio de ver\u00e3o oriental (Victoria)", "EST"}; -+ String UTC[] = new String[] {"Tempo universal coordenado", "UTC", -+ "Tempo universal coordenado", "UTC"}; -+ String UZT[] = new String[] {"Fuso hor\u00e1rio do Uzbequist\u00e3o", "UZT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Uzbequist\u00e3o", "UZST"}; -+ String WART[] = new String[] {"Fuso hor\u00e1rio da Argentina Ocidental", "WART", -+ "Fuso hor\u00e1rio de ver\u00e3o da Argentina Ocidental", "WARST"}; -+ -+ -+ return new Object[][] { -+ {"America/Los_Angeles", PST}, -+ {"PST", PST}, -+ {"America/Denver", MST}, -+ {"MST", MST}, -+ {"America/Phoenix", MST}, -+ {"PNT", MST}, -+ {"America/Chicago", CST}, -+ {"CST", CST}, -+ {"America/New_York", EST}, -+ {"EST", EST}, -+ {"America/Indianapolis", EST}, -+ {"IET", EST}, -+ {"Pacific/Honolulu", HST}, -+ {"HST", HST}, -+ {"America/Anchorage", AKST}, -+ {"AST", AKST}, -+ {"America/Halifax", AST}, -+ {"America/St_Johns", NST}, -+ {"CNT", NST}, -+ {"Europe/Paris", CET}, -+ {"ECT", CET}, -+ {"GMT", GMT}, -+ {"Africa/Casablanca", WET}, -+ {"Asia/Jerusalem", ISRAEL}, -+ {"Asia/Tokyo", JST}, -+ {"JST", JST}, -+ {"Europe/Bucharest", EET}, -+ {"Asia/Shanghai", CTT}, -+ {"CTT", CTT}, -+ /* Don't change the order of the above zones -+ * to keep compatibility with the previous version. -+ */ -+ -+ {"ACT", DARWIN}, -+ {"AET", EST_NSW}, -+ {"AGT", AGT}, -+ {"ART", EET}, -+ {"Africa/Abidjan", GMT}, -+ {"Africa/Accra", GHMT}, -+ {"Africa/Addis_Ababa", EAT}, -+ {"Africa/Algiers", CET}, -+ {"Africa/Asmara", EAT}, -+ {"Africa/Asmera", EAT}, -+ {"Africa/Bamako", GMT}, -+ {"Africa/Bangui", WAT}, -+ {"Africa/Banjul", GMT}, -+ {"Africa/Bissau", GMT}, -+ {"Africa/Blantyre", CAT}, -+ {"Africa/Brazzaville", WAT}, -+ {"Africa/Bujumbura", CAT}, -+ {"Africa/Cairo", EET}, -+ {"Africa/Ceuta", CET}, -+ {"Africa/Conakry", GMT}, -+ {"Africa/Dakar", GMT}, -+ {"Africa/Dar_es_Salaam", EAT}, -+ {"Africa/Djibouti", EAT}, -+ {"Africa/Douala", WAT}, -+ {"Africa/El_Aaiun", WET}, -+ {"Africa/Freetown", SLST}, -+ {"Africa/Gaborone", CAT}, -+ {"Africa/Harare", CAT}, -+ {"Africa/Johannesburg", SAST}, -+ {"Africa/Kampala", EAT}, -+ {"Africa/Khartoum", EAT}, -+ {"Africa/Kigali", CAT}, -+ {"Africa/Kinshasa", WAT}, -+ {"Africa/Lagos", WAT}, -+ {"Africa/Libreville", WAT}, -+ {"Africa/Lome", GMT}, -+ {"Africa/Luanda", WAT}, -+ {"Africa/Lubumbashi", CAT}, -+ {"Africa/Lusaka", CAT}, -+ {"Africa/Malabo", WAT}, -+ {"Africa/Maputo", CAT}, -+ {"Africa/Maseru", SAST}, -+ {"Africa/Mbabane", SAST}, -+ {"Africa/Mogadishu", EAT}, -+ {"Africa/Monrovia", GMT}, -+ {"Africa/Nairobi", EAT}, -+ {"Africa/Ndjamena", WAT}, -+ {"Africa/Niamey", WAT}, -+ {"Africa/Nouakchott", GMT}, -+ {"Africa/Ouagadougou", GMT}, -+ {"Africa/Porto-Novo", WAT}, -+ {"Africa/Sao_Tome", GMT}, -+ {"Africa/Timbuktu", GMT}, -+ {"Africa/Tripoli", EET}, -+ {"Africa/Tunis", CET}, -+ {"Africa/Windhoek", WAT}, -+ {"America/Adak", HAST}, -+ {"America/Anguilla", AST}, -+ {"America/Antigua", AST}, -+ {"America/Araguaina", BRT}, -+ {"America/Argentina/Buenos_Aires", AGT}, -+ {"America/Argentina/Catamarca", AGT}, -+ {"America/Argentina/ComodRivadavia", AGT}, -+ {"America/Argentina/Cordoba", AGT}, -+ {"America/Argentina/Jujuy", AGT}, -+ {"America/Argentina/La_Rioja", AGT}, -+ {"America/Argentina/Mendoza", AGT}, -+ {"America/Argentina/Rio_Gallegos", AGT}, -+ {"America/Argentina/Salta", AGT}, -+ {"America/Argentina/San_Juan", AGT}, -+ {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/Tucuman", AGT}, -+ {"America/Argentina/Ushuaia", AGT}, -+ {"America/Aruba", AST}, -+ {"America/Asuncion", new String[] {"Fuso hor\u00e1rio do Paraguai", "PYT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Paraguai", "PYST"}}, -+ {"America/Atikokan", EST}, -+ {"America/Atka", HAST}, -+ {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, -+ {"America/Barbados", AST}, -+ {"America/Belem", BRT}, -+ {"America/Belize", CST}, -+ {"America/Blanc-Sablon", AST}, -+ {"America/Boa_Vista", AMT}, -+ {"America/Bogota", new String[] {"Fuso hor\u00e1rio da Col\u00f4mbia", "COT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Col\u00f4mbia", "COST"}}, -+ {"America/Boise", MST}, -+ {"America/Buenos_Aires", AGT}, -+ {"America/Cambridge_Bay", MST}, -+ {"America/Campo_Grande", AMT}, -+ {"America/Cancun", CST}, -+ {"America/Caracas", new String[] {"Fuso hor\u00e1rio da Venezuela", "VET", -+ "Fuso hor\u00e1rio de ver\u00e3o da Venezuela", "VEST"}}, -+ {"America/Catamarca", AGT}, -+ {"America/Cayenne", new String[] {"Fuso hor\u00e1rio da Guiana Francesa", "GFT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Guiana Francesa", "GFST"}}, -+ {"America/Cayman", EST}, -+ {"America/Chihuahua", MST}, -+ {"America/Coral_Harbour", EST}, -+ {"America/Cordoba", AGT}, -+ {"America/Costa_Rica", CST}, -+ {"America/Cuiaba", AMT}, -+ {"America/Curacao", AST}, -+ {"America/Danmarkshavn", GMT}, -+ {"America/Dawson", PST}, -+ {"America/Dawson_Creek", MST}, -+ {"America/Detroit", EST}, -+ {"America/Dominica", AST}, -+ {"America/Edmonton", MST}, -+ {"America/Eirunepe", AMT}, -+ {"America/El_Salvador", CST}, -+ {"America/Ensenada", PST}, -+ {"America/Fort_Wayne", EST}, -+ {"America/Fortaleza", BRT}, -+ {"America/Glace_Bay", AST}, -+ {"America/Godthab", new String[] {"Fuso hor\u00e1rio da Groenl\u00e2ndia Ocidental", "WGT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Groenl\u00e2ndia Ocidental", "WGST"}}, -+ {"America/Goose_Bay", AST}, -+ {"America/Grand_Turk", EST}, -+ {"America/Grenada", AST}, -+ {"America/Guadeloupe", AST}, -+ {"America/Guatemala", CST}, -+ {"America/Guayaquil", new String[] {"Fuso hor\u00e1rio do Equador", "ECT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Equador", "ECST"}}, -+ {"America/Guyana", new String[] {"Fuso hor\u00e1rio da Guiana", "GYT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Guiana", "GYST"}}, -+ {"America/Havana", CUBA}, -+ {"America/Hermosillo", MST}, -+ {"America/Indiana/Indianapolis", EST}, -+ {"America/Indiana/Knox", CST}, -+ {"America/Indiana/Marengo", EST}, -+ {"America/Indiana/Petersburg", EST}, -+ {"America/Indiana/Tell_City", CST}, -+ {"America/Indiana/Vevay", EST}, -+ {"America/Indiana/Vincennes", EST}, -+ {"America/Indiana/Winamac", EST}, -+ {"America/Inuvik", MST}, -+ {"America/Iqaluit", EST}, -+ {"America/Jamaica", EST}, -+ {"America/Jujuy", AGT}, -+ {"America/Juneau", AKST}, -+ {"America/Kentucky/Louisville", EST}, -+ {"America/Kentucky/Monticello", EST}, -+ {"America/Knox_IN", CST}, -+ {"America/La_Paz", new String[] {"Fuso hor\u00e1rio da Bol\u00edvia", "BOT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Bol\u00edvia", "BOST"}}, -+ {"America/Lima", new String[] {"Fuso hor\u00e1rio do Peru", "PET", -+ "Fuso hor\u00e1rio de ver\u00e3o do Peru", "PEST"}}, -+ {"America/Louisville", EST}, -+ {"America/Maceio", BRT}, -+ {"America/Managua", CST}, -+ {"America/Manaus", AMT}, -+ {"America/Marigot", AST}, -+ {"America/Martinique", AST}, -+ {"America/Mazatlan", MST}, -+ {"America/Mendoza", AGT}, -+ {"America/Menominee", CST}, -+ {"America/Merida", CST}, -+ {"America/Mexico_City", CST}, -+ {"America/Miquelon", new String[] {"Fuso hor\u00e1rio padr\u00e3o de S\u00e3o Pedro e Miquelon", "PMST", -+ "Hor\u00e1rio de luz natural de S\u00e3o Pedro e Miquelon", "PMDT"}}, -+ {"America/Moncton", AST}, -+ {"America/Montevideo", new String[] {"Fuso hor\u00e1rio do Uruguai", "UYT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Uruguai", "UYST"}}, -+ {"America/Monterrey", CST}, -+ {"America/Montreal", EST}, -+ {"America/Montserrat", AST}, -+ {"America/Nassau", EST}, -+ {"America/Nipigon", EST}, -+ {"America/Nome", AKST}, -+ {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Center", CST}, -+ {"America/North_Dakota/New_Salem", CST}, -+ {"America/Panama", EST}, -+ {"America/Pangnirtung", EST}, -+ {"America/Paramaribo", new String[] {"Fuso hor\u00e1rio do Suriname", "SRT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Suriname", "SRST"}}, -+ {"America/Port-au-Prince", EST}, -+ {"America/Port_of_Spain", AST}, -+ {"America/Porto_Acre", AMT}, -+ {"America/Porto_Velho", AMT}, -+ {"America/Puerto_Rico", AST}, -+ {"America/Rainy_River", CST}, -+ {"America/Rankin_Inlet", CST}, -+ {"America/Recife", BRT}, -+ {"America/Regina", CST}, -+ {"America/Resolute", RST}, -+ {"America/Rio_Branco", AMT}, -+ {"America/Rosario", AGT}, -+ {"America/Santarem", BRT}, -+ {"America/Santiago", CLT}, -+ {"America/Santo_Domingo", AST}, -+ {"America/Sao_Paulo", BRT}, -+ {"America/Scoresbysund", EGT}, -+ {"America/Shiprock", MST}, -+ {"America/St_Barthelemy", AST}, -+ {"America/St_Kitts", AST}, -+ {"America/St_Lucia", AST}, -+ {"America/St_Thomas", AST}, -+ {"America/St_Vincent", AST}, -+ {"America/Swift_Current", CST}, -+ {"America/Tegucigalpa", CST}, -+ {"America/Thule", AST}, -+ {"America/Thunder_Bay", EST}, -+ {"America/Tijuana", PST}, -+ {"America/Toronto", EST}, -+ {"America/Tortola", AST}, -+ {"America/Vancouver", PST}, -+ {"America/Virgin", AST}, -+ {"America/Whitehorse", PST}, -+ {"America/Winnipeg", CST}, -+ {"America/Yakutat", AKST}, -+ {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, -+ {"Antarctica/Davis", new String[] {"Fuso hor\u00e1rio de Davis", "DAVT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Davis", "DAVST"}}, -+ {"Antarctica/DumontDUrville", new String[] {"Fuso hor\u00e1rio de Dumont-d'Urville", "DDUT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Dumont-d'Urville", "DDUST"}}, -+ {"Antarctica/Mawson", new String[] {"Fuso hor\u00e1rio de Mawson", "MAWT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Mawson", "MAWST"}}, -+ {"Antarctica/McMurdo", NZST}, -+ {"Antarctica/Palmer", CLT}, -+ {"Antarctica/Rothera", new String[] {"Fuso hor\u00e1rio de Rothera", "ROTT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Rothera", "ROTST"}}, -+ {"Antarctica/South_Pole", NZST}, -+ {"Antarctica/Syowa", new String[] {"Fuso hor\u00e1rio de Syowa", "SYOT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Syowa", "SYOST"}}, -+ {"Antarctica/Vostok", new String[] {"Fuso hor\u00e1rio de Vostok", "VOST", -+ "Fuso hor\u00e1rio de ver\u00e3o de Vostok", "VOSST"}}, -+ {"Arctic/Longyearbyen", CET}, -+ {"Asia/Aden", ARAST}, -+ {"Asia/Almaty", new String[] {"Fuso hor\u00e1rio de Alma-Ata", "ALMT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Alma-Ata", "ALMST"}}, -+ {"Asia/Amman", EET}, -+ {"Asia/Anadyr", new String[] {"Fuso hor\u00e1rio de Anadyr", "ANAT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Anadyr", "ANAST"}}, -+ {"Asia/Aqtau", new String[] {"Fuso hor\u00e1rio de Aqtau", "AQTT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Aqtau", "AQTST"}}, -+ {"Asia/Aqtobe", new String[] {"Fuso hor\u00e1rio de Aqtobe", "AQTT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Aqtobe", "AQTST"}}, -+ {"Asia/Ashgabat", TMT}, -+ {"Asia/Ashkhabad", TMT}, -+ {"Asia/Baghdad", ARAST}, -+ {"Asia/Bahrain", ARAST}, -+ {"Asia/Baku", new String[] {"Fuso hor\u00e1rio do Azerbaij\u00e3o", "AZT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Azerbaij\u00e3o", "AZST"}}, -+ {"Asia/Bangkok", ICT}, -+ {"Asia/Beirut", EET}, -+ {"Asia/Bishkek", new String[] {"Fuso hor\u00e1rio do Quirguist\u00e3o", "KGT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Quirguist\u00e3o", "KGST"}}, -+ {"Asia/Brunei", new String[] {"Fuso hor\u00e1rio de Brunei", "BNT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Brunei", "BNST"}}, -+ {"Asia/Calcutta", IST}, -+ {"Asia/Choibalsan", new String[] {"Fuso hor\u00e1rio de Choibalsan", "CHOT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Choibalsan", "CHOST"}}, -+ {"Asia/Chongqing", CTT}, -+ {"Asia/Chungking", CTT}, -+ {"Asia/Colombo", IST}, -+ {"Asia/Dacca", BDT}, -+ {"Asia/Dhaka", BDT}, -+ {"Asia/Dili", new String[] {"Fuso hor\u00e1rio do Timor-Leste", "TLT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Timor-Leste", "TLST"}}, -+ {"Asia/Damascus", EET}, -+ {"Asia/Dubai", GST}, -+ {"Asia/Dushanbe", new String[] {"Fuso hor\u00e1rio do Tadjiquist\u00e3o", "TJT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Tadjiquist\u00e3o", "TJST"}}, -+ {"Asia/Gaza", EET}, -+ {"Asia/Harbin", CTT}, -+ {"Asia/Ho_Chi_Minh", ICT}, -+ {"Asia/Hong_Kong", HKT}, -+ {"Asia/Hovd", new String[] {"Fuso hor\u00e1rio de Hovd", "HOVT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Hovd", "HOVST"}}, -+ {"Asia/Irkutsk", new String[] {"Fuso hor\u00e1rio de Irkutsk", "IRKT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Irkutsk", "IRKST"}}, -+ {"Asia/Istanbul", EET}, -+ {"Asia/Jakarta", WIT}, -+ {"Asia/Jayapura", new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Oriental", "EIT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Oriental", "EIST"}}, -+ {"Asia/Kabul", new String[] {"Fuso hor\u00e1rio do Afeganist\u00e3o", "AFT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Afeganist\u00e3o", "AFST"}}, -+ {"Asia/Kamchatka", new String[] {"Fuso hor\u00e1rio de Petropavlovsk-Kamchatski", "PETT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Petropavlovsk-Kamchatski", "PETST"}}, -+ {"Asia/Karachi", PKT}, -+ {"Asia/Kashgar", CTT}, -+ {"Asia/Kathmandu", NPT}, -+ {"Asia/Katmandu", NPT}, -+ {"Asia/Kolkata", IST}, -+ {"Asia/Krasnoyarsk", new String[] {"Fuso hor\u00e1rio de Krasnoyarsk", "KRAT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Krasnoyarsk", "KRAST"}}, -+ {"Asia/Kuala_Lumpur", MYT}, -+ {"Asia/Kuching", MYT}, -+ {"Asia/Kuwait", ARAST}, -+ {"Asia/Macao", CTT}, -+ {"Asia/Macau", CTT}, -+ {"Asia/Magadan", new String[] {"Fuso hor\u00e1rio de Magadan", "MAGT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Magadan", "MAGST"}}, -+ {"Asia/Makassar", CIT}, -+ {"Asia/Manila", new String[] {"Fuso hor\u00e1rio das Filipinas", "PHT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Filipinas", "PHST"}}, -+ {"Asia/Muscat", GST}, -+ {"Asia/Nicosia", EET}, -+ {"Asia/Novokuznetsk", NOVT}, -+ {"Asia/Novosibirsk", NOVT}, -+ {"Asia/Oral", new String[] {"Fuso hor\u00e1rio de Uralsk", "ORAT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Uralsk", "ORAST"}}, -+ {"Asia/Omsk", new String[] {"Fuso hor\u00e1rio de Omsk", "OMST", -+ "Fuso hor\u00e1rio de ver\u00e3o de Omsk", "OMSST"}}, -+ {"Asia/Phnom_Penh", ICT}, -+ {"Asia/Pontianak", WIT}, -+ {"Asia/Pyongyang", KST}, -+ {"Asia/Qatar", ARAST}, -+ {"Asia/Qyzylorda", new String[] {"Fuso hor\u00e1rio de Kizil-Orda", "QYZT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Kizil-Orda", "QYZST"}}, -+ {"Asia/Rangoon", new String[] {"Fuso hor\u00e1rio de Mianmar", "MMT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Mianmar", "MMST"}}, -+ {"Asia/Riyadh", ARAST}, -+ {"Asia/Saigon", ICT}, -+ {"Asia/Sakhalin", new String[] {"Fuso hor\u00e1rio de Sakhalina", "SAKT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Sakhalina", "SAKST"}}, -+ {"Asia/Samarkand", UZT}, -+ {"Asia/Seoul", KST}, -+ {"Asia/Singapore", SGT}, -+ {"Asia/Taipei", CTT}, -+ {"Asia/Tel_Aviv", ISRAEL}, -+ {"Asia/Tashkent", UZT}, -+ {"Asia/Tbilisi", new String[] {"Fuso hor\u00e1rio da Ge\u00f3rgia", "GET", -+ "Fuso hor\u00e1rio de ver\u00e3o da Ge\u00f3rgia", "GEST"}}, -+ {"Asia/Tehran", IRT}, -+ {"Asia/Thimbu", BTT}, -+ {"Asia/Thimphu", BTT}, -+ {"Asia/Ujung_Pandang", CIT}, -+ {"Asia/Ulaanbaatar", ULAT}, -+ {"Asia/Ulan_Bator", ULAT}, -+ {"Asia/Urumqi", CTT}, -+ {"Asia/Vientiane", ICT}, -+ {"Asia/Vladivostok", new String[] {"Fuso hor\u00e1rio de Vladivostok", "VLAT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Vladivostok", "VLAST"}}, -+ {"Asia/Yakutsk", new String[] {"Fuso hor\u00e1rio de Yakutsk", "YAKT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Yakutsk", "YAKST"}}, -+ {"Asia/Yekaterinburg", new String[] {"Fuso hor\u00e1rio de Yekaterinburgo", "YEKT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Yekaterinburgo", "YEKST"}}, -+ {"Asia/Yerevan", ARMT}, -+ {"Atlantic/Azores", new String[] {"Fuso hor\u00e1rio das A\u00e7ores", "AZOT", -+ "Fuso hor\u00e1rio de ver\u00e3o das A\u00e7ores", "AZOST"}}, -+ {"Atlantic/Bermuda", AST}, -+ {"Atlantic/Canary", WET}, -+ {"Atlantic/Cape_Verde", new String[] {"Fuso hor\u00e1rio de Cabo Verde", "CVT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Cabo Verde", "CVST"}}, -+ {"Atlantic/Faeroe", WET}, -+ {"Atlantic/Faroe", WET}, -+ {"Atlantic/Jan_Mayen", CET}, -+ {"Atlantic/Madeira", WET}, -+ {"Atlantic/Reykjavik", GMT}, -+ {"Atlantic/South_Georgia", new String[] {"Fuso hor\u00e1rio padr\u00e3o da Ge\u00f3rgia do Sul", "GST", -+ "Hor\u00e1rio de luz natural da Ge\u00f3rgia do Sul", "GDT"}}, -+ {"Atlantic/St_Helena", GMT}, -+ {"Atlantic/Stanley", new String[] {"Fuso hor\u00e1rio das Ilhas Falkland", "FKT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Falkland", "FKST"}}, -+ {"Australia/ACT", EST_NSW}, -+ {"Australia/Adelaide", ADELAIDE}, -+ {"Australia/Brisbane", BRISBANE}, -+ {"Australia/Broken_Hill", BROKEN_HILL}, -+ {"Australia/Canberra", EST_NSW}, -+ {"Australia/Currie", EST_NSW}, -+ {"Australia/Darwin", DARWIN}, -+ {"Australia/Eucla", new String[] {"Fuso hor\u00e1rio ocidental central (Austr\u00e1lia)", "CWST", -+ "Fuso hor\u00e1rio de ver\u00e3o ocidental central (Austr\u00e1lia)", "CWST"}}, -+ {"Australia/Hobart", TASMANIA}, -+ {"Australia/LHI", LORD_HOWE}, -+ {"Australia/Lindeman", BRISBANE}, -+ {"Australia/Lord_Howe", LORD_HOWE}, -+ {"Australia/Melbourne", VICTORIA}, -+ {"Australia/North", DARWIN}, -+ {"Australia/NSW", EST_NSW}, -+ {"Australia/Perth", WST_AUS}, -+ {"Australia/Queensland", BRISBANE}, -+ {"Australia/South", ADELAIDE}, -+ {"Australia/Sydney", EST_NSW}, -+ {"Australia/Tasmania", TASMANIA}, -+ {"Australia/Victoria", VICTORIA}, -+ {"Australia/West", WST_AUS}, -+ {"Australia/Yancowinna", BROKEN_HILL}, -+ {"BET", BRT}, -+ {"BST", BDT}, -+ {"Brazil/Acre", AMT}, -+ {"Brazil/DeNoronha", NORONHA}, -+ {"Brazil/East", BRT}, -+ {"Brazil/West", AMT}, -+ {"Canada/Atlantic", AST}, -+ {"Canada/Central", CST}, -+ {"Canada/East-Saskatchewan", CST}, -+ {"Canada/Eastern", EST}, -+ {"Canada/Mountain", MST}, -+ {"Canada/Newfoundland", NST}, -+ {"Canada/Pacific", PST}, -+ {"Canada/Yukon", PST}, -+ {"Canada/Saskatchewan", CST}, -+ {"CAT", CAT}, -+ {"CET", CET}, -+ {"Chile/Continental", CLT}, -+ {"Chile/EasterIsland", EASTER}, -+ {"CST6CDT", CST}, -+ {"Cuba", CUBA}, -+ {"EAT", EAT}, -+ {"EET", EET}, -+ {"Egypt", EET}, -+ {"Eire", DUBLIN}, -+ {"EST5EDT", EST}, -+ {"Etc/Greenwich", GMT}, -+ {"Etc/UCT", UTC}, -+ {"Etc/Universal", UTC}, -+ {"Etc/UTC", UTC}, -+ {"Etc/Zulu", UTC}, -+ {"Europe/Amsterdam", CET}, -+ {"Europe/Andorra", CET}, -+ {"Europe/Athens", EET}, -+ {"Europe/Belfast", GMTBST}, -+ {"Europe/Belgrade", CET}, -+ {"Europe/Berlin", CET}, -+ {"Europe/Bratislava", CET}, -+ {"Europe/Brussels", CET}, -+ {"Europe/Budapest", CET}, -+ {"Europe/Chisinau", EET}, -+ {"Europe/Copenhagen", CET}, -+ {"Europe/Dublin", DUBLIN}, -+ {"Europe/Gibraltar", CET}, -+ {"Europe/Guernsey", GMTBST}, -+ {"Europe/Helsinki", EET}, -+ {"Europe/Isle_of_Man", GMTBST}, -+ {"Europe/Istanbul", EET}, -+ {"Europe/Jersey", GMTBST}, -+ {"Europe/Kaliningrad", EET}, -+ {"Europe/Kiev", EET}, -+ {"Europe/Lisbon", WET}, -+ {"Europe/Ljubljana", CET}, -+ {"Europe/London", GMTBST}, -+ {"Europe/Luxembourg", CET}, -+ {"Europe/Madrid", CET}, -+ {"Europe/Malta", CET}, -+ {"Europe/Mariehamn", EET}, -+ {"Europe/Minsk", EET}, -+ {"Europe/Monaco", CET}, -+ {"Europe/Moscow", MSK}, -+ {"Europe/Nicosia", EET}, -+ {"Europe/Oslo", CET}, -+ {"Europe/Podgorica", CET}, -+ {"Europe/Prague", CET}, -+ {"Europe/Riga", EET}, -+ {"Europe/Rome", CET}, -+ {"Europe/Samara", new String[] {"Fuso hor\u00e1rio de Samara", "SAMT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Samara", "SAMST"}}, -+ {"Europe/San_Marino", CET}, -+ {"Europe/Sarajevo", CET}, -+ {"Europe/Simferopol", EET}, -+ {"Europe/Skopje", CET}, -+ {"Europe/Sofia", EET}, -+ {"Europe/Stockholm", CET}, -+ {"Europe/Tallinn", EET}, -+ {"Europe/Tirane", CET}, -+ {"Europe/Tiraspol", EET}, -+ {"Europe/Uzhgorod", EET}, -+ {"Europe/Vaduz", CET}, -+ {"Europe/Vatican", CET}, -+ {"Europe/Vienna", CET}, -+ {"Europe/Vilnius", EET}, -+ {"Europe/Volgograd", new String[] {"Fuso hor\u00e1rio de Volgogrado", "VOLT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Volgogrado", "VOLST"}}, -+ {"Europe/Warsaw", CET}, -+ {"Europe/Zagreb", CET}, -+ {"Europe/Zaporozhye", EET}, -+ {"Europe/Zurich", CET}, -+ {"GB", GMTBST}, -+ {"GB-Eire", GMTBST}, -+ {"Greenwich", GMT}, -+ {"Hongkong", HKT}, -+ {"Iceland", GMT}, -+ {"Iran", IRT}, -+ {"IST", IST}, -+ {"Indian/Antananarivo", EAT}, -+ {"Indian/Chagos", new String[] {"Fuso hor\u00e1rio dos territ\u00f3rios do Oceano \u00cdndico", "IOT", -+ "Fuso hor\u00e1rio de ver\u00e3o dos territ\u00f3rios do Oceano \u00cdndico", "IOST"}}, -+ {"Indian/Christmas", new String[] {"Fuso hor\u00e1rio das Ilhas Christmas", "CXT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Christmas", "CXST"}}, -+ {"Indian/Cocos", new String[] {"Fuso hor\u00e1rio das Ilhas Cocos", "CCT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Cocos", "CCST"}}, -+ {"Indian/Comoro", EAT}, -+ {"Indian/Kerguelen", new String[] {"Fuso hor\u00e1rio das Terras Austrais e Ant\u00e1rticas Francesas", "TFT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Terras Austrais e Ant\u00e1rticas Francesas", "TFST"}}, -+ {"Indian/Mahe", new String[] {"Fuso hor\u00e1rio das Seychelles", "SCT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Seychelles", "SCST"}}, -+ {"Indian/Maldives", new String[] {"Fuso hor\u00e1rio das Maldivas", "MVT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Maldivas", "MVST"}}, -+ {"Indian/Mauritius", new String[] {"Fuso hor\u00e1rio das Ilhas Maur\u00edcio", "MUT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Maur\u00edcio", "MUST"}}, -+ {"Indian/Mayotte", EAT}, -+ {"Indian/Reunion", new String[] {"Fuso hor\u00e1rio de Reuni\u00e3o", "RET", -+ "Fuso hor\u00e1rio de ver\u00e3o de Reuni\u00e3o", "REST"}}, -+ {"Israel", ISRAEL}, -+ {"Jamaica", EST}, -+ {"Japan", JST}, -+ {"Kwajalein", MHT}, -+ {"Libya", EET}, -+ {"MET", new String[] {"Fuso hor\u00e1rio da Europa M\u00e9dia", "MET", -+ "Fuso hor\u00e1rio de ver\u00e3o da Europa M\u00e9dia", "MEST"}}, -+ {"Mexico/BajaNorte", PST}, -+ {"Mexico/BajaSur", MST}, -+ {"Mexico/General", CST}, -+ {"MIT", WST_SAMOA}, -+ {"MST7MDT", MST}, -+ {"Navajo", MST}, -+ {"NET", ARMT}, -+ {"NST", NZST}, -+ {"NZ", NZST}, -+ {"NZ-CHAT", CHAST}, -+ {"PLT", PKT}, -+ {"Portugal", WET}, -+ {"PRT", AST}, -+ {"Pacific/Apia", WST_SAMOA}, -+ {"Pacific/Auckland", NZST}, -+ {"Pacific/Chatham", CHAST}, -+ {"Pacific/Chuuk", TRUT}, -+ {"Pacific/Easter", EASTER}, -+ {"Pacific/Efate", new String[] {"Fuso hor\u00e1rio de Vanuatu", "VUT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Vanuatu", "VUST"}}, -+ {"Pacific/Enderbury", new String[] {"Fuso hor\u00e1rio das Ilhas F\u00e9nix", "PHOT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas F\u00e9nix", "PHOST"}}, -+ {"Pacific/Fakaofo", new String[] {"Fuso hor\u00e1rio de Tokelau", "TKT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Tokelau", "TKST"}}, -+ {"Pacific/Fiji", new String[] {"Fuso hor\u00e1rio de Fiji", "FJT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Fiji", "FJST"}}, -+ {"Pacific/Funafuti", new String[] {"Fuso hor\u00e1rio de Tuvalu", "TVT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Tuvalu", "TVST"}}, -+ {"Pacific/Galapagos", new String[] {"Fuso hor\u00e1rio das Ilhas Gal\u00e1pagos", "GALT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Gal\u00e1pagos", "GALST"}}, -+ {"Pacific/Gambier", GAMBIER}, -+ {"Pacific/Guadalcanal", SBT}, -+ {"Pacific/Guam", ChST}, -+ {"Pacific/Johnston", HST}, -+ {"Pacific/Kiritimati", new String[] {"Fuso hor\u00e1rio das Esp\u00f3rades Equatoriais", "LINT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Esp\u00f3rades Equatoriais", "LINST"}}, -+ {"Pacific/Kosrae", new String[] {"Fuso hor\u00e1rio de Kosrae", "KOST", -+ "Fuso hor\u00e1rio de ver\u00e3o de Kosrae", "KOSST"}}, -+ {"Pacific/Kwajalein", MHT}, -+ {"Pacific/Majuro", MHT}, -+ {"Pacific/Marquesas", new String[] {"Fuso hor\u00e1rio das Ilhas Marquesas", "MART", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Marquesas", "MARST"}}, -+ {"Pacific/Midway", SAMOA}, -+ {"Pacific/Nauru", new String[] {"Fuso hor\u00e1rio de Nauru", "NRT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Nauru", "NRST"}}, -+ {"Pacific/Niue", new String[] {"Fuso hor\u00e1rio de Niue", "NUT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Niue", "NUST"}}, -+ {"Pacific/Norfolk", new String[] {"Fuso hor\u00e1rio da Ilha de Norfolk", "NFT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Ilha de Norfolk", "NFST"}}, -+ {"Pacific/Noumea", new String[] {"Fuso hor\u00e1rio da Nova Caled\u00f4nia", "NCT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Nova Caled\u00f4nia", "NCST"}}, -+ {"Pacific/Pago_Pago", SAMOA}, -+ {"Pacific/Palau", new String[] {"Fuso hor\u00e1rio de Palau", "PWT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Palau", "PWST"}}, -+ {"Pacific/Pitcairn", PITCAIRN}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, -+ {"Pacific/Port_Moresby", new String[] {"Fuso hor\u00e1rio de Papua-Nova Guin\u00e9", "PGT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Papua-Nova Guin\u00e9", "PGST"}}, -+ {"Pacific/Rarotonga", new String[] {"Fuso hor\u00e1rio das Ilhas Cook", "CKT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Cook", "CKHST"}}, -+ {"Pacific/Saipan", ChST}, -+ {"Pacific/Samoa", SAMOA}, -+ {"Pacific/Tahiti", new String[] {"Fuso hor\u00e1rio do Taiti", "TAHT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Taiti", "TAHST"}}, -+ {"Pacific/Tarawa", new String[] {"Fuso hor\u00e1rio das Ilhas Gilbert", "GILT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Gilbert", "GILST"}}, -+ {"Pacific/Tongatapu", new String[] {"Fuso hor\u00e1rio de Tonga", "TOT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Tonga", "TOST"}}, -+ {"Pacific/Truk", TRUT}, -+ {"Pacific/Wake", new String[] {"Fuso hor\u00e1rio de Wake", "WAKT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Wake", "WAKST"}}, -+ {"Pacific/Wallis", new String[] {"Fuso hor\u00e1rio de Wallis e Futuna", "WFT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Wallis e Futuna", "WFST"}}, -+ {"Pacific/Yap", TRUT}, -+ {"Poland", CET}, -+ {"PRC", CTT}, -+ {"PST8PDT", PST}, -+ {"ROK", KST}, -+ {"Singapore", SGT}, -+ {"SST", SBT}, -+ {"SystemV/AST4", AST}, -+ {"SystemV/AST4ADT", AST}, -+ {"SystemV/CST6", CST}, -+ {"SystemV/CST6CDT", CST}, -+ {"SystemV/EST5", EST}, -+ {"SystemV/EST5EDT", EST}, -+ {"SystemV/HST10", HST}, -+ {"SystemV/MST7", MST}, -+ {"SystemV/MST7MDT", MST}, -+ {"SystemV/PST8", PST}, -+ {"SystemV/PST8PDT", PST}, -+ {"SystemV/YST9", AKST}, -+ {"SystemV/YST9YDT", AKST}, -+ {"Turkey", EET}, -+ {"UCT", UTC}, -+ {"Universal", UTC}, -+ {"US/Alaska", AKST}, -+ {"US/Aleutian", HAST}, -+ {"US/Arizona", MST}, -+ {"US/Central", CST}, -+ {"US/Eastern", EST}, -+ {"US/Hawaii", HST}, -+ {"US/Indiana-Starke", CST}, -+ {"US/East-Indiana", EST}, -+ {"US/Michigan", EST}, -+ {"US/Mountain", MST}, -+ {"US/Pacific", PST}, -+ {"US/Pacific-New", PST}, -+ {"US/Samoa", SAMOA}, -+ {"UTC", UTC}, -+ {"VST", ICT}, -+ {"W-SU", MSK}, -+ {"WET", WET}, -+ {"Zulu", UTC}, -+ }; -+ } -+} -+ -+ -diff -r b357910aa04a -r e3ecd9555ff0 src/windows/classes/sun/awt/windows/awtLocalization_pt_BR.properties ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ openjdk/jdk/src/windows/classes/sun/awt/windows/awtLocalization_pt_BR.properties Thu Dec 02 02:17:37 2010 -0800 -@@ -0,0 +1,10 @@ -+ -+# -+# AWT Localization Properties -+# -+ -+# Default font size for Menus and MenuItems -+menuFont=SansSerif-plain-11 -+ -+# Value for "All files" for FileDialog -+allFiles=Todos os arquivos
--- a/patches/openjdk/6977550-tzdata2010l.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1208 +0,0 @@ -# HG changeset patch -# User peytoia -# Date 1282540492 -32400 -# Node ID 23f72ec0d8e83e9f7e05c450e1ec230e31f579ed -# Parent 58626b4eedcbd0a316ae2bd6f5a7818702e3d97c -6977550: (tz) Support tzdata2010l -Reviewed-by: okutsu - ---- openjdk/jdk/make/sun/javazic/tzdata/VERSION -+++ openjdk/jdk/make/sun/javazic/tzdata/VERSION -@@ -21,4 +21,4 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --tzdata2010i -+tzdata2010l ---- openjdk/jdk/make/sun/javazic/tzdata/africa -+++ openjdk/jdk/make/sun/javazic/tzdata/africa -@@ -316,8 +316,25 @@ - # and can be found by searching for "winter" in their search engine - # (at least today). - -+# From Alexander Krivenyshev (2010-07-20): -+# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has -+# decided that Daylight Saving Time will not be used in Egypt during -+# Ramadan. -+# -+# Arabic translation: -+# "Clocks to go back during Ramadan--and then forward again" -+# <a href="http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again"> -+# http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again -+# </a> -+# or -+# <a href="http://www.worldtimezone.com/dst_news/dst_news_egypt02.html"> -+# http://www.worldtimezone.com/dst_news/dst_news_egypt02.html -+# </a> -+ - Rule Egypt 2008 only - Aug lastThu 23:00s 0 - - Rule Egypt 2009 only - Aug 20 23:00s 0 - -+Rule Egypt 2010 only - Aug 11 0:00 0 - -+Rule Egypt 2010 only - Sep 10 0:00 1:00 S - Rule Egypt 2010 max - Sep lastThu 23:00s 0 - - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] ---- openjdk/jdk/make/sun/javazic/tzdata/asia -+++ openjdk/jdk/make/sun/javazic/tzdata/asia -@@ -2200,6 +2200,18 @@ - # "At 12:01am Friday, clocks in Israel and the West Bank will change to - # 1:01am, while Gaza clocks will change at 12:01am Saturday morning." - -+# From Steffen Thorsen (2010-08-11): -+# According to several sources, including -+# <a href="http://www.maannews.net/eng/ViewDetails.aspx?ID=306795"> -+# http://www.maannews.net/eng/ViewDetails.aspx?ID=306795 -+# </a> -+# the clocks were set back one hour at 2010-08-11 00:00:00 local time in -+# Gaza and the West Bank. -+# Some more background info: -+# <a href="http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html"> -+# http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html -+# </a> -+ - # The rules for Egypt are stolen from the `africa' file. - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule EgyptAsia 1957 only - May 10 0:00 1:00 S -@@ -2220,6 +2232,7 @@ - Rule Palestine 2009 only - Mar lastFri 0:00 1:00 S - Rule Palestine 2010 max - Mar lastSat 0:01 1:00 S - Rule Palestine 2009 max - Sep Fri>=1 2:00 0 - -+Rule Palestine 2010 only - Aug 11 0:00 0 - - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Asia/Gaza 2:17:52 - LMT 1900 Oct ---- openjdk/jdk/make/sun/javazic/tzdata/australasia -+++ openjdk/jdk/make/sun/javazic/tzdata/australasia -@@ -368,10 +368,10 @@ - - # Micronesia - # Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone Pacific/Truk 10:07:08 - LMT 1901 -- 10:00 - TRUT # Truk Time --Zone Pacific/Ponape 10:32:52 - LMT 1901 # Kolonia -- 11:00 - PONT # Ponape Time -+Zone Pacific/Chuuk 10:07:08 - LMT 1901 -+ 10:00 - CHUT # Chuuk Time -+Zone Pacific/Pohnpei 10:32:52 - LMT 1901 # Kolonia -+ 11:00 - PONT # Pohnpei Time - Zone Pacific/Kosrae 10:51:56 - LMT 1901 - 11:00 - KOST 1969 Oct # Kosrae Time - 12:00 - KOST 1999 ---- openjdk/jdk/make/sun/javazic/tzdata/backward -+++ openjdk/jdk/make/sun/javazic/tzdata/backward -@@ -112,7 +112,9 @@ - Link America/Denver Navajo - Link Asia/Shanghai PRC - Link Pacific/Pago_Pago Pacific/Samoa --Link Pacific/Truk Pacific/Yap -+Link Pacific/Chuuk Pacific/Yap -+Link Pacific/Chuuk Pacific/Truk -+Link Pacific/Pohnpei Pacific/Ponape - Link Europe/Warsaw Poland - Link Europe/Lisbon Portugal - Link Asia/Taipei ROC ---- openjdk/jdk/make/sun/javazic/tzdata/europe -+++ openjdk/jdk/make/sun/javazic/tzdata/europe -@@ -1035,22 +1035,47 @@ - 2:00 EU EE%sT - - # Finland --# -+ - # From Hannu Strang (1994-09-25 06:03:37 UTC): - # Well, here in Helsinki we're just changing from summer time to regular one, - # and it's supposed to change at 4am... -+ -+# From Janne Snabb (2010-0715): - # --# From Paul Eggert (2006-03-22): --# Shanks & Pottenger say Finland has switched at 02:00 standard time --# since 1981. Go with Strang instead. -+# I noticed that the Finland data is not accurate for years 1981 and 1982. -+# During these two first trial years the DST adjustment was made one hour -+# earlier than in forthcoming years. Starting 1983 the adjustment was made -+# according to the central European standards. - # -+# This is documented in Heikki Oja: Aikakirja 2007, published by The Almanac -+# Office of University of Helsinki, ISBN 952-10-3221-9, available online (in -+# Finnish) at -+# -+# <a href="http://almanakka.helsinki.fi/aikakirja/Aikakirja2007kokonaan.pdf"> -+# http://almanakka.helsinki.fi/aikakirja/Aikakirja2007kokonaan.pdf -+# </a> -+# -+# Page 105 (56 in PDF version) has a handy table of all past daylight savings -+# transitions. It is easy enough to interpret without Finnish skills. -+# -+# This is also confirmed by Finnish Broadcasting Company's archive at: -+# -+# <a href="http://www.yle.fi/elavaarkisto/?s=s&g=1&ag=5&t=&a=3401"> -+# http://www.yle.fi/elavaarkisto/?s=s&g=1&ag=5&t=&a=3401 -+# </a> -+# -+# The news clip from 1981 says that "the time between 2 and 3 o'clock does not -+# exist tonight." -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Finland 1942 only - Apr 3 0:00 1:00 S - Rule Finland 1942 only - Oct 3 0:00 0 - -+Rule Finland 1981 1982 - Mar lastSun 2:00 1:00 S -+Rule Finland 1981 1982 - Sep lastSun 3:00 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Europe/Helsinki 1:39:52 - LMT 1878 May 31 - 1:39:52 - HMT 1921 May # Helsinki Mean Time -- 2:00 Finland EE%sT 1981 Mar 29 2:00 -+ 2:00 Finland EE%sT 1983 - 2:00 EU EE%sT - - # Aaland Is ---- openjdk/jdk/make/sun/javazic/tzdata/leapseconds -+++ openjdk/jdk/make/sun/javazic/tzdata/leapseconds -@@ -82,9 +82,9 @@ - # FAX : 33 (0) 1 40 51 22 91 - # Internet : services.iers@obspm.fr - # --# Paris, 4 July 2009 -+# Paris, 14 July 2010 - # --# Bulletin C 38 -+# Bulletin C 40 - # - # To authorities responsible - # for the measurement and -@@ -92,9 +92,9 @@ - # - # INFORMATION ON UTC - TAI - # --# NO positive leap second will be introduced at the end of December 2009. -+# NO positive leap second will be introduced at the end of December 2010. - # The difference between Coordinated Universal Time UTC and the --# International Atomic Time TAI is : -+# International Atomic Time TAI is : - # - # from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s - # -@@ -104,6 +104,6 @@ - # will be no time step at the next possible date. - # - # Daniel GAMBIS --# Director -+# Director - # Earth Orientation Center of IERS - # Observatoire de Paris, France ---- openjdk/jdk/make/sun/javazic/tzdata/northamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/northamerica -@@ -1346,6 +1346,83 @@ - # entry since our cutoff date of 1970, so we can move - # America/Coral_Harbour to the 'backward' file. - -+# From Mark Brader (2010-03-06): -+# -+# Currently the database has: -+# -+# # Ontario -+# -+# # From Paul Eggert (2006-07-09): -+# # Shanks & Pottenger write that since 1970 most of Ontario has been like -+# # Toronto. -+# # Thunder Bay skipped DST in 1973. -+# # Many smaller locales did not observe peacetime DST until 1974; -+# # Nipigon (EST) and Rainy River (CST) are the largest that we know of. -+# -+# In the (Toronto) Globe and Mail for Saturday, 1955-09-24, in the bottom -+# right corner of page 1, it says that Toronto will return to standard -+# time at 2 am Sunday morning (which agrees with the database), and that: -+# -+# The one-hour setback will go into effect throughout most of Ontario, -+# except in areas like Windsor which remains on standard time all year. -+# -+# Windsor is, of course, a lot larger than Nipigon. -+# -+# I only came across this incidentally. I don't know if Windsor began -+# observing DST when Detroit did, or in 1974, or on some other date. -+# -+# By the way, the article continues by noting that: -+# -+# Some cities in the United States have pushed the deadline back -+# three weeks and will change over from daylight saving in October. -+ -+# From Arthur David Olson (2010-07-17): -+# -+# "Standard Time and Time Zones in Canada" appeared in -+# The Journal of The Royal Astronomical Society of Canada, -+# volume 26, number 2 (February 1932) and, as of 2010-07-17, -+# was available at -+# <a href="http://adsabs.harvard.edu/full/1932JRASC..26...49S"> -+# http://adsabs.harvard.edu/full/1932JRASC..26...49S -+# </a> -+# -+# It includes the text below (starting on page 57): -+# -+# A list of the places in Canada using daylight saving time would -+# require yearly revision. From information kindly furnished by -+# the provincial governments and by the postmasters in many cities -+# and towns, it is found that the following places used daylight sav- -+# ing in 1930. The information for the province of Quebec is definite, -+# for the other provinces only approximate: -+# -+# Province Daylight saving time used -+# Prince Edward Island Not used. -+# Nova Scotia In Halifax only. -+# New Brunswick In St. John only. -+# Quebec In the following places: -+# Montreal Lachine -+# Quebec Mont-Royal -+# Levis Iberville -+# St. Lambert Cap de la Madeleine -+# Verdun Loretteville -+# Westmount Richmond -+# Outremont St. Jerome -+# Longueuil Greenfield Park -+# Arvida Waterloo -+# Chambly-Canton Beaulieu -+# Melbourne La Tuque -+# St. Theophile Buckingham -+# Ontario Used generally in the cities and towns along -+# the southerly part of the province. Not -+# used in the northwesterlhy part. -+# Manitoba Not used. -+# Saskatchewan In Regina only. -+# Alberta Not used. -+# British Columbia Not used. -+# -+# With some exceptions, the use of daylight saving may be said to be limited -+# to those cities and towns lying between Quebec city and Windsor, Ont. -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Toronto 1919 only - Mar 30 23:30 1:00 D - Rule Toronto 1919 only - Oct 26 0:00 0 S -@@ -2111,7 +2188,44 @@ - -8:00 - PST 1970 - -7:00 Mexico M%sT 1999 - -7:00 - MST -+ -+# From Alexander Krivenyshev (2010-04-21): -+# According to news, Bahía de Banderas (Mexican state of Nayarit) -+# changed time zone UTC-7 to new time zone UTC-6 on April 4, 2010 (to -+# share the same time zone as nearby city Puerto Vallarta, Jalisco). -+# -+# (Spanish) -+# Bahía de Banderas homologa su horario al del centro del -+# país, a partir de este domingo -+# <a href="http://www.nayarit.gob.mx/notes.asp?id=20748"> -+# http://www.nayarit.gob.mx/notes.asp?id=20748 -+# </a> -+# -+# Bahía de Banderas homologa su horario con el del Centro del -+# País -+# <a href="http://www.bahiadebanderas.gob.mx/principal/index.php?option=com_content&view=article&id=261:bahia-de-banderas-homologa-su-horario-con-el-del-centro-del-pais&catid=42:comunicacion-social&Itemid=50"> -+# http://www.bahiadebanderas.gob.mx/principal/index.php?option=com_content&view=article&id=261:bahia-de-banderas-homologa-su-horario-con-el-del-centro-del-pais&catid=42:comunicacion-social&Itemid=50" -+# </a> -+# -+# (English) -+# Puerto Vallarta and Bahía de Banderas: One Time Zone -+# <a href="http://virtualvallarta.com/puertovallarta/puertovallarta/localnews/2009-12-03-Puerto-Vallarta-and-Bahia-de-Banderas-One-Time-Zone.shtml"> -+# http://virtualvallarta.com/puertovallarta/puertovallarta/localnews/2009-12-03-Puerto-Vallarta-and-Bahia-de-Banderas-One-Time-Zone.shtml -+# </a> -+# -+# or -+# <a href="http://www.worldtimezone.com/dst_news/dst_news_mexico08.html"> -+# http://www.worldtimezone.com/dst_news/dst_news_mexico08.html -+# </a> -+# -+# "Mexico's Senate approved the amendments to the Mexican Schedule System that -+# will allow Bahía de Banderas and Puerto Vallarta to share the same time -+# zone ..." - # Baja California Sur, Nayarit, Sinaloa -+ -+# From Arthur David Olson (2010-05-01): -+# Use "Bahia_Banderas" to keep the name to fourteen characters. -+ - Zone America/Mazatlan -7:05:40 - LMT 1921 Dec 31 23:54:20 - -7:00 - MST 1927 Jun 10 23:00 - -6:00 - CST 1930 Nov 15 -@@ -2122,6 +2236,19 @@ - -7:00 - MST 1949 Jan 14 - -8:00 - PST 1970 - -7:00 Mexico M%sT -+ -+Zone America/Bahia_Banderas -7:01:00 - LMT 1921 Dec 31 23:59:00 -+ -7:00 - MST 1927 Jun 10 23:00 -+ -6:00 - CST 1930 Nov 15 -+ -7:00 - MST 1931 May 1 23:00 -+ -6:00 - CST 1931 Oct -+ -7:00 - MST 1932 Apr 1 -+ -6:00 - CST 1942 Apr 24 -+ -7:00 - MST 1949 Jan 14 -+ -8:00 - PST 1970 -+ -7:00 Mexico M%sT 2010 Apr 4 2:00 -+ -6:00 Mexico C%sT -+ - # Baja California (near US border) - Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 0:11:56 - -7:00 - MST 1924 ---- openjdk/jdk/make/sun/javazic/tzdata/zone.tab -+++ openjdk/jdk/make/sun/javazic/tzdata/zone.tab -@@ -199,8 +199,8 @@ - FI +6010+02458 Europe/Helsinki - FJ -1808+17825 Pacific/Fiji - FK -5142-05751 Atlantic/Stanley --FM +0725+15147 Pacific/Truk Truk (Chuuk) and Yap --FM +0658+15813 Pacific/Ponape Ponape (Pohnpei) -+FM +0725+15147 Pacific/Chuuk Chuuk (Truk) and Yap -+FM +0658+15813 Pacific/Pohnpei Pohnpei (Ponape) - FM +0519+16259 Pacific/Kosrae Kosrae - FO +6201-00646 Atlantic/Faroe - FR +4852+00220 Europe/Paris -@@ -310,6 +310,7 @@ - MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora - MX +3232-11701 America/Tijuana US Pacific Time - Baja California near US border - MX +3018-11452 America/Santa_Isabel Mexican Pacific Time - Baja California away from US border -+MX +2048-10515 America/Bahia_Banderas Mexican Central Time - Bahia de Banderas - MY +0310+10142 Asia/Kuala_Lumpur peninsular Malaysia - MY +0133+11020 Asia/Kuching Sabah & Sarawak - MZ -2558+03235 Africa/Maputo ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -@@ -75,6 +75,8 @@ - "Central European Summer Time", "CEST"}; - String CHAST[] = new String[] {"Chatham Standard Time", "CHAST", - "Chatham Daylight Time", "CHADT"}; -+ String CHUT[] = new String[] {"Chuuk Time", "CHUT", -+ "Chuuk Summer Time", "CHUST"}; - String CIT[] = new String[] {"Central Indonesia Time", "CIT", - "Central Indonesia Summer Time", "CIST"}; - String CLT[] = new String[] {"Chile Time", "CLT", -@@ -153,6 +155,8 @@ - "Pitcairn Daylight Time", "PDT"}; - String PKT[] = new String[] {"Pakistan Time", "PKT", - "Pakistan Summer Time", "PKST"}; -+ String PONT[] = new String[] {"Pohnpei Time", "PONT", -+ "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"Pacific Standard Time", "PST", - "Pacific Daylight Time", "PDT"}; - String RST[] = new String[] {"Eastern Standard Time", "EST", -@@ -169,8 +173,6 @@ - "Eastern Summer Time (Tasmania)", "EST"}; - String TMT[] = new String[] {"Turkmenistan Time", "TMT", - "Turkmenistan Summer Time", "TMST"}; -- String TRUT[] = new String[] {"Truk Time", "TRUT", -- "Truk Summer Time", "TRUST"}; - String ULAT[]= new String[] {"Ulaanbaatar Time", "ULAT", - "Ulaanbaatar Summer Time", "ULAST"}; - String WART[] = new String[] {"Western Argentine Time", "WART", -@@ -309,6 +311,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -755,6 +758,7 @@ - {"Pacific/Apia", WST_SAMOA}, - {"Pacific/Auckland", NZST}, - {"Pacific/Chatham", CHAST}, -+ {"Pacific/Chuuk", CHUT}, - {"Pacific/Easter", EASTER}, - {"Pacific/Efate", new String[] {"Vanuatu Time", "VUT", - "Vanuatu Summer Time", "VUST"}}, -@@ -793,8 +797,8 @@ - {"Pacific/Palau", new String[] {"Palau Time", "PWT", - "Palau Summer Time", "PWST"}}, - {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Ponape", new String[] {"Ponape Time", "PONT", -- "Ponape Summer Time", "PONST"}}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, - {"Pacific/Port_Moresby", new String[] {"Papua New Guinea Time", "PGT", - "Papua New Guinea Summer Time", "PGST"}}, - {"Pacific/Rarotonga", new String[] {"Cook Is. Time", "CKT", -@@ -807,12 +811,12 @@ - "Gilbert Is. Summer Time", "GILST"}}, - {"Pacific/Tongatapu", new String[] {"Tonga Time", "TOT", - "Tonga Summer Time", "TOST"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"Wake Time", "WAKT", - "Wake Summer Time", "WAKST"}}, - {"Pacific/Wallis", new String[] {"Wallis & Futuna Time", "WFT", - "Wallis & Futuna Summer Time", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -@@ -75,6 +75,8 @@ - "Mitteleurop\u00e4ische Sommerzeit", "MESZ"}; - String CHAST[] = new String[] {"Chatham Normalzeit", "CHAST", - "Chatham Sommerzeit", "CHADT"}; -+ String CHUT[] = new String[] {"Chuuk Time", "CHUT", -+ "Chuuk Summer Time", "CHUST"}; - String CIT[] = new String[] {"Zentralindonesische Zeit", "CIT", - "Zentralindonesische Sommerzeit", "CIST"}; - String CLT[] = new String[] {"Chilenische Zeit", "CLT", -@@ -153,6 +155,8 @@ - "Pitcairn Sommerzeit", "PDT"}; - String PKT[] = new String[] {"Pakistanische Zeit", "PKT", - "Pakistanische Sommerzeit", "PKST"}; -+ String PONT[] = new String[] {"Pohnpei Time", "PONT", -+ "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"Pazifische Normalzeit", "PST", - "Pazifische Sommerzeit", "PDT"}; - String RST[] = new String[] {"\u00d6stliche Normalzeit", "EST", -@@ -169,8 +173,6 @@ - "\u00d6stliche Sommerzeit (Tasmanien)", "EST"}; - String TMT[] = new String[] {"Turkmenische Zeit", "TMT", - "Turkmenische Sommerzeit", "TMST"}; -- String TRUT[] = new String[] {"Truk Zeit", "TRUT", -- "Truk Sommerzeit", "TRUST"}; - String ULAT[]= new String[] {"Ulaanbaatar Zeit", "ULAT", - "Ulaanbaatar Sommerzeit", "ULAST"}; - String WART[] = new String[] {"Westargentinische Zeit", "WART", -@@ -309,6 +311,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -446,10 +449,13 @@ - {"America/Winnipeg", CST}, - {"America/Yakutat", AKST}, - {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, - {"Antarctica/Davis", new String[] {"Davis Zeit", "DAVT", - "Davis Sommerzeit", "DAVST"}}, - {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville Zeit", "DDUT", - "Dumont-d'Urville Sommerzeit", "DDUST"}}, -+ {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", -+ "Macquarie Island Summer Time", "MIST"}}, - {"Antarctica/Mawson", new String[] {"Mawson Zeit", "MAWT", - "Mawson Sommerzeit", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -752,6 +758,7 @@ - {"Pacific/Apia", WST_SAMOA}, - {"Pacific/Auckland", NZST}, - {"Pacific/Chatham", CHAST}, -+ {"Pacific/Chuuk", CHUT}, - {"Pacific/Easter", EASTER}, - {"Pacific/Efate", new String[] {"Vanuatu Zeit", "VUT", - "Vanuatu Sommerzeit", "VUST"}}, -@@ -790,8 +797,8 @@ - {"Pacific/Palau", new String[] {"Palau Zeit", "PWT", - "Palau Sommerzeit", "PWST"}}, - {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Ponape", new String[] {"Ponape Zeit", "PONT", -- "Ponape Sommerzeit", "PONST"}}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, - {"Pacific/Port_Moresby", new String[] {"Papua-Neuguinea Zeit", "PGT", - "Papua-Neuguinea Sommerzeit", "PGST"}}, - {"Pacific/Rarotonga", new String[] {"Cook-Inseln Zeit", "CKT", -@@ -804,12 +811,12 @@ - "Gilbert-Inseln Sommerzeit", "GILST"}}, - {"Pacific/Tongatapu", new String[] {"Tonga Zeit", "TOT", - "Tonga Sommerzeit", "TOST"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"Wake Zeit", "WAKT", - "Wake Sommerzeit", "WAKST"}}, - {"Pacific/Wallis", new String[] {"Wallis u. Futuna Zeit", "WFT", - "Wallis u. Futuna Sommerzeit", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -@@ -75,6 +75,8 @@ - "Hora de verano de Europa Central", "CEST"}; - 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"}; - String CIT[] = new String[] {"Hora de Indonesia Central", "CIT", - "Hora de verano de Indonesia Central", "CIST"}; - String CLT[] = new String[] {"Hora de Chile", "CLT", -@@ -153,6 +155,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 PST[] = new String[] {"Hora est\u00e1ndar del Pac\u00edfico", "PST", - "Hora de verano del Pac\u00edfico", "PDT"}; - String RST[] = new String[] {"Hora est\u00e1ndar Oriental", "EST", -@@ -169,8 +173,6 @@ - "Hora de verano del Este (Tasmania)", "EST"}; - String TMT[] = new String[] {"Hora de Turkmenist\u00e1n", "TMT", - "Hora de verano de Turkmenist\u00e1n", "TMST"}; -- String TRUT[] =new String[] {"Hora de Truk", "TRUT", -- "Hora de verano de Truk", "TRUST"}; - String ULAT[]= new String[] {"Hora de Ulan Bator", "ULAT", - "Hora de verano de Ulan Bator", "ULAST"}; - String WART[] = new String[] {"Hora de Argentina Occidental", "WART", -@@ -309,6 +311,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -446,10 +449,13 @@ - {"America/Winnipeg", CST}, - {"America/Yakutat", AKST}, - {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, - {"Antarctica/Davis", new String[] {"Hora de Davis", "DAVT", - "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/Mawson", new String[] {"Hora de Mawson", "MAWT", - "Hora de verano de Mawson", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -533,7 +539,6 @@ - "Hora de verano de Filipinas", "PHST"}}, - {"Asia/Muscat", GST}, - {"Asia/Nicosia", EET}, -- - {"Asia/Novokuznetsk", NOVT}, - {"Asia/Novosibirsk", NOVT}, - {"Asia/Oral", new String[] {"Hora de Uralsk", "ORAT", -@@ -753,6 +758,7 @@ - {"Pacific/Apia", WST_SAMOA}, - {"Pacific/Auckland", NZST}, - {"Pacific/Chatham", CHAST}, -+ {"Pacific/Chuuk", CHUT}, - {"Pacific/Easter", EASTER}, - {"Pacific/Efate", new String[] {"Hora de Vanuatu", "VUT", - "Hora de verano de Vanuatu", "VUST"}}, -@@ -791,8 +797,8 @@ - {"Pacific/Palau", new String[] {"Hora de Palau", "PWT", - "Hora de verano de Palau", "PWST"}}, - {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Ponape", new String[] {"Hora de Ponape", "PONT", -- "Hora de verano de Ponape", "PONST"}}, -+ {"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"}}, - {"Pacific/Rarotonga", new String[] {"Hora de las islas Cook", "CKT", -@@ -805,12 +811,12 @@ - "Hora de verano de las islas Gilbert", "GILST"}}, - {"Pacific/Tongatapu", new String[] {"Hora de Tonga", "TOT", - "Hora de verano de Tonga", "TOST"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"Hora de Wake", "WAKT", - "Hora de verano de Wake", "WAKST"}}, - {"Pacific/Wallis", new String[] {"Hora de Wallis y Futuna", "WFT", - "Hora de verano de Wallis y Futuna", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -@@ -75,6 +75,8 @@ - "Heure d'\u00e9t\u00e9 d'Europe centrale", "CEST"} ; - String CHAST[] = new String[] {"Heure standard de Chatham", "CHAST", - "Heure avanc\u00e9e de Chatham", "CHADT"}; -+ String CHUT[] = new String[] {"Chuuk Time", "CHUT", -+ "Chuuk Summer Time", "CHUST"}; - String CIT[] = new String[] {"Heure d'Indon\u00e9sie centrale", "CIT", - "Heure d'\u00e9t\u00e9 d'Indon\u00e9sie centrale", "CIST"}; - String CLT[] = new String[] {"Heure du Chili", "CLT", -@@ -153,6 +155,8 @@ - "heure avanc\u00e9e des Pitcairn", "PDT"}; - String PKT[] = new String[] {"Heure du Pakistan", "PKT", - "Heure d'\u00e9t\u00e9 du Pakistan", "PKST"} ; -+ String PONT[] = new String[] {"Pohnpei Time", "PONT", -+ "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"Heure normale du Pacifique", "PST", - "Heure avanc\u00e9e du Pacifique", "PDT"} ; - String RST[] = new String[] {"Heure normale de l'Est", "EST", -@@ -169,8 +173,6 @@ - "Heure d'\u00e9t\u00e9 d'Australie orientale (Tasmanie)", "EST"}; - String TMT[] = new String[] {"Heure du Turkm\u00e9nistan", "TMT", - "Heure d'\u00e9t\u00e9 du Turkm\u00e9nistan", "TMST"} ; -- String TRUT[] = new String[] {"Heure de Truk", "TRUT", -- "Heure d'\u00e9t\u00e9 de Truk", "TRUST"}; - String ULAT[]= new String[] {"Heure de l'Ulaanbaatar", "ULAT", - "Heure d'\u00e9t\u00e9 de l'Ulaanbaatar", "ULAST"} ; - String WART[] = new String[] {"Heure D'Argentine de l'Ouest", "WART", -@@ -309,6 +311,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -446,10 +449,13 @@ - {"America/Winnipeg", CST}, - {"America/Yakutat", AKST}, - {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, - {"Antarctica/Davis", new String[] {"Heure de Davis", "DAVT", - "Heure d'\u00e9t\u00e9 de Davis", "DAVST"}}, - {"Antarctica/DumontDUrville", new String[] {"Heure de Dumont-d'Urville", "DDUT", - "Heure d'\u00e9t\u00e9 de Dumont-d'Urville", "DDUST"}}, -+ {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", -+ "Macquarie Island Summer Time", "MIST"}}, - {"Antarctica/Mawson", new String[] {"Heure de Mawson", "MAWT", - "Heure d'\u00e9t\u00e9 de Mawson", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -752,6 +758,7 @@ - {"Pacific/Apia", WST_SAMOA}, - {"Pacific/Auckland", NZST}, - {"Pacific/Chatham", CHAST}, -+ {"Pacific/Chuuk", CHUT}, - {"Pacific/Easter", EASTER}, - {"Pacific/Efate", new String[] {"Heure du Vanuatu", "VUT", - "Heure d'\u00e9t\u00e9 du Vanuatu", "VUST"}}, -@@ -790,8 +797,8 @@ - {"Pacific/Palau", new String[] {"Heure de Palaos", "PWT", - "Heure d'\u00e9t\u00e9 de Palaos", "PWST"}}, - {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Ponape", new String[] {"Heure de Ponap\u00e9", "PONT", -- "Heure d'\u00e9t\u00e9 de Ponap\u00e9", "PONST"}}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, - {"Pacific/Port_Moresby", new String[] {"Heure de Papouasie-Nouvelle-Guin\u00e9e", "PGT", - "Heure d'\u00e9t\u00e9 de de Papouasie-Nouvelle-Guin\u00e9e", "PGST"}}, - {"Pacific/Rarotonga", new String[] {"Heure des \u00celes Cook", "CKT", -@@ -804,12 +811,12 @@ - "Heure d'\u00e9t\u00e9 de Kiribati", "GILST"}}, - {"Pacific/Tongatapu", new String[] {"Heure de Tonga", "TOT", - "Heure d'\u00e9t\u00e9 de Tonga", "TOST"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"Heure de Wake", "WAKT", - "Heure d'\u00e9t\u00e9 de Wake", "WAKST"}}, - {"Pacific/Wallis", new String[] {"Heure de Wallis et Futuna", "WFT", - "Heure d'\u00e9t\u00e9 de Wallis et Futuna", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -@@ -75,6 +75,8 @@ - "Ora estiva dell'Europa centrale", "CEST"}; - String CHAST[] = new String[] {"Ora di Chatham standard", "CHAST", - "Ora legale di Chatham", "CHADT"}; -+ String CHUT[] = new String[] {"Chuuk Time", "CHUT", -+ "Chuuk Summer Time", "CHUST"}; - String CIT[] = new String[] {"Ora dell'Indonesia centrale", "CIT", - "Ora estiva dell'Indonesia centrale", "CIST"}; - String CLT[] = new String[] {"Ora del Cile", "CLT", -@@ -153,6 +155,8 @@ - "Ora legale di Pitcairn", "PDT"}; - String PKT[] = new String[] {"Ora del Pakistan", "PKT", - "Ora estiva del Pakistan", "PKST"}; -+ String PONT[] = new String[] {"Pohnpei Time", "PONT", -+ "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"Ora solare della costa occidentale USA", "PST", - "Ora legale della costa occidentale USA", "PDT"}; - String RST[] = new String[] {"Ora solare USA orientale", "EST", -@@ -169,8 +173,6 @@ - "Ora estiva orientale (Tasmania)", "EST"}; - String TMT[] = new String[] {"Ora del Turkmenistan", "TMT", - "Ora estiva del Turkmenistan", "TMST"}; -- String TRUT[] = new String[] {"Ora di Truk", "TRUT", -- "Ora estiva di Truk", "TRUST"}; - String ULAT[]= new String[] {"Ora di Ulaanbaatar", "ULAT", - "Ora estiva di Ulaanbaatar", "ULAST"}; - String WART[] = new String[] {"Ora dell'Argentina occidentale", "WART", -@@ -309,6 +311,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -446,10 +449,13 @@ - {"America/Winnipeg", CST}, - {"America/Yakutat", AKST}, - {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, - {"Antarctica/Davis", new String[] {"Ora di Davis", "DAVT", - "Ora estiva di Davis", "DAVST"}}, - {"Antarctica/DumontDUrville", new String[] {"Ora di Dumont-d'Urville", "DDUT", - "Ora estiva di Dumont-d'Urville", "DDUST"}}, -+ {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", -+ "Macquarie Island Summer Time", "MIST"}}, - {"Antarctica/Mawson", new String[] {"Ora di Mawson", "MAWT", - "Ora estiva di Mawson", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -752,6 +758,7 @@ - {"Pacific/Apia", WST_SAMOA}, - {"Pacific/Auckland", NZST}, - {"Pacific/Chatham", CHAST}, -+ {"Pacific/Chuuk", CHUT}, - {"Pacific/Easter", EASTER}, - {"Pacific/Efate", new String[] {"Ora di Vanuatu", "VUT", - "Ora estiva di Vanuatu", "VUST"}}, -@@ -790,8 +797,8 @@ - {"Pacific/Palau", new String[] {"Ora di Palau", "PWT", - "Ora estiva di Palau", "PWST"}}, - {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Ponape", new String[] {"Ora di Ponape", "PONT", -- "Ora estiva di Ponape", "PONST"}}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, - {"Pacific/Port_Moresby", new String[] {"Ora di Papua Nuova Guinea", "PGT", - "Ora estiva di Papua Nuova Guinea", "PGST"}}, - {"Pacific/Rarotonga", new String[] {"Ora delle Isole Cook", "CKT", -@@ -804,12 +811,12 @@ - "Ora estiva delle Isole Gilbert", "GILST"}}, - {"Pacific/Tongatapu", new String[] {"Ora di Tonga", "TOT", - "Ora estiva di Tonga", "TOST"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"Ora di Wake", "WAKT", - "Ora estiva di Wake", "WAKST"}}, - {"Pacific/Wallis", new String[] {"Ora di Wallis e Futuna", "WFT", - "Ora estiva di Wallis e Futuna", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -@@ -75,6 +75,8 @@ - "\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "CEST"}; - String CHAST[] = new String[] {"\u30c1\u30e3\u30bf\u30e0\u6a19\u6e96\u6642", "CHAST", - "\u30c1\u30e3\u30bf\u30e0\u590f\u6642\u9593", "CHADT"}; -+ String CHUT[] = new String[] {"Chuuk Time", "CHUT", -+ "Chuuk Summer Time", "CHUST"}; - String CIT[] = new String[] {"\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "CIT", - "\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "CIST"}; - String CLT[] = new String[] {"\u30c1\u30ea\u6642\u9593", "CLT", -@@ -153,6 +155,8 @@ - "\u30d4\u30c8\u30b1\u30eb\u30f3\u5cf6\u590f\u6642\u9593", "PDT"}; - String PKT[] = new String[] {"\u30d1\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "PKT", - "\u30d1\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "PKST"}; -+ String PONT[] = new String[] {"Pohnpei Time", "PONT", -+ "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642", "PST", - "\u592a\u5e73\u6d0b\u590f\u6642\u9593", "PDT"}; - String RST[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642", "EST", -@@ -169,8 +173,6 @@ - "\u6771\u90e8\u590f\u6642\u9593 (\u30bf\u30b9\u30de\u30cb\u30a2)", "EST"}; - String TMT[] = new String[] {"\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u6642\u9593", "TMT", - "\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u590f\u6642\u9593", "TMST"}; -- String TRUT[] = new String[] {"\u30c8\u30e9\u30c3\u30af\u6642\u9593", "TRUT", -- "\u30c8\u30e9\u30c3\u30af\u590f\u6642\u9593", "TRUST"}; - String ULAT[]= new String[] {"\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u6642\u9593", "ULAT", - "\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u590f\u6642\u9593", "ULAST"}; - String WART[] = new String[] {"\u897f\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "WART", -@@ -309,6 +311,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -446,10 +449,13 @@ - {"America/Winnipeg", CST}, - {"America/Yakutat", AKST}, - {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, - {"Antarctica/Davis", new String[] {"\u30c7\u30a4\u30d3\u30b9\u6642\u9593", "DAVT", - "\u30c7\u30a4\u30d3\u30b9\u590f\u6642\u9593", "DAVST"}}, - {"Antarctica/DumontDUrville", new String[] {"\u30c7\u30e5\u30e2\u30f3\u30c7\u30e5\u30eb\u30f4\u30a3\u30eb\u6642\u9593", "DDUT", - "\u30c7\u30e5\u30e2\u30f3\u30c7\u30e5\u30eb\u30f4\u30a3\u30eb\u590f\u6642\u9593", "DDUST"}}, -+ {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", -+ "Macquarie Island Summer Time", "MIST"}}, - {"Antarctica/Mawson", new String[] {"\u30e2\u30fc\u30bd\u30f3\u6642\u9593", "MAWT", - "\u30e2\u30fc\u30bd\u30f3\u590f\u6642\u9593", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -752,6 +758,7 @@ - {"Pacific/Apia", WST_SAMOA}, - {"Pacific/Auckland", NZST}, - {"Pacific/Chatham", CHAST}, -+ {"Pacific/Chuuk", CHUT}, - {"Pacific/Easter", EASTER}, - {"Pacific/Efate", new String[] {"\u30d0\u30cc\u30a2\u30c4\u6642\u9593", "VUT", - "\u30d0\u30cc\u30a2\u30c4\u590f\u6642\u9593", "VUST"}}, -@@ -790,8 +797,8 @@ - {"Pacific/Palau", new String[] {"\u30d1\u30e9\u30aa\u6642\u9593", "PWT", - "\u30d1\u30e9\u30aa\u590f\u6642\u9593", "PWST"}}, - {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Ponape", new String[] {"\u30dd\u30ca\u30da\u6642\u9593", "PONT", -- "\u30dd\u30ca\u30da\u590f\u6642\u9593", "PONST"}}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, - {"Pacific/Port_Moresby", new String[] {"\u30d1\u30d7\u30a2\u30cb\u30e5\u30fc\u30ae\u30cb\u30a2\u6642\u9593", "PGT", - "\u30d1\u30d7\u30a2\u30cb\u30e5\u30fc\u30ae\u30cb\u30a2\u590f\u6642\u9593", "PGST"}}, - {"Pacific/Rarotonga", new String[] {"\u30af\u30c3\u30af\u8af8\u5cf6\u6642\u9593", "CKT", -@@ -804,12 +811,12 @@ - "\u30ae\u30eb\u30d0\u30fc\u30c8\u8af8\u5cf6\u590f\u6642\u9593", "GILST"}}, - {"Pacific/Tongatapu", new String[] {"\u30c8\u30f3\u30ac\u6642\u9593", "TOT", - "\u30c8\u30f3\u30ac\u590f\u6642\u9593", "TOST"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"\u30a6\u30a7\u30fc\u30af\u6642\u9593", "WAKT", - "\u30a6\u30a7\u30fc\u30af\u590f\u6642\u9593", "WAKST"}}, - {"Pacific/Wallis", new String[] {"\u30ef\u30ea\u30b9\u53ca\u3073\u30d5\u30c4\u30ca\u6642\u9593", "WFT", - "\u30ef\u30ea\u30b9\u53ca\u3073\u30d5\u30c4\u30ca\u590f\u6642\u9593", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -@@ -75,6 +75,8 @@ - "\uc911\uc559 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CEST"}; - String CHAST[] = new String[] {"Chatham \ud45c\uc900\uc2dc", "CHAST", - "Chatham \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CHADT"}; -+ String CHUT[] = new String[] {"Chuuk Time", "CHUT", -+ "Chuuk Summer Time", "CHUST"}; - String CIT[] = new String[] {"\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "CIT", - "\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CIST"}; - String CLT[] = new String[] {"\uce60\ub808 \uc2dc\uac04", "CLT", -@@ -153,6 +155,8 @@ - "Pitcairn \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PDT"}; - String PKT[] = new String[] {"\ud30c\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "PKT", - "\ud30c\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PKST"}; -+ String PONT[] = new String[] {"Pohnpei Time", "PONT", -+ "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"\ud0dc\ud3c9\uc591 \ud45c\uc900\uc2dc", "PST", - "\ud0dc\ud3c9\uc591 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PDT"}; - String RST[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc", "EST", -@@ -169,8 +173,6 @@ - "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ud0dc\uc988\uba54\uc774\ub2c8\uc544)", "EST"}; - String TMT[] = new String[] {"\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc2dc\uac04", "TMT", - "\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TMST"}; -- String TRUT[] = new String[] {"\ud2b8\ub8e8\ud06c \uc2dc\uac04", "TRUT", -- "\ud2b8\ub8e8\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TRUST"}; - String ULAT[]= new String[] {"\uc6b8\ub780\ubc14\ud0c0\ub974 \uc2dc\uac04", "ULAT", - "\uc6b8\ub780\ubc14\ud0c0\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ULAST"}; - String WART[] = new String[] {"\uc11c\ubd80 \uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "WART", -@@ -309,6 +311,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -446,10 +449,13 @@ - {"America/Winnipeg", CST}, - {"America/Yakutat", AKST}, - {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, - {"Antarctica/Davis", new String[] {"Davis \uc2dc\uac04", "DAVT", - "Davis \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "DAVST"}}, - {"Antarctica/DumontDUrville", new String[] {"\ub4a4\ubabd \ub4a4\ub974\ube4c \uc2dc\uac04", "DDUT", - "\ub4a4\ubabd \ub4a4\ub974\ube4c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "DDUST"}}, -+ {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", -+ "Macquarie Island Summer Time", "MIST"}}, - {"Antarctica/Mawson", new String[] {"\ubaa8\uc2a8 \uc2dc\uac04", "MAWT", - "\ubaa8\uc2a8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -752,6 +758,7 @@ - {"Pacific/Apia", WST_SAMOA}, - {"Pacific/Auckland", NZST}, - {"Pacific/Chatham", CHAST}, -+ {"Pacific/Chuuk", CHUT}, - {"Pacific/Easter", EASTER}, - {"Pacific/Efate", new String[] {"\ube44\ub204\uc544\ud22c \uc2dc\uac04", "VUT", - "\ubc14\ub204\uc544\ud22c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VUST"}}, -@@ -790,8 +797,8 @@ - {"Pacific/Palau", new String[] {"\ud314\ub77c\uc6b0 \uc2dc\uac04", "PWT", - "\ud314\ub77c\uc6b0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PWST"}}, - {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Ponape", new String[] {"\ud3ec\ub098\ud504 \uc2dc\uac04", "PONT", -- "\ud3ec\ub098\ud504 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PONST"}}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, - {"Pacific/Port_Moresby", new String[] {"\ud30c\ud478\uc544\ub274\uae30\ub2c8 \uc2dc\uac04", "PGT", - "\ud30c\ud478\uc544\ub274\uae30\ub2c8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PGST"}}, - {"Pacific/Rarotonga", new String[] {"\ucfe0\ud06c \uad70\ub3c4 \uc2dc\uac04", "CKT", -@@ -804,12 +811,12 @@ - "\uae38\ubc84\ud2b8 \uad70\ub3c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GILST"}}, - {"Pacific/Tongatapu", new String[] {"\ud1b5\uac00 \uc2dc\uac04", "TOT", - "\ud1b5\uac00 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TOST"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"\uc6e8\uc774\ud06c \uc2dc\uac04", "WAKT", - "\uc6e8\uc774\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WAKST"}}, - {"Pacific/Wallis", new String[] {"\uc6d4\ub9ac\uc2a4 \ud6c4\ud22c\ub098 \uc2dc\uac04", "WFT", - "\uc6d4\ub9ac\uc2a4 \ud6c4\ud2b8\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -@@ -75,6 +75,8 @@ - "Centraleuropeisk sommartid", "CEST"}; - String CHAST[] = new String[] {"Chatham, normaltid", "CHAST", - "Chatham, sommartid", "CHADT"}; -+ String CHUT[] = new String[] {"Chuuk Time", "CHUT", -+ "Chuuk Summer Time", "CHUST"}; - String CIT[] = new String[] {"Centralindonesisk tid", "CIT", - "Centralindonesisk sommartid", "CIST"}; - String CLT[] = new String[] {"Chile, normaltid", "CLT", -@@ -153,6 +155,8 @@ - "Pitcairn, sommartid", "PDT"}; - String PKT[] = new String[] {"Pakistan, normaltid", "PKT", - "Pakistan, sommartid", "PKST"}; -+ String PONT[] = new String[] {"Pohnpei Time", "PONT", -+ "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"Stilla havet, normaltid", "PST", - "Stilla havet, sommartid", "PDT"}; - String RST[] = new String[] {"Eastern, normaltid", "EST", -@@ -169,8 +173,6 @@ - "Eastern, sommartid (Tasmanien)", "EST"}; - String TMT[] = new String[] {"Turkmenistan, normaltid", "TMT", - "Turkmenistan, sommartid", "TMST"}; -- String TRUT[] = new String[] {"Truk, normaltid", "TRUT", -- "Truk, sommartid", "TRUST"}; - String ULAT[]= new String[] {"Ulaanbaatar, normaltid", "ULAT", - "Ulaanbaatar, sommartid", "ULAST"}; - String WART[] = new String[] {"V\u00e4stargentina, normaltid", "WART", -@@ -309,6 +311,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -446,10 +449,13 @@ - {"America/Winnipeg", CST}, - {"America/Yakutat", AKST}, - {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, - {"Antarctica/Davis", new String[] {"Davis, normaltid", "DAVT", - "Davis, sommartid", "DAVST"}}, - {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville, normaltid", "DDUT", - "Dumont-d'Urville, sommartid", "DDUST"}}, -+ {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", -+ "Macquarie Island Summer Time", "MIST"}}, - {"Antarctica/Mawson", new String[] {"Mawson, normaltid", "MAWT", - "Mawson, sommartid", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -752,6 +758,7 @@ - {"Pacific/Apia", WST_SAMOA}, - {"Pacific/Auckland", NZST}, - {"Pacific/Chatham", CHAST}, -+ {"Pacific/Chuuk", CHUT}, - {"Pacific/Easter", EASTER}, - {"Pacific/Efate", new String[] {"Vanuatu, normaltid", "VUT", - "Vanuatu, sommartid", "VUST"}}, -@@ -790,8 +797,8 @@ - {"Pacific/Palau", new String[] {"Palau, normaltid", "PWT", - "Palau, sommartid", "PWST"}}, - {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Ponape", new String[] {"Ponape, normaltid", "PONT", -- "Ponape, sommartid", "PONST"}}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, - {"Pacific/Port_Moresby", new String[] {"Papua Nya Guinea, normaltid", "PGT", - "Papua Nya Guinea, sommartid", "PGST"}}, - {"Pacific/Rarotonga", new String[] {"Cook\u00f6arna, normaltid", "CKT", -@@ -804,12 +811,12 @@ - "Gilbert\u00f6arna, sommartid", "GILST"}}, - {"Pacific/Tongatapu", new String[] {"Tonga, normaltid", "TOT", - "Tonga, sommartid", "TOST"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"Wake, normaltid", "WAKT", - "Wake, sommartid", "WAKST"}}, - {"Pacific/Wallis", new String[] {"Wallis & Futuna, normaltid", "WFT", - "Wallis & Futuna, sommartid", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -@@ -75,6 +75,8 @@ - "\u4e2d\u6b27\u590f\u4ee4\u65f6", "CEST"}; - String CHAST[] = new String[] {"\u67e5\u8428\u59c6\u6807\u51c6\u65f6\u95f4", "CHAST", - "\u67e5\u8428\u59c6\u590f\u4ee4\u65f6", "CHADT"}; -+ String CHUT[] = new String[] {"Chuuk Time", "CHUT", -+ "Chuuk Summer Time", "CHUST"}; - String CIT[] = new String[] {"\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "CIT", - "\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "CIST"}; - String CLT[] = new String[] {"\u667a\u5229\u65f6\u95f4", "CLT", -@@ -153,6 +155,8 @@ - "\u76ae\u7279\u5eb7\u5c9b\u590f\u4ee4\u65f6", "PDT"}; - String PKT[] = new String[] {"\u5df4\u57fa\u65af\u5766\u65f6\u95f4", "PKT", - "\u5df4\u57fa\u65af\u5766\u590f\u4ee4\u65f6", "PKST"}; -+ String PONT[] = new String[] {"Pohnpei Time", "PONT", -+ "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6807\u51c6\u65f6\u95f4", "PST", - "\u592a\u5e73\u6d0b\u590f\u4ee4\u65f6", "PDT"}; - String RST[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4", "EST", -@@ -169,8 +173,6 @@ - "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u5854\u65af\u9a6c\u5c3c\u4e9a\uff09", "EST"}; - String TMT[] = new String[] {"\u571f\u5e93\u66fc\u65f6\u95f4", "TMT", - "\u571f\u5e93\u66fc\u590f\u4ee4\u65f6", "TMST"}; -- String TRUT[] = new String[] {"\u7279\u9c81\u514b\u65f6\u95f4", "TRUT", -- "\u7279\u9c81\u514b\u590f\u4ee4\u65f6", "TRUST"}; - String ULAT[]= new String[] {"\u5e93\u4f26\u65f6\u95f4", "ULAT", - "\u5e93\u4f26\u590f\u4ee4\u65f6", "ULAST"}; - String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u65f6\u95f4", "WART", -@@ -309,6 +311,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -446,10 +449,13 @@ - {"America/Winnipeg", CST}, - {"America/Yakutat", AKST}, - {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, - {"Antarctica/Davis", new String[] {"\u6234\u7ef4\u65af\u65f6\u95f4", "DAVT", - "\u6234\u7ef4\u65af\u590f\u4ee4\u65f6", "DAVST"}}, - {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville \u65f6\u95f4", "DDUT", - "Dumont-d'Urville \u590f\u4ee4\u65f6", "DDUST"}}, -+ {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", -+ "Macquarie Island Summer Time", "MIST"}}, - {"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u65f6\u95f4", "MAWT", - "\u83ab\u68ee\u590f\u4ee4\u65f6", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -752,6 +758,7 @@ - {"Pacific/Apia", WST_SAMOA}, - {"Pacific/Auckland", NZST}, - {"Pacific/Chatham", CHAST}, -+ {"Pacific/Chuuk", CHUT}, - {"Pacific/Easter", EASTER}, - {"Pacific/Efate", new String[] {"\u74e6\u5974\u963f\u56fe\u65f6\u95f4", "VUT", - "\u74e6\u5974\u963f\u56fe\u590f\u4ee4\u65f6", "VUST"}}, -@@ -790,8 +797,8 @@ - {"Pacific/Palau", new String[] {"\u5e1b\u7409\u65f6\u95f4", "PWT", - "\u5e1b\u7409\u590f\u4ee4\u65f6", "PWST"}}, - {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Ponape", new String[] {"Ponape \u65f6\u95f4", "PONT", -- "Ponape \u590f\u4ee4\u65f6", "PONST"}}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, - {"Pacific/Port_Moresby", new String[] {"\u5df4\u5e03\u4e9a\u65b0\u51e0\u5185\u4e9a\u65f6\u95f4", "PGT", - "\u5df4\u5e03\u4e9a\u65b0\u51e0\u5185\u4e9a\u590f\u4ee4\u65f6", "PGST"}}, - {"Pacific/Rarotonga", new String[] {"\u5e93\u514b\u7fa4\u5c9b\u65f6\u95f4", "CKT", -@@ -804,12 +811,12 @@ - "\u5409\u4f2f\u7279\u7fa4\u5c9b\u590f\u4ee4\u65f6", "GILST"}}, - {"Pacific/Tongatapu", new String[] {"\u4e1c\u52a0\u65f6\u95f4", "TOT", - "\u4e1c\u52a0\u590f\u4ee4\u65f6", "TOST"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"\u5a01\u514b\u65f6\u95f4", "WAKT", - "\u5a01\u514b\u590f\u4ee4\u65f6", "WAKST"}}, - {"Pacific/Wallis", new String[] {"\u74e6\u5229\u65af\u53ca\u798f\u675c\u7eb3\u7fa4\u5c9b\u65f6\u95f4", "WFT", - "\u74e6\u5229\u65af\u53ca\u798f\u675c\u7eb3\u7fa4\u5c9b\u590f\u4ee4\u65f6", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -@@ -75,6 +75,8 @@ - "\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "CEST"}; - String CHAST[] = new String[] {"\u67e5\u5766\u6a19\u6e96\u6642\u9593", "CHAST", - "\u67e5\u5766\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CHADT"}; -+ String CHUT[] = new String[] {"Chuuk Time", "CHUT", -+ "Chuuk Summer Time", "CHUST"}; - String CIT[] = new String[] {"\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "CIT", - "\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u590f\u4ee4\u6642\u9593", "CIST"}; - String CLT[] = new String[] {"\u667a\u5229\u6642\u9593", "CLT", -@@ -153,6 +155,8 @@ - "\u76ae\u7279\u5eb7\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PDT"}; - String PKT[] = new String[] {"\u5df4\u57fa\u65af\u5766\u6642\u9593", "PKT", - "\u5df4\u57fa\u65af\u5766\u590f\u4ee4\u6642\u9593", "PKST"}; -+ String PONT[] = new String[] {"Pohnpei Time", "PONT", -+ "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642\u9593", "PST", - "\u592a\u5e73\u6d0b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PDT"}; - String RST[] = new String[] {"\u6771\u65b9\u6a19\u6e96\u6642\u9593", "EST", -@@ -169,8 +173,6 @@ - "\u6771\u90e8\u590f\u4ee4\u6642\u9593 (\u5854\u65af\u6885\u5c3c\u4e9e\u5cf6)", "EST"}; - String TMT[] = new String[] {"\u571f\u5eab\u66fc\u6642\u9593", "TMT", - "\u571f\u5eab\u66fc\u590f\u4ee4\u6642\u9593", "TMST"}; -- String TRUT[] = new String[] {"\u7279\u9b6f\u514b\u6642\u9593", "TRUT", -- "\u7279\u9b6f\u514b\u590f\u4ee4\u6642\u9593", "TRUST"}; - String ULAT[]= new String[] {"\u5eab\u502b\u6642\u9593", "ULAT", - "\u5eab\u502b\u590f\u4ee4\u6642\u9593", "ULAST"}; - String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u6642\u9593", "WART", -@@ -309,6 +311,7 @@ - {"America/Atikokan", EST}, - {"America/Atka", HAST}, - {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, - {"America/Barbados", AST}, - {"America/Belem", BRT}, - {"America/Belize", CST}, -@@ -446,10 +449,13 @@ - {"America/Winnipeg", CST}, - {"America/Yakutat", AKST}, - {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, - {"Antarctica/Davis", new String[] {"\u81fa\u7dad\u65af\u6642\u9593", "DAVT", - "\u81fa\u7dad\u65af\u590f\u4ee4\u6642\u9593", "DAVST"}}, - {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville \u6642\u9593", "DDUT", - "Dumont-d'Urville \u590f\u4ee4\u6642\u9593", "DDUST"}}, -+ {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", -+ "Macquarie Island Summer Time", "MIST"}}, - {"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u6642\u9593", "MAWT", - "\u83ab\u68ee\u590f\u4ee4\u6642\u9593", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -753,6 +759,7 @@ - {"Pacific/Apia", WST_SAMOA}, - {"Pacific/Auckland", NZST}, - {"Pacific/Chatham", CHAST}, -+ {"Pacific/Chuuk", CHUT}, - {"Pacific/Easter", EASTER}, - {"Pacific/Efate", new String[] {"\u74e6\u5974\u963f\u5716\u6642\u9593", "VUT", - "\u74e6\u5974\u963f\u5716\u590f\u4ee4\u6642\u9593", "VUST"}}, -@@ -791,8 +798,8 @@ - {"Pacific/Palau", new String[] {"\u5e1b\u7409\u6642\u9593", "PWT", - "\u5e1b\u7409\u590f\u4ee4\u6642\u9593", "PWST"}}, - {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Ponape", new String[] {"Ponape \u6642\u9593", "PONT", -- "Ponape \u590f\u4ee4\u6642\u9593", "PONST"}}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, - {"Pacific/Port_Moresby", new String[] {"\u5df4\u5e03\u4e9e\u65b0\u5e7e\u5167\u4e9e\u6642\u9593", "PGT", - "\u5df4\u5e03\u4e9e\u65b0\u5e7e\u5167\u4e9e\u590f\u4ee4\u6642\u9593", "PGST"}}, - {"Pacific/Rarotonga", new String[] {"\u5eab\u514b\u7fa4\u5cf6\u6642\u9593", "CKT", -@@ -805,12 +812,12 @@ - "\u5409\u4f2f\u7279\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "GILST"}}, - {"Pacific/Tongatapu", new String[] {"\u6771\u52a0\u6642\u9593", "TOT", - "\u6771\u52a0\u590f\u4ee4\u6642\u9593", "TOST"}}, -- {"Pacific/Truk", TRUT}, -+ {"Pacific/Truk", CHUT}, - {"Pacific/Wake", new String[] {"\u5a01\u514b\u6642\u9593", "WAKT", - "\u5a01\u514b\u590f\u4ee4\u6642\u9593", "WAKST"}}, - {"Pacific/Wallis", new String[] {"\u74e6\u5229\u65af\u53ca\u798f\u675c\u7d0d\u7fa4\u5cf6\u6642\u9593", "WFT", - "\u74e6\u5229\u65af\u53ca\u798f\u675c\u7d0d\u7fa4\u5cf6\u590f\u4ee4\u6642\u9593", "WFST"}}, -- {"Pacific/Yap", TRUT}, -+ {"Pacific/Yap", CHUT}, - {"Poland", CET}, - {"PRC", CTT}, - {"PST8PDT", PST},
--- a/patches/openjdk/6996686-tzdata2010o.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,93 +0,0 @@ -# HG changeset patch -# User peytoia -# Date 1288678136 -32400 -# Node ID 30bc265fa0d0385857c106a5f9bdafa19cbf2ac5 -# Parent de89eec422c3ce434605255170459e57f940d369 -6996686: (tz) Support tzdata2010o -Reviewed-by: okutsu - ---- openjdk/jdk/make/sun/javazic/tzdata/VERSION -+++ openjdk/jdk/make/sun/javazic/tzdata/VERSION -@@ -21,4 +21,4 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --tzdata2010l -+tzdata2010o ---- openjdk/jdk/make/sun/javazic/tzdata/asia -+++ openjdk/jdk/make/sun/javazic/tzdata/asia -@@ -569,8 +569,8 @@ - Rule HK 1954 1964 - Mar Sun>=18 3:30 1:00 S - Rule HK 1954 only - Oct 31 3:30 0 - - Rule HK 1955 1964 - Nov Sun>=1 3:30 0 - --Rule HK 1965 1977 - Apr Sun>=16 3:30 1:00 S --Rule HK 1965 1977 - Oct Sun>=16 3:30 0 - -+Rule HK 1965 1976 - Apr Sun>=16 3:30 1:00 S -+Rule HK 1965 1976 - Oct Sun>=16 3:30 0 - - Rule HK 1973 only - Dec 30 3:30 1:00 S - Rule HK 1979 only - May Sun>=8 3:30 1:00 S - Rule HK 1979 only - Oct Sun>=16 3:30 0 - ---- openjdk/jdk/make/sun/javazic/tzdata/australasia -+++ openjdk/jdk/make/sun/javazic/tzdata/australasia -@@ -306,13 +306,26 @@ - # http://www.timeanddate.com/news/time/fiji-dst-ends-march-2010.html - # </a> - -+# From Alexander Krivenyshev (2010-10-24): -+# According to Radio Fiji and Fiji Times online, Fiji will end DST 3 -+# weeks earlier than expected - on March 6, 2011, not March 27, 2011... -+# Here is confirmation from Government of the Republic of the Fiji Islands, -+# Ministry of Information (fiji.gov.fj) web site: -+# <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=2608:daylight-savings&catid=71:press-releases&Itemid=155"> -+# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=2608:daylight-savings&catid=71:press-releases&Itemid=155 -+# </a> -+# or -+# <a href="http://www.worldtimezone.com/dst_news/dst_news_fiji04.html"> -+# http://www.worldtimezone.com/dst_news/dst_news_fiji04.html -+# </a> -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S - Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - - Rule Fiji 2009 only - Nov 29 2:00 1:00 S - Rule Fiji 2010 only - Mar lastSun 3:00 0 - - Rule Fiji 2010 only - Oct 24 2:00 1:00 S --Rule Fiji 2011 only - Mar lastSun 3:00 0 - -+Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Pacific/Fiji 11:53:40 - LMT 1915 Oct 26 # Suva - 12:00 Fiji FJ%sT # Fiji Time -@@ -509,11 +522,21 @@ - # http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf - # </a> - -+# From Raymond Hughes (2010-10-07): -+# Please see -+# <a href="http://www.mcil.gov.ws"> -+# http://www.mcil.gov.ws -+# </a>, -+# the Ministry of Commerce, Industry and Labour (sideframe) "Last Sunday -+# September 2010 (26/09/10) - adjust clocks forward from 12:00 midnight -+# to 01:00am and First Sunday April 2011 (03/04/11) - adjust clocks -+# backwards from 1:00am to 12:00am" -+ - Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 - -11:26:56 - LMT 1911 - -11:30 - SAMT 1950 # Samoa Time - -11:00 - WST 2010 Sep 26 -- -11:00 1:00 WSDT 2011 Apr 3 -+ -11:00 1:00 WSDT 2011 Apr 3 1:00 - -11:00 - WST - - # Solomon Is ---- openjdk/jdk/make/sun/javazic/tzdata/zone.tab -+++ openjdk/jdk/make/sun/javazic/tzdata/zone.tab -@@ -63,7 +63,7 @@ - AQ -6736+06253 Antarctica/Mawson Mawson Station, Holme Bay - AQ -6835+07758 Antarctica/Davis Davis Station, Vestfold Hills - AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula --AQ -7824+10654 Antarctica/Vostok Vostok Station, S Magnetic Pole -+AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok - AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie - AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I - AQ -5430+15857 Antarctica/Macquarie Macquarie Island Station, Macquarie Island
--- a/patches/openjdk/7017800-tzdata2011b.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,265 +0,0 @@ -# HG changeset patch -# User peytoia -# Date 1297242029 -32400 -# Node ID eeaad0d340b285fa17e438bb2b9de6fa39289dd1 -# Parent 842a0f8c89ea5d5b4702502594a7fe37c509aec7 -7017800: (tz) Support tzdata2011b -Reviewed-by: okutsu - ---- openjdk/jdk/make/sun/javazic/tzdata/VERSION -+++ openjdk/jdk/make/sun/javazic/tzdata/VERSION -@@ -21,4 +21,4 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --tzdata2010o -+tzdata2011b ---- openjdk/jdk/make/sun/javazic/tzdata/australasia -+++ openjdk/jdk/make/sun/javazic/tzdata/australasia -@@ -106,14 +106,13 @@ - Rule AS 1987 2007 - Oct lastSun 2:00s 1:00 - - Rule AS 1972 only - Feb 27 2:00s 0 - - Rule AS 1973 1985 - Mar Sun>=1 2:00s 0 - --Rule AS 1986 1989 - Mar Sun>=15 2:00s 0 - --Rule AS 1990 only - Mar Sun>=18 2:00s 0 - --Rule AS 1991 only - Mar Sun>=1 2:00s 0 - --Rule AS 1992 only - Mar Sun>=18 2:00s 0 - --Rule AS 1993 only - Mar Sun>=1 2:00s 0 - --Rule AS 1994 only - Mar Sun>=18 2:00s 0 - -+Rule AS 1986 1990 - Mar Sun>=15 2:00s 0 - -+Rule AS 1991 only - Mar 3 2:00s 0 - -+Rule AS 1992 only - Mar 22 2:00s 0 - -+Rule AS 1993 only - Mar 7 2:00s 0 - -+Rule AS 1994 only - Mar 20 2:00s 0 - - Rule AS 1995 2005 - Mar lastSun 2:00s 0 - --Rule AS 2006 only - Apr Sun>=1 2:00s 0 - -+Rule AS 2006 only - Apr 2 2:00s 0 - - Rule AS 2007 only - Mar lastSun 2:00s 0 - - Rule AS 2008 max - Apr Sun>=1 2:00s 0 - - Rule AS 2008 max - Oct Sun>=1 2:00s 1:00 - ---- openjdk/jdk/make/sun/javazic/tzdata/northamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/northamerica -@@ -368,6 +368,27 @@ - -7:00 US M%sT 2003 Oct 26 02:00 - -6:00 US C%sT - -+# From Josh Findley (2011-01-21): -+# ...it appears that Mercer County, North Dakota, changed from the -+# mountain time zone to the central time zone at the last transition from -+# daylight-saving to standard time (on Nov. 7, 2010): -+# <a href="http://www.gpo.gov/fdsys/pkg/FR-2010-09-29/html/2010-24376.htm"> -+# http://www.gpo.gov/fdsys/pkg/FR-2010-09-29/html/2010-24376.htm -+# </a> -+# <a href="http://www.bismarcktribune.com/news/local/article_1eb1b588-c758-11df-b472-001cc4c03286.html"> -+# http://www.bismarcktribune.com/news/local/article_1eb1b588-c758-11df-b472-001cc4c03286.html -+# </a> -+ -+# From Andy Lipscomb (2011-01-24): -+# ...according to the Census Bureau, the largest city is Beulah (although -+# it's commonly referred to as Beulah-Hazen, with Hazen being the next -+# largest city in Mercer County). Google Maps places Beulah's city hall -+# at 4715'51" north, 10146'40" west, which yields an offset of 6h47'07". -+ -+Zone America/North_Dakota/Beulah -6:47:07 - LMT 1883 Nov 18 12:12:53 -+ -7:00 US M%sT 2010 Nov 7 2:00 -+ -6:00 US C%sT -+ - # US mountain time, represented by Denver - # - # Colorado, far western Kansas, Montana, western -@@ -493,20 +514,50 @@ - # three votes for and one against." - - # Hawaii -+ -+# From Arthur David Olson (2010-12-09): -+# "Hawaiian Time" by Robert C. Schmitt and Doak C. Cox appears on pages 207-225 -+# of volume 26 of The Hawaiian Journal of History (1992). As of 2010-12-09, -+# the article is available at -+# <a href="http://evols.library.manoa.hawaii.edu/bitstream/10524/239/2/JL26215.pdf"> -+# http://evols.library.manoa.hawaii.edu/bitstream/10524/239/2/JL26215.pdf -+# </a> -+# and indicates that standard time was adopted effective noon, January -+# 13, 1896 (page 218), that in "1933, the Legislature decreed daylight -+# saving for the period between the last Sunday of each April and the -+# last Sunday of each September, but less than a month later repealed the -+# act," (page 220), that year-round daylight saving time was in effect -+# from 1942-02-09 to 1945-09-30 (page 221, with no time of day given for -+# when clocks changed) and that clocks were changed by 30 minutes -+# effective the second Sunday of June, 1947 (page 219, with no time of -+# day given for when clocks changed). A footnote for the 1933 changes -+# cites Session Laws of Hawaii 1933, "Act. 90 (approved 26 Apr. 1933) -+# and Act 163 (approved 21 May 1933)." -+ -+# From Arthur David Olson (2011-01-19): -+# The following is from "Laws of the Territory of Hawaii Passed by the -+# Seventeenth Legislature: Regular Session 1933," available (as of -+# 2011-01-19) at American University's Pence Law Library. Page 85: "Act -+# 90...At 2 o'clock ante meridian of the last Sunday in April of each -+# year, the standard time of this Territory shall be advanced one -+# hour...This Act shall take effect upon its approval. Approved this 26th -+# day of April, A. D. 1933. LAWRENCE M JUDD, Governor of the Territory of -+# Hawaii." Page 172: "Act 163...Act 90 of the Session Laws of 1933 is -+# hereby repealed...This Act shall take effect upon its approval, upon -+# which date the standard time of this Territory shall be restored to -+# that existing immediately prior to the taking effect of said Act 90. -+# Approved this 21st day of May, A. D. 1933. LAWRENCE M. JUDD, Governor -+# of the Territory of Hawaii." - # --# From Arthur David Olson: --# And then there's Hawaii. --# DST was observed for one day in 1933; --# standard time was changed by half an hour in 1947; --# it's always standard as of 1986. --# --# From Paul Eggert: --# Shanks says the 1933 experiment lasted for three weeks. Go with Shanks. --# --Zone Pacific/Honolulu -10:31:26 - LMT 1900 Jan 1 12:00 -- -10:30 - HST 1933 Apr 30 2:00 -- -10:30 1:00 HDT 1933 May 21 2:00 -- -10:30 US H%sT 1947 Jun 8 2:00 -+# Note that 1933-05-21 was a Sunday. -+# We're left to guess the time of day when Act 163 was approved; guess noon. -+ -+Zone Pacific/Honolulu -10:31:26 - LMT 1896 Jan 13 12:00 #Schmitt&Cox -+ -10:30 - HST 1933 Apr 30 2:00 #Laws 1933 -+ -10:30 1:00 HDT 1933 May 21 12:00 #Laws 1933+12 -+ -10:30 - HST 1942 Feb 09 2:00 #Schmitt&Cox+2 -+ -10:30 1:00 HDT 1945 Sep 30 2:00 #Schmitt&Fox+2 -+ -10:30 US H%sT 1947 Jun 8 2:00 #Schmitt&Fox+2 - -10:00 - HST - - # Now we turn to US areas that have diverged from the consensus since 1970. ---- openjdk/jdk/make/sun/javazic/tzdata/zone.tab -+++ openjdk/jdk/make/sun/javazic/tzdata/zone.tab -@@ -233,8 +233,8 @@ - HU +4730+01905 Europe/Budapest - ID -0610+10648 Asia/Jakarta Java & Sumatra - ID -0002+10920 Asia/Pontianak west & central Borneo --ID -0507+11924 Asia/Makassar east & south Borneo, Celebes, Bali, Nusa Tengarra, west Timor --ID -0232+14042 Asia/Jayapura Irian Jaya & the Moluccas -+ID -0507+11924 Asia/Makassar east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor -+ID -0232+14042 Asia/Jayapura west New Guinea (Irian Jaya) & Malukus (Moluccas) - IE +5320-00615 Europe/Dublin - IL +3146+03514 Asia/Jerusalem - IM +5409-00428 Europe/Isle_of_Man -@@ -426,6 +426,7 @@ - US +450628-0873651 America/Menominee Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties - US +470659-1011757 America/North_Dakota/Center Central Time - North Dakota - Oliver County - US +465042-1012439 America/North_Dakota/New_Salem Central Time - North Dakota - Morton County (except Mandan area) -+US +471551-1014640 America/North_Dakota/Beulah Central Time - North Dakota - Mercer County - US +394421-1045903 America/Denver Mountain Time - US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon - US +364708-1084111 America/Shiprock Mountain Time - Navajo ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -@@ -405,6 +405,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -@@ -405,6 +405,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -@@ -405,6 +405,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -@@ -405,6 +405,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -@@ -405,6 +405,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -@@ -405,6 +405,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -@@ -405,6 +405,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST}, -diff -r 842a0f8c89ea -r eeaad0d340b2 src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Tue Feb 08 09:04:30 2011 -0800 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Wed Feb 09 18:00:29 2011 +0900 -@@ -405,6 +405,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Panama", EST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -@@ -405,6 +405,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -@@ -405,6 +405,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -@@ -405,6 +405,7 @@ - {"America/Nipigon", EST}, - {"America/Nome", AKST}, - {"America/Noronha", NORONHA}, -+ {"America/North_Dakota/Beulah", CST}, - {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, - {"America/Ojinaga", MST},
--- a/patches/openjdk/7027387-tzdata2011d.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,522 +0,0 @@ -# HG changeset patch -# User peytoia -# Date 1300405325 -32400 -# Node ID 55f97ad0a36eeb8b2dff095760c8b427188a761b -# Parent c53260a00454507cf651b03ad165e32a5be8298d -7027387: (tz) Support tzdata2011d -Reviewed-by: okutsu - ---- openjdk/jdk/make/sun/javazic/tzdata/VERSION -+++ openjdk/jdk/make/sun/javazic/tzdata/VERSION -@@ -21,4 +21,4 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --tzdata2011b -+tzdata2011d ---- openjdk/jdk/make/sun/javazic/tzdata/australasia -+++ openjdk/jdk/make/sun/javazic/tzdata/australasia -@@ -531,11 +531,31 @@ - # to 01:00am and First Sunday April 2011 (03/04/11) - adjust clocks - # backwards from 1:00am to 12:00am" - -+# From Raymond Hughes (2011-03-07) -+# I believe this will be posted shortly on the website -+# <a href="http://www.mcil.gov.ws"> -+# www.mcil.gov.ws -+# </a> -+# -+# PUBLIC NOTICE ON DAYLIGHT SAVING TIME -+# -+# Pursuant to the Daylight Saving Act 2009 and Cabinets decision, -+# businesses and the general public are hereby advised that daylight -+# saving time is on the first Saturday of April 2011 (02/04/11). -+# -+# The public is therefore advised that when the standard time strikes -+# the hour of four oclock (4.00am or 0400 Hours) on the 2nd April 2011, -+# then all instruments used to measure standard time are to be -+# adjusted/changed to three oclock (3:00am or 0300Hrs). -+# -+# Margaret Fruean ACTING CHIEF EXECUTIVE OFFICER MINISTRY OF COMMERCE, -+# INDUSTRY AND LABOUR 28th February 2011 -+ - Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 - -11:26:56 - LMT 1911 - -11:30 - SAMT 1950 # Samoa Time - -11:00 - WST 2010 Sep 26 -- -11:00 1:00 WSDT 2011 Apr 3 1:00 -+ -11:00 1:00 WSDT 2011 Apr 2 4:00 - -11:00 - WST - - # Solomon Is ---- openjdk/jdk/make/sun/javazic/tzdata/etcetera -+++ openjdk/jdk/make/sun/javazic/tzdata/etcetera -@@ -58,8 +58,7 @@ - # (i.e. west of Greenwich) even though many people would expect it to - # mean 4 hours ahead of UTC (i.e. east of Greenwich). - # --# In the draft 5 of POSIX 1003.1-200x, the angle bracket notation --# (which is not yet supported by the tz code) allows for -+# In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for - # TZ='<GMT-4>+4'; if you want time zone abbreviations conforming to - # ISO 8601 you can use TZ='<-0400>+4'. Thus the commonly-expected - # offset is kept within the angle bracket (and is used for display) ---- openjdk/jdk/make/sun/javazic/tzdata/europe -+++ openjdk/jdk/make/sun/javazic/tzdata/europe -@@ -2505,25 +2505,18 @@ - # (on a non-government server though) describing dates between 2002 and 2006: - # http://www.alomaliye.com/bkk_2002_3769.htm - --# From Sue Williams (2008-08-11): --# I spotted this news article about a potential change in Turkey. --# --# <a href="http://www.hurriyet.com.tr/english/domestic/9626174.asp?scr=1"> --# http://www.hurriyet.com.tr/english/domestic/9626174.asp?scr=1 -+# From Gökdeniz Karadağ (2011-03-10): -+# -+# According to the articles linked below, Turkey will change into summer -+# time zone (GMT+3) on March 28, 2011 at 3:00 a.m. instead of March 27. -+# This change is due to a nationwide exam on 27th. -+# -+# <a href="http://www.worldbulletin.net/?aType=haber&ArticleID=70872"> -+# http://www.worldbulletin.net/?aType=haber&ArticleID=70872 - # </a> -- --# From Sue Williams (2008-08-20): --# This article says that around the end of March 2011, Turkey wants to --# adjust the clocks forward by 1/2 hour and stay that way permanently. --# The article indicates that this is a change in timezone offset in addition --# to stopping observance of DST. --# This proposal has not yet been approved. --# --# Read more here... --# --# Turkey to abandon daylight saving time in 2011 --# <a href="http://www.turkishdailynews.com.tr/article.php?enewsid=112989"> --# http://www.turkishdailynews.com.tr/article.php?enewsid=112989 -+# Turkish: -+# <a href="http://www.hurriyet.com.tr/ekonomi/17230464.asp?gid=373"> -+# http://www.hurriyet.com.tr/ekonomi/17230464.asp?gid=373 - # </a> - - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -@@ -2591,6 +2584,8 @@ - 2:00 Turkey EE%sT 1978 Oct 15 - 3:00 Turkey TR%sT 1985 Apr 20 # Turkey Time - 2:00 Turkey EE%sT 2007 -+ 2:00 EU EE%sT 2011 Mar 27 1:00u -+ 2:00 - EET 2011 Mar 28 1:00u - 2:00 EU EE%sT - Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents. - ---- openjdk/jdk/make/sun/javazic/tzdata/leapseconds -+++ openjdk/jdk/make/sun/javazic/tzdata/leapseconds -@@ -78,13 +78,13 @@ - # SERVICE DE LA ROTATION TERRESTRE - # OBSERVATOIRE DE PARIS - # 61, Av. de l'Observatoire 75014 PARIS (France) --# Tel. : 33 (0) 1 40 51 22 26 -+# Tel. : 33 (0) 1 40 51 22 29 - # FAX : 33 (0) 1 40 51 22 91 - # Internet : services.iers@obspm.fr - # --# Paris, 14 July 2010 -+# Paris, 2 February 2011 - # --# Bulletin C 40 -+# Bulletin C 41 - # - # To authorities responsible - # for the measurement and -@@ -92,9 +92,9 @@ - # - # INFORMATION ON UTC - TAI - # --# NO positive leap second will be introduced at the end of December 2010. -+# NO positive leap second will be introduced at the end of June 2011. - # The difference between Coordinated Universal Time UTC and the --# International Atomic Time TAI is : -+# International Atomic Time TAI is : - # - # from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s - # -@@ -104,6 +104,6 @@ - # will be no time step at the next possible date. - # - # Daniel GAMBIS --# Director --# Earth Orientation Center of IERS -+# Head -+# Earth Orientation Center of the IERS - # Observatoire de Paris, France ---- openjdk/jdk/make/sun/javazic/tzdata/northamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/northamerica -@@ -448,15 +448,74 @@ - # were nearby inhabitants in some cases and for our purposes perhaps - # it's best to simply use the official transition. - # -+ -+# From Steve Ferguson (2011-01-31): -+# The author lives in Alaska and many of the references listed are only -+# available to Alaskan residents. -+# -+# <a href="http://www.alaskahistoricalsociety.org/index.cfm?section=discover%20alaska&page=Glimpses%20of%20the%20Past&viewpost=2&ContentId=98"> -+# http://www.alaskahistoricalsociety.org/index.cfm?section=discover%20alaska&page=Glimpses%20of%20the%20Past&viewpost=2&ContentId=98 -+# </a> -+ -+# From Arthur David Olson (2011-02-01): -+# Here's database-relevant material from the 2001 "Alaska History" article: -+# -+# On September 20 [1979]...DOT...officials decreed that on April 27, -+# 1980, Juneau and other nearby communities would move to Yukon Time. -+# Sitka, Petersburg, Wrangell, and Ketchikan, however, would remain on -+# Pacific Time. -+# -+# ...on September 22, 1980, DOT Secretary Neil E. Goldschmidt rescinded the -+# Department's September 1979 decision. Juneau and other communities in -+# northern Southeast reverted to Pacific Time on October 26. -+# -+# On October 28 [1983]...the Metlakatla Indian Community Council voted -+# unanimously to keep the reservation on Pacific Time. -+# -+# According to DOT official Joanne Petrie, Indian reservations are not -+# bound to follow time zones imposed by neighboring jurisdictions. -+# -+# (The last is consistent with how the database now handles the Navajo -+# Nation.) -+ -+# From Arthur David Olson (2011-02-09): -+# I just spoke by phone with a staff member at the Metlakatla Indian -+# Community office (using contact information available at -+# <a href="http://www.commerce.state.ak.us/dca/commdb/CIS.cfm?Comm_Boro_name=Metlakatla"> -+# http://www.commerce.state.ak.us/dca/commdb/CIS.cfm?Comm_Boro_name=Metlakatla -+# </a>). -+# It's shortly after 1:00 here on the east coast of the United States; -+# the staffer said it was shortly after 10:00 there. When I asked whether -+# that meant they were on Pacific time, they said no--they were on their -+# own time. I asked about daylight saving; they said it wasn't used. I -+# did not inquire about practices in the past. -+ - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone America/Juneau 15:02:19 - LMT 1867 Oct 18 - -8:57:41 - LMT 1900 Aug 20 12:00 - -8:00 - PST 1942 - -8:00 US P%sT 1946 - -8:00 - PST 1969 -+ -8:00 US P%sT 1980 Apr 27 2:00 -+ -9:00 US Y%sT 1980 Oct 26 2:00 - -8:00 US P%sT 1983 Oct 30 2:00 - -9:00 US Y%sT 1983 Nov 30 - -9:00 US AK%sT -+Zone America/Sitka -14:58:47 - LMT 1867 Oct 18 -+ -9:01:13 - LMT 1900 Aug 20 12:00 -+ -8:00 - PST 1942 -+ -8:00 US P%sT 1946 -+ -8:00 - PST 1969 -+ -8:00 US P%sT 1983 Oct 30 2:00 -+ -9:00 US Y%sT 1983 Nov 30 -+ -9:00 US AK%sT -+Zone America/Metlakatla 15:13:42 - LMT 1867 Oct 18 -+ -8:46:18 - LMT 1900 Aug 20 12:00 -+ -8:00 - PST 1942 -+ -8:00 US P%sT 1946 -+ -8:00 - PST 1969 -+ -8:00 US P%sT 1983 Oct 30 2:00 -+ -8:00 US MeST - Zone America/Yakutat 14:41:05 - LMT 1867 Oct 18 - -9:18:55 - LMT 1900 Aug 20 12:00 - -9:00 - YST 1942 -@@ -2569,6 +2628,21 @@ - # the time was announced as "diez cinco"--the same time as here, indicating - # that has indeed switched to DST. Assume second Sunday from 2009 forward. - -+# From Steffen Thorsen (2011-03-08): -+# Granma announced that Cuba is going to start DST on 2011-03-20 00:00:00 -+# this year. Nothing about the end date known so far (if that has -+# changed at all). -+# -+# Source: -+# <a href="http://granma.co.cu/2011/03/08/nacional/artic01.html"> -+# http://granma.co.cu/2011/03/08/nacional/artic01.html -+# </a> -+# -+# Our info: -+# <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html"> -+# http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html -+# </a> -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Cuba 1928 only - Jun 10 0:00 1:00 D - Rule Cuba 1928 only - Oct 10 0:00 0 S -@@ -2602,7 +2676,9 @@ - Rule Cuba 2006 max - Oct lastSun 0:00s 0 S - Rule Cuba 2007 only - Mar Sun>=8 0:00s 1:00 D - Rule Cuba 2008 only - Mar Sun>=15 0:00s 1:00 D --Rule Cuba 2009 max - Mar Sun>=8 0:00s 1:00 D -+Rule Cuba 2009 2010 - Mar Sun>=8 0:00s 1:00 D -+Rule Cuba 2011 only - Mar Sun>=15 0:00s 1:00 D -+Rule Cuba 2012 max - Mar Sun>=8 0:00s 1:00 D - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone America/Havana -5:29:28 - LMT 1890 ---- openjdk/jdk/make/sun/javazic/tzdata/southamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/southamerica -@@ -1176,6 +1176,23 @@ - # From Arthur Daivd Olson (2010-03-06): - # Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch. - -+# From Glenn Eychaner (2011-03-02): [geychaner@mac.com] -+# It appears that the Chilean government has decided to postpone the -+# change from summer time to winter time again, by three weeks to April -+# 2nd: -+# <a href="http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651"> -+# http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651 -+# </a> -+# -+# This is not yet reflected in the offical "cambio de hora" site, but -+# probably will be soon: -+# <a href="http://www.horaoficial.cl/cambio.htm"> -+# http://www.horaoficial.cl/cambio.htm -+# </a> -+ -+# From Arthur David Olson (2011-03-02): -+# The emol.com article mentions a water shortage as the cause of the -+# postponement, which may mean that it's not a permanent change. - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Chile 1927 1932 - Sep 1 0:00 1:00 S - Rule Chile 1928 1932 - Apr 1 0:00 0 - -@@ -1211,8 +1228,8 @@ - # which is used below in specifying the transition. - Rule Chile 2008 only - Mar 30 3:00u 0 - - Rule Chile 2009 only - Mar Sun>=9 3:00u 0 - --Rule Chile 2010 only - Apr 4 3:00u 0 - --Rule Chile 2011 max - Mar Sun>=9 3:00u 0 - -+Rule Chile 2010 2011 - Apr Sun>=1 3:00u 0 - -+Rule Chile 2012 max - Mar Sun>=9 3:00u 0 - - # IATA SSIM anomalies: (1992-02) says 1992-03-14; - # (1996-09) says 1998-03-08. Ignore these. - # Zone NAME GMTOFF RULES FORMAT [UNTIL] ---- openjdk/jdk/make/sun/javazic/tzdata/zone.tab -+++ openjdk/jdk/make/sun/javazic/tzdata/zone.tab -@@ -434,9 +434,11 @@ - US +340308-1181434 America/Los_Angeles Pacific Time - US +611305-1495401 America/Anchorage Alaska Time - US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle -+US +571035-1351807 America/Sitka Alaska Time - southeast Alaska panhandle - US +593249-1394338 America/Yakutat Alaska Time - Alaska panhandle neck - US +643004-1652423 America/Nome Alaska Time - west Alaska - US +515248-1763929 America/Adak Aleutian Islands -+US +550737-1313435 America/Metlakatla Metlakatla Time - Annette Island - US +211825-1575130 Pacific/Honolulu Hawaii - UY -3453-05611 America/Montevideo - UZ +3940+06648 Asia/Samarkand west Uzbekistan ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -@@ -216,6 +216,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -392,6 +393,8 @@ - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST", -+ "Metlakatla Daylight Time", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"Pierre & Miquelon Standard Time", "PMST", - "Pierre & Miquelon Daylight Time", "PMDT"}}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -@@ -216,6 +216,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -392,6 +393,8 @@ - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST", -+ "Metlakatla Daylight Time", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"Pierre & Miquelon Normalzeit", "PMST", - "Pierre & Miquelon Sommerzeit", "PMDT"}}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -@@ -216,6 +216,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -392,6 +393,8 @@ - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST", -+ "Metlakatla Daylight Time", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"Hora est\u00e1ndar de Pierre & Miquelon", "PMST", - "Hora de verano de Pierre & Miquelon", "PMDT"}}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -@@ -216,6 +216,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -392,6 +393,8 @@ - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST", -+ "Metlakatla Daylight Time", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"Heure normale de Saint-Pierre et Miquelon", "PMST", - "Heure avanc\u00e9e de Saint-Pierre et Miquelon", "PMDT"}}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -@@ -216,6 +216,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -392,6 +393,8 @@ - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST", -+ "Metlakatla Daylight Time", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"Ora solare di Saint-Pierre e Miquelon", "PMST", - "Ora legale di Saint-Pierre e Miquelon", "PMDT"}}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -@@ -216,6 +216,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -392,6 +393,8 @@ - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST", -+ "Metlakatla Daylight Time", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u6a19\u6e96\u6642", "PMST", - "\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u590f\u6642\u9593", "PMDT"}}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -@@ -216,6 +216,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -392,6 +393,8 @@ - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST", -+ "Metlakatla Daylight Time", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \ud45c\uc900\uc2dc", "PMST", - "\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PMDT"}}, -diff -r c53260a00454 -r 55f97ad0a36e src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Thu Mar 17 18:22:54 2011 +0300 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Fri Mar 18 08:42:05 2011 +0900 -@@ -217,6 +217,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -392,6 +393,8 @@ - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST", -+ "Metlakatla Daylight Time", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"Fuso hor\u00e1rio padr\u00e3o de S\u00e3o Pedro e Miquelon", "PMST", - "Hor\u00e1rio de luz natural de S\u00e3o Pedro e Miquelon", "PMDT"}}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -@@ -216,6 +216,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -392,6 +393,8 @@ - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST", -+ "Metlakatla Daylight Time", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"Saint-Pierre-et-Miquelon, normaltid", "PMST", - "Saint-Pierre-et-Miquelon, sommartid", "PMDT"}}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -@@ -216,6 +216,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -392,6 +393,8 @@ - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST", -+ "Metlakatla Daylight Time", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u6807\u51c6\u65f6\u95f4", "PMST", - "\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u590f\u4ee4\u65f6", "PMDT"}}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -@@ -216,6 +216,7 @@ - {"America/Anchorage", AKST}, - {"AST", AKST}, - {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, - {"America/St_Johns", NST}, - {"CNT", NST}, - {"Europe/Paris", CET}, -@@ -392,6 +393,8 @@ - {"America/Mendoza", AGT}, - {"America/Menominee", CST}, - {"America/Merida", CST}, -+ {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST", -+ "Metlakatla Daylight Time", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u6a19\u6e96\u6642\u9593", "PMST", - "\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PMDT"}},
--- a/patches/openjdk/7033174-tzdata2011e.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,117 +0,0 @@ -# HG changeset patch -# User peytoia -# Date 1301898245 -32400 -# Node ID 8093f407d57d53d9744e3eb14a63c353a15896ff -# Parent 379a6504216e77569ee257cd5c1ece67521e9d3a -7033174: (tz) Support tzdata2011e -Reviewed-by: okutsu - ---- openjdk/jdk/make/sun/javazic/tzdata/VERSION -+++ openjdk/jdk/make/sun/javazic/tzdata/VERSION -@@ -21,4 +21,4 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --tzdata2011d -+tzdata2011e ---- openjdk/jdk/make/sun/javazic/tzdata/africa -+++ openjdk/jdk/make/sun/javazic/tzdata/africa -@@ -734,6 +734,48 @@ - # http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html - # </a> - -+# From Dan Abitol (2011-03-30): -+# ...Rules for Africa/Casablanca are the following (24h format) -+# The 3rd april 2011 at 00:00:00, [it] will be 3rd april 1:00:00 -+# The 31th july 2011 at 00:59:59, [it] will be 31th July 00:00:00 -+# ...Official links of change in morocco -+# The change was broadcast on the FM Radio -+# I ve called ANRT (telecom regulations in Morocco) at -+# +212.537.71.84.00 -+# <a href="http://www.anrt.net.ma/fr/"> -+# http://www.anrt.net.ma/fr/ -+# </a> -+# They said that -+# <a href="http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view"> -+# http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view -+# </a> -+# is the official publication to look at. -+# They said that the decision was already taken. -+# -+# More articles in the press -+# <a href="http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev"> -+# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-lev -+# </a> -+# e.html -+# <a href="http://www.lematin.ma/Actualite/Express/Article.asp?id=148923"> -+# http://www.lematin.ma/Actualite/Express/Article.asp?id=148923 -+# </a> -+# <a href="http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim"> -+# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim -+# anche-prochain-5538.html -+# </a> -+ -+# From Petr Machata (2011-03-30): -+# They have it written in English here: -+# <a href="http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view"> -+# http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view -+# </a> -+# -+# It says there that "Morocco will resume its standard time on July 31, -+# 2011 at midnight." Now they don't say whether they mean midnight of -+# wall clock time (i.e. 11pm UTC), but that's what I would assume. It has -+# also been like that in the past. -+ - # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S - - Rule Morocco 1939 only - Sep 12 0:00 1:00 S -@@ -757,6 +799,8 @@ - Rule Morocco 2009 only - Aug 21 0:00 0 - - Rule Morocco 2010 only - May 2 0:00 1:00 S - Rule Morocco 2010 only - Aug 8 0:00 0 - -+Rule Morocco 2011 only - Apr 3 0:00 1:00 S -+Rule Morocco 2011 only - Jul 31 0 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 - 0:00 Morocco WE%sT 1984 Mar 16 ---- openjdk/jdk/make/sun/javazic/tzdata/southamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/southamerica -@@ -1193,6 +1193,19 @@ - # From Arthur David Olson (2011-03-02): - # The emol.com article mentions a water shortage as the cause of the - # postponement, which may mean that it's not a permanent change. -+ -+# From Glenn Eychaner (2011-03-28): -+# The article: -+# <a href="http://diario.elmercurio.com/2011/03/28/_portada/_portada/noticias/7565897A-CA86-49E6-9E03-660B21A4883E.htm?id=3D{7565897A-CA86-49E6-9E03-660B21A4883E}"> -+# http://diario.elmercurio.com/2011/03/28/_portada/_portada/noticias/7565897A-CA86-49E6-9E03-660B21A4883E.htm?id=3D{7565897A-CA86-49E6-9E03-660B21A4883E} -+# </a> -+# -+# In English: -+# Chile's clocks will go back an hour this year on the 7th of May instead -+# of this Saturday. They will go forward again the 3rd Saturday in -+# August, not in October as they have since 1968. This is a pilot plan -+# which will be reevaluated in 2012. -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Chile 1927 1932 - Sep 1 0:00 1:00 S - Rule Chile 1928 1932 - Apr 1 0:00 0 - -@@ -1222,13 +1235,16 @@ - Rule Chile 1998 only - Mar Sun>=9 3:00u 0 - - Rule Chile 1998 only - Sep 27 4:00u 1:00 S - Rule Chile 1999 only - Apr 4 3:00u 0 - --Rule Chile 1999 max - Oct Sun>=9 4:00u 1:00 S -+Rule Chile 1999 2010 - Oct Sun>=9 4:00u 1:00 S -+Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 S -+Rule Chile 2012 max - Oct Sun>=9 4:00u 1:00 S - Rule Chile 2000 2007 - Mar Sun>=9 3:00u 0 - - # N.B.: the end of March 29 in Chile is March 30 in Universal time, - # which is used below in specifying the transition. - Rule Chile 2008 only - Mar 30 3:00u 0 - - Rule Chile 2009 only - Mar Sun>=9 3:00u 0 - --Rule Chile 2010 2011 - Apr Sun>=1 3:00u 0 - -+Rule Chile 2010 only - Apr Sun>=1 3:00u 0 - -+Rule Chile 2011 only - May Sun>=2 3:00u 0 - - Rule Chile 2012 max - Mar Sun>=9 3:00u 0 - - # IATA SSIM anomalies: (1992-02) says 1992-03-14; - # (1996-09) says 1998-03-08. Ignore these.
--- a/patches/openjdk/7035073-missing_pt_br_timezones.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1644 +0,0 @@ -# HG changeset patch -# User peytoia -# Date 1302592601 -32400 -# Tue Apr 12 16:16:41 2011 +0900 -# Node ID e392becfd94f67beaf41432807a0eb0397f3f783 -# Parent 44b9482e9efb734a1290f1c6026e7d785a1f5e1e -7035073: Add missing timezones to TimeZoneNames_pt_BR.java -Reviewed-by: okutsu - -diff -r 44b9482e9efb -r e392becfd94f src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Tue Apr 12 10:15:26 2011 +0400 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Tue Apr 12 16:16:41 2011 +0900 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -43,822 +43,824 @@ - public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle { - - protected final Object[][] getContents() { -- String ACT[] = new String[] {"Fuso hor\u00e1rio do Acre", "ACT", -- "Fuso hor\u00e1rio de ver\u00e3o do Acre", "ACST"}; -- String ADELAIDE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Austr\u00e1lia do Sul)", "CST", -- "Fuso hor\u00e1rio de ver\u00e3o central (Austr\u00e1lia do Sul)", "CST"}; -- String AGT[] = new String[] {"Fuso hor\u00e1rio da Argentina", "ART", -- "Fuso hor\u00e1rio de ver\u00e3o da Argentina", "ARST"}; -- String AKST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Alaska", "AKST", -- "Hor\u00e1rio de luz natural do Alaska", "AKDT"}; -- String AMT[] = new String[] {"Fuso hor\u00e1rio do Amazonas", "AMT", -- "Fuso hor\u00e1rio de ver\u00e3o do Amazonas", "AMST"}; -- String ARAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da Ar\u00e1bia", "AST", -- "Hor\u00e1rio de luz natural da Ar\u00e1bia", "ADT"}; -- String ARMT[] = new String[] {"Fuso hor\u00e1rio da Arm\u00eania", "AMT", -- "Fuso hor\u00e1rio de ver\u00e3o da Arm\u00eania", "AMST"}; -- String AST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Atl\u00e2ntico", "AST", -- "Hor\u00e1rio de luz natural do Atl\u00e2ntico", "ADT"}; -- String BDT[] = new String[] {"Fuso hor\u00e1rio de Bangladesh", "BDT", -- "Fuso hor\u00e1rio de ver\u00e3o de Bangladesh", "BDST"}; -- String BRISBANE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Queensland)", "EST", -- "Fuso hor\u00e1rio de ver\u00e3o oriental (Queensland)", "EST"}; -- String BROKEN_HILL[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Austr\u00e1lia do Sul/Nova Gales do Sul)", "CST", -- "Fuso hor\u00e1rio de ver\u00e3o central (Austr\u00e1lia do Sul/Nova Gales do Sul)", "CST"}; -- String BRT[] = new String[] {"Fuso hor\u00e1rio de Bras\u00edlia", "BRT", -- "Fuso hor\u00e1rio de ver\u00e3o de Bras\u00edlia", "BRST"}; -- String BTT[] = new String[] {"Fuso hor\u00e1rio de But\u00e3o", "BTT", -- "Fuso hor\u00e1rio de ver\u00e3o de But\u00e3o", "BTST"}; -- String CAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Central", "CAT", -- "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica Central", "CAST"}; -- String CET[] = new String[] {"Fuso hor\u00e1rio da Europa Central", "CET", -- "Fuso hor\u00e1rio de ver\u00e3o da Europa Central", "CEST"}; -- String CHAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chatham", "CHAST", -- "Hor\u00e1rio de luz natural de Chatham", "CHADT"}; -- String CIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Central", "CIT", -- "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Central", "CIST"}; -- String CLT[] = new String[] {"Fuso hor\u00e1rio do Chile", "CLT", -- "Fuso hor\u00e1rio de ver\u00e3o do Chile", "CLST"}; -- String CST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central", "CST", -- "Hor\u00e1rio de luz natural central", "CDT"}; -- String CTT[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da China", "CST", -- "Hor\u00e1rio de luz natural da China", "CDT"}; -- String CUBA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Cuba", "CST", -- "Hor\u00e1rio de luz natural de Cuba", "CDT"}; -- String DARWIN[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Territ\u00f3rio do Norte)", "CST", -- "Fuso hor\u00e1rio de ver\u00e3o central (Territ\u00f3rio do Norte)", "CST"}; -- String DUBLIN[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT", -- "Fuso hor\u00e1rio de ver\u00e3o da Irlanda", "IST"}; -- String EAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Oriental", "EAT", -- "Fuso hor\u00e1rio padr\u00e3o da \u00c1frica Oriental", "EAST"}; -- String EASTER[] = new String[] {"Fuso hor\u00e1rio da Ilha de P\u00e1scoa", "EAST", -- "Fuso hor\u00e1rio de ver\u00e3o da Ilha de P\u00e1scoa", "EASST"}; -- String EET[] = new String[] {"Fuso hor\u00e1rio da Europa Oriental", "EET", -- "Fuso hor\u00e1rio de ver\u00e3o da Europa Oriental", "EEST"}; -- String EGT[] = new String[] {"Fuso hor\u00e1rio da Groenl\u00e2ndia Oriental", "EGT", -- "Fuso hor\u00e1rio de ver\u00e3o da Groenl\u00e2ndia Oriental", "EGST"}; -- String EST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental", "EST", -- "Hor\u00e1rio de luz natural oriental", "EDT"}; -- String EST_NSW[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Nova Gales do Sul)", "EST", -- "Fuso hor\u00e1rio de ver\u00e3o oriental (Nova Gales do Sul)", "EST"}; -- String GHMT[] = new String[] {"Fuso hor\u00e1rio do meridiano de Gana", "GMT", -- "Fuso hor\u00e1rio de ver\u00e3o de Gana", "GHST"}; -- String GAMBIER[] = new String[] {"Fuso hor\u00e1rio de Gambier", "GAMT", -- "Fuso hor\u00e1rio de ver\u00e3o de Gambier", "GAMST"}; -- String GMT[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT", -- "Fuso hor\u00e1rio do meridiano de Greenwich", "GMT"}; -- String GMTBST[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT", -- "Fuso hor\u00e1rio de ver\u00e3o da Gr\u00e3-Bretanha", "BST"}; -- String GST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do golfo", "GST", -- "Hor\u00e1rio de luz natural do golfo", "GDT"}; -- String HAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Hava\u00ed-Aleutian", "HAST", -- "Hor\u00e1rio de luz natural do Hava\u00ed-Aleutian", "HADT"}; -- String HKT[] = new String[] {"Fuso hor\u00e1rio de Hong Kong", "HKT", -- "Fuso hor\u00e1rio de ver\u00e3o de Hong Kong", "HKST"}; -- String HST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Hava\u00ed", "HST", -- "Hor\u00e1rio de luz natural do Hava\u00ed", "HDT"}; -- String ICT[] = new String[] {"Fuso hor\u00e1rio da Indochina", "ICT", -- "Fuso hor\u00e1rio de ver\u00e3o da Indochina", "ICST"}; -- String IRT[] = new String[] {"Fuso hor\u00e1rio do Ir\u00e3", "IRST", -- "Hor\u00e1rio de luz natural do Ir\u00e3", "IRDT"}; -- String ISRAEL[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Israel", "IST", -- "Hor\u00e1rio de luz natural de Israel", "IDT"}; -- String IST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da \u00cdndia", "IST", -- "Hor\u00e1rio de luz natural da \u00cdndia", "IDT"}; -- String JST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Jap\u00e3o", "JST", -- "Hor\u00e1rio de luz natural do Jap\u00e3o", "JDT"}; -- String KST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da Coreia", "KST", -- "Hor\u00e1rio de luz natural da Coreia", "KDT"}; -- String LORD_HOWE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Lord Howe", "LHST", -- "Fuso hor\u00e1rio de ver\u00e3o de Lord Howe", "LHST"}; -- String MHT[] = new String[] {"Fuso hor\u00e1rio das Ilhas Marshall", "MHT", -- "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Marshall", "MHST"}; -- String MSK[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Moscou", "MSK", -- "Hor\u00e1rio de luz natural de Moscou", "MSD"}; -- String MST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o das montanhas", "MST", -- "Hor\u00e1rio de luz natural das montanhas", "MDT"}; -- String MYT[] = new String[] {"Fuso hor\u00e1rio da Mal\u00e1sia", "MYT", -- "Fuso hor\u00e1rio de ver\u00e3o da Mal\u00e1sia", "MYST"}; -- String NORONHA[] = new String[] {"Fuso hor\u00e1rio de Fernando de Noronha", "FNT", -- "Fuso hor\u00e1rio de ver\u00e3o de Fernando de Noronha", "FNST"}; -- String NOVT[] = new String[] {"Fuso hor\u00e1rio de Novosibirsk", "NOVT", -- "Fuso hor\u00e1rio de ver\u00e3o de Novosibirsk", "NOVST"}; -+ String ACT[] = new String[] {"Fuso hor\u00e1rio do Acre", "ACT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Acre", "ACST"}; -+ String ADELAIDE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Austr\u00e1lia do Sul)", "CST", -+ "Fuso hor\u00e1rio de ver\u00e3o central (Austr\u00e1lia do Sul)", "CST"}; -+ String AGT[] = new String[] {"Fuso hor\u00e1rio da Argentina", "ART", -+ "Fuso hor\u00e1rio de ver\u00e3o da Argentina", "ARST"}; -+ String AKST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Alaska", "AKST", -+ "Hor\u00e1rio de luz natural do Alaska", "AKDT"}; -+ String AMT[] = new String[] {"Fuso hor\u00e1rio do Amazonas", "AMT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Amazonas", "AMST"}; -+ String ARAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da Ar\u00e1bia", "AST", -+ "Hor\u00e1rio de luz natural da Ar\u00e1bia", "ADT"}; -+ String ARMT[] = new String[] {"Fuso hor\u00e1rio da Arm\u00eania", "AMT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Arm\u00eania", "AMST"}; -+ String AST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Atl\u00e2ntico", "AST", -+ "Hor\u00e1rio de luz natural do Atl\u00e2ntico", "ADT"}; -+ String BDT[] = new String[] {"Fuso hor\u00e1rio de Bangladesh", "BDT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Bangladesh", "BDST"}; -+ String BRISBANE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Queensland)", "EST", -+ "Fuso hor\u00e1rio de ver\u00e3o oriental (Queensland)", "EST"}; -+ String BROKEN_HILL[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Austr\u00e1lia do Sul/Nova Gales do Sul)", "CST", -+ "Fuso hor\u00e1rio de ver\u00e3o central (Austr\u00e1lia do Sul/Nova Gales do Sul)", "CST"}; -+ String BRT[] = new String[] {"Fuso hor\u00e1rio de Bras\u00edlia", "BRT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Bras\u00edlia", "BRST"}; -+ String BTT[] = new String[] {"Fuso hor\u00e1rio de But\u00e3o", "BTT", -+ "Fuso hor\u00e1rio de ver\u00e3o de But\u00e3o", "BTST"}; -+ String CAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Central", "CAT", -+ "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica Central", "CAST"}; -+ String CET[] = new String[] {"Fuso hor\u00e1rio da Europa Central", "CET", -+ "Fuso hor\u00e1rio de ver\u00e3o da Europa Central", "CEST"}; -+ String CHAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chatham", "CHAST", -+ "Hor\u00e1rio de luz natural de Chatham", "CHADT"}; -+ String CIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Central", "CIT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Central", "CIST"}; -+ String CLT[] = new String[] {"Fuso hor\u00e1rio do Chile", "CLT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Chile", "CLST"}; -+ String CST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central", "CST", -+ "Hor\u00e1rio de luz natural central", "CDT"}; -+ String CTT[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da China", "CST", -+ "Hor\u00e1rio de luz natural da China", "CDT"}; -+ String CUBA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Cuba", "CST", -+ "Hor\u00e1rio de luz natural de Cuba", "CDT"}; -+ String DARWIN[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Territ\u00f3rio do Norte)", "CST", -+ "Fuso hor\u00e1rio de ver\u00e3o central (Territ\u00f3rio do Norte)", "CST"}; -+ String DUBLIN[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Irlanda", "IST"}; -+ String EAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Oriental", "EAT", -+ "Fuso hor\u00e1rio padr\u00e3o da \u00c1frica Oriental", "EAST"}; -+ String EASTER[] = new String[] {"Fuso hor\u00e1rio da Ilha de P\u00e1scoa", "EAST", -+ "Fuso hor\u00e1rio de ver\u00e3o da Ilha de P\u00e1scoa", "EASST"}; -+ String EET[] = new String[] {"Fuso hor\u00e1rio da Europa Oriental", "EET", -+ "Fuso hor\u00e1rio de ver\u00e3o da Europa Oriental", "EEST"}; -+ String EGT[] = new String[] {"Fuso hor\u00e1rio da Groenl\u00e2ndia Oriental", "EGT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Groenl\u00e2ndia Oriental", "EGST"}; -+ String EST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental", "EST", -+ "Hor\u00e1rio de luz natural oriental", "EDT"}; -+ String EST_NSW[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Nova Gales do Sul)", "EST", -+ "Fuso hor\u00e1rio de ver\u00e3o oriental (Nova Gales do Sul)", "EST"}; -+ String GHMT[] = new String[] {"Fuso hor\u00e1rio do meridiano de Gana", "GMT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Gana", "GHST"}; -+ String GAMBIER[] = new String[] {"Fuso hor\u00e1rio de Gambier", "GAMT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Gambier", "GAMST"}; -+ String GMT[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT", -+ "Fuso hor\u00e1rio do meridiano de Greenwich", "GMT"}; -+ String GMTBST[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Gr\u00e3-Bretanha", "BST"}; -+ String GST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do golfo", "GST", -+ "Hor\u00e1rio de luz natural do golfo", "GDT"}; -+ String HAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Hava\u00ed-Aleutian", "HAST", -+ "Hor\u00e1rio de luz natural do Hava\u00ed-Aleutian", "HADT"}; -+ String HKT[] = new String[] {"Fuso hor\u00e1rio de Hong Kong", "HKT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Hong Kong", "HKST"}; -+ String HST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Hava\u00ed", "HST", -+ "Hor\u00e1rio de luz natural do Hava\u00ed", "HDT"}; -+ String ICT[] = new String[] {"Fuso hor\u00e1rio da Indochina", "ICT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Indochina", "ICST"}; -+ String IRT[] = new String[] {"Fuso hor\u00e1rio do Ir\u00e3", "IRST", -+ "Hor\u00e1rio de luz natural do Ir\u00e3", "IRDT"}; -+ String ISRAEL[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Israel", "IST", -+ "Hor\u00e1rio de luz natural de Israel", "IDT"}; -+ String IST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da \u00cdndia", "IST", -+ "Hor\u00e1rio de luz natural da \u00cdndia", "IDT"}; -+ String JST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Jap\u00e3o", "JST", -+ "Hor\u00e1rio de luz natural do Jap\u00e3o", "JDT"}; -+ String KST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da Coreia", "KST", -+ "Hor\u00e1rio de luz natural da Coreia", "KDT"}; -+ String LORD_HOWE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Lord Howe", "LHST", -+ "Fuso hor\u00e1rio de ver\u00e3o de Lord Howe", "LHST"}; -+ String MHT[] = new String[] {"Fuso hor\u00e1rio das Ilhas Marshall", "MHT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Marshall", "MHST"}; -+ String MSK[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Moscou", "MSK", -+ "Hor\u00e1rio de luz natural de Moscou", "MSD"}; -+ String MST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o das montanhas", "MST", -+ "Hor\u00e1rio de luz natural das montanhas", "MDT"}; -+ String MYT[] = new String[] {"Fuso hor\u00e1rio da Mal\u00e1sia", "MYT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Mal\u00e1sia", "MYST"}; -+ String NORONHA[] = new String[] {"Fuso hor\u00e1rio de Fernando de Noronha", "FNT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Fernando de Noronha", "FNST"}; -+ String NOVT[] = new String[] {"Fuso hor\u00e1rio de Novosibirsk", "NOVT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Novosibirsk", "NOVST"}; - String NPT[] = new String[] {"Fuso hor\u00e1rio do Nepal", "NPT", - "Fuso hor\u00e1rio de ver\u00e3o do Nepal", "NPST"}; -- String NST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Terra Nova", "NST", -- "Hor\u00e1rio de luz natural de Terra Nova", "NDT"}; -- String NZST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da Nova Zel\u00e2ndia", "NZST", -- "Hor\u00e1rio de luz natural da Nova Zel\u00e2ndia", "NZDT"}; -+ String NST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Terra Nova", "NST", -+ "Hor\u00e1rio de luz natural de Terra Nova", "NDT"}; -+ String NZST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da Nova Zel\u00e2ndia", "NZST", -+ "Hor\u00e1rio de luz natural da Nova Zel\u00e2ndia", "NZDT"}; - String PITCAIRN[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Pitcairn", "PST", -- "Hor\u00e1rio de luz natural de Pitcairn", "PDT"}; -- String PKT[] = new String[] {"Fuso hor\u00e1rio do Paquist\u00e3o", "PKT", -- "Fuso hor\u00e1rio de ver\u00e3o do Paquist\u00e3o", "PKST"}; -- String PONT[] = new String[] {"Fuso hor\u00e1rio de Pohnpei", "PONT", -- "Fuso hor\u00e1rio de ver\u00e3o de Pohnpei", "PONST"}; -- String PST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Pac\u00edfico", "PST", -- "Hor\u00e1rio de luz natural do Pac\u00edfico", "PDT"}; -+ "Hor\u00e1rio de luz natural de Pitcairn", "PDT"}; -+ String PKT[] = new String[] {"Fuso hor\u00e1rio do Paquist\u00e3o", "PKT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Paquist\u00e3o", "PKST"}; -+ String PONT[] = new String[] {"Fuso hor\u00e1rio de Pohnpei", "PONT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Pohnpei", "PONST"}; -+ String PST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Pac\u00edfico", "PST", -+ "Hor\u00e1rio de luz natural do Pac\u00edfico", "PDT"}; - String RST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental", "EST", - "Hor\u00e1rio de luz natural central", "CDT"}; -- String SAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da \u00c1frica do Sul", "SAST", -- "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica do Sul", "SAST"}; -- String SBT[] = new String[] {"Fuso hor\u00e1rio das Ilhas Salom\u00e3o", "SBT", -- "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Salom\u00e3o", "SBST"}; -- String SGT[] = new String[] {"Fuso hor\u00e1rio de Cingapura", "SGT", -- "Fuso hor\u00e1rio de ver\u00e1 de Cingapura", "SGST"}; -- String SLST[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT", -- "Fuso hor\u00e1rio de ver\u00e3o de Serra Leoa", "SLST"}; -- String TASMANIA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Tasm\u00e2nia)", "EST", -- "Fuso hor\u00e1rio de ver\u00e3o oriental (Tasm\u00e2nia)", "EST"}; -- String TMT[] = new String[] {"Fuso hor\u00e1rio do Turcomenist\u00e3o", "TMT", -- "Fuso hor\u00e1rio de ver\u00e3o do Turcomenist\u00e3o", "TMST"}; -- String TRUT[] = new String[] {"Fuso hor\u00e1rio de Chuuk", "CHUT", -- "Fuso hor\u00e1rio de ver\u00e3o de Chuuk", "CHUST"}; -- String ULAT[]= new String[] {"Fuso hor\u00e1rio de Ulan Bator", "ULAT", -- "Fuso hor\u00e1rio de ver\u00e3o de Ulan Bator", "ULAST"}; -- String WAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Ocidental", "WAT", -- "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica Ocidental", "WAST"}; -- String WET[] = new String[] {"Fuso hor\u00e1rio da Europa Ocidental", "WET", -- "Fuso hor\u00e1rio de ver\u00e3o da Europa Ocidental", "WEST"}; -- String WIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Ocidental", "WIT", -- "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Ocidental", "WIST"}; -- String WST_AUS[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o ocidental (Austr\u00e1lia)", "WST", -- "Fuso hor\u00e1rio de ver\u00e3o ocidental (Austr\u00e1lia)", "WST"}; -- String SAMOA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Samoa", "SST", -- "Hor\u00e1rio de luz natural de Samoa", "SDT"}; -- String WST_SAMOA[] = new String[] {"Fuso hor\u00e1rio de Samoa Ocidental", "WST", -- "Fuso hor\u00e1rio de ver\u00e3o de Samoa Ocidental", "WSST"}; -- String ChST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chamorro", "ChST", -- "Hor\u00e1rio de luz natural de Chamorro", "ChDT"}; -- String VICTORIA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Victoria)", "EST", -- "Fuso hor\u00e1rio de ver\u00e3o oriental (Victoria)", "EST"}; -- String UTC[] = new String[] {"Tempo universal coordenado", "UTC", -- "Tempo universal coordenado", "UTC"}; -- String UZT[] = new String[] {"Fuso hor\u00e1rio do Uzbequist\u00e3o", "UZT", -- "Fuso hor\u00e1rio de ver\u00e3o do Uzbequist\u00e3o", "UZST"}; -- String WART[] = new String[] {"Fuso hor\u00e1rio da Argentina Ocidental", "WART", -- "Fuso hor\u00e1rio de ver\u00e3o da Argentina Ocidental", "WARST"}; -+ String SAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da \u00c1frica do Sul", "SAST", -+ "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica do Sul", "SAST"}; -+ String SBT[] = new String[] {"Fuso hor\u00e1rio das Ilhas Salom\u00e3o", "SBT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Salom\u00e3o", "SBST"}; -+ String SGT[] = new String[] {"Fuso hor\u00e1rio de Cingapura", "SGT", -+ "Fuso hor\u00e1rio de ver\u00e1 de Cingapura", "SGST"}; -+ String SLST[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Serra Leoa", "SLST"}; -+ String TASMANIA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Tasm\u00e2nia)", "EST", -+ "Fuso hor\u00e1rio de ver\u00e3o oriental (Tasm\u00e2nia)", "EST"}; -+ String TMT[] = new String[] {"Fuso hor\u00e1rio do Turcomenist\u00e3o", "TMT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Turcomenist\u00e3o", "TMST"}; -+ String TRUT[] = new String[] {"Fuso hor\u00e1rio de Chuuk", "CHUT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Chuuk", "CHUST"}; -+ String ULAT[]= new String[] {"Fuso hor\u00e1rio de Ulan Bator", "ULAT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Ulan Bator", "ULAST"}; -+ String WAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Ocidental", "WAT", -+ "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica Ocidental", "WAST"}; -+ String WET[] = new String[] {"Fuso hor\u00e1rio da Europa Ocidental", "WET", -+ "Fuso hor\u00e1rio de ver\u00e3o da Europa Ocidental", "WEST"}; -+ String WIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Ocidental", "WIT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Ocidental", "WIST"}; -+ String WST_AUS[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o ocidental (Austr\u00e1lia)", "WST", -+ "Fuso hor\u00e1rio de ver\u00e3o ocidental (Austr\u00e1lia)", "WST"}; -+ String SAMOA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Samoa", "SST", -+ "Hor\u00e1rio de luz natural de Samoa", "SDT"}; -+ String WST_SAMOA[] = new String[] {"Fuso hor\u00e1rio de Samoa Ocidental", "WST", -+ "Fuso hor\u00e1rio de ver\u00e3o de Samoa Ocidental", "WSST"}; -+ String ChST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chamorro", "ChST", -+ "Hor\u00e1rio de luz natural de Chamorro", "ChDT"}; -+ String VICTORIA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Victoria)", "EST", -+ "Fuso hor\u00e1rio de ver\u00e3o oriental (Victoria)", "EST"}; -+ String UTC[] = new String[] {"Tempo universal coordenado", "UTC", -+ "Tempo universal coordenado", "UTC"}; -+ String UZT[] = new String[] {"Fuso hor\u00e1rio do Uzbequist\u00e3o", "UZT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Uzbequist\u00e3o", "UZST"}; -+ String WART[] = new String[] {"Fuso hor\u00e1rio da Argentina Ocidental", "WART", -+ "Fuso hor\u00e1rio de ver\u00e3o da Argentina Ocidental", "WARST"}; - -+ return new Object[][] { -+ {"America/Los_Angeles", PST}, -+ {"PST", PST}, -+ {"America/Denver", MST}, -+ {"MST", MST}, -+ {"America/Phoenix", MST}, -+ {"PNT", MST}, -+ {"America/Chicago", CST}, -+ {"CST", CST}, -+ {"America/New_York", EST}, -+ {"EST", EST}, -+ {"America/Indianapolis", EST}, -+ {"IET", EST}, -+ {"Pacific/Honolulu", HST}, -+ {"HST", HST}, -+ {"America/Anchorage", AKST}, -+ {"AST", AKST}, -+ {"America/Halifax", AST}, -+ {"America/Sitka", AKST}, -+ {"America/St_Johns", NST}, -+ {"CNT", NST}, -+ {"Europe/Paris", CET}, -+ {"ECT", CET}, -+ {"GMT", GMT}, -+ {"Africa/Casablanca", WET}, -+ {"Asia/Jerusalem", ISRAEL}, -+ {"Asia/Tokyo", JST}, -+ {"JST", JST}, -+ {"Europe/Bucharest", EET}, -+ {"Asia/Shanghai", CTT}, -+ {"CTT", CTT}, -+ /* Don't change the order of the above zones -+ * to keep compatibility with the previous version. -+ */ - -- return new Object[][] { -- {"America/Los_Angeles", PST}, -- {"PST", PST}, -- {"America/Denver", MST}, -- {"MST", MST}, -- {"America/Phoenix", MST}, -- {"PNT", MST}, -- {"America/Chicago", CST}, -- {"CST", CST}, -- {"America/New_York", EST}, -- {"EST", EST}, -- {"America/Indianapolis", EST}, -- {"IET", EST}, -- {"Pacific/Honolulu", HST}, -- {"HST", HST}, -- {"America/Anchorage", AKST}, -- {"AST", AKST}, -- {"America/Halifax", AST}, -- {"America/Sitka", AKST}, -- {"America/St_Johns", NST}, -- {"CNT", NST}, -- {"Europe/Paris", CET}, -- {"ECT", CET}, -- {"GMT", GMT}, -- {"Africa/Casablanca", WET}, -- {"Asia/Jerusalem", ISRAEL}, -- {"Asia/Tokyo", JST}, -- {"JST", JST}, -- {"Europe/Bucharest", EET}, -- {"Asia/Shanghai", CTT}, -- {"CTT", CTT}, -- /* Don't change the order of the above zones -- * to keep compatibility with the previous version. -- */ -- -- {"ACT", DARWIN}, -- {"AET", EST_NSW}, -- {"AGT", AGT}, -- {"ART", EET}, -- {"Africa/Abidjan", GMT}, -- {"Africa/Accra", GHMT}, -- {"Africa/Addis_Ababa", EAT}, -- {"Africa/Algiers", CET}, -- {"Africa/Asmara", EAT}, -- {"Africa/Asmera", EAT}, -- {"Africa/Bamako", GMT}, -- {"Africa/Bangui", WAT}, -- {"Africa/Banjul", GMT}, -- {"Africa/Bissau", GMT}, -- {"Africa/Blantyre", CAT}, -- {"Africa/Brazzaville", WAT}, -- {"Africa/Bujumbura", CAT}, -- {"Africa/Cairo", EET}, -- {"Africa/Ceuta", CET}, -- {"Africa/Conakry", GMT}, -- {"Africa/Dakar", GMT}, -- {"Africa/Dar_es_Salaam", EAT}, -- {"Africa/Djibouti", EAT}, -- {"Africa/Douala", WAT}, -- {"Africa/El_Aaiun", WET}, -- {"Africa/Freetown", SLST}, -- {"Africa/Gaborone", CAT}, -- {"Africa/Harare", CAT}, -- {"Africa/Johannesburg", SAST}, -- {"Africa/Kampala", EAT}, -- {"Africa/Khartoum", EAT}, -- {"Africa/Kigali", CAT}, -- {"Africa/Kinshasa", WAT}, -- {"Africa/Lagos", WAT}, -- {"Africa/Libreville", WAT}, -- {"Africa/Lome", GMT}, -- {"Africa/Luanda", WAT}, -- {"Africa/Lubumbashi", CAT}, -- {"Africa/Lusaka", CAT}, -- {"Africa/Malabo", WAT}, -- {"Africa/Maputo", CAT}, -- {"Africa/Maseru", SAST}, -- {"Africa/Mbabane", SAST}, -- {"Africa/Mogadishu", EAT}, -- {"Africa/Monrovia", GMT}, -- {"Africa/Nairobi", EAT}, -- {"Africa/Ndjamena", WAT}, -- {"Africa/Niamey", WAT}, -- {"Africa/Nouakchott", GMT}, -- {"Africa/Ouagadougou", GMT}, -- {"Africa/Porto-Novo", WAT}, -- {"Africa/Sao_Tome", GMT}, -- {"Africa/Timbuktu", GMT}, -- {"Africa/Tripoli", EET}, -- {"Africa/Tunis", CET}, -- {"Africa/Windhoek", WAT}, -- {"America/Adak", HAST}, -- {"America/Anguilla", AST}, -- {"America/Antigua", AST}, -- {"America/Araguaina", BRT}, -- {"America/Argentina/Buenos_Aires", AGT}, -- {"America/Argentina/Catamarca", AGT}, -- {"America/Argentina/ComodRivadavia", AGT}, -- {"America/Argentina/Cordoba", AGT}, -- {"America/Argentina/Jujuy", AGT}, -- {"America/Argentina/La_Rioja", AGT}, -- {"America/Argentina/Mendoza", AGT}, -- {"America/Argentina/Rio_Gallegos", AGT}, -- {"America/Argentina/Salta", AGT}, -- {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -- {"America/Argentina/Tucuman", AGT}, -- {"America/Argentina/Ushuaia", AGT}, -- {"America/Aruba", AST}, -- {"America/Asuncion", new String[] {"Fuso hor\u00e1rio do Paraguai", "PYT", -- "Fuso hor\u00e1rio de ver\u00e3o do Paraguai", "PYST"}}, -+ {"ACT", DARWIN}, -+ {"AET", EST_NSW}, -+ {"AGT", AGT}, -+ {"ART", EET}, -+ {"Africa/Abidjan", GMT}, -+ {"Africa/Accra", GHMT}, -+ {"Africa/Addis_Ababa", EAT}, -+ {"Africa/Algiers", CET}, -+ {"Africa/Asmara", EAT}, -+ {"Africa/Asmera", EAT}, -+ {"Africa/Bamako", GMT}, -+ {"Africa/Bangui", WAT}, -+ {"Africa/Banjul", GMT}, -+ {"Africa/Bissau", GMT}, -+ {"Africa/Blantyre", CAT}, -+ {"Africa/Brazzaville", WAT}, -+ {"Africa/Bujumbura", CAT}, -+ {"Africa/Cairo", EET}, -+ {"Africa/Ceuta", CET}, -+ {"Africa/Conakry", GMT}, -+ {"Africa/Dakar", GMT}, -+ {"Africa/Dar_es_Salaam", EAT}, -+ {"Africa/Djibouti", EAT}, -+ {"Africa/Douala", WAT}, -+ {"Africa/El_Aaiun", WET}, -+ {"Africa/Freetown", SLST}, -+ {"Africa/Gaborone", CAT}, -+ {"Africa/Harare", CAT}, -+ {"Africa/Johannesburg", SAST}, -+ {"Africa/Kampala", EAT}, -+ {"Africa/Khartoum", EAT}, -+ {"Africa/Kigali", CAT}, -+ {"Africa/Kinshasa", WAT}, -+ {"Africa/Lagos", WAT}, -+ {"Africa/Libreville", WAT}, -+ {"Africa/Lome", GMT}, -+ {"Africa/Luanda", WAT}, -+ {"Africa/Lubumbashi", CAT}, -+ {"Africa/Lusaka", CAT}, -+ {"Africa/Malabo", WAT}, -+ {"Africa/Maputo", CAT}, -+ {"Africa/Maseru", SAST}, -+ {"Africa/Mbabane", SAST}, -+ {"Africa/Mogadishu", EAT}, -+ {"Africa/Monrovia", GMT}, -+ {"Africa/Nairobi", EAT}, -+ {"Africa/Ndjamena", WAT}, -+ {"Africa/Niamey", WAT}, -+ {"Africa/Nouakchott", GMT}, -+ {"Africa/Ouagadougou", GMT}, -+ {"Africa/Porto-Novo", WAT}, -+ {"Africa/Sao_Tome", GMT}, -+ {"Africa/Timbuktu", GMT}, -+ {"Africa/Tripoli", EET}, -+ {"Africa/Tunis", CET}, -+ {"Africa/Windhoek", WAT}, -+ {"America/Adak", HAST}, -+ {"America/Anguilla", AST}, -+ {"America/Antigua", AST}, -+ {"America/Araguaina", BRT}, -+ {"America/Argentina/Buenos_Aires", AGT}, -+ {"America/Argentina/Catamarca", AGT}, -+ {"America/Argentina/ComodRivadavia", AGT}, -+ {"America/Argentina/Cordoba", AGT}, -+ {"America/Argentina/Jujuy", AGT}, -+ {"America/Argentina/La_Rioja", AGT}, -+ {"America/Argentina/Mendoza", AGT}, -+ {"America/Argentina/Rio_Gallegos", AGT}, -+ {"America/Argentina/Salta", AGT}, -+ {"America/Argentina/San_Juan", AGT}, -+ {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/Tucuman", AGT}, -+ {"America/Argentina/Ushuaia", AGT}, -+ {"America/Aruba", AST}, -+ {"America/Asuncion", new String[] {"Fuso hor\u00e1rio do Paraguai", "PYT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Paraguai", "PYST"}}, - {"America/Atikokan", EST}, -- {"America/Atka", HAST}, -- {"America/Bahia", BRT}, -- {"America/Bahia_Banderas", CST}, -- {"America/Barbados", AST}, -- {"America/Belem", BRT}, -- {"America/Belize", CST}, -+ {"America/Atka", HAST}, -+ {"America/Bahia", BRT}, -+ {"America/Bahia_Banderas", CST}, -+ {"America/Barbados", AST}, -+ {"America/Belem", BRT}, -+ {"America/Belize", CST}, - {"America/Blanc-Sablon", AST}, -- {"America/Boa_Vista", AMT}, -- {"America/Bogota", new String[] {"Fuso hor\u00e1rio da Col\u00f4mbia", "COT", -- "Fuso hor\u00e1rio de ver\u00e3o da Col\u00f4mbia", "COST"}}, -- {"America/Boise", MST}, -- {"America/Buenos_Aires", AGT}, -- {"America/Cambridge_Bay", MST}, -- {"America/Campo_Grande", AMT}, -- {"America/Cancun", CST}, -- {"America/Caracas", new String[] {"Fuso hor\u00e1rio da Venezuela", "VET", -- "Fuso hor\u00e1rio de ver\u00e3o da Venezuela", "VEST"}}, -- {"America/Catamarca", AGT}, -- {"America/Cayenne", new String[] {"Fuso hor\u00e1rio da Guiana Francesa", "GFT", -- "Fuso hor\u00e1rio de ver\u00e3o da Guiana Francesa", "GFST"}}, -- {"America/Cayman", EST}, -- {"America/Chihuahua", MST}, -- {"America/Coral_Harbour", EST}, -- {"America/Cordoba", AGT}, -- {"America/Costa_Rica", CST}, -- {"America/Cuiaba", AMT}, -- {"America/Curacao", AST}, -- {"America/Danmarkshavn", GMT}, -- {"America/Dawson", PST}, -- {"America/Dawson_Creek", MST}, -- {"America/Detroit", EST}, -- {"America/Dominica", AST}, -- {"America/Edmonton", MST}, -- {"America/Eirunepe", AMT}, -- {"America/El_Salvador", CST}, -- {"America/Ensenada", PST}, -- {"America/Fort_Wayne", EST}, -- {"America/Fortaleza", BRT}, -- {"America/Glace_Bay", AST}, -- {"America/Godthab", new String[] {"Fuso hor\u00e1rio da Groenl\u00e2ndia Ocidental", "WGT", -- "Fuso hor\u00e1rio de ver\u00e3o da Groenl\u00e2ndia Ocidental", "WGST"}}, -- {"America/Goose_Bay", AST}, -- {"America/Grand_Turk", EST}, -- {"America/Grenada", AST}, -- {"America/Guadeloupe", AST}, -- {"America/Guatemala", CST}, -- {"America/Guayaquil", new String[] {"Fuso hor\u00e1rio do Equador", "ECT", -- "Fuso hor\u00e1rio de ver\u00e3o do Equador", "ECST"}}, -- {"America/Guyana", new String[] {"Fuso hor\u00e1rio da Guiana", "GYT", -- "Fuso hor\u00e1rio de ver\u00e3o da Guiana", "GYST"}}, -- {"America/Havana", CUBA}, -- {"America/Hermosillo", MST}, -- {"America/Indiana/Indianapolis", EST}, -- {"America/Indiana/Knox", CST}, -- {"America/Indiana/Marengo", EST}, -- {"America/Indiana/Petersburg", EST}, -- {"America/Indiana/Tell_City", CST}, -- {"America/Indiana/Vevay", EST}, -- {"America/Indiana/Vincennes", EST}, -- {"America/Indiana/Winamac", EST}, -- {"America/Inuvik", MST}, -- {"America/Iqaluit", EST}, -- {"America/Jamaica", EST}, -- {"America/Jujuy", AGT}, -- {"America/Juneau", AKST}, -- {"America/Kentucky/Louisville", EST}, -- {"America/Kentucky/Monticello", EST}, -- {"America/Knox_IN", CST}, -- {"America/La_Paz", new String[] {"Fuso hor\u00e1rio da Bol\u00edvia", "BOT", -- "Fuso hor\u00e1rio de ver\u00e3o da Bol\u00edvia", "BOST"}}, -- {"America/Lima", new String[] {"Fuso hor\u00e1rio do Peru", "PET", -- "Fuso hor\u00e1rio de ver\u00e3o do Peru", "PEST"}}, -- {"America/Louisville", EST}, -- {"America/Maceio", BRT}, -- {"America/Managua", CST}, -- {"America/Manaus", AMT}, -- {"America/Marigot", AST}, -- {"America/Martinique", AST}, -- {"America/Mazatlan", MST}, -- {"America/Mendoza", AGT}, -- {"America/Menominee", CST}, -- {"America/Merida", CST}, -- {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST", -- "Metlakatla Daylight Time", "MeDT"}}, -- {"America/Mexico_City", CST}, -- {"America/Miquelon", new String[] {"Fuso hor\u00e1rio padr\u00e3o de S\u00e3o Pedro e Miquelon", "PMST", -- "Hor\u00e1rio de luz natural de S\u00e3o Pedro e Miquelon", "PMDT"}}, -- {"America/Moncton", AST}, -- {"America/Montevideo", new String[] {"Fuso hor\u00e1rio do Uruguai", "UYT", -- "Fuso hor\u00e1rio de ver\u00e3o do Uruguai", "UYST"}}, -- {"America/Monterrey", CST}, -- {"America/Montreal", EST}, -- {"America/Montserrat", AST}, -- {"America/Nassau", EST}, -- {"America/Nipigon", EST}, -- {"America/Nome", AKST}, -- {"America/Noronha", NORONHA}, -+ {"America/Boa_Vista", AMT}, -+ {"America/Bogota", new String[] {"Fuso hor\u00e1rio da Col\u00f4mbia", "COT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Col\u00f4mbia", "COST"}}, -+ {"America/Boise", MST}, -+ {"America/Buenos_Aires", AGT}, -+ {"America/Cambridge_Bay", MST}, -+ {"America/Campo_Grande", AMT}, -+ {"America/Cancun", CST}, -+ {"America/Caracas", new String[] {"Fuso hor\u00e1rio da Venezuela", "VET", -+ "Fuso hor\u00e1rio de ver\u00e3o da Venezuela", "VEST"}}, -+ {"America/Catamarca", AGT}, -+ {"America/Cayenne", new String[] {"Fuso hor\u00e1rio da Guiana Francesa", "GFT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Guiana Francesa", "GFST"}}, -+ {"America/Cayman", EST}, -+ {"America/Chihuahua", MST}, -+ {"America/Coral_Harbour", EST}, -+ {"America/Cordoba", AGT}, -+ {"America/Costa_Rica", CST}, -+ {"America/Cuiaba", AMT}, -+ {"America/Curacao", AST}, -+ {"America/Danmarkshavn", GMT}, -+ {"America/Dawson", PST}, -+ {"America/Dawson_Creek", MST}, -+ {"America/Detroit", EST}, -+ {"America/Dominica", AST}, -+ {"America/Edmonton", MST}, -+ {"America/Eirunepe", AMT}, -+ {"America/El_Salvador", CST}, -+ {"America/Ensenada", PST}, -+ {"America/Fort_Wayne", EST}, -+ {"America/Fortaleza", BRT}, -+ {"America/Glace_Bay", AST}, -+ {"America/Godthab", new String[] {"Fuso hor\u00e1rio da Groenl\u00e2ndia Ocidental", "WGT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Groenl\u00e2ndia Ocidental", "WGST"}}, -+ {"America/Goose_Bay", AST}, -+ {"America/Grand_Turk", EST}, -+ {"America/Grenada", AST}, -+ {"America/Guadeloupe", AST}, -+ {"America/Guatemala", CST}, -+ {"America/Guayaquil", new String[] {"Fuso hor\u00e1rio do Equador", "ECT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Equador", "ECST"}}, -+ {"America/Guyana", new String[] {"Fuso hor\u00e1rio da Guiana", "GYT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Guiana", "GYST"}}, -+ {"America/Havana", CUBA}, -+ {"America/Hermosillo", MST}, -+ {"America/Indiana/Indianapolis", EST}, -+ {"America/Indiana/Knox", CST}, -+ {"America/Indiana/Marengo", EST}, -+ {"America/Indiana/Petersburg", EST}, -+ {"America/Indiana/Tell_City", CST}, -+ {"America/Indiana/Vevay", EST}, -+ {"America/Indiana/Vincennes", EST}, -+ {"America/Indiana/Winamac", EST}, -+ {"America/Inuvik", MST}, -+ {"America/Iqaluit", EST}, -+ {"America/Jamaica", EST}, -+ {"America/Jujuy", AGT}, -+ {"America/Juneau", AKST}, -+ {"America/Kentucky/Louisville", EST}, -+ {"America/Kentucky/Monticello", EST}, -+ {"America/Knox_IN", CST}, -+ {"America/La_Paz", new String[] {"Fuso hor\u00e1rio da Bol\u00edvia", "BOT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Bol\u00edvia", "BOST"}}, -+ {"America/Lima", new String[] {"Fuso hor\u00e1rio do Peru", "PET", -+ "Fuso hor\u00e1rio de ver\u00e3o do Peru", "PEST"}}, -+ {"America/Louisville", EST}, -+ {"America/Maceio", BRT}, -+ {"America/Managua", CST}, -+ {"America/Manaus", AMT}, -+ {"America/Marigot", AST}, -+ {"America/Martinique", AST}, -+ {"America/Matamoros", CST}, -+ {"America/Mazatlan", MST}, -+ {"America/Mendoza", AGT}, -+ {"America/Menominee", CST}, -+ {"America/Merida", CST}, -+ {"America/Metlakatla", new String[] {"Metlakatla Standard Time", "MeST", -+ "Metlakatla Daylight Time", "MeDT"}}, -+ {"America/Mexico_City", CST}, -+ {"America/Miquelon", new String[] {"Fuso hor\u00e1rio padr\u00e3o de S\u00e3o Pedro e Miquelon", "PMST", -+ "Hor\u00e1rio de luz natural de S\u00e3o Pedro e Miquelon", "PMDT"}}, -+ {"America/Moncton", AST}, -+ {"America/Montevideo", new String[] {"Fuso hor\u00e1rio do Uruguai", "UYT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Uruguai", "UYST"}}, -+ {"America/Monterrey", CST}, -+ {"America/Montreal", EST}, -+ {"America/Montserrat", AST}, -+ {"America/Nassau", EST}, -+ {"America/Nipigon", EST}, -+ {"America/Nome", AKST}, -+ {"America/Noronha", NORONHA}, - {"America/North_Dakota/Beulah", CST}, -- {"America/North_Dakota/Center", CST}, -+ {"America/North_Dakota/Center", CST}, - {"America/North_Dakota/New_Salem", CST}, -- {"America/Panama", EST}, -- {"America/Pangnirtung", EST}, -- {"America/Paramaribo", new String[] {"Fuso hor\u00e1rio do Suriname", "SRT", -- "Fuso hor\u00e1rio de ver\u00e3o do Suriname", "SRST"}}, -- {"America/Port-au-Prince", EST}, -- {"America/Port_of_Spain", AST}, -- {"America/Porto_Acre", AMT}, -- {"America/Porto_Velho", AMT}, -- {"America/Puerto_Rico", AST}, -- {"America/Rainy_River", CST}, -- {"America/Rankin_Inlet", CST}, -- {"America/Recife", BRT}, -- {"America/Regina", CST}, -- {"America/Resolute", RST}, -- {"America/Rio_Branco", AMT}, -- {"America/Rosario", AGT}, -- {"America/Santarem", BRT}, -- {"America/Santiago", CLT}, -- {"America/Santo_Domingo", AST}, -- {"America/Sao_Paulo", BRT}, -- {"America/Scoresbysund", EGT}, -- {"America/Shiprock", MST}, -- {"America/St_Barthelemy", AST}, -- {"America/St_Kitts", AST}, -- {"America/St_Lucia", AST}, -- {"America/St_Thomas", AST}, -- {"America/St_Vincent", AST}, -- {"America/Swift_Current", CST}, -- {"America/Tegucigalpa", CST}, -- {"America/Thule", AST}, -- {"America/Thunder_Bay", EST}, -- {"America/Tijuana", PST}, -- {"America/Toronto", EST}, -- {"America/Tortola", AST}, -- {"America/Vancouver", PST}, -- {"America/Virgin", AST}, -- {"America/Whitehorse", PST}, -- {"America/Winnipeg", CST}, -- {"America/Yakutat", AKST}, -- {"America/Yellowknife", MST}, -- {"Antarctica/Casey", WST_AUS}, -- {"Antarctica/Davis", new String[] {"Fuso hor\u00e1rio de Davis", "DAVT", -- "Fuso hor\u00e1rio de ver\u00e3o de Davis", "DAVST"}}, -- {"Antarctica/DumontDUrville", new String[] {"Fuso hor\u00e1rio de Dumont-d'Urville", "DDUT", -- "Fuso hor\u00e1rio de ver\u00e3o de Dumont-d'Urville", "DDUST"}}, -- {"Antarctica/Mawson", new String[] {"Fuso hor\u00e1rio de Mawson", "MAWT", -- "Fuso hor\u00e1rio de ver\u00e3o de Mawson", "MAWST"}}, -- {"Antarctica/McMurdo", NZST}, -- {"Antarctica/Palmer", CLT}, -- {"Antarctica/Rothera", new String[] {"Fuso hor\u00e1rio de Rothera", "ROTT", -- "Fuso hor\u00e1rio de ver\u00e3o de Rothera", "ROTST"}}, -- {"Antarctica/South_Pole", NZST}, -- {"Antarctica/Syowa", new String[] {"Fuso hor\u00e1rio de Syowa", "SYOT", -- "Fuso hor\u00e1rio de ver\u00e3o de Syowa", "SYOST"}}, -- {"Antarctica/Vostok", new String[] {"Fuso hor\u00e1rio de Vostok", "VOST", -- "Fuso hor\u00e1rio de ver\u00e3o de Vostok", "VOSST"}}, -- {"Arctic/Longyearbyen", CET}, -- {"Asia/Aden", ARAST}, -- {"Asia/Almaty", new String[] {"Fuso hor\u00e1rio de Alma-Ata", "ALMT", -- "Fuso hor\u00e1rio de ver\u00e3o de Alma-Ata", "ALMST"}}, -- {"Asia/Amman", EET}, -- {"Asia/Anadyr", new String[] {"Fuso hor\u00e1rio de Anadyr", "ANAT", -- "Fuso hor\u00e1rio de ver\u00e3o de Anadyr", "ANAST"}}, -- {"Asia/Aqtau", new String[] {"Fuso hor\u00e1rio de Aqtau", "AQTT", -- "Fuso hor\u00e1rio de ver\u00e3o de Aqtau", "AQTST"}}, -- {"Asia/Aqtobe", new String[] {"Fuso hor\u00e1rio de Aqtobe", "AQTT", -- "Fuso hor\u00e1rio de ver\u00e3o de Aqtobe", "AQTST"}}, -- {"Asia/Ashgabat", TMT}, -- {"Asia/Ashkhabad", TMT}, -- {"Asia/Baghdad", ARAST}, -- {"Asia/Bahrain", ARAST}, -- {"Asia/Baku", new String[] {"Fuso hor\u00e1rio do Azerbaij\u00e3o", "AZT", -- "Fuso hor\u00e1rio de ver\u00e3o do Azerbaij\u00e3o", "AZST"}}, -- {"Asia/Bangkok", ICT}, -- {"Asia/Beirut", EET}, -- {"Asia/Bishkek", new String[] {"Fuso hor\u00e1rio do Quirguist\u00e3o", "KGT", -- "Fuso hor\u00e1rio de ver\u00e3o do Quirguist\u00e3o", "KGST"}}, -- {"Asia/Brunei", new String[] {"Fuso hor\u00e1rio de Brunei", "BNT", -- "Fuso hor\u00e1rio de ver\u00e3o de Brunei", "BNST"}}, -- {"Asia/Calcutta", IST}, -- {"Asia/Choibalsan", new String[] {"Fuso hor\u00e1rio de Choibalsan", "CHOT", -- "Fuso hor\u00e1rio de ver\u00e3o de Choibalsan", "CHOST"}}, -- {"Asia/Chongqing", CTT}, -- {"Asia/Chungking", CTT}, -- {"Asia/Colombo", IST}, -- {"Asia/Dacca", BDT}, -- {"Asia/Dhaka", BDT}, -- {"Asia/Dili", new String[] {"Fuso hor\u00e1rio do Timor-Leste", "TLT", -- "Fuso hor\u00e1rio de ver\u00e3o do Timor-Leste", "TLST"}}, -- {"Asia/Damascus", EET}, -- {"Asia/Dubai", GST}, -- {"Asia/Dushanbe", new String[] {"Fuso hor\u00e1rio do Tadjiquist\u00e3o", "TJT", -- "Fuso hor\u00e1rio de ver\u00e3o do Tadjiquist\u00e3o", "TJST"}}, -- {"Asia/Gaza", EET}, -- {"Asia/Harbin", CTT}, -- {"Asia/Ho_Chi_Minh", ICT}, -- {"Asia/Hong_Kong", HKT}, -- {"Asia/Hovd", new String[] {"Fuso hor\u00e1rio de Hovd", "HOVT", -- "Fuso hor\u00e1rio de ver\u00e3o de Hovd", "HOVST"}}, -- {"Asia/Irkutsk", new String[] {"Fuso hor\u00e1rio de Irkutsk", "IRKT", -- "Fuso hor\u00e1rio de ver\u00e3o de Irkutsk", "IRKST"}}, -- {"Asia/Istanbul", EET}, -- {"Asia/Jakarta", WIT}, -- {"Asia/Jayapura", new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Oriental", "EIT", -- "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Oriental", "EIST"}}, -- {"Asia/Kabul", new String[] {"Fuso hor\u00e1rio do Afeganist\u00e3o", "AFT", -- "Fuso hor\u00e1rio de ver\u00e3o do Afeganist\u00e3o", "AFST"}}, -- {"Asia/Kamchatka", new String[] {"Fuso hor\u00e1rio de Petropavlovsk-Kamchatski", "PETT", -- "Fuso hor\u00e1rio de ver\u00e3o de Petropavlovsk-Kamchatski", "PETST"}}, -- {"Asia/Karachi", PKT}, -- {"Asia/Kashgar", CTT}, -- {"Asia/Kathmandu", NPT}, -- {"Asia/Katmandu", NPT}, -- {"Asia/Kolkata", IST}, -- {"Asia/Krasnoyarsk", new String[] {"Fuso hor\u00e1rio de Krasnoyarsk", "KRAT", -- "Fuso hor\u00e1rio de ver\u00e3o de Krasnoyarsk", "KRAST"}}, -- {"Asia/Kuala_Lumpur", MYT}, -- {"Asia/Kuching", MYT}, -- {"Asia/Kuwait", ARAST}, -- {"Asia/Macao", CTT}, -- {"Asia/Macau", CTT}, -- {"Asia/Magadan", new String[] {"Fuso hor\u00e1rio de Magadan", "MAGT", -- "Fuso hor\u00e1rio de ver\u00e3o de Magadan", "MAGST"}}, -- {"Asia/Makassar", CIT}, -- {"Asia/Manila", new String[] {"Fuso hor\u00e1rio das Filipinas", "PHT", -- "Fuso hor\u00e1rio de ver\u00e3o das Filipinas", "PHST"}}, -- {"Asia/Muscat", GST}, -- {"Asia/Nicosia", EET}, -- {"Asia/Novokuznetsk", NOVT}, -- {"Asia/Novosibirsk", NOVT}, -- {"Asia/Oral", new String[] {"Fuso hor\u00e1rio de Uralsk", "ORAT", -- "Fuso hor\u00e1rio de ver\u00e3o de Uralsk", "ORAST"}}, -- {"Asia/Omsk", new String[] {"Fuso hor\u00e1rio de Omsk", "OMST", -- "Fuso hor\u00e1rio de ver\u00e3o de Omsk", "OMSST"}}, -- {"Asia/Phnom_Penh", ICT}, -- {"Asia/Pontianak", WIT}, -- {"Asia/Pyongyang", KST}, -- {"Asia/Qatar", ARAST}, -- {"Asia/Qyzylorda", new String[] {"Fuso hor\u00e1rio de Kizil-Orda", "QYZT", -- "Fuso hor\u00e1rio de ver\u00e3o de Kizil-Orda", "QYZST"}}, -- {"Asia/Rangoon", new String[] {"Fuso hor\u00e1rio de Mianmar", "MMT", -- "Fuso hor\u00e1rio de ver\u00e3o de Mianmar", "MMST"}}, -- {"Asia/Riyadh", ARAST}, -- {"Asia/Saigon", ICT}, -- {"Asia/Sakhalin", new String[] {"Fuso hor\u00e1rio de Sakhalina", "SAKT", -- "Fuso hor\u00e1rio de ver\u00e3o de Sakhalina", "SAKST"}}, -- {"Asia/Samarkand", UZT}, -- {"Asia/Seoul", KST}, -- {"Asia/Singapore", SGT}, -- {"Asia/Taipei", CTT}, -- {"Asia/Tel_Aviv", ISRAEL}, -- {"Asia/Tashkent", UZT}, -- {"Asia/Tbilisi", new String[] {"Fuso hor\u00e1rio da Ge\u00f3rgia", "GET", -- "Fuso hor\u00e1rio de ver\u00e3o da Ge\u00f3rgia", "GEST"}}, -- {"Asia/Tehran", IRT}, -- {"Asia/Thimbu", BTT}, -- {"Asia/Thimphu", BTT}, -- {"Asia/Ujung_Pandang", CIT}, -- {"Asia/Ulaanbaatar", ULAT}, -- {"Asia/Ulan_Bator", ULAT}, -- {"Asia/Urumqi", CTT}, -- {"Asia/Vientiane", ICT}, -- {"Asia/Vladivostok", new String[] {"Fuso hor\u00e1rio de Vladivostok", "VLAT", -- "Fuso hor\u00e1rio de ver\u00e3o de Vladivostok", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"Fuso hor\u00e1rio de Yakutsk", "YAKT", -- "Fuso hor\u00e1rio de ver\u00e3o de Yakutsk", "YAKST"}}, -- {"Asia/Yekaterinburg", new String[] {"Fuso hor\u00e1rio de Yekaterinburgo", "YEKT", -- "Fuso hor\u00e1rio de ver\u00e3o de Yekaterinburgo", "YEKST"}}, -- {"Asia/Yerevan", ARMT}, -- {"Atlantic/Azores", new String[] {"Fuso hor\u00e1rio das A\u00e7ores", "AZOT", -- "Fuso hor\u00e1rio de ver\u00e3o das A\u00e7ores", "AZOST"}}, -- {"Atlantic/Bermuda", AST}, -- {"Atlantic/Canary", WET}, -- {"Atlantic/Cape_Verde", new String[] {"Fuso hor\u00e1rio de Cabo Verde", "CVT", -- "Fuso hor\u00e1rio de ver\u00e3o de Cabo Verde", "CVST"}}, -- {"Atlantic/Faeroe", WET}, -- {"Atlantic/Faroe", WET}, -- {"Atlantic/Jan_Mayen", CET}, -- {"Atlantic/Madeira", WET}, -- {"Atlantic/Reykjavik", GMT}, -- {"Atlantic/South_Georgia", new String[] {"Fuso hor\u00e1rio padr\u00e3o da Ge\u00f3rgia do Sul", "GST", -- "Hor\u00e1rio de luz natural da Ge\u00f3rgia do Sul", "GDT"}}, -- {"Atlantic/St_Helena", GMT}, -- {"Atlantic/Stanley", new String[] {"Fuso hor\u00e1rio das Ilhas Falkland", "FKT", -- "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Falkland", "FKST"}}, -- {"Australia/ACT", EST_NSW}, -- {"Australia/Adelaide", ADELAIDE}, -- {"Australia/Brisbane", BRISBANE}, -- {"Australia/Broken_Hill", BROKEN_HILL}, -- {"Australia/Canberra", EST_NSW}, -- {"Australia/Currie", EST_NSW}, -- {"Australia/Darwin", DARWIN}, -- {"Australia/Eucla", new String[] {"Fuso hor\u00e1rio ocidental central (Austr\u00e1lia)", "CWST", -- "Fuso hor\u00e1rio de ver\u00e3o ocidental central (Austr\u00e1lia)", "CWST"}}, -- {"Australia/Hobart", TASMANIA}, -- {"Australia/LHI", LORD_HOWE}, -- {"Australia/Lindeman", BRISBANE}, -- {"Australia/Lord_Howe", LORD_HOWE}, -- {"Australia/Melbourne", VICTORIA}, -- {"Australia/North", DARWIN}, -- {"Australia/NSW", EST_NSW}, -- {"Australia/Perth", WST_AUS}, -- {"Australia/Queensland", BRISBANE}, -- {"Australia/South", ADELAIDE}, -- {"Australia/Sydney", EST_NSW}, -- {"Australia/Tasmania", TASMANIA}, -- {"Australia/Victoria", VICTORIA}, -- {"Australia/West", WST_AUS}, -- {"Australia/Yancowinna", BROKEN_HILL}, -- {"BET", BRT}, -- {"BST", BDT}, -- {"Brazil/Acre", AMT}, -- {"Brazil/DeNoronha", NORONHA}, -- {"Brazil/East", BRT}, -- {"Brazil/West", AMT}, -- {"Canada/Atlantic", AST}, -- {"Canada/Central", CST}, -- {"Canada/East-Saskatchewan", CST}, -- {"Canada/Eastern", EST}, -- {"Canada/Mountain", MST}, -- {"Canada/Newfoundland", NST}, -- {"Canada/Pacific", PST}, -- {"Canada/Yukon", PST}, -- {"Canada/Saskatchewan", CST}, -- {"CAT", CAT}, -- {"CET", CET}, -- {"Chile/Continental", CLT}, -- {"Chile/EasterIsland", EASTER}, -- {"CST6CDT", CST}, -- {"Cuba", CUBA}, -- {"EAT", EAT}, -- {"EET", EET}, -- {"Egypt", EET}, -- {"Eire", DUBLIN}, -- {"EST5EDT", EST}, -- {"Etc/Greenwich", GMT}, -- {"Etc/UCT", UTC}, -- {"Etc/Universal", UTC}, -- {"Etc/UTC", UTC}, -- {"Etc/Zulu", UTC}, -- {"Europe/Amsterdam", CET}, -- {"Europe/Andorra", CET}, -- {"Europe/Athens", EET}, -- {"Europe/Belfast", GMTBST}, -- {"Europe/Belgrade", CET}, -- {"Europe/Berlin", CET}, -- {"Europe/Bratislava", CET}, -- {"Europe/Brussels", CET}, -- {"Europe/Budapest", CET}, -- {"Europe/Chisinau", EET}, -- {"Europe/Copenhagen", CET}, -- {"Europe/Dublin", DUBLIN}, -- {"Europe/Gibraltar", CET}, -+ {"America/Ojinaga", MST}, -+ {"America/Panama", EST}, -+ {"America/Pangnirtung", EST}, -+ {"America/Paramaribo", new String[] {"Fuso hor\u00e1rio do Suriname", "SRT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Suriname", "SRST"}}, -+ {"America/Port-au-Prince", EST}, -+ {"America/Port_of_Spain", AST}, -+ {"America/Porto_Acre", AMT}, -+ {"America/Porto_Velho", AMT}, -+ {"America/Puerto_Rico", AST}, -+ {"America/Rainy_River", CST}, -+ {"America/Rankin_Inlet", CST}, -+ {"America/Recife", BRT}, -+ {"America/Regina", CST}, -+ {"America/Resolute", RST}, -+ {"America/Rio_Branco", AMT}, -+ {"America/Rosario", AGT}, -+ {"America/Santa_Isabel", PST}, -+ {"America/Santarem", BRT}, -+ {"America/Santiago", CLT}, -+ {"America/Santo_Domingo", AST}, -+ {"America/Sao_Paulo", BRT}, -+ {"America/Scoresbysund", EGT}, -+ {"America/Shiprock", MST}, -+ {"America/St_Barthelemy", AST}, -+ {"America/St_Kitts", AST}, -+ {"America/St_Lucia", AST}, -+ {"America/St_Thomas", AST}, -+ {"America/St_Vincent", AST}, -+ {"America/Swift_Current", CST}, -+ {"America/Tegucigalpa", CST}, -+ {"America/Thule", AST}, -+ {"America/Thunder_Bay", EST}, -+ {"America/Tijuana", PST}, -+ {"America/Toronto", EST}, -+ {"America/Tortola", AST}, -+ {"America/Vancouver", PST}, -+ {"America/Virgin", AST}, -+ {"America/Whitehorse", PST}, -+ {"America/Winnipeg", CST}, -+ {"America/Yakutat", AKST}, -+ {"America/Yellowknife", MST}, -+ {"Antarctica/Casey", WST_AUS}, -+ {"Antarctica/Davis", new String[] {"Fuso hor\u00e1rio de Davis", "DAVT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Davis", "DAVST"}}, -+ {"Antarctica/DumontDUrville", new String[] {"Fuso hor\u00e1rio de Dumont-d'Urville", "DDUT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Dumont-d'Urville", "DDUST"}}, -+ {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", -+ "Macquarie Island Summer Time", "MIST"}}, -+ {"Antarctica/Mawson", new String[] {"Fuso hor\u00e1rio de Mawson", "MAWT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Mawson", "MAWST"}}, -+ {"Antarctica/McMurdo", NZST}, -+ {"Antarctica/Palmer", CLT}, -+ {"Antarctica/Rothera", new String[] {"Fuso hor\u00e1rio de Rothera", "ROTT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Rothera", "ROTST"}}, -+ {"Antarctica/South_Pole", NZST}, -+ {"Antarctica/Syowa", new String[] {"Fuso hor\u00e1rio de Syowa", "SYOT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Syowa", "SYOST"}}, -+ {"Antarctica/Vostok", new String[] {"Fuso hor\u00e1rio de Vostok", "VOST", -+ "Fuso hor\u00e1rio de ver\u00e3o de Vostok", "VOSST"}}, -+ {"Arctic/Longyearbyen", CET}, -+ {"Asia/Aden", ARAST}, -+ {"Asia/Almaty", new String[] {"Fuso hor\u00e1rio de Alma-Ata", "ALMT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Alma-Ata", "ALMST"}}, -+ {"Asia/Amman", EET}, -+ {"Asia/Anadyr", new String[] {"Fuso hor\u00e1rio de Anadyr", "ANAT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Anadyr", "ANAST"}}, -+ {"Asia/Aqtau", new String[] {"Fuso hor\u00e1rio de Aqtau", "AQTT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Aqtau", "AQTST"}}, -+ {"Asia/Aqtobe", new String[] {"Fuso hor\u00e1rio de Aqtobe", "AQTT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Aqtobe", "AQTST"}}, -+ {"Asia/Ashgabat", TMT}, -+ {"Asia/Ashkhabad", TMT}, -+ {"Asia/Baghdad", ARAST}, -+ {"Asia/Bahrain", ARAST}, -+ {"Asia/Baku", new String[] {"Fuso hor\u00e1rio do Azerbaij\u00e3o", "AZT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Azerbaij\u00e3o", "AZST"}}, -+ {"Asia/Bangkok", ICT}, -+ {"Asia/Beirut", EET}, -+ {"Asia/Bishkek", new String[] {"Fuso hor\u00e1rio do Quirguist\u00e3o", "KGT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Quirguist\u00e3o", "KGST"}}, -+ {"Asia/Brunei", new String[] {"Fuso hor\u00e1rio de Brunei", "BNT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Brunei", "BNST"}}, -+ {"Asia/Calcutta", IST}, -+ {"Asia/Choibalsan", new String[] {"Fuso hor\u00e1rio de Choibalsan", "CHOT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Choibalsan", "CHOST"}}, -+ {"Asia/Chongqing", CTT}, -+ {"Asia/Chungking", CTT}, -+ {"Asia/Colombo", IST}, -+ {"Asia/Dacca", BDT}, -+ {"Asia/Dhaka", BDT}, -+ {"Asia/Dili", new String[] {"Fuso hor\u00e1rio do Timor-Leste", "TLT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Timor-Leste", "TLST"}}, -+ {"Asia/Damascus", EET}, -+ {"Asia/Dubai", GST}, -+ {"Asia/Dushanbe", new String[] {"Fuso hor\u00e1rio do Tadjiquist\u00e3o", "TJT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Tadjiquist\u00e3o", "TJST"}}, -+ {"Asia/Gaza", EET}, -+ {"Asia/Harbin", CTT}, -+ {"Asia/Ho_Chi_Minh", ICT}, -+ {"Asia/Hong_Kong", HKT}, -+ {"Asia/Hovd", new String[] {"Fuso hor\u00e1rio de Hovd", "HOVT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Hovd", "HOVST"}}, -+ {"Asia/Irkutsk", new String[] {"Fuso hor\u00e1rio de Irkutsk", "IRKT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Irkutsk", "IRKST"}}, -+ {"Asia/Istanbul", EET}, -+ {"Asia/Jakarta", WIT}, -+ {"Asia/Jayapura", new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Oriental", "EIT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Oriental", "EIST"}}, -+ {"Asia/Kabul", new String[] {"Fuso hor\u00e1rio do Afeganist\u00e3o", "AFT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Afeganist\u00e3o", "AFST"}}, -+ {"Asia/Kamchatka", new String[] {"Fuso hor\u00e1rio de Petropavlovsk-Kamchatski", "PETT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Petropavlovsk-Kamchatski", "PETST"}}, -+ {"Asia/Karachi", PKT}, -+ {"Asia/Kashgar", CTT}, -+ {"Asia/Kathmandu", NPT}, -+ {"Asia/Katmandu", NPT}, -+ {"Asia/Kolkata", IST}, -+ {"Asia/Krasnoyarsk", new String[] {"Fuso hor\u00e1rio de Krasnoyarsk", "KRAT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Krasnoyarsk", "KRAST"}}, -+ {"Asia/Kuala_Lumpur", MYT}, -+ {"Asia/Kuching", MYT}, -+ {"Asia/Kuwait", ARAST}, -+ {"Asia/Macao", CTT}, -+ {"Asia/Macau", CTT}, -+ {"Asia/Magadan", new String[] {"Fuso hor\u00e1rio de Magadan", "MAGT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Magadan", "MAGST"}}, -+ {"Asia/Makassar", CIT}, -+ {"Asia/Manila", new String[] {"Fuso hor\u00e1rio das Filipinas", "PHT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Filipinas", "PHST"}}, -+ {"Asia/Muscat", GST}, -+ {"Asia/Nicosia", EET}, -+ {"Asia/Novokuznetsk", NOVT}, -+ {"Asia/Novosibirsk", NOVT}, -+ {"Asia/Oral", new String[] {"Fuso hor\u00e1rio de Uralsk", "ORAT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Uralsk", "ORAST"}}, -+ {"Asia/Omsk", new String[] {"Fuso hor\u00e1rio de Omsk", "OMST", -+ "Fuso hor\u00e1rio de ver\u00e3o de Omsk", "OMSST"}}, -+ {"Asia/Phnom_Penh", ICT}, -+ {"Asia/Pontianak", WIT}, -+ {"Asia/Pyongyang", KST}, -+ {"Asia/Qatar", ARAST}, -+ {"Asia/Qyzylorda", new String[] {"Fuso hor\u00e1rio de Kizil-Orda", "QYZT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Kizil-Orda", "QYZST"}}, -+ {"Asia/Rangoon", new String[] {"Fuso hor\u00e1rio de Mianmar", "MMT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Mianmar", "MMST"}}, -+ {"Asia/Riyadh", ARAST}, -+ {"Asia/Saigon", ICT}, -+ {"Asia/Sakhalin", new String[] {"Fuso hor\u00e1rio de Sakhalina", "SAKT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Sakhalina", "SAKST"}}, -+ {"Asia/Samarkand", UZT}, -+ {"Asia/Seoul", KST}, -+ {"Asia/Singapore", SGT}, -+ {"Asia/Taipei", CTT}, -+ {"Asia/Tel_Aviv", ISRAEL}, -+ {"Asia/Tashkent", UZT}, -+ {"Asia/Tbilisi", new String[] {"Fuso hor\u00e1rio da Ge\u00f3rgia", "GET", -+ "Fuso hor\u00e1rio de ver\u00e3o da Ge\u00f3rgia", "GEST"}}, -+ {"Asia/Tehran", IRT}, -+ {"Asia/Thimbu", BTT}, -+ {"Asia/Thimphu", BTT}, -+ {"Asia/Ujung_Pandang", CIT}, -+ {"Asia/Ulaanbaatar", ULAT}, -+ {"Asia/Ulan_Bator", ULAT}, -+ {"Asia/Urumqi", CTT}, -+ {"Asia/Vientiane", ICT}, -+ {"Asia/Vladivostok", new String[] {"Fuso hor\u00e1rio de Vladivostok", "VLAT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Vladivostok", "VLAST"}}, -+ {"Asia/Yakutsk", new String[] {"Fuso hor\u00e1rio de Yakutsk", "YAKT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Yakutsk", "YAKST"}}, -+ {"Asia/Yekaterinburg", new String[] {"Fuso hor\u00e1rio de Yekaterinburgo", "YEKT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Yekaterinburgo", "YEKST"}}, -+ {"Asia/Yerevan", ARMT}, -+ {"Atlantic/Azores", new String[] {"Fuso hor\u00e1rio das A\u00e7ores", "AZOT", -+ "Fuso hor\u00e1rio de ver\u00e3o das A\u00e7ores", "AZOST"}}, -+ {"Atlantic/Bermuda", AST}, -+ {"Atlantic/Canary", WET}, -+ {"Atlantic/Cape_Verde", new String[] {"Fuso hor\u00e1rio de Cabo Verde", "CVT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Cabo Verde", "CVST"}}, -+ {"Atlantic/Faeroe", WET}, -+ {"Atlantic/Faroe", WET}, -+ {"Atlantic/Jan_Mayen", CET}, -+ {"Atlantic/Madeira", WET}, -+ {"Atlantic/Reykjavik", GMT}, -+ {"Atlantic/South_Georgia", new String[] {"Fuso hor\u00e1rio padr\u00e3o da Ge\u00f3rgia do Sul", "GST", -+ "Hor\u00e1rio de luz natural da Ge\u00f3rgia do Sul", "GDT"}}, -+ {"Atlantic/St_Helena", GMT}, -+ {"Atlantic/Stanley", new String[] {"Fuso hor\u00e1rio das Ilhas Falkland", "FKT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Falkland", "FKST"}}, -+ {"Australia/ACT", EST_NSW}, -+ {"Australia/Adelaide", ADELAIDE}, -+ {"Australia/Brisbane", BRISBANE}, -+ {"Australia/Broken_Hill", BROKEN_HILL}, -+ {"Australia/Canberra", EST_NSW}, -+ {"Australia/Currie", EST_NSW}, -+ {"Australia/Darwin", DARWIN}, -+ {"Australia/Eucla", new String[] {"Fuso hor\u00e1rio ocidental central (Austr\u00e1lia)", "CWST", -+ "Fuso hor\u00e1rio de ver\u00e3o ocidental central (Austr\u00e1lia)", "CWST"}}, -+ {"Australia/Hobart", TASMANIA}, -+ {"Australia/LHI", LORD_HOWE}, -+ {"Australia/Lindeman", BRISBANE}, -+ {"Australia/Lord_Howe", LORD_HOWE}, -+ {"Australia/Melbourne", VICTORIA}, -+ {"Australia/North", DARWIN}, -+ {"Australia/NSW", EST_NSW}, -+ {"Australia/Perth", WST_AUS}, -+ {"Australia/Queensland", BRISBANE}, -+ {"Australia/South", ADELAIDE}, -+ {"Australia/Sydney", EST_NSW}, -+ {"Australia/Tasmania", TASMANIA}, -+ {"Australia/Victoria", VICTORIA}, -+ {"Australia/West", WST_AUS}, -+ {"Australia/Yancowinna", BROKEN_HILL}, -+ {"BET", BRT}, -+ {"BST", BDT}, -+ {"Brazil/Acre", AMT}, -+ {"Brazil/DeNoronha", NORONHA}, -+ {"Brazil/East", BRT}, -+ {"Brazil/West", AMT}, -+ {"Canada/Atlantic", AST}, -+ {"Canada/Central", CST}, -+ {"Canada/East-Saskatchewan", CST}, -+ {"Canada/Eastern", EST}, -+ {"Canada/Mountain", MST}, -+ {"Canada/Newfoundland", NST}, -+ {"Canada/Pacific", PST}, -+ {"Canada/Yukon", PST}, -+ {"Canada/Saskatchewan", CST}, -+ {"CAT", CAT}, -+ {"CET", CET}, -+ {"Chile/Continental", CLT}, -+ {"Chile/EasterIsland", EASTER}, -+ {"CST6CDT", CST}, -+ {"Cuba", CUBA}, -+ {"EAT", EAT}, -+ {"EET", EET}, -+ {"Egypt", EET}, -+ {"Eire", DUBLIN}, -+ {"EST5EDT", EST}, -+ {"Etc/Greenwich", GMT}, -+ {"Etc/UCT", UTC}, -+ {"Etc/Universal", UTC}, -+ {"Etc/UTC", UTC}, -+ {"Etc/Zulu", UTC}, -+ {"Europe/Amsterdam", CET}, -+ {"Europe/Andorra", CET}, -+ {"Europe/Athens", EET}, -+ {"Europe/Belfast", GMTBST}, -+ {"Europe/Belgrade", CET}, -+ {"Europe/Berlin", CET}, -+ {"Europe/Bratislava", CET}, -+ {"Europe/Brussels", CET}, -+ {"Europe/Budapest", CET}, -+ {"Europe/Chisinau", EET}, -+ {"Europe/Copenhagen", CET}, -+ {"Europe/Dublin", DUBLIN}, -+ {"Europe/Gibraltar", CET}, - {"Europe/Guernsey", GMTBST}, -- {"Europe/Helsinki", EET}, -+ {"Europe/Helsinki", EET}, - {"Europe/Isle_of_Man", GMTBST}, -- {"Europe/Istanbul", EET}, -+ {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", EET}, -- {"Europe/Kiev", EET}, -- {"Europe/Lisbon", WET}, -- {"Europe/Ljubljana", CET}, -- {"Europe/London", GMTBST}, -- {"Europe/Luxembourg", CET}, -- {"Europe/Madrid", CET}, -- {"Europe/Malta", CET}, -- {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -- {"Europe/Monaco", CET}, -- {"Europe/Moscow", MSK}, -- {"Europe/Nicosia", EET}, -- {"Europe/Oslo", CET}, -- {"Europe/Podgorica", CET}, -- {"Europe/Prague", CET}, -- {"Europe/Riga", EET}, -- {"Europe/Rome", CET}, -- {"Europe/Samara", new String[] {"Fuso hor\u00e1rio de Samara", "SAMT", -- "Fuso hor\u00e1rio de ver\u00e3o de Samara", "SAMST"}}, -- {"Europe/San_Marino", CET}, -- {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -- {"Europe/Skopje", CET}, -- {"Europe/Sofia", EET}, -- {"Europe/Stockholm", CET}, -- {"Europe/Tallinn", EET}, -- {"Europe/Tirane", CET}, -- {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", EET}, -- {"Europe/Vaduz", CET}, -- {"Europe/Vatican", CET}, -- {"Europe/Vienna", CET}, -- {"Europe/Vilnius", EET}, -+ {"Europe/Kaliningrad", EET}, -+ {"Europe/Kiev", EET}, -+ {"Europe/Lisbon", WET}, -+ {"Europe/Ljubljana", CET}, -+ {"Europe/London", GMTBST}, -+ {"Europe/Luxembourg", CET}, -+ {"Europe/Madrid", CET}, -+ {"Europe/Malta", CET}, -+ {"Europe/Mariehamn", EET}, -+ {"Europe/Minsk", EET}, -+ {"Europe/Monaco", CET}, -+ {"Europe/Moscow", MSK}, -+ {"Europe/Nicosia", EET}, -+ {"Europe/Oslo", CET}, -+ {"Europe/Podgorica", CET}, -+ {"Europe/Prague", CET}, -+ {"Europe/Riga", EET}, -+ {"Europe/Rome", CET}, -+ {"Europe/Samara", new String[] {"Fuso hor\u00e1rio de Samara", "SAMT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Samara", "SAMST"}}, -+ {"Europe/San_Marino", CET}, -+ {"Europe/Sarajevo", CET}, -+ {"Europe/Simferopol", EET}, -+ {"Europe/Skopje", CET}, -+ {"Europe/Sofia", EET}, -+ {"Europe/Stockholm", CET}, -+ {"Europe/Tallinn", EET}, -+ {"Europe/Tirane", CET}, -+ {"Europe/Tiraspol", EET}, -+ {"Europe/Uzhgorod", EET}, -+ {"Europe/Vaduz", CET}, -+ {"Europe/Vatican", CET}, -+ {"Europe/Vienna", CET}, -+ {"Europe/Vilnius", EET}, - {"Europe/Volgograd", new String[] {"Fuso hor\u00e1rio de Volgogrado", "VOLT", - "Fuso hor\u00e1rio de ver\u00e3o de Volgogrado", "VOLST"}}, -- {"Europe/Warsaw", CET}, -- {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", EET}, -- {"Europe/Zurich", CET}, -- {"GB", GMTBST}, -- {"GB-Eire", GMTBST}, -- {"Greenwich", GMT}, -- {"Hongkong", HKT}, -- {"Iceland", GMT}, -- {"Iran", IRT}, -- {"IST", IST}, -- {"Indian/Antananarivo", EAT}, -- {"Indian/Chagos", new String[] {"Fuso hor\u00e1rio dos territ\u00f3rios do Oceano \u00cdndico", "IOT", -- "Fuso hor\u00e1rio de ver\u00e3o dos territ\u00f3rios do Oceano \u00cdndico", "IOST"}}, -- {"Indian/Christmas", new String[] {"Fuso hor\u00e1rio das Ilhas Christmas", "CXT", -- "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Christmas", "CXST"}}, -- {"Indian/Cocos", new String[] {"Fuso hor\u00e1rio das Ilhas Cocos", "CCT", -- "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Cocos", "CCST"}}, -- {"Indian/Comoro", EAT}, -- {"Indian/Kerguelen", new String[] {"Fuso hor\u00e1rio das Terras Austrais e Ant\u00e1rticas Francesas", "TFT", -- "Fuso hor\u00e1rio de ver\u00e3o das Terras Austrais e Ant\u00e1rticas Francesas", "TFST"}}, -- {"Indian/Mahe", new String[] {"Fuso hor\u00e1rio das Seychelles", "SCT", -- "Fuso hor\u00e1rio de ver\u00e3o das Seychelles", "SCST"}}, -- {"Indian/Maldives", new String[] {"Fuso hor\u00e1rio das Maldivas", "MVT", -- "Fuso hor\u00e1rio de ver\u00e3o das Maldivas", "MVST"}}, -- {"Indian/Mauritius", new String[] {"Fuso hor\u00e1rio das Ilhas Maur\u00edcio", "MUT", -- "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Maur\u00edcio", "MUST"}}, -- {"Indian/Mayotte", EAT}, -- {"Indian/Reunion", new String[] {"Fuso hor\u00e1rio de Reuni\u00e3o", "RET", -- "Fuso hor\u00e1rio de ver\u00e3o de Reuni\u00e3o", "REST"}}, -- {"Israel", ISRAEL}, -- {"Jamaica", EST}, -- {"Japan", JST}, -- {"Kwajalein", MHT}, -- {"Libya", EET}, -- {"MET", new String[] {"Fuso hor\u00e1rio da Europa M\u00e9dia", "MET", -- "Fuso hor\u00e1rio de ver\u00e3o da Europa M\u00e9dia", "MEST"}}, -- {"Mexico/BajaNorte", PST}, -- {"Mexico/BajaSur", MST}, -- {"Mexico/General", CST}, -- {"MIT", WST_SAMOA}, -- {"MST7MDT", MST}, -- {"Navajo", MST}, -- {"NET", ARMT}, -- {"NST", NZST}, -- {"NZ", NZST}, -- {"NZ-CHAT", CHAST}, -- {"PLT", PKT}, -- {"Portugal", WET}, -- {"PRT", AST}, -- {"Pacific/Apia", WST_SAMOA}, -- {"Pacific/Auckland", NZST}, -- {"Pacific/Chatham", CHAST}, -- {"Pacific/Chuuk", TRUT}, -- {"Pacific/Easter", EASTER}, -- {"Pacific/Efate", new String[] {"Fuso hor\u00e1rio de Vanuatu", "VUT", -- "Fuso hor\u00e1rio de ver\u00e3o de Vanuatu", "VUST"}}, -- {"Pacific/Enderbury", new String[] {"Fuso hor\u00e1rio das Ilhas F\u00e9nix", "PHOT", -- "Fuso hor\u00e1rio de ver\u00e3o das Ilhas F\u00e9nix", "PHOST"}}, -- {"Pacific/Fakaofo", new String[] {"Fuso hor\u00e1rio de Tokelau", "TKT", -- "Fuso hor\u00e1rio de ver\u00e3o de Tokelau", "TKST"}}, -- {"Pacific/Fiji", new String[] {"Fuso hor\u00e1rio de Fiji", "FJT", -- "Fuso hor\u00e1rio de ver\u00e3o de Fiji", "FJST"}}, -- {"Pacific/Funafuti", new String[] {"Fuso hor\u00e1rio de Tuvalu", "TVT", -- "Fuso hor\u00e1rio de ver\u00e3o de Tuvalu", "TVST"}}, -- {"Pacific/Galapagos", new String[] {"Fuso hor\u00e1rio das Ilhas Gal\u00e1pagos", "GALT", -- "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Gal\u00e1pagos", "GALST"}}, -- {"Pacific/Gambier", GAMBIER}, -- {"Pacific/Guadalcanal", SBT}, -- {"Pacific/Guam", ChST}, -- {"Pacific/Johnston", HST}, -- {"Pacific/Kiritimati", new String[] {"Fuso hor\u00e1rio das Esp\u00f3rades Equatoriais", "LINT", -- "Fuso hor\u00e1rio de ver\u00e3o das Esp\u00f3rades Equatoriais", "LINST"}}, -- {"Pacific/Kosrae", new String[] {"Fuso hor\u00e1rio de Kosrae", "KOST", -- "Fuso hor\u00e1rio de ver\u00e3o de Kosrae", "KOSST"}}, -- {"Pacific/Kwajalein", MHT}, -- {"Pacific/Majuro", MHT}, -- {"Pacific/Marquesas", new String[] {"Fuso hor\u00e1rio das Ilhas Marquesas", "MART", -- "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Marquesas", "MARST"}}, -- {"Pacific/Midway", SAMOA}, -- {"Pacific/Nauru", new String[] {"Fuso hor\u00e1rio de Nauru", "NRT", -- "Fuso hor\u00e1rio de ver\u00e3o de Nauru", "NRST"}}, -- {"Pacific/Niue", new String[] {"Fuso hor\u00e1rio de Niue", "NUT", -- "Fuso hor\u00e1rio de ver\u00e3o de Niue", "NUST"}}, -- {"Pacific/Norfolk", new String[] {"Fuso hor\u00e1rio da Ilha de Norfolk", "NFT", -- "Fuso hor\u00e1rio de ver\u00e3o da Ilha de Norfolk", "NFST"}}, -- {"Pacific/Noumea", new String[] {"Fuso hor\u00e1rio da Nova Caled\u00f4nia", "NCT", -- "Fuso hor\u00e1rio de ver\u00e3o da Nova Caled\u00f4nia", "NCST"}}, -- {"Pacific/Pago_Pago", SAMOA}, -- {"Pacific/Palau", new String[] {"Fuso hor\u00e1rio de Palau", "PWT", -- "Fuso hor\u00e1rio de ver\u00e3o de Palau", "PWST"}}, -- {"Pacific/Pitcairn", PITCAIRN}, -- {"Pacific/Pohnpei", PONT}, -- {"Pacific/Ponape", PONT}, -- {"Pacific/Port_Moresby", new String[] {"Fuso hor\u00e1rio de Papua-Nova Guin\u00e9", "PGT", -- "Fuso hor\u00e1rio de ver\u00e3o de Papua-Nova Guin\u00e9", "PGST"}}, -- {"Pacific/Rarotonga", new String[] {"Fuso hor\u00e1rio das Ilhas Cook", "CKT", -- "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Cook", "CKHST"}}, -- {"Pacific/Saipan", ChST}, -- {"Pacific/Samoa", SAMOA}, -- {"Pacific/Tahiti", new String[] {"Fuso hor\u00e1rio do Taiti", "TAHT", -- "Fuso hor\u00e1rio de ver\u00e3o do Taiti", "TAHST"}}, -- {"Pacific/Tarawa", new String[] {"Fuso hor\u00e1rio das Ilhas Gilbert", "GILT", -- "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Gilbert", "GILST"}}, -- {"Pacific/Tongatapu", new String[] {"Fuso hor\u00e1rio de Tonga", "TOT", -- "Fuso hor\u00e1rio de ver\u00e3o de Tonga", "TOST"}}, -- {"Pacific/Truk", TRUT}, -- {"Pacific/Wake", new String[] {"Fuso hor\u00e1rio de Wake", "WAKT", -- "Fuso hor\u00e1rio de ver\u00e3o de Wake", "WAKST"}}, -- {"Pacific/Wallis", new String[] {"Fuso hor\u00e1rio de Wallis e Futuna", "WFT", -- "Fuso hor\u00e1rio de ver\u00e3o de Wallis e Futuna", "WFST"}}, -- {"Pacific/Yap", TRUT}, -- {"Poland", CET}, -- {"PRC", CTT}, -- {"PST8PDT", PST}, -- {"ROK", KST}, -- {"Singapore", SGT}, -- {"SST", SBT}, -- {"SystemV/AST4", AST}, -- {"SystemV/AST4ADT", AST}, -- {"SystemV/CST6", CST}, -- {"SystemV/CST6CDT", CST}, -- {"SystemV/EST5", EST}, -- {"SystemV/EST5EDT", EST}, -- {"SystemV/HST10", HST}, -- {"SystemV/MST7", MST}, -- {"SystemV/MST7MDT", MST}, -- {"SystemV/PST8", PST}, -- {"SystemV/PST8PDT", PST}, -- {"SystemV/YST9", AKST}, -- {"SystemV/YST9YDT", AKST}, -- {"Turkey", EET}, -- {"UCT", UTC}, -- {"Universal", UTC}, -- {"US/Alaska", AKST}, -- {"US/Aleutian", HAST}, -- {"US/Arizona", MST}, -- {"US/Central", CST}, -- {"US/Eastern", EST}, -- {"US/Hawaii", HST}, -- {"US/Indiana-Starke", CST}, -- {"US/East-Indiana", EST}, -- {"US/Michigan", EST}, -- {"US/Mountain", MST}, -- {"US/Pacific", PST}, -- {"US/Pacific-New", PST}, -- {"US/Samoa", SAMOA}, -- {"UTC", UTC}, -- {"VST", ICT}, -- {"W-SU", MSK}, -- {"WET", WET}, -- {"Zulu", UTC}, -+ {"Europe/Warsaw", CET}, -+ {"Europe/Zagreb", CET}, -+ {"Europe/Zaporozhye", EET}, -+ {"Europe/Zurich", CET}, -+ {"GB", GMTBST}, -+ {"GB-Eire", GMTBST}, -+ {"Greenwich", GMT}, -+ {"Hongkong", HKT}, -+ {"Iceland", GMT}, -+ {"Iran", IRT}, -+ {"IST", IST}, -+ {"Indian/Antananarivo", EAT}, -+ {"Indian/Chagos", new String[] {"Fuso hor\u00e1rio dos territ\u00f3rios do Oceano \u00cdndico", "IOT", -+ "Fuso hor\u00e1rio de ver\u00e3o dos territ\u00f3rios do Oceano \u00cdndico", "IOST"}}, -+ {"Indian/Christmas", new String[] {"Fuso hor\u00e1rio das Ilhas Christmas", "CXT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Christmas", "CXST"}}, -+ {"Indian/Cocos", new String[] {"Fuso hor\u00e1rio das Ilhas Cocos", "CCT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Cocos", "CCST"}}, -+ {"Indian/Comoro", EAT}, -+ {"Indian/Kerguelen", new String[] {"Fuso hor\u00e1rio das Terras Austrais e Ant\u00e1rticas Francesas", "TFT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Terras Austrais e Ant\u00e1rticas Francesas", "TFST"}}, -+ {"Indian/Mahe", new String[] {"Fuso hor\u00e1rio das Seychelles", "SCT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Seychelles", "SCST"}}, -+ {"Indian/Maldives", new String[] {"Fuso hor\u00e1rio das Maldivas", "MVT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Maldivas", "MVST"}}, -+ {"Indian/Mauritius", new String[] {"Fuso hor\u00e1rio das Ilhas Maur\u00edcio", "MUT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Maur\u00edcio", "MUST"}}, -+ {"Indian/Mayotte", EAT}, -+ {"Indian/Reunion", new String[] {"Fuso hor\u00e1rio de Reuni\u00e3o", "RET", -+ "Fuso hor\u00e1rio de ver\u00e3o de Reuni\u00e3o", "REST"}}, -+ {"Israel", ISRAEL}, -+ {"Jamaica", EST}, -+ {"Japan", JST}, -+ {"Kwajalein", MHT}, -+ {"Libya", EET}, -+ {"MET", new String[] {"Fuso hor\u00e1rio da Europa M\u00e9dia", "MET", -+ "Fuso hor\u00e1rio de ver\u00e3o da Europa M\u00e9dia", "MEST"}}, -+ {"Mexico/BajaNorte", PST}, -+ {"Mexico/BajaSur", MST}, -+ {"Mexico/General", CST}, -+ {"MIT", WST_SAMOA}, -+ {"MST7MDT", MST}, -+ {"Navajo", MST}, -+ {"NET", ARMT}, -+ {"NST", NZST}, -+ {"NZ", NZST}, -+ {"NZ-CHAT", CHAST}, -+ {"PLT", PKT}, -+ {"Portugal", WET}, -+ {"PRT", AST}, -+ {"Pacific/Apia", WST_SAMOA}, -+ {"Pacific/Auckland", NZST}, -+ {"Pacific/Chatham", CHAST}, -+ {"Pacific/Chuuk", TRUT}, -+ {"Pacific/Easter", EASTER}, -+ {"Pacific/Efate", new String[] {"Fuso hor\u00e1rio de Vanuatu", "VUT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Vanuatu", "VUST"}}, -+ {"Pacific/Enderbury", new String[] {"Fuso hor\u00e1rio das Ilhas F\u00e9nix", "PHOT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas F\u00e9nix", "PHOST"}}, -+ {"Pacific/Fakaofo", new String[] {"Fuso hor\u00e1rio de Tokelau", "TKT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Tokelau", "TKST"}}, -+ {"Pacific/Fiji", new String[] {"Fuso hor\u00e1rio de Fiji", "FJT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Fiji", "FJST"}}, -+ {"Pacific/Funafuti", new String[] {"Fuso hor\u00e1rio de Tuvalu", "TVT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Tuvalu", "TVST"}}, -+ {"Pacific/Galapagos", new String[] {"Fuso hor\u00e1rio das Ilhas Gal\u00e1pagos", "GALT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Gal\u00e1pagos", "GALST"}}, -+ {"Pacific/Gambier", GAMBIER}, -+ {"Pacific/Guadalcanal", SBT}, -+ {"Pacific/Guam", ChST}, -+ {"Pacific/Johnston", HST}, -+ {"Pacific/Kiritimati", new String[] {"Fuso hor\u00e1rio das Esp\u00f3rades Equatoriais", "LINT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Esp\u00f3rades Equatoriais", "LINST"}}, -+ {"Pacific/Kosrae", new String[] {"Fuso hor\u00e1rio de Kosrae", "KOST", -+ "Fuso hor\u00e1rio de ver\u00e3o de Kosrae", "KOSST"}}, -+ {"Pacific/Kwajalein", MHT}, -+ {"Pacific/Majuro", MHT}, -+ {"Pacific/Marquesas", new String[] {"Fuso hor\u00e1rio das Ilhas Marquesas", "MART", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Marquesas", "MARST"}}, -+ {"Pacific/Midway", SAMOA}, -+ {"Pacific/Nauru", new String[] {"Fuso hor\u00e1rio de Nauru", "NRT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Nauru", "NRST"}}, -+ {"Pacific/Niue", new String[] {"Fuso hor\u00e1rio de Niue", "NUT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Niue", "NUST"}}, -+ {"Pacific/Norfolk", new String[] {"Fuso hor\u00e1rio da Ilha de Norfolk", "NFT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Ilha de Norfolk", "NFST"}}, -+ {"Pacific/Noumea", new String[] {"Fuso hor\u00e1rio da Nova Caled\u00f4nia", "NCT", -+ "Fuso hor\u00e1rio de ver\u00e3o da Nova Caled\u00f4nia", "NCST"}}, -+ {"Pacific/Pago_Pago", SAMOA}, -+ {"Pacific/Palau", new String[] {"Fuso hor\u00e1rio de Palau", "PWT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Palau", "PWST"}}, -+ {"Pacific/Pitcairn", PITCAIRN}, -+ {"Pacific/Pohnpei", PONT}, -+ {"Pacific/Ponape", PONT}, -+ {"Pacific/Port_Moresby", new String[] {"Fuso hor\u00e1rio de Papua-Nova Guin\u00e9", "PGT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Papua-Nova Guin\u00e9", "PGST"}}, -+ {"Pacific/Rarotonga", new String[] {"Fuso hor\u00e1rio das Ilhas Cook", "CKT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Cook", "CKHST"}}, -+ {"Pacific/Saipan", ChST}, -+ {"Pacific/Samoa", SAMOA}, -+ {"Pacific/Tahiti", new String[] {"Fuso hor\u00e1rio do Taiti", "TAHT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Taiti", "TAHST"}}, -+ {"Pacific/Tarawa", new String[] {"Fuso hor\u00e1rio das Ilhas Gilbert", "GILT", -+ "Fuso hor\u00e1rio de ver\u00e3o das Ilhas Gilbert", "GILST"}}, -+ {"Pacific/Tongatapu", new String[] {"Fuso hor\u00e1rio de Tonga", "TOT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Tonga", "TOST"}}, -+ {"Pacific/Truk", TRUT}, -+ {"Pacific/Wake", new String[] {"Fuso hor\u00e1rio de Wake", "WAKT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Wake", "WAKST"}}, -+ {"Pacific/Wallis", new String[] {"Fuso hor\u00e1rio de Wallis e Futuna", "WFT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Wallis e Futuna", "WFST"}}, -+ {"Pacific/Yap", TRUT}, -+ {"Poland", CET}, -+ {"PRC", CTT}, -+ {"PST8PDT", PST}, -+ {"ROK", KST}, -+ {"Singapore", SGT}, -+ {"SST", SBT}, -+ {"SystemV/AST4", AST}, -+ {"SystemV/AST4ADT", AST}, -+ {"SystemV/CST6", CST}, -+ {"SystemV/CST6CDT", CST}, -+ {"SystemV/EST5", EST}, -+ {"SystemV/EST5EDT", EST}, -+ {"SystemV/HST10", HST}, -+ {"SystemV/MST7", MST}, -+ {"SystemV/MST7MDT", MST}, -+ {"SystemV/PST8", PST}, -+ {"SystemV/PST8PDT", PST}, -+ {"SystemV/YST9", AKST}, -+ {"SystemV/YST9YDT", AKST}, -+ {"Turkey", EET}, -+ {"UCT", UTC}, -+ {"Universal", UTC}, -+ {"US/Alaska", AKST}, -+ {"US/Aleutian", HAST}, -+ {"US/Arizona", MST}, -+ {"US/Central", CST}, -+ {"US/Eastern", EST}, -+ {"US/Hawaii", HST}, -+ {"US/Indiana-Starke", CST}, -+ {"US/East-Indiana", EST}, -+ {"US/Michigan", EST}, -+ {"US/Mountain", MST}, -+ {"US/Pacific", PST}, -+ {"US/Pacific-New", PST}, -+ {"US/Samoa", SAMOA}, -+ {"UTC", UTC}, -+ {"VST", ICT}, -+ {"W-SU", MSK}, -+ {"WET", WET}, -+ {"Zulu", UTC}, - }; - } - } -- --
--- a/patches/openjdk/7039469-tzdata2011g.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,116 +0,0 @@ -# HG changeset patch -# User peytoia -# Date 1303782379 -32400 -# Node ID 78890acd99e4981483a90a218fd19f8773ed6b68 -# Parent 91a590306e020f9cee4d0a96245e2a27235ba23d -7039469: (tz) Support tzdata2011g -Reviewed-by: okutsu - ---- openjdk/jdk/make/sun/javazic/tzdata/VERSION -+++ openjdk/jdk/make/sun/javazic/tzdata/VERSION -@@ -21,4 +21,4 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --tzdata2011e -+tzdata2011g ---- openjdk/jdk/make/sun/javazic/tzdata/africa -+++ openjdk/jdk/make/sun/javazic/tzdata/africa -@@ -234,7 +234,21 @@ - Rule Egypt 1990 1994 - May 1 1:00 1:00 S - # IATA (after 1990) says transitions are at 0:00. - # Go with IATA starting in 1995, except correct 1995 entry from 09-30 to 09-29. --Rule Egypt 1995 max - Apr lastFri 0:00s 1:00 S -+ -+# From Alexander Krivenyshev (2011-04-20): -+# "...Egypt's interim cabinet decided on Wednesday to cancel daylight -+# saving time after a poll posted on its website showed the majority of -+# Egyptians would approve the cancellation." -+# -+# Egypt to cancel daylight saving time -+# <a href="http://www.almasryalyoum.com/en/node/407168"> -+# http://www.almasryalyoum.com/en/node/407168 -+# </a> -+# or -+# <a href="http://www.worldtimezone.com/dst_news/dst_news_egypt04.html"> -+# http://www.worldtimezone.com/dst_news/dst_news_egypt04.html -+# </a> -+Rule Egypt 1995 2010 - Apr lastFri 0:00s 1:00 S - Rule Egypt 1995 2005 - Sep lastThu 23:00s 0 - - # From Steffen Thorsen (2006-09-19): - # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports: -@@ -335,7 +349,7 @@ - Rule Egypt 2009 only - Aug 20 23:00s 0 - - Rule Egypt 2010 only - Aug 11 0:00 0 - - Rule Egypt 2010 only - Sep 10 0:00 1:00 S --Rule Egypt 2010 max - Sep lastThu 23:00s 0 - -+Rule Egypt 2010 only - Sep lastThu 23:00s 0 - - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Africa/Cairo 2:05:00 - LMT 1900 Oct ---- openjdk/jdk/make/sun/javazic/tzdata/europe -+++ openjdk/jdk/make/sun/javazic/tzdata/europe -@@ -168,7 +168,7 @@ - # A monument to Willett was unveiled on 1927-05-21, in an open space in - # a 45-acre wood near Chislehurst, Kent that was purchased by popular - # subscription and open to the public. On the south face of the monolith, --# designed by G. W. Miller, is the the William Willett Memorial Sundial, -+# designed by G. W. Miller, is the...William Willett Memorial Sundial, - # which is permanently set to Summer Time. - - # From Winston Churchill (1934-04-28): -@@ -1808,7 +1808,7 @@ - # - # All these events predate our cutoff date of 1970. Unless we can - # come up with more definitive info about the timekeeping during the --# war years it's probably best just do do the following for now: -+# war years it's probably best just do...the following for now: - Link Europe/Oslo Arctic/Longyearbyen - - # Poland ---- openjdk/jdk/make/sun/javazic/tzdata/southamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/southamerica -@@ -767,7 +767,7 @@ - # - # As a result of the above Decree I believe the America/Rio_Branco - # timezone shall be modified from UTC-5 to UTC-4 and a new timezone shall --# be created to represent the the west side of the Para State. I -+# be created to represent the...west side of the Para State. I - # suggest this new timezone be called Santarem as the most - # important/populated city in the affected area. - # -@@ -1365,6 +1365,24 @@ - # For now, we'll just record the time in Stanley, since we have no - # better info. - -+# From Steffen Thorsen (2011-04-01): -+# The Falkland Islands will not turn back clocks this winter, but stay on -+# daylight saving time. -+# -+# One source: -+# <a href="http://www.falklandnews.com/public/story.cfm?get=5914&source=3"> -+# http://www.falklandnews.com/public/story.cfm?get=5914&source=3 -+# </a> -+# -+# We have gotten this confirmed by a clerk of the legislative assembly: -+# Normally the clocks revert to Local Mean Time (UTC/GMT -4 hours) on the -+# third Sunday of April at 0200hrs and advance to Summer Time (UTC/GMT -3 -+# hours) on the first Sunday of September at 0200hrs. -+# -+# IMPORTANT NOTE: During 2011, on a trial basis, the Falkland Islands -+# will not revert to local mean time, but clocks will remain on Summer -+# time (UTC/GMT - 3 hours) throughout the whole of 2011. Any long term -+# change to local time following the trial period will be notified. - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Falk 1937 1938 - Sep lastSun 0:00 1:00 S - Rule Falk 1938 1942 - Mar Sun>=19 0:00 0 - -@@ -1376,7 +1394,8 @@ - Rule Falk 1984 only - Sep 16 0:00 1:00 S - Rule Falk 1985 2000 - Sep Sun>=9 0:00 1:00 S - Rule Falk 1986 2000 - Apr Sun>=16 0:00 0 - --Rule Falk 2001 max - Apr Sun>=15 2:00 0 - -+Rule Falk 2001 2010 - Apr Sun>=15 2:00 0 - -+Rule Falk 2012 max - Apr Sun>=15 2:00 0 - - Rule Falk 2001 max - Sep Sun>=1 2:00 1:00 S - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Atlantic/Stanley -3:51:24 - LMT 1890
--- a/patches/openjdk/7090843-tzdata2011j.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1281 +0,0 @@ -# HG changeset patch -# User peytoia -# Date 1316071034 -32400 -# Node ID e97325a7fe7b037be1cfcb33acd5ed5aea25a24e -# Parent 6b1e65e73b804bb5eeee4cb2d8ba15db7e6ad73f -7090843: (tz) Support tzdata2011j -Reviewed-by: okutsu - ---- openjdk/jdk/make/sun/javazic/tzdata/VERSION -+++ openjdk/jdk/make/sun/javazic/tzdata/VERSION -@@ -21,4 +21,4 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --tzdata2011g -+tzdata2011j ---- openjdk/jdk/make/sun/javazic/tzdata/africa -+++ openjdk/jdk/make/sun/javazic/tzdata/africa -@@ -80,7 +80,7 @@ - # I invented the following abbreviations; corrections are welcome! - # 2:00 WAST West Africa Summer Time - # 2:30 BEAT British East Africa Time (no longer used) --# 2:44:45 BEAUT British East Africa Unified Time (no longer used) -+# 2:45 BEAUT British East Africa Unified Time (no longer used) - # 3:00 CAST Central Africa Summer Time (no longer used) - # 3:00 SAST South Africa Summer Time (no longer used) - # 3:00 EAT East Africa Time -@@ -418,7 +418,7 @@ - Zone Africa/Nairobi 2:27:16 - LMT 1928 Jul - 3:00 - EAT 1930 - 2:30 - BEAT 1940 -- 2:44:45 - BEAUT 1960 -+ 2:45 - BEAUT 1960 - 3:00 - EAT - - # Lesotho -@@ -979,6 +979,11 @@ - 2:00 Sudan CA%sT 2000 Jan 15 12:00 - 3:00 - EAT - -+# South Sudan -+Zone Africa/Juba 2:06:24 - LMT 1931 -+ 2:00 Sudan CA%sT 2000 Jan 15 12:00 -+ 3:00 - EAT -+ - # Swaziland - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Africa/Mbabane 2:04:24 - LMT 1903 Mar -@@ -988,7 +993,7 @@ - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Africa/Dar_es_Salaam 2:37:08 - LMT 1931 - 3:00 - EAT 1948 -- 2:44:45 - BEAUT 1961 -+ 2:45 - BEAUT 1961 - 3:00 - EAT - - # Togo -@@ -1114,7 +1119,7 @@ - Zone Africa/Kampala 2:09:40 - LMT 1928 Jul - 3:00 - EAT 1930 - 2:30 - BEAT 1948 -- 2:44:45 - BEAUT 1957 -+ 2:45 - BEAUT 1957 - 3:00 - EAT - - # Zambia ---- openjdk/jdk/make/sun/javazic/tzdata/antarctica -+++ openjdk/jdk/make/sun/javazic/tzdata/antarctica -@@ -41,18 +41,6 @@ - # I made up all time zone abbreviations mentioned here; corrections welcome! - # FORMAT is `zzz' and GMTOFF is 0 for locations while uninhabited. - --# These rules are stolen from the `europe' file. --# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S --Rule RussAQ 1981 1984 - Apr 1 0:00 1:00 S --Rule RussAQ 1981 1983 - Oct 1 0:00 0 - --Rule RussAQ 1984 1991 - Sep lastSun 2:00s 0 - --Rule RussAQ 1985 1991 - Mar lastSun 2:00s 1:00 S --Rule RussAQ 1992 only - Mar lastSat 23:00 1:00 S --Rule RussAQ 1992 only - Sep lastSat 23:00 0 - --Rule RussAQ 1993 max - Mar lastSun 2:00s 1:00 S --Rule RussAQ 1993 1995 - Sep lastSun 2:00s 0 - --Rule RussAQ 1996 max - Oct lastSun 2:00s 0 - -- - # These rules are stolen from the `southamerica' file. - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule ArgAQ 1964 1966 - Mar 1 0:00 0 - ---- openjdk/jdk/make/sun/javazic/tzdata/asia -+++ openjdk/jdk/make/sun/javazic/tzdata/asia -@@ -99,6 +99,10 @@ - Rule RussiaAsia 1993 1995 - Sep lastSun 2:00s 0 - - Rule RussiaAsia 1996 max - Oct lastSun 2:00s 0 - - -+# From Arthur David Olson (2011-06-15): -+# While Russia abandoned DST in 2011, Armenia may choose to -+# follow Russia's "old" rules. -+ - # Afghanistan - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Asia/Kabul 4:36:48 - LMT 1890 ---- openjdk/jdk/make/sun/javazic/tzdata/australasia -+++ openjdk/jdk/make/sun/javazic/tzdata/australasia -@@ -521,7 +521,7 @@ - # http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf - # </a> - --# From Raymond Hughes (2010-10-07): -+# From Laupue Raymond Hughes (2010-10-07): - # Please see - # <a href="http://www.mcil.gov.ws"> - # http://www.mcil.gov.ws -@@ -531,7 +531,7 @@ - # to 01:00am and First Sunday April 2011 (03/04/11) - adjust clocks - # backwards from 1:00am to 12:00am" - --# From Raymond Hughes (2011-03-07) -+# From Laupue Raymond Hughes (2011-03-07): - # I believe this will be posted shortly on the website - # <a href="http://www.mcil.gov.ws"> - # www.mcil.gov.ws -@@ -551,12 +551,74 @@ - # Margaret Fruean ACTING CHIEF EXECUTIVE OFFICER MINISTRY OF COMMERCE, - # INDUSTRY AND LABOUR 28th February 2011 - -+# From David Zuelke (2011-05-09): -+# Subject: Samoa to move timezone from east to west of international date line -+# -+# <a href="http://www.morningstar.co.uk/uk/markets/newsfeeditem.aspx?id=138501958347963"> -+# http://www.morningstar.co.uk/uk/markets/newsfeeditem.aspx?id=138501958347963 -+# </a> -+ -+# From Mark Sim-Smith (2011-08-17): -+# I have been in contact with Leilani Tuala Warren from the Samoa Law -+# Reform Commission, and she has sent me a copy of the Bill that she -+# confirmed has been passed...Most of the sections are about maps rather -+# than the time zone change, but I'll paste the relevant bits below. But -+# the essence is that at midnight 29 Dec (UTC-11 I suppose), Samoa -+# changes from UTC-11 to UTC+13: -+# -+# International Date Line Bill 2011 -+# -+# AN ACT to provide for the change to standard time in Samoa and to make -+# consequential amendments to the position of the International Date -+# Line, and for related purposes. -+# -+# BE IT ENACTED by the Legislative Assembly of Samoa in Parliament -+# assembled as follows: -+# -+# 1. Short title and commencement-(1) This Act may be cited as the -+# International Date Line Act 2011. (2) Except for section 5(3) this Act -+# commences at 12 o'clock midnight, on Thursday 29th December 2011. (3) -+# Section 5(3) commences on the date of assent by the Head of State. -+# -+# [snip] -+# -+# 3. Interpretation - [snip] "Samoa standard time" in this Act and any -+# other statute of Samoa which refers to 'Samoa standard time' means the -+# time 13 hours in advance of Co-ordinated Universal Time. -+# -+# 4. Samoa standard time - (1) Upon the commencement of this Act, Samoa -+# standard time shall be set at 13 hours in advance of Co-ordinated -+# Universal Time for the whole of Samoa. (2) All references to Samoa's -+# time zone and to Samoa standard time in Samoa in all legislation and -+# instruments after the commencement of this Act shall be references to -+# Samoa standard time as provided for in this Act. (3) Nothing in this -+# Act affects the provisions of the Daylight Saving Act 2009, except that -+# it defines Samoa standard time.... -+ -+# From Laupue Raymond Hughes (2011-09-02): -+# <a href="http://www.mcil.gov.ws/mcil_publications.html"> -+# http://www.mcil.gov.ws/mcil_publications.html -+# </a> -+# -+# here is the official website publication for Samoa DST and dateline change -+# -+# DST -+# Year End Time Start Time -+# 2011 - - - - - - 24 September 3:00am to 4:00am -+# 2012 01 April 4:00am to 3:00am - - - - - - -+# -+# Dateline Change skip Friday 30th Dec 2011 -+# Thursday 29th December 2011 23:59:59 Hours -+# Saturday 31st December 2011 00:00:00 Hours - Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 - -11:26:56 - LMT 1911 - -11:30 - SAMT 1950 # Samoa Time - -11:00 - WST 2010 Sep 26 - -11:00 1:00 WSDT 2011 Apr 2 4:00 -- -11:00 - WST -+ -11:00 - WST 2011 Sep 24 3:00 -+ -11:00 1:00 WSDT 2011 Dec 30 -+ 13:00 1:00 WSDT 2012 Apr 1 4:00 -+ 13:00 - WST - - # Solomon Is - # excludes Bougainville, for which see Papua New Guinea -@@ -1228,7 +1290,7 @@ - # Lord Howe Island Board (controlling authority for the Island) is - # seeking the community's views on various options for summer time - # arrangements on the Island, e.g. advance clocks by 1 full hour --# instead of only 30 minutes. Dependant on the wishes of residents -+# instead of only 30 minutes. [Dependent] on the wishes of residents - # the Board may approach the NSW government to change the existing - # arrangements. The starting date for summer time on the Island will - # however always coincide with the rest of NSW. -@@ -1354,7 +1416,7 @@ - - # From Paul Eggert (1996-01-22): - # Today's _Wall Street Journal_ (page 1) reports that Kiribati --# ``declared it the same day throught the country as of Jan. 1, 1995'' -+# ``declared it the same day [throughout] the country as of Jan. 1, 1995'' - # as part of the competition to be first into the 21st century. - - ---- openjdk/jdk/make/sun/javazic/tzdata/europe -+++ openjdk/jdk/make/sun/javazic/tzdata/europe -@@ -587,6 +587,26 @@ - Rule Russia 1993 1995 - Sep lastSun 2:00s 0 - - Rule Russia 1996 max - Oct lastSun 2:00s 0 - - -+# From Alexander Krivenyshev (2011-06-14): -+# According to Kremlin press service, Russian President Dmitry Medvedev -+# signed a federal law "On calculation of time" on June 9, 2011. -+# According to the law Russia is abolishing daylight saving time. -+# -+# Medvedev signed a law "On the Calculation of Time" (in russian): -+# <a href="http://bmockbe.ru/events/?ID=7583"> -+# http://bmockbe.ru/events/?ID=7583 -+# </a> -+# -+# Medvedev signed a law on the calculation of the time (in russian): -+# <a href="http://www.regnum.ru/news/polit/1413906.html"> -+# http://www.regnum.ru/news/polit/1413906.html -+# </a> -+ -+# From Arthur David Olson (2011-06-15): -+# Take "abolishing daylight saving time" to mean that time is now considered -+# to be standard. -+# At least for now, keep the "old" Russia rules for the benefit of Belarus. -+ - # These are for backward compatibility with older versions. - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -@@ -2035,7 +2055,8 @@ - 1:00 C-Eur CE%sT 1945 - 2:00 Poland CE%sT 1946 - 3:00 Russia MSK/MSD 1991 Mar 31 2:00s -- 2:00 Russia EE%sT -+ 2:00 Russia EE%sT 2011 Mar 27 2:00s -+ 3:00 - KALT - # - # From Oscar van Vlijmen (2001-08-25): [This region consists of] - # Respublika Adygeya, Arkhangel'skaya oblast', -@@ -2064,7 +2085,8 @@ - 2:00 - EET 1930 Jun 21 - 3:00 Russia MSK/MSD 1991 Mar 31 2:00s - 2:00 Russia EE%sT 1992 Jan 19 2:00s -- 3:00 Russia MSK/MSD -+ 3:00 Russia MSK/MSD 2011 Mar 27 2:00s -+ 4:00 - MSK - # - # Astrakhanskaya oblast', Kirovskaya oblast', Saratovskaya oblast', - # Volgogradskaya oblast'. Shanks & Pottenger say Kirov is still at +0400 -@@ -2077,7 +2099,8 @@ - 4:00 Russia VOL%sT 1989 Mar 26 2:00s # Volgograd T - 3:00 Russia VOL%sT 1991 Mar 31 2:00s - 4:00 - VOLT 1992 Mar 29 2:00s -- 3:00 Russia VOL%sT -+ 3:00 Russia VOL%sT 2011 Mar 27 2:00s -+ 4:00 - VOLT - # - # From Oscar van Vlijmen (2001-08-25): [This region consists of] - # Samarskaya oblast', Udmyrtskaya respublika -@@ -2089,7 +2112,8 @@ - 2:00 Russia KUY%sT 1991 Sep 29 2:00s - 3:00 - KUYT 1991 Oct 20 3:00 - 4:00 Russia SAM%sT 2010 Mar 28 2:00s # Samara Time -- 3:00 Russia SAM%sT -+ 3:00 Russia SAM%sT 2011 Mar 27 2:00s -+ 4:00 - SAMT - - # - # From Oscar van Vlijmen (2001-08-25): [This region consists of] -@@ -2102,7 +2126,8 @@ - 4:00 - SVET 1930 Jun 21 # Sverdlovsk Time - 5:00 Russia SVE%sT 1991 Mar 31 2:00s - 4:00 Russia SVE%sT 1992 Jan 19 2:00s -- 5:00 Russia YEK%sT # Yekaterinburg Time -+ 5:00 Russia YEK%sT 2011 Mar 27 2:00s -+ 6:00 - YEKT # Yekaterinburg Time - # - # From Oscar van Vlijmen (2001-08-25): [This region consists of] - # Respublika Altaj, Altajskij kraj, Omskaya oblast'. -@@ -2110,7 +2135,8 @@ - 5:00 - OMST 1930 Jun 21 # Omsk TIme - 6:00 Russia OMS%sT 1991 Mar 31 2:00s - 5:00 Russia OMS%sT 1992 Jan 19 2:00s -- 6:00 Russia OMS%sT -+ 6:00 Russia OMS%sT 2011 Mar 27 2:00s -+ 7:00 - OMST - # - # From Paul Eggert (2006-08-19): I'm guessing about Tomsk here; it's - # not clear when it switched from +7 to +6. -@@ -2120,7 +2146,8 @@ - 7:00 Russia NOV%sT 1991 Mar 31 2:00s - 6:00 Russia NOV%sT 1992 Jan 19 2:00s - 7:00 Russia NOV%sT 1993 May 23 # say Shanks & P. -- 6:00 Russia NOV%sT -+ 6:00 Russia NOV%sT 2011 Mar 27 2:00s -+ 7:00 - NOVT - - # From Alexander Krivenyshev (2009-10-13): - # Kemerovo oblast' (Kemerovo region) in Russia will change current time zone on -@@ -2153,7 +2180,8 @@ - 7:00 Russia KRA%sT 1991 Mar 31 2:00s - 6:00 Russia KRA%sT 1992 Jan 19 2:00s - 7:00 Russia KRA%sT 2010 Mar 28 2:00s -- 6:00 Russia NOV%sT # Novosibirsk/Novokuznetsk Time -+ 6:00 Russia NOV%sT 2011 Mar 27 2:00s -+ 7:00 - NOVT # Novosibirsk/Novokuznetsk Time - - # - # From Oscar van Vlijmen (2001-08-25): [This region consists of] -@@ -2164,7 +2192,8 @@ - 6:00 - KRAT 1930 Jun 21 # Krasnoyarsk Time - 7:00 Russia KRA%sT 1991 Mar 31 2:00s - 6:00 Russia KRA%sT 1992 Jan 19 2:00s -- 7:00 Russia KRA%sT -+ 7:00 Russia KRA%sT 2011 Mar 27 2:00s -+ 8:00 - KRAT - # - # From Oscar van Vlijmen (2001-08-25): [This region consists of] - # Respublika Buryatiya, Irkutskaya oblast', -@@ -2174,7 +2203,8 @@ - 7:00 - IRKT 1930 Jun 21 # Irkutsk Time - 8:00 Russia IRK%sT 1991 Mar 31 2:00s - 7:00 Russia IRK%sT 1992 Jan 19 2:00s -- 8:00 Russia IRK%sT -+ 8:00 Russia IRK%sT 2011 Mar 27 2:00s -+ 9:00 - IRKT - # - # From Oscar van Vlijmen (2003-10-18): [This region consists of] - # Aginskij Buryatskij avtonomnyj okrug, Amurskaya oblast', -@@ -2197,7 +2227,8 @@ - 8:00 - YAKT 1930 Jun 21 # Yakutsk Time - 9:00 Russia YAK%sT 1991 Mar 31 2:00s - 8:00 Russia YAK%sT 1992 Jan 19 2:00s -- 9:00 Russia YAK%sT -+ 9:00 Russia YAK%sT 2011 Mar 27 2:00s -+ 10:00 - YAKT - # - # From Oscar van Vlijmen (2003-10-18): [This region consists of] - # Evrejskaya avtonomnaya oblast', Khabarovskij kraj, Primorskij kraj, -@@ -2210,7 +2241,8 @@ - 9:00 - VLAT 1930 Jun 21 # Vladivostok Time - 10:00 Russia VLA%sT 1991 Mar 31 2:00s - 9:00 Russia VLA%sST 1992 Jan 19 2:00s -- 10:00 Russia VLA%sT -+ 10:00 Russia VLA%sT 2011 Mar 27 2:00s -+ 11:00 - VLAT - # - # Sakhalinskaya oblast'. - # The Zone name should be Yuzhno-Sakhalinsk, but that's too long. -@@ -2220,7 +2252,8 @@ - 11:00 Russia SAK%sT 1991 Mar 31 2:00s # Sakhalin T. - 10:00 Russia SAK%sT 1992 Jan 19 2:00s - 11:00 Russia SAK%sT 1997 Mar lastSun 2:00s -- 10:00 Russia SAK%sT -+ 10:00 Russia SAK%sT 2011 Mar 27 2:00s -+ 11:00 - SAKT - # - # From Oscar van Vlijmen (2003-10-18): [This region consists of] - # Magadanskaya oblast', Respublika Sakha (Yakutiya). -@@ -2233,7 +2266,8 @@ - 10:00 - MAGT 1930 Jun 21 # Magadan Time - 11:00 Russia MAG%sT 1991 Mar 31 2:00s - 10:00 Russia MAG%sT 1992 Jan 19 2:00s -- 11:00 Russia MAG%sT -+ 11:00 Russia MAG%sT 2011 Mar 27 2:00s -+ 12:00 - MAGT - # - # From Oscar van Vlijmen (2001-08-25): [This region consists of] - # Kamchatskaya oblast', Koryakskij avtonomnyj okrug. -@@ -2244,7 +2278,8 @@ - 12:00 Russia PET%sT 1991 Mar 31 2:00s - 11:00 Russia PET%sT 1992 Jan 19 2:00s - 12:00 Russia PET%sT 2010 Mar 28 2:00s -- 11:00 Russia PET%sT -+ 11:00 Russia PET%sT 2011 Mar 27 2:00s -+ 12:00 - PETT - # - # Chukotskij avtonomnyj okrug - Zone Asia/Anadyr 11:49:56 - LMT 1924 May 2 -@@ -2253,7 +2288,8 @@ - 12:00 Russia ANA%sT 1991 Mar 31 2:00s - 11:00 Russia ANA%sT 1992 Jan 19 2:00s - 12:00 Russia ANA%sT 2010 Mar 28 2:00s -- 11:00 Russia ANA%sT -+ 11:00 Russia ANA%sT 2011 Mar 27 2:00s -+ 12:00 - ANAT - - # Serbia - # Zone NAME GMTOFF RULES FORMAT [UNTIL] ---- openjdk/jdk/make/sun/javazic/tzdata/iso3166.tab -+++ openjdk/jdk/make/sun/javazic/tzdata/iso3166.tab -@@ -43,6 +43,9 @@ - # - # Lines beginning with `#' are comments. - # -+# From Arthur David Olson (2011-08-17): -+# Resynchronized today with the ISO 3166 site (adding SS for South Sudan). -+# - #country- - #code country name - AD Andorra -@@ -52,7 +55,6 @@ - AI Anguilla - AL Albania - AM Armenia --AN Netherlands Antilles - AO Angola - AQ Antarctica - AR Argentina -@@ -75,6 +77,7 @@ - BM Bermuda - BN Brunei - BO Bolivia -+BQ Bonaire Sint Eustatius & Saba - BR Brazil - BS Bahamas - BT Bhutan -@@ -97,6 +100,7 @@ - CR Costa Rica - CU Cuba - CV Cape Verde -+CW Curacao - CX Christmas Island - CY Cyprus - CZ Czech Republic -@@ -251,8 +255,10 @@ - SN Senegal - SO Somalia - SR Suriname -+SS South Sudan - ST Sao Tome & Principe - SV El Salvador -+SX Sint Maarten - SY Syria - SZ Swaziland - TC Turks & Caicos Is ---- openjdk/jdk/make/sun/javazic/tzdata/northamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/northamerica -@@ -490,6 +490,10 @@ - # own time. I asked about daylight saving; they said it wasn't used. I - # did not inquire about practices in the past. - -+# From Arthur David Olson (2011-08-17): -+# For lack of better information, assume that Metlakatla's -+# abandonment of use of daylight saving resulted from the 1983 vote. -+ - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone America/Juneau 15:02:19 - LMT 1867 Oct 18 - -8:57:41 - LMT 1900 Aug 20 12:00 -@@ -515,7 +519,7 @@ - -8:00 US P%sT 1946 - -8:00 - PST 1969 - -8:00 US P%sT 1983 Oct 30 2:00 -- -8:00 US MeST -+ -8:00 - MeST - Zone America/Yakutat 14:41:05 - LMT 1867 Oct 18 - -9:18:55 - LMT 1900 Aug 20 12:00 - -9:00 - YST 1942 -@@ -615,8 +619,8 @@ - -10:30 - HST 1933 Apr 30 2:00 #Laws 1933 - -10:30 1:00 HDT 1933 May 21 12:00 #Laws 1933+12 - -10:30 - HST 1942 Feb 09 2:00 #Schmitt&Cox+2 -- -10:30 1:00 HDT 1945 Sep 30 2:00 #Schmitt&Fox+2 -- -10:30 US H%sT 1947 Jun 8 2:00 #Schmitt&Fox+2 -+ -10:30 1:00 HDT 1945 Sep 30 2:00 #Schmitt&Cox+2 -+ -10:30 - HST 1947 Jun 8 2:00 #Schmitt&Cox+2 - -10:00 - HST - - # Now we turn to US areas that have diverged from the consensus since 1970. -@@ -1185,12 +1189,39 @@ - # From Paul Eggert (2000-10-02): - # INMS (2000-09-12) says that, since 1988 at least, Newfoundland switches - # at 00:01 local time. For now, assume it started in 1987. -+ -+# From Michael Pelley (2011-08-05): -+# The Government of Newfoundland and Labrador has pending changes to -+# modify the hour for daylight savings time to come into effect in -+# November 2011. This modification would change the time from 12:01AM to -+# 2:00AM on the dates of the switches of Daylight Savings Time to/from -+# Standard Time. -+# -+# As a matter of reference, in Canada provinces have the authority of -+# setting time zone information. The legislation has passed our -+# legislative body (The House of Assembly) and is awaiting the -+# proclamation to come into effect. You may find this information at: -+# <a href="http://www.assembly.nl.ca/legislation/sr/lists/Proclamation.htm"> -+# http://www.assembly.nl.ca/legislation/sr/lists/Proclamation.htm -+# </a> -+# and -+# search within that web page for Standard Time (Amendment) Act. The Act -+# may be found at: -+# <a href="http://www.assembly.nl.ca/business/bills/Bill1106.htm"> -+# http://www.assembly.nl.ca/business/bills/Bill1106.htm -+# </a> -+# ... -+# MICHAEL PELLEY | Manager of Enterprise Architecture - Solution Delivery -+# Office of the Chief Information Officer Executive Council Government of -+# Newfoundland & Labrador P.O. Box 8700, 40 Higgins Line, St. John's NL -+# A1B 4J6 -+ - Rule StJohns 1987 only - Apr Sun>=1 0:01 1:00 D - Rule StJohns 1987 2006 - Oct lastSun 0:01 0 S - Rule StJohns 1988 only - Apr Sun>=1 0:01 2:00 DD - Rule StJohns 1989 2006 - Apr Sun>=1 0:01 1:00 D --Rule StJohns 2007 max - Mar Sun>=8 0:01 1:00 D --Rule StJohns 2007 max - Nov Sun>=1 0:01 0 S -+Rule StJohns 2007 2011 - Mar Sun>=8 0:01 1:00 D -+Rule StJohns 2007 2010 - Nov Sun>=1 0:01 0 S - # - # St John's has an apostrophe, but Posix file names can't have apostrophes. - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -@@ -1200,7 +1231,8 @@ - -3:30:52 StJohns N%sT 1935 Mar 30 - -3:30 StJohns N%sT 1942 May 11 - -3:30 Canada N%sT 1946 -- -3:30 StJohns N%sT -+ -3:30 StJohns N%sT 2011 Nov -+ -3:30 Canada N%sT - - # most of east Labrador - -@@ -1214,7 +1246,8 @@ - -3:30 StJohns N%sT 1942 May 11 - -3:30 Canada N%sT 1946 - -3:30 StJohns N%sT 1966 Mar 15 2:00 -- -4:00 StJohns A%sT -+ -4:00 StJohns A%sT 2011 Nov -+ -4:00 Canada A%sT - - - # west Labrador, Nova Scotia, Prince Edward I -@@ -1946,20 +1979,69 @@ - # daylight saving.... - # http://www.nnsl.com/frames/newspapers/2006-11/nov13_06none.html - --# From Chris Walton (2007-03-14): --# Today I phoned the "hamlet office" to find out what Resolute was doing with --# its clocks. -+# From Chris Walton (2011-03-21): -+# Back in 2007 I initiated the creation of a new "zone file" for Resolute -+# Bay. Resolute Bay is a small community located about 900km north of -+# the Arctic Circle. The zone file was required because Resolute Bay had -+# decided to use UTC-5 instead of UTC-6 for the winter of 2006-2007. - # --# The individual that answered the phone confirmed that the clocks did not --# move at the end of daylight saving on October 29/2006. He also told me that --# the clocks did not move this past weekend (March 11/2007).... -- --# From Chris Walton (2008-11-13): --# ...the residents of Resolute believe that they are changing "time zones" --# twice a year. In winter months, local time is qualified with "Eastern --# Time" which is really "Eastern Standard Time (UTC-5)". In summer --# months, local time is qualified with "Central Time" which is really --# "Central Daylight Time (UTC-5)"... -+# According to new information which I received last week, Resolute Bay -+# went back to using UTC-6 in the winter of 2007-2008... -+# -+# On March 11/2007 most of Canada went onto daylight saving. On March -+# 14/2007 I phoned the Resolute Bay hamlet office to do a "time check." I -+# talked to somebody that was both knowledgeable and helpful. I was able -+# to confirm that Resolute Bay was still operating on UTC-5. It was -+# explained to me that Resolute Bay had been on the Eastern Time zone -+# (EST) in the winter, and was now back on the Central Time zone (CDT). -+# i.e. the time zone had changed twice in the last year but the clocks -+# had not moved. The residents had to know which time zone they were in -+# so they could follow the correct TV schedule... -+# -+# On Nov 02/2008 most of Canada went onto standard time. On Nov 03/2008 I -+# phoned the Resolute Bay hamlet office...[D]ue to the challenging nature -+# of the phone call, I decided to seek out an alternate source of -+# information. I found an e-mail address for somebody by the name of -+# Stephanie Adams whose job was listed as "Inns North Support Officer for -+# Arctic Co-operatives." I was under the impression that Stephanie lived -+# and worked in Resolute Bay... -+# -+# On March 14/2011 I phoned the hamlet office again. I was told that -+# Resolute Bay had been using Central Standard Time over the winter of -+# 2010-2011 and that the clocks had therefore been moved one hour ahead -+# on March 13/2011. The person I talked to was aware that Resolute Bay -+# had previously experimented with Eastern Standard Time but he could not -+# tell me when the practice had stopped. -+# -+# On March 17/2011 I searched the Web to find an e-mail address of -+# somebody that might be able to tell me exactly when Resolute Bay went -+# off Eastern Standard Time. I stumbled on the name "Aziz Kheraj." Aziz -+# used to be the mayor of Resolute Bay and he apparently owns half the -+# businesses including "South Camp Inn." This website has some info on -+# Aziz: -+# <a href="http://www.uphere.ca/node/493"> -+# http://www.uphere.ca/node/493 -+# </a> -+# -+# I sent Aziz an e-mail asking when Resolute Bay had stopped using -+# Eastern Standard Time. -+# -+# Aziz responded quickly with this: "hi, The time was not changed for the -+# 1 year only, the following year, the community went back to the old way -+# of "spring ahead-fall behind" currently we are zulu plus 5 hrs and in -+# the winter Zulu plus 6 hrs" -+# -+# This of course conflicted with everything I had ascertained in November 2008. -+# -+# I sent Aziz a copy of my 2008 e-mail exchange with Stephanie. Aziz -+# responded with this: "Hi, Stephanie lives in Winnipeg. I live here, You -+# may want to check with the weather office in Resolute Bay or do a -+# search on the weather through Env. Canada. web site" -+# -+# If I had realized the Stephanie did not live in Resolute Bay I would -+# never have contacted her. I now believe that all the information I -+# obtained in November 2008 should be ignored... -+# I apologize for reporting incorrect information in 2008. - - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule NT_YK 1918 only - Apr 14 2:00 1:00 D -@@ -1987,14 +2069,12 @@ - -6:00 Canada C%sT 2000 Oct 29 2:00 - -5:00 Canada E%sT - # aka Qausuittuq --# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S --Rule Resolute 2006 max - Nov Sun>=1 2:00 0 ES --Rule Resolute 2007 max - Mar Sun>=8 2:00 0 CD - Zone America/Resolute 0 - zzz 1947 Aug 31 # Resolute founded - -6:00 NT_YK C%sT 2000 Oct 29 2:00 - -5:00 - EST 2001 Apr 1 3:00 - -6:00 Canada C%sT 2006 Oct 29 2:00 -- -5:00 Resolute %sT -+ -5:00 - EST 2007 Mar 11 3:00 -+ -6:00 Canada C%sT - # aka Kangiqiniq - Zone America/Rankin_Inlet 0 - zzz 1957 # Rankin Inlet founded - -6:00 NT_YK C%sT 2000 Oct 29 2:00 ---- openjdk/jdk/make/sun/javazic/tzdata/southamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/southamerica -@@ -1298,6 +1298,14 @@ - -4:30 - ANT 1965 # Netherlands Antilles Time - -4:00 - AST - -+# From Arthur David Olson (2011-06-15): -+# At least for now, use links for places with new iso3166 codes. -+# The name "Lower Prince's Quarter" is both longer than fourteen charaters -+# and contains an apostrophe; use "Lower_Princes" below. -+ -+Link America/Curacao America/Lower_Princes # Sint Maarten -+Link America/Curacao America/Kralendijk # Bonaire, Sint Estatius and Saba -+ - # Ecuador - # - # From Paul Eggert (2007-03-04): ---- openjdk/jdk/make/sun/javazic/tzdata/zone.tab -+++ openjdk/jdk/make/sun/javazic/tzdata/zone.tab -@@ -54,7 +54,6 @@ - AI +1812-06304 America/Anguilla - AL +4120+01950 Europe/Tirane - AM +4011+04430 Asia/Yerevan --AN +1211-06900 America/Curacao - AO -0848+01314 Africa/Luanda - AQ -7750+16636 Antarctica/McMurdo McMurdo Station, Ross Island - AQ -9000+00000 Antarctica/South_Pole Amundsen-Scott Station, South Pole -@@ -109,6 +108,7 @@ - BM +3217-06446 Atlantic/Bermuda - BN +0456+11455 Asia/Brunei - BO -1630-06809 America/La_Paz -+BQ +120903-0681636 America/Kralendijk - BR -0351-03225 America/Noronha Atlantic islands - BR -0127-04829 America/Belem Amapa, E Para - BR -0343-03830 America/Fortaleza NE Brazil (MA, PI, CE, RN, PB) -@@ -142,7 +142,7 @@ - CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario - CA +6344-06828 America/Iqaluit Eastern Time - east Nunavut - most locations - CA +6608-06544 America/Pangnirtung Eastern Time - Pangnirtung, Nunavut --CA +744144-0944945 America/Resolute Eastern Standard Time - Resolute, Nunavut -+CA +744144-0944945 America/Resolute Central Standard Time - Resolute, Nunavut - CA +484531-0913718 America/Atikokan Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut - CA +624900-0920459 America/Rankin_Inlet Central Time - central Nunavut - CA +4953-09709 America/Winnipeg Central Time - Manitoba & west Ontario -@@ -177,6 +177,7 @@ - CR +0956-08405 America/Costa_Rica - CU +2308-08222 America/Havana - CV +1455-02331 Atlantic/Cape_Verde -+CW +1211-06900 America/Curacao - CX -1025+10543 Indian/Christmas - CY +3510+03322 Asia/Nicosia - CZ +5005+01426 Europe/Prague -@@ -382,8 +383,10 @@ - SN +1440-01726 Africa/Dakar - SO +0204+04522 Africa/Mogadishu - SR +0550-05510 America/Paramaribo -+SS +0451+03136 Africa/Juba - ST +0020+00644 Africa/Sao_Tome - SV +1342-08912 America/El_Salvador -+SX +180305-0630250 America/Lower_Princes - SY +3330+03618 Asia/Damascus - SZ -2618+03106 Africa/Mbabane - TC +2128-07108 America/Grand_Turk ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -@@ -159,8 +159,6 @@ - "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"Pacific Standard Time", "PST", - "Pacific Daylight Time", "PDT"}; -- String RST[] = new String[] {"Eastern Standard Time", "EST", -- "Central Daylight Time", "CDT"}; - String SAST[] = new String[] {"South Africa Standard Time", "SAST", - "South Africa Summer Time", "SAST"}; - String SBT[] = new String[] {"Solomon Is. Time", "SBT", -@@ -262,6 +260,7 @@ - {"Africa/Gaborone", CAT}, - {"Africa/Harare", CAT}, - {"Africa/Johannesburg", SAST}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -378,11 +377,13 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"Bolivia Time", "BOT", - "Bolivia Summer Time", "BOST"}}, - {"America/Lima", new String[] {"Peru Time", "PET", - "Peru Summer Time", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -@@ -425,7 +426,7 @@ - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -+ {"America/Resolute", CST}, - {"America/Rio_Branco", AMT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, -@@ -673,7 +674,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", EET}, -+ {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -+ "Kaliningrad Summer Time", "KALST"}}, - {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -@@ -159,8 +159,6 @@ - "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"Pazifische Normalzeit", "PST", - "Pazifische Sommerzeit", "PDT"}; -- String RST[] = new String[] {"\u00d6stliche Normalzeit", "EST", -- "Zentrale Sommerzeit", "CDT"}; - String SAST[] = new String[] {"S\u00fcdafrikanische Normalzeit", "SAST", - "S\u00fcdafrikanische Sommerzeit", "SAST"}; - String SBT[] = new String[] {"Salomoninseln Zeit", "SBT", -@@ -262,6 +260,7 @@ - {"Africa/Gaborone", CAT}, - {"Africa/Harare", CAT}, - {"Africa/Johannesburg", SAST}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -378,11 +377,13 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"Bolivianische Zeit", "BOT", - "Bolivianische Sommerzeit", "BOST"}}, - {"America/Lima", new String[] {"Peruanische Zeit", "PET", - "Peruanische Sommerzeit", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -@@ -425,7 +426,7 @@ - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -+ {"America/Resolute", CST}, - {"America/Rio_Branco", AMT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, -@@ -673,7 +674,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", EET}, -+ {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -+ "Kaliningrad Summer Time", "KALST"}}, - {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -@@ -159,8 +159,6 @@ - "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"Hora est\u00e1ndar del Pac\u00edfico", "PST", - "Hora de verano del Pac\u00edfico", "PDT"}; -- String RST[] = new String[] {"Hora est\u00e1ndar Oriental", "EST", -- "Hora de verano Central", "CDT"}; - String SAST[] = new String[] {"Hora est\u00e1ndar de Sud\u00e1frica", "SAST", - "Hora de verano de Sud\u00e1frica", "SAST"}; - String SBT[] = new String[] {"Hora de las Islas Solomon", "SBT", -@@ -262,6 +260,7 @@ - {"Africa/Gaborone", CAT}, - {"Africa/Harare", CAT}, - {"Africa/Johannesburg", SAST}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -378,11 +377,13 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"Hora de Bolivia", "BOT", - "Hora de verano de Bolivia", "BOST"}}, - {"America/Lima", new String[] {"Hora de Per\u00fa", "PET", - "Hora de verano de Per\u00fa", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -@@ -425,7 +426,7 @@ - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -+ {"America/Resolute", CST}, - {"America/Rio_Branco", AMT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, -@@ -673,7 +674,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", EET}, -+ {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -+ "Kaliningrad Summer Time", "KALST"}}, - {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -@@ -159,8 +159,6 @@ - "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"Heure normale du Pacifique", "PST", - "Heure avanc\u00e9e du Pacifique", "PDT"} ; -- String RST[] = new String[] {"Heure normale de l'Est", "EST", -- "Heure avanc\u00e9e du Centre", "CDT"} ; - String SAST[] = new String[] {"Heure normale d'Afrique du Sud", "SAST", - "Heure d'\u00e9t\u00e9 d'Afrique du Sud", "SAST"} ; - String SBT[] = new String[] {"Heure des \u00celes Salomon", "SBT", -@@ -262,6 +260,7 @@ - {"Africa/Gaborone", CAT}, - {"Africa/Harare", CAT}, - {"Africa/Johannesburg", SAST}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -378,11 +377,13 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"Heure de Bolivie", "BOT", - "Heure d'\u00e9t\u00e9 de Bolivie", "BOST"}}, - {"America/Lima", new String[] {"Heure du P\u00e9rou", "PET", - "Heure d'\u00e9t\u00e9 du P\u00e9rou", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -@@ -425,7 +426,7 @@ - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -+ {"America/Resolute", CST}, - {"America/Rio_Branco", AMT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, -@@ -673,7 +674,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", EET}, -+ {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -+ "Kaliningrad Summer Time", "KALST"}}, - {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -@@ -159,8 +159,6 @@ - "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"Ora solare della costa occidentale USA", "PST", - "Ora legale della costa occidentale USA", "PDT"}; -- String RST[] = new String[] {"Ora solare USA orientale", "EST", -- "Ora legale USA centrale", "CDT"}; - String SAST[] = new String[] {"Ora solare del Sudafrica", "SAST", - "Ora estiva del Sudafrica", "SAST"}; - String SBT[] = new String[] {"Ora delle Isole Salomone", "SBT", -@@ -262,6 +260,7 @@ - {"Africa/Gaborone", CAT}, - {"Africa/Harare", CAT}, - {"Africa/Johannesburg", SAST}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -378,11 +377,13 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"Ora della Bolivia", "BOT", - "Ora estiva della Bolivia", "BOST"}}, - {"America/Lima", new String[] {"Ora del Per\u00f9", "PET", - "Ora estiva del Per\u00f9", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -@@ -425,7 +426,7 @@ - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -+ {"America/Resolute", CST}, - {"America/Rio_Branco", AMT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, -@@ -673,7 +674,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", EET}, -+ {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -+ "Kaliningrad Summer Time", "KALST"}}, - {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -@@ -159,8 +159,6 @@ - "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642", "PST", - "\u592a\u5e73\u6d0b\u590f\u6642\u9593", "PDT"}; -- String RST[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642", "EST", -- "\u4e2d\u90e8\u590f\u6642\u9593", "CDT"}; - String SAST[] = new String[] {"\u5357\u30a2\u30d5\u30ea\u30ab\u6a19\u6e96\u6642", "SAST", - "\u5357\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "SAST"}; - String SBT[] = new String[] {"\u30bd\u30ed\u30e2\u30f3\u8af8\u5cf6\u6642\u9593", "SBT", -@@ -262,6 +260,7 @@ - {"Africa/Gaborone", CAT}, - {"Africa/Harare", CAT}, - {"Africa/Johannesburg", SAST}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -378,11 +377,13 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"\u30dc\u30ea\u30d3\u30a2\u6642\u9593", "BOT", - "\u30dc\u30ea\u30d3\u30a2\u590f\u6642\u9593", "BOST"}}, - {"America/Lima", new String[] {"\u30da\u30eb\u30fc\u6642\u9593", "PET", - "\u30da\u30eb\u30fc\u590f\u6642\u9593", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -@@ -425,7 +426,7 @@ - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -+ {"America/Resolute", CST}, - {"America/Rio_Branco", AMT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, -@@ -673,7 +674,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", EET}, -+ {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -+ "Kaliningrad Summer Time", "KALST"}}, - {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -@@ -159,8 +159,6 @@ - "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"\ud0dc\ud3c9\uc591 \ud45c\uc900\uc2dc", "PST", - "\ud0dc\ud3c9\uc591 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PDT"}; -- String RST[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc", "EST", -- "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"}; - String SAST[] = new String[] {"\ub0a8\uc544\ud504\ub9ac\uce74 \ud45c\uc900\uc2dc", "SAST", - "\ub0a8\uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SAST"}; - String SBT[] = new String[] {"\uc194\ub85c\ubaac \uad70\ub3c4 \uc2dc\uac04", "SBT", -@@ -262,6 +260,7 @@ - {"Africa/Gaborone", CAT}, - {"Africa/Harare", CAT}, - {"Africa/Johannesburg", SAST}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -378,11 +377,13 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"\ubcfc\ub9ac\ube44\uc544 \uc2dc\uac04", "BOT", - "\ubcfc\ub9ac\ube44\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BOST"}}, - {"America/Lima", new String[] {"\ud398\ub8e8 \uc2dc\uac04", "PET", - "\ud398\ub8e8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -@@ -425,7 +426,7 @@ - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -+ {"America/Resolute", CST}, - {"America/Rio_Branco", AMT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, -@@ -673,7 +674,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", EET}, -+ {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -+ "Kaliningrad Summer Time", "KALST"}}, - {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, -diff -r 6b1e65e73b80 -r e97325a7fe7b src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Thu Sep 15 16:09:20 2011 +0900 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Thu Sep 15 16:17:14 2011 +0900 -@@ -157,8 +157,6 @@ - "Fuso hor\u00e1rio de ver\u00e3o de Pohnpei", "PONST"}; - String PST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Pac\u00edfico", "PST", - "Hor\u00e1rio de luz natural do Pac\u00edfico", "PDT"}; -- String RST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental", "EST", -- "Hor\u00e1rio de luz natural central", "CDT"}; - String SAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da \u00c1frica do Sul", "SAST", - "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica do Sul", "SAST"}; - String SBT[] = new String[] {"Fuso hor\u00e1rio das Ilhas Salom\u00e3o", "SBT", -@@ -262,6 +260,7 @@ - {"Africa/Gaborone", CAT}, - {"Africa/Harare", CAT}, - {"Africa/Johannesburg", SAST}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -378,11 +377,13 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"Fuso hor\u00e1rio da Bol\u00edvia", "BOT", - "Fuso hor\u00e1rio de ver\u00e3o da Bol\u00edvia", "BOST"}}, - {"America/Lima", new String[] {"Fuso hor\u00e1rio do Peru", "PET", - "Fuso hor\u00e1rio de ver\u00e3o do Peru", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -@@ -425,7 +426,7 @@ - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -+ {"America/Resolute", CST}, - {"America/Rio_Branco", AMT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, -@@ -673,7 +674,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", EET}, -+ {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -+ "Kaliningrad Summer Time", "KALST"}}, - {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -@@ -159,8 +159,6 @@ - "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"Stilla havet, normaltid", "PST", - "Stilla havet, sommartid", "PDT"}; -- String RST[] = new String[] {"Eastern, normaltid", "EST", -- "Central sommartid", "CDT"}; - String SAST[] = new String[] {"Sydafrika, normaltid", "SAST", - "Sydafrika, sommartid", "SAST"}; - String SBT[] = new String[] {"Salomon\u00f6arna, normaltid", "SBT", -@@ -262,6 +260,7 @@ - {"Africa/Gaborone", CAT}, - {"Africa/Harare", CAT}, - {"Africa/Johannesburg", SAST}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -378,11 +377,13 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"Bolivia, normaltid", "BOT", - "Bolivia, sommartid", "BOST"}}, - {"America/Lima", new String[] {"Peru, normaltid", "PET", - "Peru, sommartid", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -@@ -425,7 +426,7 @@ - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -+ {"America/Resolute", CST}, - {"America/Rio_Branco", AMT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, -@@ -673,7 +674,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", EET}, -+ {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -+ "Kaliningrad Summer Time", "KALST"}}, - {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -@@ -159,8 +159,6 @@ - "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6807\u51c6\u65f6\u95f4", "PST", - "\u592a\u5e73\u6d0b\u590f\u4ee4\u65f6", "PDT"}; -- String RST[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4", "EST", -- "\u4e2d\u592e\u590f\u4ee4\u65f6", "CDT"}; - String SAST[] = new String[] {"\u5357\u975e\u6807\u51c6\u65f6\u95f4", "SAST", - "\u5357\u975e\u590f\u4ee4\u65f6", "SAST"}; - String SBT[] = new String[] {"\u6240\u7f57\u95e8\u7fa4\u5c9b\u65f6\u95f4", "SBT", -@@ -262,6 +260,7 @@ - {"Africa/Gaborone", CAT}, - {"Africa/Harare", CAT}, - {"Africa/Johannesburg", SAST}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -378,11 +377,13 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"\u73bb\u5229\u7ef4\u4e9a\u65f6\u95f4", "BOT", - "\u73bb\u5229\u7ef4\u4e9a\u590f\u4ee4\u65f6", "BOST"}}, - {"America/Lima", new String[] {"\u79d8\u9c81\u65f6\u95f4", "PET", - "\u79d8\u9c81\u590f\u4ee4\u65f6", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -@@ -425,7 +426,7 @@ - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -+ {"America/Resolute", CST}, - {"America/Rio_Branco", AMT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, -@@ -673,7 +674,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", EET}, -+ {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -+ "Kaliningrad Summer Time", "KALST"}}, - {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -@@ -159,8 +159,6 @@ - "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642\u9593", "PST", - "\u592a\u5e73\u6d0b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PDT"}; -- String RST[] = new String[] {"\u6771\u65b9\u6a19\u6e96\u6642\u9593", "EST", -- "\u4e2d\u592e\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"}; - String SAST[] = new String[] {"\u5357\u975e\u6a19\u6e96\u6642\u9593", "SAST", - "\u5357\u975e\u590f\u4ee4\u6642\u9593", "SAST"}; - String SBT[] = new String[] {"\u6240\u7f85\u9580\u7fa4\u5cf6\u6642\u9593", "SBT", -@@ -262,6 +260,7 @@ - {"Africa/Gaborone", CAT}, - {"Africa/Harare", CAT}, - {"Africa/Johannesburg", SAST}, -+ {"Africa/Juba", EAT}, - {"Africa/Kampala", EAT}, - {"Africa/Khartoum", EAT}, - {"Africa/Kigali", CAT}, -@@ -378,11 +377,13 @@ - {"America/Kentucky/Louisville", EST}, - {"America/Kentucky/Monticello", EST}, - {"America/Knox_IN", CST}, -+ {"America/Kralendijk", AST}, - {"America/La_Paz", new String[] {"\u73bb\u5229\u7dad\u4e9e\u6642\u9593", "BOT", - "\u73bb\u5229\u7dad\u4e9e\u590f\u4ee4\u6642\u9593", "BOST"}}, - {"America/Lima", new String[] {"\u7955\u9b6f\u6642\u9593", "PET", - "\u7955\u9b6f\u590f\u4ee4\u6642\u9593", "PEST"}}, - {"America/Louisville", EST}, -+ {"America/Lower_Princes", AST}, - {"America/Maceio", BRT}, - {"America/Managua", CST}, - {"America/Manaus", AMT}, -@@ -425,7 +426,7 @@ - {"America/Rankin_Inlet", CST}, - {"America/Recife", BRT}, - {"America/Regina", CST}, -- {"America/Resolute", RST}, -+ {"America/Resolute", CST}, - {"America/Rio_Branco", AMT}, - {"America/Rosario", AGT}, - {"America/Santa_Isabel", PST}, -@@ -674,7 +675,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", EET}, -+ {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -+ "Kaliningrad Summer Time", "KALST"}}, - {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET},
--- a/patches/openjdk/7103108-tzdata2011l.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1660 +0,0 @@ -# HG changeset patch -# User asaha -# Date 1319235923 25200 -# Node ID dd8350c61d3669eed93507e46e877affe18c2d41 -# Parent 426499ae8e0465161186dfee107ca30f6f6d833c -7103108: (tz) Support tzdata2011l -Reviewed-by: coffeys, peytoia - ---- openjdk/jdk/make/sun/javazic/tzdata/VERSION -+++ openjdk/jdk/make/sun/javazic/tzdata/VERSION -@@ -21,4 +21,4 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --tzdata2011j -+tzdata2011l ---- openjdk/jdk/make/sun/javazic/tzdata/africa -+++ openjdk/jdk/make/sun/javazic/tzdata/africa -@@ -1,27 +1,5 @@ --# --# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# --# This code is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Oracle designates this --# particular file as subject to the "Classpath" exception as provided --# by Oracle in the LICENSE file that accompanied this code. --# --# This code is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --# version 2 for more details (a copy is included in the LICENSE file that --# accompanied this code). --# --# You should have received a copy of the GNU General Public License version --# 2 along with this work; if not, write to the Free Software Foundation, --# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# --# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA --# or visit www.oracle.com if you need additional information or have any --# questions. --# - # <pre> -+# @(#)africa 8.33 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/antarctica -+++ openjdk/jdk/make/sun/javazic/tzdata/antarctica -@@ -1,27 +1,5 @@ --# --# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# --# This code is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Oracle designates this --# particular file as subject to the "Classpath" exception as provided --# by Oracle in the LICENSE file that accompanied this code. --# --# This code is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --# version 2 for more details (a copy is included in the LICENSE file that --# accompanied this code). --# --# You should have received a copy of the GNU General Public License version --# 2 along with this work; if not, write to the Free Software Foundation, --# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# --# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA --# or visit www.oracle.com if you need additional information or have any --# questions. --# - # <pre> -+# @(#)antarctica 8.9 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/asia -+++ openjdk/jdk/make/sun/javazic/tzdata/asia -@@ -1,26 +1,4 @@ --# --# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# --# This code is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Oracle designates this --# particular file as subject to the "Classpath" exception as provided --# by Oracle in the LICENSE file that accompanied this code. --# --# This code is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --# version 2 for more details (a copy is included in the LICENSE file that --# accompanied this code). --# --# You should have received a copy of the GNU General Public License version --# 2 along with this work; if not, write to the Free Software Foundation, --# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# --# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA --# or visit www.oracle.com if you need additional information or have any --# questions. --# -+# @(#)asia 8.68 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -2216,7 +2194,47 @@ - # http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html - # </a> - -+# From Steffen Thorsen (2011-08-26): -+# Gaza and the West Bank did go back to standard time in the beginning of -+# August, and will now enter daylight saving time again on 2011-08-30 -+# 00:00 (so two periods of DST in 2011). The pause was because of -+# Ramadan. -+# -+# <a href="http://www.maannews.net/eng/ViewDetails.aspx?ID=416217"> -+# http://www.maannews.net/eng/ViewDetails.aspx?ID=416217 -+# </a> -+# Additional info: -+# <a href="http://www.timeanddate.com/news/time/palestine-dst-2011.html"> -+# http://www.timeanddate.com/news/time/palestine-dst-2011.html -+# </a> -+ -+# From Alexander Krivenyshev (2011-08-27): -+# According to the article in The Jerusalem Post: -+# "...Earlier this month, the Palestinian government in the West Bank decided to -+# move to standard time for 30 days, during Ramadan. The Palestinians in the -+# Gaza Strip accepted the change and also moved their clocks one hour back. -+# The Hamas government said on Saturday that it won't observe summertime after -+# the Muslim feast of Id al-Fitr, which begins on Tuesday..." -+# ... -+# <a href="http://www.jpost.com/MiddleEast/Article.aspx?id=235650"> -+# http://www.jpost.com/MiddleEast/Article.aspx?id=235650 -+# </a> -+# or -+# <a href="http://www.worldtimezone.com/dst_news/dst_news_gazastrip05.html"> -+# http://www.worldtimezone.com/dst_news/dst_news_gazastrip05.html -+# </a> - # The rules for Egypt are stolen from the `africa' file. -+ -+# From Steffen Thorsen (2011-09-30): -+# West Bank did end Daylight Saving Time this morning/midnight (2011-09-30 -+# 00:00). -+# So West Bank and Gaza now have the same time again. -+# -+# Many sources, including: -+# <a href="http://www.maannews.net/eng/ViewDetails.aspx?ID=424808"> -+# http://www.maannews.net/eng/ViewDetails.aspx?ID=424808 -+# </a> -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule EgyptAsia 1957 only - May 10 0:00 1:00 S - Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 - -@@ -2232,19 +2250,37 @@ - Rule Palestine 2006 2008 - Apr 1 0:00 1:00 S - Rule Palestine 2006 only - Sep 22 0:00 0 - - Rule Palestine 2007 only - Sep Thu>=8 2:00 0 - --Rule Palestine 2008 only - Aug lastFri 2:00 0 - -+Rule Palestine 2008 only - Aug lastFri 0:00 0 - - Rule Palestine 2009 only - Mar lastFri 0:00 1:00 S --Rule Palestine 2010 max - Mar lastSat 0:01 1:00 S --Rule Palestine 2009 max - Sep Fri>=1 2:00 0 - -+Rule Palestine 2009 only - Sep Fri>=1 2:00 0 - -+Rule Palestine 2010 only - Mar lastSat 0:01 1:00 S - Rule Palestine 2010 only - Aug 11 0:00 0 - - -+# From Arthur David Olson (2011-09-20): -+# 2011 transitions per http://www.timeanddate.com as of 2011-09-20. -+ - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Asia/Gaza 2:17:52 - LMT 1900 Oct - 2:00 Zion EET 1948 May 15 - 2:00 EgyptAsia EE%sT 1967 Jun 5 - 2:00 Zion I%sT 1996 - 2:00 Jordan EE%sT 1999 -- 2:00 Palestine EE%sT -+ 2:00 Palestine EE%sT 2011 Apr 2 12:01 -+ 2:00 1:00 EEST 2011 Aug 1 -+ 2:00 - EET -+ -+Zone Asia/Hebron 2:20:23 - LMT 1900 Oct -+ 2:00 Zion EET 1948 May 15 -+ 2:00 EgyptAsia EE%sT 1967 Jun 5 -+ 2:00 Zion I%sT 1996 -+ 2:00 Jordan EE%sT 1999 -+ 2:00 Palestine EE%sT 2008 Aug -+ 2:00 1:00 EEST 2008 Sep -+ 2:00 Palestine EE%sT 2011 Apr 1 12:01 -+ 2:00 1:00 EEST 2011 Aug 1 -+ 2:00 - EET 2011 Aug 30 -+ 2:00 1:00 EEST 2011 Sep 30 3:00 -+ 2:00 - EET - - # Paracel Is - # no information ---- openjdk/jdk/make/sun/javazic/tzdata/australasia -+++ openjdk/jdk/make/sun/javazic/tzdata/australasia -@@ -1,27 +1,5 @@ --# --# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# --# This code is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Oracle designates this --# particular file as subject to the "Classpath" exception as provided --# by Oracle in the LICENSE file that accompanied this code. --# --# This code is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --# version 2 for more details (a copy is included in the LICENSE file that --# accompanied this code). --# --# You should have received a copy of the GNU General Public License version --# 2 along with this work; if not, write to the Free Software Foundation, --# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# --# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA --# or visit www.oracle.com if you need additional information or have any --# questions. --# - # <pre> -+# @(#)australasia 8.27 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -318,6 +296,18 @@ - # http://www.worldtimezone.com/dst_news/dst_news_fiji04.html - # </a> - -+# From Steffen Thorsen (2011-10-03): -+# Now the dates have been confirmed, and at least our start date -+# assumption was correct (end date was one week wrong). -+# -+# <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=4966:daylight-saving-starts-in-fiji&catid=71:press-releases&Itemid=155"> -+# www.fiji.gov.fj/index.php?option=com_content&view=article&id=4966:daylight-saving-starts-in-fiji&catid=71:press-releases&Itemid=155 -+# </a> -+# which says -+# Members of the public are reminded to change their time to one hour in -+# advance at 2am to 3am on October 23, 2011 and one hour back at 3am to -+# 2am on February 26 next year. -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S - Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - -@@ -325,6 +315,8 @@ - Rule Fiji 2010 only - Mar lastSun 3:00 0 - - Rule Fiji 2010 only - Oct 24 2:00 1:00 S - Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - -+Rule Fiji 2011 only - Oct 23 2:00 1:00 S -+Rule Fiji 2012 only - Feb 26 3:00 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Pacific/Fiji 11:53:40 - LMT 1915 Oct 26 # Suva - 12:00 Fiji FJ%sT # Fiji Time ---- openjdk/jdk/make/sun/javazic/tzdata/backward -+++ openjdk/jdk/make/sun/javazic/tzdata/backward -@@ -1,27 +1,5 @@ --# --# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# --# This code is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Oracle designates this --# particular file as subject to the "Classpath" exception as provided --# by Oracle in the LICENSE file that accompanied this code. --# --# This code is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --# version 2 for more details (a copy is included in the LICENSE file that --# accompanied this code). --# --# You should have received a copy of the GNU General Public License version --# 2 along with this work; if not, write to the Free Software Foundation, --# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# --# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA --# or visit www.oracle.com if you need additional information or have any --# questions. --# - # <pre> -+# @(#)backward 8.9 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/etcetera -+++ openjdk/jdk/make/sun/javazic/tzdata/etcetera -@@ -1,27 +1,5 @@ --# --# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# --# This code is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Oracle designates this --# particular file as subject to the "Classpath" exception as provided --# by Oracle in the LICENSE file that accompanied this code. --# --# This code is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --# version 2 for more details (a copy is included in the LICENSE file that --# accompanied this code). --# --# You should have received a copy of the GNU General Public License version --# 2 along with this work; if not, write to the Free Software Foundation, --# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# --# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA --# or visit www.oracle.com if you need additional information or have any --# questions. --# - # <pre> -+# @(#)etcetera 8.3 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/europe -+++ openjdk/jdk/make/sun/javazic/tzdata/europe -@@ -1,27 +1,5 @@ --# --# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# --# This code is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Oracle designates this --# particular file as subject to the "Classpath" exception as provided --# by Oracle in the LICENSE file that accompanied this code. --# --# This code is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --# version 2 for more details (a copy is included in the LICENSE file that --# accompanied this code). --# --# You should have received a copy of the GNU General Public License version --# 2 along with this work; if not, write to the Free Software Foundation, --# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# --# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA --# or visit www.oracle.com if you need additional information or have any --# questions. --# - # <pre> -+# @(#)europe 8.38 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -583,9 +561,9 @@ - # - Rule Russia 1992 only - Mar lastSat 23:00 1:00 S - Rule Russia 1992 only - Sep lastSat 23:00 0 - --Rule Russia 1993 max - Mar lastSun 2:00s 1:00 S -+Rule Russia 1993 2010 - Mar lastSun 2:00s 1:00 S - Rule Russia 1993 1995 - Sep lastSun 2:00s 0 - --Rule Russia 1996 max - Oct lastSun 2:00s 0 - -+Rule Russia 1996 2010 - Oct lastSun 2:00s 0 - - - # From Alexander Krivenyshev (2011-06-14): - # According to Kremlin press service, Russian President Dmitry Medvedev -@@ -605,7 +583,6 @@ - # From Arthur David Olson (2011-06-15): - # Take "abolishing daylight saving time" to mean that time is now considered - # to be standard. --# At least for now, keep the "old" Russia rules for the benefit of Belarus. - - # These are for backward compatibility with older versions. - -@@ -711,6 +688,23 @@ - 1:00 EU CE%sT - - # Belarus -+# From Yauhen Kharuzhy (2011-09-16): -+# By latest Belarus government act Europe/Minsk timezone was changed to -+# GMT+3 without DST (was GMT+2 with DST). -+# -+# Sources (Russian language): -+# 1. -+# <a href="http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html"> -+# http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html -+# </a> -+# 2. -+# <a href="http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/"> -+# http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/ -+# </a> -+# 3. -+# <a href="http://news.tut.by/society/250578.html"> -+# http://news.tut.by/society/250578.html -+# </a> - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Europe/Minsk 1:50:16 - LMT 1880 - 1:50 - MMT 1924 May 2 # Minsk Mean Time -@@ -722,7 +716,8 @@ - 2:00 1:00 EEST 1991 Sep 29 2:00s - 2:00 - EET 1992 Mar 29 0:00s - 2:00 1:00 EEST 1992 Sep 27 0:00s -- 2:00 Russia EE%sT -+ 2:00 Russia EE%sT 2011 Mar 27 2:00s -+ 3:00 - FET # Further-eastern European Time - - # Belgium - # -@@ -2056,7 +2051,7 @@ - 2:00 Poland CE%sT 1946 - 3:00 Russia MSK/MSD 1991 Mar 31 2:00s - 2:00 Russia EE%sT 2011 Mar 27 2:00s -- 3:00 - KALT -+ 3:00 - FET # Further-eastern European Time - # - # From Oscar van Vlijmen (2001-08-25): [This region consists of] - # Respublika Adygeya, Arkhangel'skaya oblast', -@@ -2211,7 +2206,7 @@ - # [parts of] Respublika Sakha (Yakutiya), Chitinskaya oblast'. - - # From Oscar van Vlijmen (2009-11-29): --# ...some regions of RUssia were merged with others since 2005... -+# ...some regions of [Russia] were merged with others since 2005... - # Some names were changed, no big deal, except for one instance: a new name. - # YAK/YAKST: UTC+9 Zabajkal'skij kraj. - -@@ -2635,6 +2630,28 @@ - # of March at 3am the time is changing to 4am and each last Sunday of - # October the time at 4am is changing to 3am" - -+# From Alexander Krivenyshev (2011-09-20): -+# On September 20, 2011 the deputies of the Verkhovna Rada agreed to -+# abolish the transfer clock to winter time. -+# -+# Bill number 8330 of MP from the Party of Regions Oleg Nadoshi got -+# approval from 266 deputies. -+# -+# Ukraine abolishes transter back to the winter time (in Russian) -+# <a href="http://news.mail.ru/politics/6861560/"> -+# http://news.mail.ru/politics/6861560/ -+# </a> -+# -+# The Ukrainians will no longer change the clock (in Russian) -+# <a href="http://www.segodnya.ua/news/14290482.html"> -+# http://www.segodnya.ua/news/14290482.html -+# </a> -+# -+# Deputies cancelled the winter time (in Russian) -+# <a href="http://www.pravda.com.ua/rus/news/2011/09/20/6600616/"> -+# http://www.pravda.com.ua/rus/news/2011/09/20/6600616/ -+# </a> -+ - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - # Most of Ukraine since 1970 has been like Kiev. - # "Kyiv" is the transliteration of the Ukrainian name, but -@@ -2648,7 +2665,8 @@ - 3:00 - MSK 1990 Jul 1 2:00 - 2:00 - EET 1992 - 2:00 E-Eur EE%sT 1995 -- 2:00 EU EE%sT -+ 2:00 EU EE%sT 2011 Mar lastSun 1:00u -+ 3:00 - FET # Further-eastern European Time - # Ruthenia used CET 1990/1991. - # "Uzhhorod" is the transliteration of the Ukrainian name, but - # "Uzhgorod" is more common in English. -@@ -2662,7 +2680,8 @@ - 1:00 - CET 1991 Mar 31 3:00 - 2:00 - EET 1992 - 2:00 E-Eur EE%sT 1995 -- 2:00 EU EE%sT -+ 2:00 EU EE%sT 2011 Mar lastSun 1:00u -+ 3:00 - FET # Further-eastern European Time - # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991. - # "Zaporizhia" is the transliteration of the Ukrainian name, but - # "Zaporozh'ye" is more common in English. Use the common English -@@ -2675,7 +2694,8 @@ - 1:00 C-Eur CE%sT 1943 Oct 25 - 3:00 Russia MSK/MSD 1991 Mar 31 2:00 - 2:00 E-Eur EE%sT 1995 -- 2:00 EU EE%sT -+ 2:00 EU EE%sT 2011 Mar lastSun 1:00u -+ 3:00 - FET # Further-eastern European Time - # Central Crimea used Moscow time 1994/1997. - Zone Europe/Simferopol 2:16:24 - LMT 1880 - 2:16 - SMT 1924 May 2 # Simferopol Mean T -@@ -2700,7 +2720,8 @@ - # Assume it happened in March by not changing the clocks. - 3:00 Russia MSK/MSD 1997 - 3:00 - MSK 1997 Mar lastSun 1:00u -- 2:00 EU EE%sT -+ 2:00 EU EE%sT 2011 Mar lastSun 1:00u -+ 3:00 - FET # Further-eastern European Time - - ############################################################################### - ---- openjdk/jdk/make/sun/javazic/tzdata/factory -+++ openjdk/jdk/make/sun/javazic/tzdata/factory -@@ -1,27 +1,5 @@ --# --# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# --# This code is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Oracle designates this --# particular file as subject to the "Classpath" exception as provided --# by Oracle in the LICENSE file that accompanied this code. --# --# This code is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --# version 2 for more details (a copy is included in the LICENSE file that --# accompanied this code). --# --# You should have received a copy of the GNU General Public License version --# 2 along with this work; if not, write to the Free Software Foundation, --# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# --# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA --# or visit www.oracle.com if you need additional information or have any --# questions. --# - # <pre> -+# @(#)factory 8.2 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/iso3166.tab -+++ openjdk/jdk/make/sun/javazic/tzdata/iso3166.tab -@@ -1,27 +1,5 @@ --# --# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# --# This code is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Oracle designates this --# particular file as subject to the "Classpath" exception as provided --# by Oracle in the LICENSE file that accompanied this code. --# --# This code is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --# version 2 for more details (a copy is included in the LICENSE file that --# accompanied this code). --# --# You should have received a copy of the GNU General Public License version --# 2 along with this work; if not, write to the Free Software Foundation, --# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# --# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA --# or visit www.oracle.com if you need additional information or have any --# questions. --# - # <pre> -+# @(#)iso3166.tab 8.11 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - # ISO 3166 alpha-2 country codes ---- openjdk/jdk/make/sun/javazic/tzdata/leapseconds -+++ openjdk/jdk/make/sun/javazic/tzdata/leapseconds -@@ -1,27 +1,5 @@ --# --# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# --# This code is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Oracle designates this --# particular file as subject to the "Classpath" exception as provided --# by Oracle in the LICENSE file that accompanied this code. --# --# This code is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --# version 2 for more details (a copy is included in the LICENSE file that --# accompanied this code). --# --# You should have received a copy of the GNU General Public License version --# 2 along with this work; if not, write to the Free Software Foundation, --# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# --# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA --# or visit www.oracle.com if you need additional information or have any --# questions. --# - # <pre> -+# @(#)leapseconds 8.11 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/northamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/northamerica -@@ -1,27 +1,5 @@ --# --# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# --# This code is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Oracle designates this --# particular file as subject to the "Classpath" exception as provided --# by Oracle in the LICENSE file that accompanied this code. --# --# This code is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --# version 2 for more details (a copy is included in the LICENSE file that --# accompanied this code). --# --# You should have received a copy of the GNU General Public License version --# 2 along with this work; if not, write to the Free Software Foundation, --# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# --# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA --# or visit www.oracle.com if you need additional information or have any --# questions. --# - # <pre> -+# @(#)northamerica 8.49 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -505,7 +483,7 @@ - -8:00 US P%sT 1983 Oct 30 2:00 - -9:00 US Y%sT 1983 Nov 30 - -9:00 US AK%sT --Zone America/Sitka -14:58:47 - LMT 1867 Oct 18 -+Zone America/Sitka 14:58:47 - LMT 1867 Oct 18 - -9:01:13 - LMT 1900 Aug 20 12:00 - -8:00 - PST 1942 - -8:00 US P%sT 1946 -@@ -1190,31 +1168,21 @@ - # INMS (2000-09-12) says that, since 1988 at least, Newfoundland switches - # at 00:01 local time. For now, assume it started in 1987. - --# From Michael Pelley (2011-08-05): --# The Government of Newfoundland and Labrador has pending changes to --# modify the hour for daylight savings time to come into effect in --# November 2011. This modification would change the time from 12:01AM to --# 2:00AM on the dates of the switches of Daylight Savings Time to/from --# Standard Time. --# --# As a matter of reference, in Canada provinces have the authority of --# setting time zone information. The legislation has passed our --# legislative body (The House of Assembly) and is awaiting the --# proclamation to come into effect. You may find this information at: --# <a href="http://www.assembly.nl.ca/legislation/sr/lists/Proclamation.htm"> --# http://www.assembly.nl.ca/legislation/sr/lists/Proclamation.htm --# </a> --# and --# search within that web page for Standard Time (Amendment) Act. The Act --# may be found at: --# <a href="http://www.assembly.nl.ca/business/bills/Bill1106.htm"> --# http://www.assembly.nl.ca/business/bills/Bill1106.htm -+# From Michael Pelley (2011-09-12): -+# We received today, Monday, September 12, 2011, notification that the -+# changes to the Newfoundland Standard Time Act have been proclaimed. -+# The change in the Act stipulates that the change from Daylight Savings -+# Time to Standard Time and from Standard Time to Daylight Savings Time -+# now occurs at 2:00AM. -+# ... -+# <a href="http://www.assembly.nl.ca/legislation/sr/annualstatutes/2011/1106.chp.htm"> -+# http://www.assembly.nl.ca/legislation/sr/annualstatutes/2011/1106.chp.htm - # </a> - # ... --# MICHAEL PELLEY | Manager of Enterprise Architecture - Solution Delivery --# Office of the Chief Information Officer Executive Council Government of --# Newfoundland & Labrador P.O. Box 8700, 40 Higgins Line, St. John's NL --# A1B 4J6 -+# MICHAEL PELLEY | Manager of Enterprise Architecture - Solution Delivery -+# Office of the Chief Information Officer -+# Executive Council -+# Government of Newfoundland & Labrador - - Rule StJohns 1987 only - Apr Sun>=1 0:01 1:00 D - Rule StJohns 1987 2006 - Oct lastSun 0:01 0 S ---- openjdk/jdk/make/sun/javazic/tzdata/pacificnew -+++ openjdk/jdk/make/sun/javazic/tzdata/pacificnew -@@ -1,27 +1,5 @@ --# --# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# --# This code is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Oracle designates this --# particular file as subject to the "Classpath" exception as provided --# by Oracle in the LICENSE file that accompanied this code. --# --# This code is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --# version 2 for more details (a copy is included in the LICENSE file that --# accompanied this code). --# --# You should have received a copy of the GNU General Public License version --# 2 along with this work; if not, write to the Free Software Foundation, --# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# --# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA --# or visit www.oracle.com if you need additional information or have any --# questions. --# - # <pre> -+# @(#)pacificnew 8.2 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/solar87 -+++ openjdk/jdk/make/sun/javazic/tzdata/solar87 -@@ -1,27 +1,5 @@ --# --# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# --# This code is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Oracle designates this --# particular file as subject to the "Classpath" exception as provided --# by Oracle in the LICENSE file that accompanied this code. --# --# This code is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --# version 2 for more details (a copy is included in the LICENSE file that --# accompanied this code). --# --# You should have received a copy of the GNU General Public License version --# 2 along with this work; if not, write to the Free Software Foundation, --# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# --# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA --# or visit www.oracle.com if you need additional information or have any --# questions. --# - # <pre> -+# @(#)solar87 8.2 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/solar88 -+++ openjdk/jdk/make/sun/javazic/tzdata/solar88 -@@ -1,27 +1,5 @@ --# --# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# --# This code is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Oracle designates this --# particular file as subject to the "Classpath" exception as provided --# by Oracle in the LICENSE file that accompanied this code. --# --# This code is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --# version 2 for more details (a copy is included in the LICENSE file that --# accompanied this code). --# --# You should have received a copy of the GNU General Public License version --# 2 along with this work; if not, write to the Free Software Foundation, --# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# --# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA --# or visit www.oracle.com if you need additional information or have any --# questions. --# - # <pre> -+# @(#)solar88 8.2 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/solar89 -+++ openjdk/jdk/make/sun/javazic/tzdata/solar89 -@@ -1,27 +1,5 @@ --# --# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# --# This code is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Oracle designates this --# particular file as subject to the "Classpath" exception as provided --# by Oracle in the LICENSE file that accompanied this code. --# --# This code is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --# version 2 for more details (a copy is included in the LICENSE file that --# accompanied this code). --# --# You should have received a copy of the GNU General Public License version --# 2 along with this work; if not, write to the Free Software Foundation, --# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# --# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA --# or visit www.oracle.com if you need additional information or have any --# questions. --# - # <pre> -+# @(#)solar89 8.2 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/southamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/southamerica -@@ -1,27 +1,5 @@ --# --# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# --# This code is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Oracle designates this --# particular file as subject to the "Classpath" exception as provided --# by Oracle in the LICENSE file that accompanied this code. --# --# This code is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --# version 2 for more details (a copy is included in the LICENSE file that --# accompanied this code). --# --# You should have received a copy of the GNU General Public License version --# 2 along with this work; if not, write to the Free Software Foundation, --# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# --# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA --# or visit www.oracle.com if you need additional information or have any --# questions. --# - # <pre> -+# @(#)southamerica 8.50 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -819,6 +797,26 @@ - # <a href="http://www.timeanddate.com/news/time/brazil-dst-2008-2009.html"> - # http://www.timeanddate.com/news/time/brazil-dst-2008-2009.html - # </a> -+# -+# From Alexander Krivenyshev (2011-10-04): -+# State Bahia will return to Daylight savings time this year after 8 years off. -+# The announcement was made by Governor Jaques Wagner in an interview to a -+# television station in Salvador. -+ -+# In Portuguese: -+# <a href="http://g1.globo.com/bahia/noticia/2011/10/governador-jaques-wagner-confirma-horario-de-verao-na-bahia.html"> -+# http://g1.globo.com/bahia/noticia/2011/10/governador-jaques-wagner-confirma-horario-de-verao-na-bahia.html -+# </a> and -+# <a href="http://noticias.terra.com.br/brasil/noticias/0,,OI5390887-EI8139,00-Bahia+volta+a+ter+horario+de+verao+apos+oito+anos.html"> -+# http://noticias.terra.com.br/brasil/noticias/0,,OI5390887-EI8139,00-Bahia+volta+a+ter+horario+de+verao+apos+oito+anos.html -+# </a> -+ -+# From Guilherme Bernardes Rodrigues (2011-10-07): -+# There is news in the media, however there is still no decree about it. -+# I just send a e-mail to Zulmira Brandão at -+# <a href="http://pcdsh01.on.br/">http://pcdsh01.on.br/</a> the -+# oficial agency about time in Brazil, and she confirmed that the old rule is -+# still in force. - - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01) -@@ -1057,6 +1055,9 @@ - Zone America/Bahia -2:34:04 - LMT 1914 - -3:00 Brazil BR%sT 2003 Sep 24 - -3:00 - BRT -+# as noted above, not yet in operation. -+# -3:00 - BRT 2011 Oct 16 -+# -3:00 Brazil BR%sT - # - # Goias (GO), Distrito Federal (DF), Minas Gerais (MG), - # Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR), ---- openjdk/jdk/make/sun/javazic/tzdata/systemv -+++ openjdk/jdk/make/sun/javazic/tzdata/systemv -@@ -1,27 +1,5 @@ --# --# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# --# This code is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Oracle designates this --# particular file as subject to the "Classpath" exception as provided --# by Oracle in the LICENSE file that accompanied this code. --# --# This code is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --# version 2 for more details (a copy is included in the LICENSE file that --# accompanied this code). --# --# You should have received a copy of the GNU General Public License version --# 2 along with this work; if not, write to the Free Software Foundation, --# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# --# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA --# or visit www.oracle.com if you need additional information or have any --# questions. --# - # <pre> -+# @(#)systemv 8.2 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/zone.tab -+++ openjdk/jdk/make/sun/javazic/tzdata/zone.tab -@@ -1,27 +1,5 @@ --# --# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# --# This code is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Oracle designates this --# particular file as subject to the "Classpath" exception as provided --# by Oracle in the LICENSE file that accompanied this code. --# --# This code is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --# version 2 for more details (a copy is included in the LICENSE file that --# accompanied this code). --# --# You should have received a copy of the GNU General Public License version --# 2 along with this work; if not, write to the Free Software Foundation, --# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# --# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA --# or visit www.oracle.com if you need additional information or have any --# questions. --# - # <pre> -+# @(#)zone.tab 8.49 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - # -@@ -341,7 +319,8 @@ - PM +4703-05620 America/Miquelon - PN -2504-13005 Pacific/Pitcairn - PR +182806-0660622 America/Puerto_Rico --PS +3130+03428 Asia/Gaza -+PS +3130+03428 Asia/Gaza Gaza Strip -+PS +313200+0350542 Asia/Hebron West Bank - PT +3843-00908 Europe/Lisbon mainland - PT +3238-01654 Atlantic/Madeira Madeira Islands - PT +3744-02540 Atlantic/Azores Azores ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -@@ -103,6 +103,8 @@ - "Eastern Daylight Time", "EDT"}; - String EST_NSW[] = new String[] {"Eastern Standard Time (New South Wales)", "EST", - "Eastern Summer Time (New South Wales)", "EST"}; -+ String FET[] = new String[] {"Further-eastern European Time", "FET", -+ "Further-eastern European Summer Time", "FEST"}; - String GHMT[] = new String[] {"Ghana Mean Time", "GMT", - "Ghana Summer Time", "GHST"}; - String GAMBIER[] = new String[] {"Gambier Time", "GAMT", -@@ -511,6 +513,7 @@ - "Tajikistan Summer Time", "TJST"}}, - {"Asia/Gaza", EET}, - {"Asia/Harbin", CTT}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"Hovd Time", "HOVT", -@@ -674,9 +677,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -- "Kaliningrad Summer Time", "KALST"}}, -- {"Europe/Kiev", EET}, -+ {"Europe/Kaliningrad", FET}, -+ {"Europe/Kiev", FET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -684,7 +686,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -697,14 +699,14 @@ - "Samara Summer Time", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", FET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", EET}, -+ {"Europe/Uzhgorod", FET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -713,7 +715,7 @@ - "Volgograd Summer Time", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", EET}, -+ {"Europe/Zaporozhye", FET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -@@ -103,6 +103,8 @@ - "\u00d6stliche Sommerzeit", "EDT"}; - String EST_NSW[] = new String[] {"\u00d6stliche Normalzeit (New South Wales)", "EST", - "\u00d6stliche Sommerzeit (New South Wales)", "EST"}; -+ String FET[] = new String[] {"Further-eastern European Time", "FET", -+ "Further-eastern European Summer Time", "FEST"}; - String GHMT[] = new String[] {"Ghanaische Normalzeit", "GMT", - "Ghanaische Sommerzeit", "GHST"}; - String GAMBIER[] = new String[] {"Gambier Zeit", "GAMT", -@@ -511,6 +513,7 @@ - "Tadschikische Sommerzeit", "TJST"}}, - {"Asia/Gaza", EET}, - {"Asia/Harbin", CTT}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"Hovd Zeit", "HOVT", -@@ -674,9 +677,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -- "Kaliningrad Summer Time", "KALST"}}, -- {"Europe/Kiev", EET}, -+ {"Europe/Kaliningrad", FET}, -+ {"Europe/Kiev", FET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -684,7 +686,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -697,14 +699,14 @@ - "Samarische Sommerzeit", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", FET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", EET}, -+ {"Europe/Uzhgorod", FET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -713,7 +715,7 @@ - "Wolgograder Sommerzeit", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", EET}, -+ {"Europe/Zaporozhye", FET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -@@ -103,6 +103,8 @@ - "Hora de verano Oriental", "EDT"}; - String EST_NSW[] = new String[] {"Hora est\u00e1ndar Oriental (Nueva Gales del Sur)", "EST", - "Hora de verano Oriental (Nueva Gales del Sur)", "EST"}; -+ String FET[] = new String[] {"Further-eastern European Time", "FET", -+ "Further-eastern European Summer Time", "FEST"}; - String GHMT[] = new String[] {"Hora central de Ghana", "GMT", - "Hora de verano de Ghana", "GHST"}; - String GAMBIER[] = new String[] {"Hora de Gambier", "GAMT", -@@ -511,6 +513,7 @@ - "Hora de verano de Tajikist\u00e1n", "TJST"}}, - {"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", -@@ -674,9 +677,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -- "Kaliningrad Summer Time", "KALST"}}, -- {"Europe/Kiev", EET}, -+ {"Europe/Kaliningrad", FET}, -+ {"Europe/Kiev", FET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -684,7 +686,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -697,14 +699,14 @@ - "Hora de verano de Samara", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", FET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", EET}, -+ {"Europe/Uzhgorod", FET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -713,7 +715,7 @@ - "Hora de verano de Volgogrado", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", EET}, -+ {"Europe/Zaporozhye", FET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -@@ -103,6 +103,8 @@ - "Heure avanc\u00e9e de l'Est", "EDT"} ; - String EST_NSW[] = new String[] {"Heure normale de l'Est (Nouvelle-Galles du Sud)", "EST", - "Heure d'\u00e9t\u00e9 de l'Est (Nouvelle-Galles du Sud)", "EST"} ; -+ String FET[] = new String[] {"Further-eastern European Time", "FET", -+ "Further-eastern European Summer Time", "FEST"}; - String GHMT[] = new String[] {"Heure du Ghana", "GMT", - "Heure d'\u00e9t\u00e9 du Ghana", "GHST"}; - String GAMBIER[] = new String[] {"Heure de Gambi", "GAMT", -@@ -511,6 +513,7 @@ - "Heure d'\u00e9t\u00e9 du Tadjikistan", "TJST"}}, - {"Asia/Gaza", EET}, - {"Asia/Harbin", CTT}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"Heure de Hovd", "HOVT", -@@ -674,9 +677,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -- "Kaliningrad Summer Time", "KALST"}}, -- {"Europe/Kiev", EET}, -+ {"Europe/Kaliningrad", FET}, -+ {"Europe/Kiev", FET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -684,7 +686,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -697,14 +699,14 @@ - "Heure d'\u00e9t\u00e9 de Samara", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", FET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", EET}, -+ {"Europe/Uzhgorod", FET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -713,7 +715,7 @@ - "Heure d'\u00e9t\u00e9 de Volgograd", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", EET}, -+ {"Europe/Zaporozhye", FET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -@@ -103,6 +103,8 @@ - "Ora legale USA orientale", "EDT"}; - String EST_NSW[] = new String[] {"Ora solare dell'Australia orientale (Nuovo Galles del Sud)", "EST", - "Ora estiva dell'Australia orientale (Nuovo Galles del Sud)", "EST"}; -+ String FET[] = new String[] {"Further-eastern European Time", "FET", -+ "Further-eastern European Summer Time", "FEST"}; - String GHMT[] = new String[] {"Ora media del Ghana", "GMT", - "Ora legale del Ghana", "GHST"}; - String GAMBIER[] = new String[] {"Ora di Gambier", "GAMT", -@@ -511,6 +513,7 @@ - "Ora estiva del Tagikistan", "TJST"}}, - {"Asia/Gaza", EET}, - {"Asia/Harbin", CTT}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"Ora di Hovd", "HOVT", -@@ -674,9 +677,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -- "Kaliningrad Summer Time", "KALST"}}, -- {"Europe/Kiev", EET}, -+ {"Europe/Kaliningrad", FET}, -+ {"Europe/Kiev", FET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -684,7 +686,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -697,14 +699,14 @@ - "Ora estiva di Samara", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", FET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", EET}, -+ {"Europe/Uzhgorod", FET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -713,7 +715,7 @@ - "Ora estiva di Volgograd", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", EET}, -+ {"Europe/Zaporozhye", FET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -@@ -103,6 +103,8 @@ - "\u6771\u90e8\u590f\u6642\u9593", "EDT"}; - String EST_NSW[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "EST", - "\u6771\u90e8\u590f\u6642\u9593 (\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "EST"}; -+ String FET[] = new String[] {"Further-eastern European Time", "FET", -+ "Further-eastern European Summer Time", "FEST"}; - String GHMT[] = new String[] {"\u30ac\u30fc\u30ca\u6a19\u6e96\u6642", "GMT", - "\u30ac\u30fc\u30ca\u590f\u6642\u9593", "GHST"}; - String GAMBIER[] = new String[] {"\u30ac\u30f3\u30d3\u30a2\u6642\u9593", "GAMT", -@@ -511,6 +513,7 @@ - "\u30bf\u30b8\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "TJST"}}, - {"Asia/Gaza", EET}, - {"Asia/Harbin", CTT}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"\u30db\u30d6\u30c9\u6642\u9593", "HOVT", -@@ -674,9 +677,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -- "Kaliningrad Summer Time", "KALST"}}, -- {"Europe/Kiev", EET}, -+ {"Europe/Kaliningrad", FET}, -+ {"Europe/Kiev", FET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -684,7 +686,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -697,14 +699,14 @@ - "\u30b5\u30de\u30e9\u590f\u6642\u9593", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", FET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", EET}, -+ {"Europe/Uzhgorod", FET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -713,7 +715,7 @@ - "\u30dc\u30eb\u30b4\u30b0\u30e9\u30fc\u30c9\u590f\u6642\u9593", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", EET}, -+ {"Europe/Zaporozhye", FET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -@@ -103,6 +103,8 @@ - "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EDT"}; - String EST_NSW[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "EST", - "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "EST"}; -+ String FET[] = new String[] {"Further-eastern European Time", "FET", -+ "Further-eastern European Summer Time", "FEST"}; - String GHMT[] = new String[] {"\uac00\ub098 \ud45c\uc900\uc2dc", "GMT", - "\uac00\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GHST"}; - String GAMBIER[] = new String[] {"\uac10\ube44\uc544 \uc2dc\uac04", "GAMT", -@@ -511,6 +513,7 @@ - "\ud0c0\uc9c0\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TJST"}}, - {"Asia/Gaza", EET}, - {"Asia/Harbin", CTT}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"Hovd \uc2dc\uac04", "HOVT", -@@ -674,9 +677,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -- "Kaliningrad Summer Time", "KALST"}}, -- {"Europe/Kiev", EET}, -+ {"Europe/Kaliningrad", FET}, -+ {"Europe/Kiev", FET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -684,7 +686,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -697,14 +699,14 @@ - "\uc0ac\ub9c8\ub77c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", FET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", EET}, -+ {"Europe/Uzhgorod", FET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -713,7 +715,7 @@ - "\ubcfc\uace0\uadf8\ub77c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", EET}, -+ {"Europe/Zaporozhye", FET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, -diff -r 426499ae8e04 -r dd8350c61d36 src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Fri Oct 21 19:22:17 2011 +0400 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Fri Oct 21 15:25:23 2011 -0700 -@@ -101,6 +101,8 @@ - "Hor\u00e1rio de luz natural oriental", "EDT"}; - String EST_NSW[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Nova Gales do Sul)", "EST", - "Fuso hor\u00e1rio de ver\u00e3o oriental (Nova Gales do Sul)", "EST"}; -+ String FET[] = new String[] {"Further-eastern European Time", "FET", -+ "Further-eastern European Summer Time", "FEST"}; - String GHMT[] = new String[] {"Fuso hor\u00e1rio do meridiano de Gana", "GMT", - "Fuso hor\u00e1rio de ver\u00e3o de Gana", "GHST"}; - String GAMBIER[] = new String[] {"Fuso hor\u00e1rio de Gambier", "GAMT", -@@ -511,6 +513,7 @@ - "Fuso hor\u00e1rio de ver\u00e3o do Tadjiquist\u00e3o", "TJST"}}, - {"Asia/Gaza", EET}, - {"Asia/Harbin", CTT}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"Fuso hor\u00e1rio de Hovd", "HOVT", -@@ -674,9 +677,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -- "Kaliningrad Summer Time", "KALST"}}, -- {"Europe/Kiev", EET}, -+ {"Europe/Kaliningrad", FET}, -+ {"Europe/Kiev", FET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -684,7 +686,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -697,14 +699,14 @@ - "Fuso hor\u00e1rio de ver\u00e3o de Samara", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", FET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", EET}, -+ {"Europe/Uzhgorod", FET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -713,7 +715,7 @@ - "Fuso hor\u00e1rio de ver\u00e3o de Volgogrado", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", EET}, -+ {"Europe/Zaporozhye", FET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -@@ -103,6 +103,8 @@ - "Eastern, sommartid", "EDT"}; - String EST_NSW[] = new String[] {"Eastern, normaltid (Nya Sydwales)", "EST", - "Eastern, sommartid (Nya Sydwales)", "EST"}; -+ String FET[] = new String[] {"Further-eastern European Time", "FET", -+ "Further-eastern European Summer Time", "FEST"}; - String GHMT[] = new String[] {"Ghana, normaltid", "GMT", - "Ghana, sommartid", "GHST"}; - String GAMBIER[] = new String[] {"Gambier, normaltid", "GAMT", -@@ -511,6 +513,7 @@ - "Tadzjikistan, sommartid", "TJST"}}, - {"Asia/Gaza", EET}, - {"Asia/Harbin", CTT}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"Hovd, normaltid", "HOVT", -@@ -674,9 +677,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -- "Kaliningrad Summer Time", "KALST"}}, -- {"Europe/Kiev", EET}, -+ {"Europe/Kaliningrad", FET}, -+ {"Europe/Kiev", FET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -684,7 +686,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -697,14 +699,14 @@ - "Samara, sommartid", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", FET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", EET}, -+ {"Europe/Uzhgorod", FET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -713,7 +715,7 @@ - "Volgograd, sommartid", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", EET}, -+ {"Europe/Zaporozhye", FET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -@@ -103,6 +103,8 @@ - "\u4e1c\u90e8\u590f\u4ee4\u65f6", "EDT"}; - String EST_NSW[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u65b0\u5357\u5a01\u5c14\u65af\uff09", "EST", - "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u65b0\u5357\u5a01\u5c14\u65af\uff09", "EST"}; -+ String FET[] = new String[] {"Further-eastern European Time", "FET", -+ "Further-eastern European Summer Time", "FEST"}; - String GHMT[] = new String[] {"\u52a0\u7eb3\u65f6\u95f4", "GMT", - "\u52a0\u7eb3\u590f\u4ee4\u65f6", "GHST"}; - String GAMBIER[] = new String[] {"\u5188\u6bd4\u4e9a\u65f6\u95f4", "GAMT", -@@ -511,6 +513,7 @@ - "\u5854\u5409\u514b\u65af\u5766\u590f\u4ee4\u65f6", "TJST"}}, - {"Asia/Gaza", EET}, - {"Asia/Harbin", CTT}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"\u79d1\u5e03\u591a\u65f6\u95f4", "HOVT", -@@ -674,9 +677,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -- "Kaliningrad Summer Time", "KALST"}}, -- {"Europe/Kiev", EET}, -+ {"Europe/Kaliningrad", FET}, -+ {"Europe/Kiev", FET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -684,7 +686,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -697,14 +699,14 @@ - "\u6c99\u9a6c\u62c9\u590f\u4ee4\u65f6", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", FET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", EET}, -+ {"Europe/Uzhgorod", FET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -713,7 +715,7 @@ - "\u4f0f\u5c14\u52a0\u683c\u52d2\u590f\u4ee4\u65f6", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", EET}, -+ {"Europe/Zaporozhye", FET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -@@ -103,6 +103,8 @@ - "\u6771\u65b9\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "EDT"}; - String EST_NSW[] = new String[] {"\u6771\u65b9\u6a19\u6e96\u6642\u9593 (\u65b0\u5357\u5a01\u723e\u65af)", "EST", - "\u6771\u65b9\u590f\u4ee4\u6642\u9593 (\u65b0\u5357\u5a01\u723e\u65af)", "EST"}; -+ String FET[] = new String[] {"Further-eastern European Time", "FET", -+ "Further-eastern European Summer Time", "FEST"}; - String GHMT[] = new String[] {"\u8fe6\u7d0d\u5e73\u5747\u6642\u9593", "GMT", - "\u8fe6\u7d0d\u590f\u4ee4\u6642\u9593", "GHST"}; - String GAMBIER[] = new String[] {"\u7518\u6bd4\u723e\u6642\u9593", "GAMT", -@@ -511,6 +513,7 @@ - "\u5854\u5409\u514b\u590f\u4ee4\u6642\u9593", "TJST"}}, - {"Asia/Gaza", EET}, - {"Asia/Harbin", CTT}, -+ {"Asia/Hebron", EET}, - {"Asia/Ho_Chi_Minh", ICT}, - {"Asia/Hong_Kong", HKT}, - {"Asia/Hovd", new String[] {"\u4faf\u5fb7 (Hovd) \u6642\u9593", "HOVT", -@@ -675,9 +678,8 @@ - {"Europe/Isle_of_Man", GMTBST}, - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, -- {"Europe/Kaliningrad", new String[] {"Kaliningrad Time", "KALT", -- "Kaliningrad Summer Time", "KALST"}}, -- {"Europe/Kiev", EET}, -+ {"Europe/Kaliningrad", FET}, -+ {"Europe/Kiev", FET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -685,7 +687,7 @@ - {"Europe/Madrid", CET}, - {"Europe/Malta", CET}, - {"Europe/Mariehamn", EET}, -- {"Europe/Minsk", EET}, -+ {"Europe/Minsk", FET}, - {"Europe/Monaco", CET}, - {"Europe/Moscow", MSK}, - {"Europe/Nicosia", EET}, -@@ -698,14 +700,14 @@ - "\u6c99\u99ac\u62c9\u590f\u4ee4\u6642\u9593", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", EET}, -+ {"Europe/Simferopol", FET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", EET}, -+ {"Europe/Uzhgorod", FET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -714,7 +716,7 @@ - "\u4f0f\u723e\u52a0\u683c\u52d2\u590f\u4ee4\u6642\u9593", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", EET}, -+ {"Europe/Zaporozhye", FET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST},
--- a/patches/openjdk/7103405-correct_display_names.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,130 +0,0 @@ -# HG changeset patch -# User asaha -# Date 1319245792 25200 -# Node ID 48463dbf345cda1cdb7ff53e2d24f3827ae85d20 -# Parent ca52af5acd261b790aa40a904af96d4f55d780d9 -7103405: Correct display names for Pacific/Apia timezone -Reviewed-by: coffeys, peytoia - ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -@@ -188,7 +188,7 @@ - String SAMOA[] = new String[] {"Samoa Standard Time", "SST", - "Samoa Daylight Time", "SDT"}; - String WST_SAMOA[] = new String[] {"West Samoa Time", "WST", -- "West Samoa Summer Time", "WSST"}; -+ "West Samoa Daylight Time", "WSDT"}; - String ChST[] = new String[] {"Chamorro Standard Time", "ChST", - "Chamorro Daylight Time", "ChDT"}; - String VICTORIA[] = new String[] {"Eastern Standard Time (Victoria)", "EST", ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -@@ -188,7 +188,7 @@ - String SAMOA[] = new String[] {"Samoa Normalzeit", "SST", - "Samoa Sommerzeit", "SDT"}; - String WST_SAMOA[] = new String[] {"West Samoa Zeit", "WST", -- "West Samoa Sommerzeit", "WSST"}; -+ "West Samoa Sommerzeit", "WSDT"}; - String ChST[] = new String[] {"Chamorro Normalzeit", "ChST", - "Chamorro Sommerzeit", "ChDT"}; - String VICTORIA[] = new String[] {"\u00d6stliche Normalzeit (Victoria)", "EST", ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -@@ -188,7 +188,7 @@ - String SAMOA[] = new String[] {"Hora est\u00e1ndar de Samoa", "SST", - "Hora de verano de Samoa", "SDT"}; - String WST_SAMOA[] = new String[] {"Hora de Samoa Occidental", "WST", -- "Hora de verano de Samoa Occidental", "WSST"}; -+ "Hora de verano de Samoa Occidental", "WSDT"}; - String ChST[] = new String[] {"Hora est\u00e1ndar de Chamorro", "ChST", - "Hora de verano de Chamorro", "ChDT"}; - String VICTORIA[] = new String[] {"Hora est\u00e1ndar del Este (Victoria)", "EST", ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -@@ -188,7 +188,7 @@ - String SAMOA[] = new String[] {"Heure standard de Samoa", "SST", - "Heure avanc\u00e9e de Samoa", "SDT"}; - String WST_SAMOA[] = new String[] {"Heure des Samoas occidentales", "WST", -- "Heure d'\u00e9t\u00e9 des Samoas occidentales", "WSST"} ; -+ "Heure d'\u00e9t\u00e9 des Samoas occidentales", "WSDT"} ; - String ChST[] = new String[] {"Heure normale des \u00eeles Mariannes", "ChST", - "Heure d'\u00e9t\u00e9 des \u00eeles Mariannes", "ChDT"}; - String VICTORIA[] = new String[] {"Heure standard d'Australie orientale (Victoria)", "EST", ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -@@ -188,7 +188,7 @@ - String SAMOA[] = new String[] {"Ora standard di Samoa", "SST", - "Ora legale di Samoa", "SDT"}; - String WST_SAMOA[] = new String[] {"Ora di Samoa", "WST", -- "Ora estiva di Samoa", "WSST"}; -+ "Ora estiva di Samoa", "WSDT"}; - String ChST[] = new String[] {"Ora standard di Chamorro", "ChST", - "Ora legale di Chamorro", "ChDT"}; - String VICTORIA[] = new String[] {"Ora orientale standard (Victoria)", "EST", ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -@@ -188,7 +188,7 @@ - String SAMOA[] = new String[] {"\u30b5\u30e2\u30a2\u6a19\u6e96\u6642", "SST", - "\u30b5\u30e2\u30a2\u590f\u6642\u9593", "SDT"}; - String WST_SAMOA[] = new String[] {"\u897f\u30b5\u30e2\u30a2\u6642\u9593", "WST", -- "\u897f\u30b5\u30e2\u30a2\u590f\u6642\u9593", "WSST"}; -+ "\u897f\u30b5\u30e2\u30a2\u590f\u6642\u9593", "WSDT"}; - String ChST[] = new String[] {"\u30b0\u30a2\u30e0\u6a19\u6e96\u6642", "ChST", - "\u30b0\u30a2\u30e0\u590f\u6642\u9593", "ChDT"}; - String VICTORIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30d3\u30af\u30c8\u30ea\u30a2)", "EST", ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -@@ -188,7 +188,7 @@ - String SAMOA[] = new String[] {"\uc0ac\ubaa8\uc544 \ud45c\uc900\uc2dc", "SST", - "\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SDT"}; - String WST_SAMOA[] = new String[] {"\uc11c\uc0ac\ubaa8\uc544 \uc2dc\uac04", "WST", -- "\uc11c\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WSST"}; -+ "\uc11c\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WSDT"}; - String ChST[] = new String[] {"\ucc28\ubaa8\ub85c \ud45c\uc900\uc2dc", "ChST", - "\ucc28\ubaa8\ub85c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ChDT"}; - String VICTORIA[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ube45\ud1a0\ub9ac\uc544)", "EST", -diff -r ca52af5acd26 -r 48463dbf345c src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Mon Oct 17 17:11:26 2011 +0800 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Fri Oct 21 18:09:52 2011 -0700 -@@ -186,7 +186,7 @@ - String SAMOA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Samoa", "SST", - "Hor\u00e1rio de luz natural de Samoa", "SDT"}; - String WST_SAMOA[] = new String[] {"Fuso hor\u00e1rio de Samoa Ocidental", "WST", -- "Fuso hor\u00e1rio de ver\u00e3o de Samoa Ocidental", "WSST"}; -+ "Fuso hor\u00e1rio de ver\u00e3o de Samoa Ocidental", "WSDT"}; - String ChST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chamorro", "ChST", - "Hor\u00e1rio de luz natural de Chamorro", "ChDT"}; - String VICTORIA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Victoria)", "EST", ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -@@ -188,7 +188,7 @@ - String SAMOA[] = new String[] {"Samoa, normaltid", "SST", - "Samoa, sommartid", "SDT"}; - String WST_SAMOA[] = new String[] {"V\u00e4stsamoansk tid", "WST", -- "V\u00e4stsamoansk sommartid", "WSST"}; -+ "V\u00e4stsamoansk sommartid", "WSDT"}; - String ChST[] = new String[] {"Chamorro, normaltid", "ChST", - "Chamorro, sommartid", "ChDT"}; - String VICTORIA[] = new String[] {"\u00d6stlig normaltid (Victoria)", "EST", ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -@@ -188,7 +188,7 @@ - String SAMOA[] = new String[] {"\u8428\u6469\u4e9a\u7fa4\u5c9b\u6807\u51c6\u65f6\u95f4", "SST", - "\u8428\u6469\u4e9a\u7fa4\u5c9b\u590f\u4ee4\u65f6", "SDT"}; - String WST_SAMOA[] = new String[] {"\u897f\u8428\u6469\u4e9a\u65f6\u95f4", "WST", -- "\u897f\u8428\u6469\u4e9a\u590f\u4ee4\u65f6", "WSST"}; -+ "\u897f\u8428\u6469\u4e9a\u590f\u4ee4\u65f6", "WSDT"}; - String ChST[] = new String[] {"Chamorro \u6807\u51c6\u65f6\u95f4", "ChST", - "Chamorro \u590f\u4ee4\u65f6", "ChDT"}; - String VICTORIA[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u7ef4\u591a\u5229\u4e9a\uff09", "EST", ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -@@ -188,7 +188,7 @@ - String SAMOA[] = new String[] {"\u85a9\u6469\u4e9e\u6a19\u6e96\u6642\u9593", "SST", - "\u85a9\u6469\u4e9e\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "SDT"}; - String WST_SAMOA[] = new String[] {"\u897f\u85a9\u6469\u4e9e\u6642\u9593", "WST", -- "\u897f\u85a9\u6469\u4e9e\u590f\u4ee4\u6642\u9593", "WSST"}; -+ "\u897f\u85a9\u6469\u4e9e\u590f\u4ee4\u6642\u9593", "WSDT"}; - String ChST[] = new String[] {"\u67e5\u83ab\u6d1b\u6a19\u6e96\u6642\u9593", "ChST", - "\u67e5\u83ab\u6d1b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ChDT"}; - String VICTORIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642\u9593 (\u7dad\u591a\u5229\u4e9e\u90a6)", "EST",
--- a/patches/openjdk/7104126-headers_tzdata.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,530 +0,0 @@ -# HG changeset patch -# User asaha -# Date 1319476295 25200 -# Node ID b5090771e19b2b20670bef60a84de95797cb01be -# Parent 48463dbf345cda1cdb7ff53e2d24f3827ae85d20 -7104126: Insert openjdk copyright header back into TZdata files -Reviewed-by: okutsu - ---- openjdk/jdk/make/sun/javazic/tzdata/africa -+++ openjdk/jdk/make/sun/javazic/tzdata/africa -@@ -1,3 +1,26 @@ -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# - # <pre> - # @(#)africa 8.33 - # This file is in the public domain, so clarified as of ---- openjdk/jdk/make/sun/javazic/tzdata/antarctica -+++ openjdk/jdk/make/sun/javazic/tzdata/antarctica -@@ -1,3 +1,26 @@ -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# - # <pre> - # @(#)antarctica 8.9 - # This file is in the public domain, so clarified as of ---- openjdk/jdk/make/sun/javazic/tzdata/asia -+++ openjdk/jdk/make/sun/javazic/tzdata/asia -@@ -1,3 +1,26 @@ -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# - # @(#)asia 8.68 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. ---- openjdk/jdk/make/sun/javazic/tzdata/australasia -+++ openjdk/jdk/make/sun/javazic/tzdata/australasia -@@ -1,3 +1,26 @@ -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# - # <pre> - # @(#)australasia 8.27 - # This file is in the public domain, so clarified as of ---- openjdk/jdk/make/sun/javazic/tzdata/backward -+++ openjdk/jdk/make/sun/javazic/tzdata/backward -@@ -1,3 +1,26 @@ -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# - # <pre> - # @(#)backward 8.9 - # This file is in the public domain, so clarified as of ---- openjdk/jdk/make/sun/javazic/tzdata/etcetera -+++ openjdk/jdk/make/sun/javazic/tzdata/etcetera -@@ -1,3 +1,26 @@ -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# - # <pre> - # @(#)etcetera 8.3 - # This file is in the public domain, so clarified as of ---- openjdk/jdk/make/sun/javazic/tzdata/europe -+++ openjdk/jdk/make/sun/javazic/tzdata/europe -@@ -1,3 +1,26 @@ -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# - # <pre> - # @(#)europe 8.38 - # This file is in the public domain, so clarified as of ---- openjdk/jdk/make/sun/javazic/tzdata/factory -+++ openjdk/jdk/make/sun/javazic/tzdata/factory -@@ -1,3 +1,26 @@ -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# - # <pre> - # @(#)factory 8.2 - # This file is in the public domain, so clarified as of ---- openjdk/jdk/make/sun/javazic/tzdata/iso3166.tab -+++ openjdk/jdk/make/sun/javazic/tzdata/iso3166.tab -@@ -1,3 +1,26 @@ -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# - # <pre> - # @(#)iso3166.tab 8.11 - # This file is in the public domain, so clarified as of ---- openjdk/jdk/make/sun/javazic/tzdata/leapseconds -+++ openjdk/jdk/make/sun/javazic/tzdata/leapseconds -@@ -1,3 +1,26 @@ -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# - # <pre> - # @(#)leapseconds 8.11 - # This file is in the public domain, so clarified as of ---- openjdk/jdk/make/sun/javazic/tzdata/northamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/northamerica -@@ -1,3 +1,26 @@ -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# - # <pre> - # @(#)northamerica 8.49 - # This file is in the public domain, so clarified as of ---- openjdk/jdk/make/sun/javazic/tzdata/pacificnew -+++ openjdk/jdk/make/sun/javazic/tzdata/pacificnew -@@ -1,3 +1,26 @@ -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# - # <pre> - # @(#)pacificnew 8.2 - # This file is in the public domain, so clarified as of ---- openjdk/jdk/make/sun/javazic/tzdata/solar87 -+++ openjdk/jdk/make/sun/javazic/tzdata/solar87 -@@ -1,3 +1,26 @@ -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# - # <pre> - # @(#)solar87 8.2 - # This file is in the public domain, so clarified as of ---- openjdk/jdk/make/sun/javazic/tzdata/solar88 -+++ openjdk/jdk/make/sun/javazic/tzdata/solar88 -@@ -1,3 +1,26 @@ -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# - # <pre> - # @(#)solar88 8.2 - # This file is in the public domain, so clarified as of ---- openjdk/jdk/make/sun/javazic/tzdata/solar89 -+++ openjdk/jdk/make/sun/javazic/tzdata/solar89 -@@ -1,3 +1,26 @@ -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# - # <pre> - # @(#)solar89 8.2 - # This file is in the public domain, so clarified as of ---- openjdk/jdk/make/sun/javazic/tzdata/southamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/southamerica -@@ -1,3 +1,26 @@ -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# - # <pre> - # @(#)southamerica 8.50 - # This file is in the public domain, so clarified as of ---- openjdk/jdk/make/sun/javazic/tzdata/systemv -+++ openjdk/jdk/make/sun/javazic/tzdata/systemv -@@ -1,3 +1,26 @@ -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# - # <pre> - # @(#)systemv 8.2 - # This file is in the public domain, so clarified as of ---- openjdk/jdk/make/sun/javazic/tzdata/zone.tab -+++ openjdk/jdk/make/sun/javazic/tzdata/zone.tab -@@ -1,3 +1,26 @@ -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# This code is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License version 2 only, as -+# published by the Free Software Foundation. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# This code is distributed in the hope that it will be useful, but WITHOUT -+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# version 2 for more details (a copy is included in the LICENSE file that -+# accompanied this code). -+# -+# You should have received a copy of the GNU General Public License version -+# 2 along with this work; if not, write to the Free Software Foundation, -+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+# -+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -+# or visit www.oracle.com if you need additional information or have any -+# questions. -+# - # <pre> - # @(#)zone.tab 8.49 - # This file is in the public domain, so clarified as of
--- a/patches/openjdk/7158483-tzdata2012c.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1482 +0,0 @@ -# HG changeset patch -# User peytoia -# Date 1333444888 -32400 -# Node ID 5683b3f7f8cc58746a2983ee6294b62ccdfa159c -# Parent e15562835a5e91f0bca6a088e58970c3c1c3dc3f -7158483: (tz) Support tzdata2012c -Reviewed-by: okutsu - ---- openjdk/jdk/make/sun/javazic/tzdata/VERSION -+++ openjdk/jdk/make/sun/javazic/tzdata/VERSION -@@ -21,4 +21,4 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --tzdata2011l -+tzdata2012c ---- openjdk/jdk/make/sun/javazic/tzdata/africa -+++ openjdk/jdk/make/sun/javazic/tzdata/africa -@@ -22,7 +22,7 @@ - # questions. - # - # <pre> --# @(#)africa 8.33 -+# @(#)africa 8.35 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -791,6 +791,37 @@ - # wall clock time (i.e. 11pm UTC), but that's what I would assume. It has - # also been like that in the past. - -+# From Alexander Krivenyshev (2012-03-09): -+# According to Infomédiaire web site from Morocco (infomediaire.ma), -+# on March 9, 2012, (in French) Heure légale: -+# Le Maroc adopte officiellement l'heure d'été -+# <a href="http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9"> -+# http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9 -+# </a> -+# Governing Council adopted draft decree, that Morocco DST starts on -+# the last Sunday of March (March 25, 2012) and ends on -+# last Sunday of September (September 30, 2012) -+# except the month of Ramadan. -+# or (brief) -+# <a href="http://www.worldtimezone.com/dst_news/dst_news_morocco06.html"> -+# http://www.worldtimezone.com/dst_news/dst_news_morocco06.html -+# </a> -+ -+# From Arthur David Olson (2012-03-10): -+# The infomediaire.ma source indicates that the system is to be in -+# effect every year. It gives 03H00 as the "fall back" time of day; -+# it lacks a "spring forward" time of day; assume 2:00 XXX. -+# Wait on specifying the Ramadan exception for details about -+# start date, start time of day, end date, and end time of day XXX. -+ -+# From Christophe Tropamer (2012-03-16): -+# Seen Morocco change again: -+# <a href="http://www.le2uminutes.com/actualite.php"> -+# http://www.le2uminutes.com/actualite.php -+# </a> -+# "...à partir du dernier dimance d'avril et non fins mars, -+# comme annoncé précédemment." -+ - # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S - - Rule Morocco 1939 only - Sep 12 0:00 1:00 S -@@ -816,6 +847,9 @@ - Rule Morocco 2010 only - Aug 8 0:00 0 - - Rule Morocco 2011 only - Apr 3 0:00 1:00 S - Rule Morocco 2011 only - Jul 31 0 0 - -+Rule Morocco 2012 max - Apr lastSun 2:00 1:00 S -+Rule Morocco 2012 max - Sep lastSun 3:00 0 - -+ - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 - 0:00 Morocco WE%sT 1984 Mar 16 ---- openjdk/jdk/make/sun/javazic/tzdata/antarctica -+++ openjdk/jdk/make/sun/javazic/tzdata/antarctica -@@ -22,7 +22,7 @@ - # questions. - # - # <pre> --# @(#)antarctica 8.9 -+# @(#)antarctica 8.10 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -65,8 +65,19 @@ - Rule ChileAQ 1998 only - Mar Sun>=9 3:00u 0 - - Rule ChileAQ 1998 only - Sep 27 4:00u 1:00 S - Rule ChileAQ 1999 only - Apr 4 3:00u 0 - --Rule ChileAQ 1999 max - Oct Sun>=9 4:00u 1:00 S --Rule ChileAQ 2000 max - Mar Sun>=9 3:00u 0 - -+Rule ChileAQ 1999 2010 - Oct Sun>=9 4:00u 1:00 S -+Rule ChileAQ 2000 2007 - Mar Sun>=9 3:00u 0 - -+# N.B.: the end of March 29 in Chile is March 30 in Universal time, -+# which is used below in specifying the transition. -+Rule ChileAQ 2008 only - Mar 30 3:00u 0 - -+Rule ChileAQ 2009 only - Mar Sun>=9 3:00u 0 - -+Rule ChileAQ 2010 only - Apr Sun>=1 3:00u 0 - -+Rule ChileAQ 2011 only - May Sun>=2 3:00u 0 - -+Rule ChileAQ 2011 only - Aug Sun>=16 4:00u 1:00 S -+Rule ChileAQ 2012 only - Apr Sun>=23 3:00u 0 - -+Rule ChileAQ 2012 only - Sep Sun>=2 4:00u 1:00 S -+Rule ChileAQ 2013 max - Mar Sun>=9 3:00u 0 - -+Rule ChileAQ 2013 max - Oct Sun>=9 4:00u 1:00 S - - # These rules are stolen from the `australasia' file. - Rule AusAQ 1917 only - Jan 1 0:01 1:00 - -@@ -165,12 +176,16 @@ - # Western (Aus) Standard Time - 11:00 - CAST 2010 Mar 5 2:00 - # Casey Time -+ 8:00 - WST 2011 Oct 28 2:00 -+ 11:00 - CAST 2012 Feb 21 17:00u - 8:00 - WST - Zone Antarctica/Davis 0 - zzz 1957 Jan 13 - 7:00 - DAVT 1964 Nov # Davis Time - 0 - zzz 1969 Feb - 7:00 - DAVT 2009 Oct 18 2:00 - 5:00 - DAVT 2010 Mar 10 20:00u -+ 7:00 - DAVT 2011 Oct 28 2:00 -+ 5:00 - DAVT 2012 Feb 21 20:00u - 7:00 - DAVT - Zone Antarctica/Mawson 0 - zzz 1954 Feb 13 - 6:00 - MAWT 2009 Oct 18 2:00 ---- openjdk/jdk/make/sun/javazic/tzdata/asia -+++ openjdk/jdk/make/sun/javazic/tzdata/asia -@@ -21,7 +21,8 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --# @(#)asia 8.68 -+# <pre> -+# @(#)asia 8.73 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -100,10 +101,6 @@ - Rule RussiaAsia 1993 1995 - Sep lastSun 2:00s 0 - - Rule RussiaAsia 1996 max - Oct lastSun 2:00s 0 - - --# From Arthur David Olson (2011-06-15): --# While Russia abandoned DST in 2011, Armenia may choose to --# follow Russia's "old" rules. -- - # Afghanistan - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Asia/Kabul 4:36:48 - LMT 1890 -@@ -120,6 +117,21 @@ - # in 1996, though it did use DST in 1995. IATA SSIM (1991/1998) reports that - # Armenia switched from 3:00 to 4:00 in 1998 and observed DST after 1991, - # but started switching at 3:00s in 1998. -+ -+# From Arthur David Olson (2011-06-15): -+# While Russia abandoned DST in 2011, Armenia may choose to -+# follow Russia's "old" rules. -+ -+# From Alexander Krivenyshev (2012-02-10): -+# According to News Armenia, on Feb 9, 2012, -+# http://newsarmenia.ru/society/20120209/42609695.html -+# -+# The Armenia National Assembly adopted final reading of Amendments to the -+# Law "On procedure of calculation time on the territory of the Republic of -+# Armenia" according to which Armenia [is] abolishing Daylight Saving Time. -+# or -+# (brief) -+# http://www.worldtimezone.com/dst_news/dst_news_armenia03.html - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Asia/Yerevan 2:58:00 - LMT 1924 May 2 - 3:00 - YERT 1957 Mar # Yerevan Time -@@ -127,7 +139,8 @@ - 3:00 1:00 YERST 1991 Sep 23 # independence - 3:00 RussiaAsia AM%sT 1995 Sep 24 2:00s - 4:00 - AMT 1997 -- 4:00 RussiaAsia AM%sT -+ 4:00 RussiaAsia AM%sT 2012 Mar 25 2:00s -+ 4:00 - AMT - - # Azerbaijan - # From Rustam Aliyev of the Azerbaijan Internet Forum (2005-10-23): -@@ -2258,6 +2271,29 @@ - # http://www.maannews.net/eng/ViewDetails.aspx?ID=424808 - # </a> - -+# From Steffen Thorsen (2012-03-26): -+# Palestinian news sources tell that both Gaza and West Bank will start DST -+# on Friday (Thursday midnight, 2012-03-29 24:00). -+# Some of many sources in Arabic: -+# <a href="http://www.samanews.com/index.php?act=Show&id=122638"> -+# http://www.samanews.com/index.php?act=Show&id=122638 -+# </a> -+# -+# <a href="http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html"> -+# http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html -+# </a> -+# -+# Our brief summary: -+# <a href="http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html"> -+# http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html -+# </a> -+ -+# From Arthur David Olson (2012-03-27): -+# The timeanddate article for 2012 says that "the end date has not yet been -+# announced" and that "Last year, both...paused daylight saving time during... -+# Ramadan. It is not yet known [for] 2012." -+# For now, assume both switch back on the last Friday in September. XXX -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule EgyptAsia 1957 only - May 10 0:00 1:00 S - Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 - -@@ -2290,6 +2326,8 @@ - 2:00 Jordan EE%sT 1999 - 2:00 Palestine EE%sT 2011 Apr 2 12:01 - 2:00 1:00 EEST 2011 Aug 1 -+ 2:00 - EET 2012 Mar 30 -+ 2:00 1:00 EEST 2012 Sep 28 - 2:00 - EET - - Zone Asia/Hebron 2:20:23 - LMT 1900 Oct -@@ -2303,6 +2341,8 @@ - 2:00 1:00 EEST 2011 Aug 1 - 2:00 - EET 2011 Aug 30 - 2:00 1:00 EEST 2011 Sep 30 3:00 -+ 2:00 - EET 2012 Mar 30 -+ 2:00 1:00 EEST 2012 Sep 28 3:00 - 2:00 - EET - - # Paracel Is -@@ -2594,10 +2634,28 @@ - # http://sns.sy/sns/?path=news/read/11421 (Arabic) - # </a> - -+# From Steffen Thorsen (2012-03-26): -+# Today, Syria's government announced that they will start DST early on Friday -+# (00:00). This is a bit earlier than the past two years. -+# -+# From Syrian Arab News Agency, in Arabic: -+# <a href="http://www.sana.sy/ara/2/2012/03/26/408215.htm"> -+# http://www.sana.sy/ara/2/2012/03/26/408215.htm -+# </a> -+# -+# Our brief summary: -+# <a href="http://www.timeanddate.com/news/time/syria-dst-2012.html"> -+# http://www.timeanddate.com/news/time/syria-dst-2012.html -+# </a> -+ -+# From Arthur David Olson (2012-03-27): -+# Assume last Friday in March going forward XXX. -+ - Rule Syria 2008 only - Apr Fri>=1 0:00 1:00 S - Rule Syria 2008 only - Nov 1 0:00 0 - - Rule Syria 2009 only - Mar lastFri 0:00 1:00 S --Rule Syria 2010 max - Apr Fri>=1 0:00 1:00 S -+Rule Syria 2010 2011 - Apr Fri>=1 0:00 1:00 S -+Rule Syria 2012 max - Mar lastFri 0:00 1:00 S - Rule Syria 2009 max - Oct lastFri 0:00 0 - - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] ---- openjdk/jdk/make/sun/javazic/tzdata/australasia -+++ openjdk/jdk/make/sun/javazic/tzdata/australasia -@@ -22,7 +22,7 @@ - # questions. - # - # <pre> --# @(#)australasia 8.27 -+# @(#)australasia 8.30 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -331,6 +331,20 @@ - # advance at 2am to 3am on October 23, 2011 and one hour back at 3am to - # 2am on February 26 next year. - -+# From Ken Rylander (2011-10-24) -+# Another change to the Fiji DST end date. In the TZ database the end date for -+# Fiji DST 2012, is currently Feb 26. This has been changed to Jan 22. -+# -+# <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=5017:amendments-to-daylight-savings&catid=71:press-releases&Itemid=155"> -+# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=5017:amendments-to-daylight-savings&catid=71:press-releases&Itemid=155 -+# </a> -+# states: -+# -+# The end of daylight saving scheduled initially for the 26th of February 2012 -+# has been brought forward to the 22nd of January 2012. -+# The commencement of daylight saving will remain unchanged and start -+# on the 23rd of October, 2011. -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S - Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - -@@ -339,7 +353,7 @@ - Rule Fiji 2010 only - Oct 24 2:00 1:00 S - Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - - Rule Fiji 2011 only - Oct 23 2:00 1:00 S --Rule Fiji 2012 only - Feb 26 3:00 0 - -+Rule Fiji 2012 only - Jan 22 3:00 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Pacific/Fiji 11:53:40 - LMT 1915 Oct 26 # Suva - 12:00 Fiji FJ%sT # Fiji Time -@@ -625,6 +639,11 @@ - # Dateline Change skip Friday 30th Dec 2011 - # Thursday 29th December 2011 23:59:59 Hours - # Saturday 31st December 2011 00:00:00 Hours -+# -+# Clarification by Tim Parenti (2012-01-03): -+# Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012 -+# seasons, there is not yet any indication that this trend will continue on -+# a regular basis. For now, we have explicitly listed the transitions below. - Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 - -11:26:56 - LMT 1911 - -11:30 - SAMT 1950 # Samoa Time -@@ -642,9 +661,28 @@ - 11:00 - SBT # Solomon Is Time - - # Tokelau Is -+# -+# From Gwillim Law (2011-12-29) -+# A correspondent informed me that Tokelau, like Samoa, will be skipping -+# December 31 this year, thereby changing its time zone from UTC-10 to -+# UTC+14. When I tried to verify this statement, I found a confirming -+# article in Time magazine online -+# <a href="http://www.time.com/time/world/article/0,8599,2103243,00.html"> -+# (http://www.time.com/time/world/article/0,8599,2103243,00.html). -+# </a> -+# -+# From Jonathan Leffler (2011-12-29) -+# Information from the BBC to the same effect: -+# <a href="http://www.bbc.co.uk/news/world-asia-16351377"> -+# http://www.bbc.co.uk/news/world-asia-16351377 -+# </a> -+# -+# Patch supplied by Tim Parenti (2011-12-29) -+ - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Pacific/Fakaofo -11:24:56 - LMT 1901 -- -10:00 - TKT # Tokelau Time -+ -10:00 - TKT 2011 Dec 30 # Tokelau Time -+ 14:00 - TKT - - # Tonga - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S ---- openjdk/jdk/make/sun/javazic/tzdata/backward -+++ openjdk/jdk/make/sun/javazic/tzdata/backward -@@ -22,7 +22,7 @@ - # questions. - # - # <pre> --# @(#)backward 8.9 -+# @(#)backward 8.11 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/europe -+++ openjdk/jdk/make/sun/javazic/tzdata/europe -@@ -22,7 +22,7 @@ - # questions. - # - # <pre> --# @(#)europe 8.38 -+# @(#)europe 8.41 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -234,9 +234,15 @@ - # the history of summer time legislation in the United Kingdom. - # Since 1998 Joseph S. Myers has been updating - # and extending this list, which can be found in --# <a href="http://student.cusu.cam.ac.uk/~jsm28/british-time/"> -+# http://student.cusu.cam.ac.uk/~jsm28/british-time/ -+# <a href="http://www.polyomino.org.uk/british-time/"> - # History of legal time in Britain - # </a> -+# Rob Crowther (2012-01-04) reports that that URL no longer -+# exists, and the article can now be found at: -+# <a href="http://www.polyomino.org.uk/british-time/"> -+# http://www.polyomino.org.uk/british-time/ -+# </a> - - # From Joseph S. Myers (1998-01-06): - # -@@ -1174,10 +1180,10 @@ - # write that they were used in Monaco and in many French locations. - # Le Corre writes that the upper limit of the free zone was Arneguy, Orthez, - # Mont-de-Marsan, Bazas, Langon, Lamotte-Montravel, Marouil, La --# Rochefoucault, Champagne-Mouton, La Roche-Posay, La Haye-Decartes, -+# Rochefoucault, Champagne-Mouton, La Roche-Posay, La Haye-Descartes, - # Loches, Montrichard, Vierzon, Bourges, Moulins, Digoin, - # Paray-le-Monial, Montceau-les-Mines, Chalons-sur-Saone, Arbois, --# Dole, Morez, St-Claude, and Collognes (Haute-Savioe). -+# Dole, Morez, St-Claude, and Collonges (Haute-Savoie). - Rule France 1941 only - May 5 0:00 2:00 M # Midsummer - # Shanks & Pottenger say this transition occurred at Oct 6 1:00, - # but go with Denis Excoffier (1997-12-12), -@@ -1678,6 +1684,41 @@ - # But [two people] separately reported via - # Jesper Norgaard that as of 2001-01-24 Tiraspol was like Chisinau. - # The Tiraspol entry has therefore been removed for now. -+# -+# From Alexander Krivenyshev (2011-10-17): -+# Pridnestrovian Moldavian Republic (PMR, also known as -+# "Pridnestrovie") has abolished seasonal clock change (no transition -+# to the Winter Time). -+# -+# News (in Russian): -+# <a href="http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html"> -+# http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html -+# </a> -+# -+# <a href="http://www.allmoldova.com/moldova-news/1249064116.html"> -+# http://www.allmoldova.com/moldova-news/1249064116.html -+# </a> -+# -+# The substance of this change (reinstatement of the Tiraspol entry) -+# is from a patch from Petr Machata (2011-10-17) -+# -+# From Tim Parenti (2011-10-19) -+# In addition, being situated at +4651+2938 would give Tiraspol -+# a pre-1880 LMT offset of 1:58:32. -+# -+# (which agrees with the earlier entry that had been removed) -+# -+# From Alexander Krivenyshev (2011-10-26) -+# NO need to divide Moldova into two timezones at this point. -+# As of today, Transnistria (Pridnestrovie)- Tiraspol reversed its own -+# decision to abolish DST this winter. -+# Following Moldova and neighboring Ukraine- Transnistria (Pridnestrovie)- -+# Tiraspol will go back to winter time on October 30, 2011. -+# News from Moldova (in russian): -+# <a href="http://ru.publika.md/link_317061.html"> -+# http://ru.publika.md/link_317061.html -+# </a> -+ - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Europe/Chisinau 1:55:20 - LMT 1880 -@@ -2674,6 +2715,28 @@ - # <a href="http://www.pravda.com.ua/rus/news/2011/09/20/6600616/"> - # http://www.pravda.com.ua/rus/news/2011/09/20/6600616/ - # </a> -+# -+# From Philip Pizzey (2011-10-18): -+# Today my Ukrainian colleagues have informed me that the -+# Ukrainian parliament have decided that they will go to winter -+# time this year after all. -+# -+# From Udo Schwedt (2011-10-18): -+# As far as I understand, the recent change to the Ukranian time zone -+# (Europe/Kiev) to introduce permanent daylight saving time (similar -+# to Russia) was reverted today: -+# -+# <a href="http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995"> -+# http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995 -+# </a> -+# -+# Also reported by Alexander Bokovoy (2011-10-18) who also noted: -+# The law documents themselves are at -+# -+# <a href="http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484"> -+# http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484 -+# </a> -+ - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - # Most of Ukraine since 1970 has been like Kiev. -@@ -2688,8 +2751,7 @@ - 3:00 - MSK 1990 Jul 1 2:00 - 2:00 - EET 1992 - 2:00 E-Eur EE%sT 1995 -- 2:00 EU EE%sT 2011 Mar lastSun 1:00u -- 3:00 - FET # Further-eastern European Time -+ 2:00 EU EE%sT - # Ruthenia used CET 1990/1991. - # "Uzhhorod" is the transliteration of the Ukrainian name, but - # "Uzhgorod" is more common in English. -@@ -2703,8 +2765,7 @@ - 1:00 - CET 1991 Mar 31 3:00 - 2:00 - EET 1992 - 2:00 E-Eur EE%sT 1995 -- 2:00 EU EE%sT 2011 Mar lastSun 1:00u -- 3:00 - FET # Further-eastern European Time -+ 2:00 EU EE%sT - # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991. - # "Zaporizhia" is the transliteration of the Ukrainian name, but - # "Zaporozh'ye" is more common in English. Use the common English -@@ -2717,8 +2778,7 @@ - 1:00 C-Eur CE%sT 1943 Oct 25 - 3:00 Russia MSK/MSD 1991 Mar 31 2:00 - 2:00 E-Eur EE%sT 1995 -- 2:00 EU EE%sT 2011 Mar lastSun 1:00u -- 3:00 - FET # Further-eastern European Time -+ 2:00 EU EE%sT - # Central Crimea used Moscow time 1994/1997. - Zone Europe/Simferopol 2:16:24 - LMT 1880 - 2:16 - SMT 1924 May 2 # Simferopol Mean T -@@ -2743,8 +2803,7 @@ - # Assume it happened in March by not changing the clocks. - 3:00 Russia MSK/MSD 1997 - 3:00 - MSK 1997 Mar lastSun 1:00u -- 2:00 EU EE%sT 2011 Mar lastSun 1:00u -- 3:00 - FET # Further-eastern European Time -+ 2:00 EU EE%sT - - ############################################################################### - ---- openjdk/jdk/make/sun/javazic/tzdata/leapseconds -+++ openjdk/jdk/make/sun/javazic/tzdata/leapseconds -@@ -22,7 +22,7 @@ - # questions. - # - # <pre> --# @(#)leapseconds 8.11 -+# @(#)leapseconds 8.13 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -71,40 +71,54 @@ - Leap 1998 Dec 31 23:59:60 + S - Leap 2005 Dec 31 23:59:60 + S - Leap 2008 Dec 31 23:59:60 + S -+Leap 2012 Jun 30 23:59:60 + S - - # INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS) - # - # SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE - # -+# - # SERVICE DE LA ROTATION TERRESTRE - # OBSERVATOIRE DE PARIS - # 61, Av. de l'Observatoire 75014 PARIS (France) --# Tel. : 33 (0) 1 40 51 22 29 -+# Tel. : 33 (0) 1 40 51 22 26 - # FAX : 33 (0) 1 40 51 22 91 --# Internet : services.iers@obspm.fr -+# e-mail : (E-Mail Removed) -+# http://hpiers.obspm.fr/eop-pc - # --# Paris, 2 February 2011 -+# Paris, 5 January 2012 - # --# Bulletin C 41 -+# -+# Bulletin C 43 - # - # To authorities responsible - # for the measurement and - # distribution of time - # --# INFORMATION ON UTC - TAI - # --# NO positive leap second will be introduced at the end of June 2011. --# The difference between Coordinated Universal Time UTC and the --# International Atomic Time TAI is : -+# UTC TIME STEP -+# on the 1st of July 2012 - # --# from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s -+# -+# A positive leap second will be introduced at the end of June 2012. -+# The sequence of dates of the UTC second markers will be: -+# -+# 2012 June 30, 23h 59m 59s -+# 2012 June 30, 23h 59m 60s -+# 2012 July 1, 0h 0m 0s -+# -+# The difference between UTC and the International Atomic Time TAI is: -+# -+# from 2009 January 1, 0h UTC, to 2012 July 1 0h UTC : UTC-TAI = - 34s -+# from 2012 July 1, 0h UTC, until further notice : UTC-TAI = - 35s - # - # Leap seconds can be introduced in UTC at the end of the months of December --# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every --# six months, either to announce a time step in UTC, or to confirm that there -+# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every -+# six months, either to announce a time step in UTC or to confirm that there - # will be no time step at the next possible date. - # -+# - # Daniel GAMBIS --# Head --# Earth Orientation Center of the IERS -+# Head -+# Earth Orientation Center of IERS - # Observatoire de Paris, France ---- openjdk/jdk/make/sun/javazic/tzdata/northamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/northamerica -@@ -22,7 +22,7 @@ - # questions. - # - # <pre> --# @(#)northamerica 8.49 -+# @(#)northamerica 8.54 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -1143,9 +1143,26 @@ - # For now, assume all of DST-observing Canada will fall into line with the - # new US DST rules, - -+# From Chris Walton (2011-12-01) -+# In the first of Tammy Hardwick's articles -+# <a href="http://www.ilovecreston.com/?p=articles&t=spec&ar=260"> -+# http://www.ilovecreston.com/?p=articles&t=spec&ar=260 -+# </a> -+# she quotes the Friday November 1/1918 edition of the Creston Review. -+# The quote includes these two statements: -+# 'Sunday the CPR went back to the old system of time...' -+# '... The daylight saving scheme was dropped all over Canada at the same time,' -+# These statements refer to a transition from daylight time to standard time -+# that occurred nationally on Sunday October 27/1918. This transition was -+# also documented in the Saturday October 26/1918 edition of the Toronto Star. -+ -+# In light of that evidence, we alter the date from the earlier believed -+# Oct 31, to Oct 27, 1918 (and Sunday is a more likely transition day -+# than Thursday) in all Canadian rulesets. -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Canada 1918 only - Apr 14 2:00 1:00 D --Rule Canada 1918 only - Oct 31 2:00 0 S -+Rule Canada 1918 only - Oct 27 2:00 0 S - Rule Canada 1942 only - Feb 9 2:00 1:00 W # War - Rule Canada 1945 only - Aug 14 23:00u 1:00 P # Peace - Rule Canada 1945 only - Sep 30 2:00 0 S -@@ -1668,7 +1685,7 @@ - Rule Winn 1916 only - Apr 23 0:00 1:00 D - Rule Winn 1916 only - Sep 17 0:00 0 S - Rule Winn 1918 only - Apr 14 2:00 1:00 D --Rule Winn 1918 only - Oct 31 2:00 0 S -+Rule Winn 1918 only - Oct 27 2:00 0 S - Rule Winn 1937 only - May 16 2:00 1:00 D - Rule Winn 1937 only - Sep 26 2:00 0 S - Rule Winn 1942 only - Feb 9 2:00 1:00 W # War -@@ -1751,7 +1768,7 @@ - - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Regina 1918 only - Apr 14 2:00 1:00 D --Rule Regina 1918 only - Oct 31 2:00 0 S -+Rule Regina 1918 only - Oct 27 2:00 0 S - Rule Regina 1930 1934 - May Sun>=1 0:00 1:00 D - Rule Regina 1930 1934 - Oct Sun>=1 0:00 0 S - Rule Regina 1937 1941 - Apr Sun>=8 0:00 1:00 D -@@ -1788,7 +1805,7 @@ - - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Edm 1918 1919 - Apr Sun>=8 2:00 1:00 D --Rule Edm 1918 only - Oct 31 2:00 0 S -+Rule Edm 1918 only - Oct 27 2:00 0 S - Rule Edm 1919 only - May 27 2:00 0 S - Rule Edm 1920 1923 - Apr lastSun 2:00 1:00 D - Rule Edm 1920 only - Oct lastSun 2:00 0 S -@@ -1818,9 +1835,68 @@ - # Dawson Creek uses MST. Much of east BC is like Edmonton. - # Matthews and Vincent (1998) write that Creston is like Dawson Creek. - -+# It seems though that (re: Creston) is not entirely correct: -+ -+# From Chris Walton (2011-12-01): -+# There are two areas within the Canadian province of British Columbia -+# that do not currently observe daylight saving: -+# a) The Creston Valley (includes the town of Creston and surrounding area) -+# b) The eastern half of the Peace River Regional District -+# (includes the cities of Dawson Creek and Fort St. John) -+ -+# Earlier this year I stumbled across a detailed article about the time -+# keeping history of Creston; it was written by Tammy Hardwick who is the -+# manager of the Creston & District Museum. The article was written in May 2009. -+# <a href="http://www.ilovecreston.com/?p=articles&t=spec&ar=260"> -+# http://www.ilovecreston.com/?p=articles&t=spec&ar=260 -+# </a> -+# According to the article, Creston has not changed its clocks since June 1918. -+# i.e. Creston has been stuck on UTC-7 for 93 years. -+# Dawson Creek, on the other hand, changed its clocks as recently as April 1972. -+ -+# Unfortunately the exact date for the time change in June 1918 remains -+# unknown and will be difficult to ascertain. I e-mailed Tammy a few months -+# ago to ask if Sunday June 2 was a reasonable guess. She said it was just -+# as plausible as any other date (in June). She also said that after writing the -+# article she had discovered another time change in 1916; this is the subject -+# of another article which she wrote in October 2010. -+# <a href="http://www.creston.museum.bc.ca/index.php?module=comments&uop=view_comment&cm+id=56"> -+# http://www.creston.museum.bc.ca/index.php?module=comments&uop=view_comment&cm+id=56 -+# </a> -+ -+# Here is a summary of the three clock change events in Creston's history: -+# 1. 1884 or 1885: adoption of Mountain Standard Time (GMT-7) -+# Exact date unknown -+# 2. Oct 1916: switch to Pacific Standard Time (GMT-8) -+# Exact date in October unknown; Sunday October 1 is a reasonable guess. -+# 3. June 1918: switch to Pacific Daylight Time (GMT-7) -+# Exact date in June unknown; Sunday June 2 is a reasonable guess. -+# note#1: -+# On Oct 27/1918 when daylight saving ended in the rest of Canada, -+# Creston did not change its clocks. -+# note#2: -+# During WWII when the Federal Government legislated a mandatory clock change, -+# Creston did not oblige. -+# note#3: -+# There is no guarantee that Creston will remain on Mountain Standard Time -+# (UTC-7) forever. -+# The subject was debated at least once this year by the town Council. -+# <a href="http://www.bclocalnews.com/kootenay_rockies/crestonvalleyadvance/news/116760809.html"> -+# http://www.bclocalnews.com/kootenay_rockies/crestonvalleyadvance/news/116760809.html -+# </a> -+ -+# During a period WWII, summer time (Daylight saying) was mandatory in Canada. -+# In Creston, that was handled by shifting the area to PST (-8:00) then applying -+# summer time to cause the offset to be -7:00, the same as it had been before -+# the change. It can be argued that the timezone abbreviation during this -+# period should be PDT rather than MST, but that doesn't seem important enough -+# (to anyone) to further complicate the rules. -+ -+# The transition dates (and times) are guesses. -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Vanc 1918 only - Apr 14 2:00 1:00 D --Rule Vanc 1918 only - Oct 31 2:00 0 S -+Rule Vanc 1918 only - Oct 27 2:00 0 S - Rule Vanc 1942 only - Feb 9 2:00 1:00 W # War - Rule Vanc 1945 only - Aug 14 23:00u 1:00 P # Peace - Rule Vanc 1945 only - Sep 30 2:00 0 S -@@ -1836,7 +1912,10 @@ - -8:00 Canada P%sT 1947 - -8:00 Vanc P%sT 1972 Aug 30 2:00 - -7:00 - MST -- -+Zone America/Creston -7:46:04 - LMT 1884 -+ -7:00 - MST 1916 Oct 1 -+ -8:00 - PST 1918 Jun 2 -+ -7:00 - MST - - # Northwest Territories, Nunavut, Yukon - -@@ -2713,6 +2792,34 @@ - # <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html"> - # http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html - # </a> -+# -+# From Steffen Thorsen (2011-10-30) -+# Cuba will end DST two weeks later this year. Instead of going back -+# tonight, it has been delayed to 2011-11-13 at 01:00. -+# -+# One source (Spanish) -+# <a href="http://www.radioangulo.cu/noticias/cuba/17105-cuba-restablecera-el-horario-del-meridiano-de-greenwich.html"> -+# http://www.radioangulo.cu/noticias/cuba/17105-cuba-restablecera-el-horario-del-meridiano-de-greenwich.html -+# </a> -+# -+# Our page: -+# <a href="http://www.timeanddate.com/news/time/cuba-time-changes-2011.html"> -+# http://www.timeanddate.com/news/time/cuba-time-changes-2011.html -+# </a> -+# -+# From Steffen Thorsen (2012-03-01) -+# According to Radio Reloj, Cuba will start DST on Midnight between March -+# 31 and April 1. -+# -+# Radio Reloj has the following info (Spanish): -+# <a href="http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529-cuba-aplicara-el-horario-de-verano-desde-el-1-de-abril"> -+# http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529-cuba-aplicara-el-horario-de-verano-desde-el-1-de-abril -+# </a> -+# -+# Our info on it: -+# <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html"> -+# http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html -+# </a> - - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Cuba 1928 only - Jun 10 0:00 1:00 D -@@ -2744,12 +2851,15 @@ - Rule Cuba 1998 1999 - Mar lastSun 0:00s 1:00 D - Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S - Rule Cuba 2000 2004 - Apr Sun>=1 0:00s 1:00 D --Rule Cuba 2006 max - Oct lastSun 0:00s 0 S -+Rule Cuba 2006 2010 - Oct lastSun 0:00s 0 S - Rule Cuba 2007 only - Mar Sun>=8 0:00s 1:00 D - Rule Cuba 2008 only - Mar Sun>=15 0:00s 1:00 D - Rule Cuba 2009 2010 - Mar Sun>=8 0:00s 1:00 D - Rule Cuba 2011 only - Mar Sun>=15 0:00s 1:00 D --Rule Cuba 2012 max - Mar Sun>=8 0:00s 1:00 D -+Rule Cuba 2011 only - Nov 13 0:00s 0 S -+Rule Cuba 2012 only - Apr 1 0:00s 1:00 D -+Rule Cuba 2012 max - Oct lastSun 0:00s 0 S -+Rule Cuba 2013 max - Mar Sun>=8 0:00s 1:00 D - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone America/Havana -5:29:28 - LMT 1890 -@@ -2883,6 +2993,29 @@ - # From Stephen Colebourne (2007-02-22): - # Some IATA info: Haiti won't be having DST in 2007. - -+# From Steffen Thorsen (2012-03-11): -+# According to several news sources, Haiti will observe DST this year, -+# apparently using the same start and end date as USA/Canada. -+# So this means they have already changed their time. -+# -+# (Sources in French): -+# <a href="http://www.alterpresse.org/spip.php?article12510"> -+# http://www.alterpresse.org/spip.php?article12510 -+# </a> -+# <a href="http://radiovision2000haiti.net/home/?p=13253"> -+# http://radiovision2000haiti.net/home/?p=13253 -+# </a> -+# -+# Our coverage: -+# <a href="http://www.timeanddate.com/news/time/haiti-dst-2012.html"> -+# http://www.timeanddate.com/news/time/haiti-dst-2012.html -+# </a> -+ -+# From Arthur David Olson (2012-03-11): -+# The alterpresse.org source seems to show a US-style leap from 2:00 a.m. to -+# 3:00 a.m. rather than the traditional Haitian jump at midnight. -+# Assume a US-style fall back as well XXX. -+# Do not yet assume that the change carries forward past 2012 XXX. - - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Haiti 1983 only - May 8 0:00 1:00 D -@@ -2894,6 +3027,8 @@ - Rule Haiti 1988 1997 - Oct lastSun 1:00s 0 S - Rule Haiti 2005 2006 - Apr Sun>=1 0:00 1:00 D - Rule Haiti 2005 2006 - Oct lastSun 0:00 0 S -+Rule Haiti 2012 only - Mar Sun>=8 2:00 1:00 D -+Rule Haiti 2012 only - Nov Sun>=1 2:00 0 S - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone America/Port-au-Prince -4:49:20 - LMT 1890 - -4:49 - PPMT 1917 Jan 24 12:00 # P-a-P MT ---- openjdk/jdk/make/sun/javazic/tzdata/southamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/southamerica -@@ -22,7 +22,7 @@ - # questions. - # - # <pre> --# @(#)southamerica 8.50 -+# @(#)southamerica 8.53 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -841,6 +841,19 @@ - # oficial agency about time in Brazil, and she confirmed that the old rule is - # still in force. - -+# From Guilherme Bernardes Rodrigues (2011-10-14) -+# It's official, the President signed a decree that includes Bahia in summer -+# time. -+# [ and in a second message (same day): ] -+# I found the decree. -+# -+# DECRETO No- 7.584, DE 13 DE OUTUBRO DE 2011 -+# Link : -+# <a href="http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6"> -+# http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6 -+# </a> -+ -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01) - # Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10) -@@ -1077,10 +1090,8 @@ - # of America/Salvador. - Zone America/Bahia -2:34:04 - LMT 1914 - -3:00 Brazil BR%sT 2003 Sep 24 -- -3:00 - BRT --# as noted above, not yet in operation. --# -3:00 - BRT 2011 Oct 16 --# -3:00 Brazil BR%sT -+ -3:00 - BRT 2011 Oct 16 -+ -3:00 Brazil BR%sT - # - # Goias (GO), Distrito Federal (DF), Minas Gerais (MG), - # Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR), -@@ -1230,6 +1241,28 @@ - # August, not in October as they have since 1968. This is a pilot plan - # which will be reevaluated in 2012. - -+# From Mauricio Parada (2012-02-22), translated by Glenn Eychaner (2012-02-23): -+# As stated in the website of the Chilean Energy Ministry -+# http://www.minenergia.cl/ministerio/noticias/generales/gobierno-anuncia-fechas-de-cambio-de.html -+# The Chilean Government has decided to postpone the entrance into winter time -+# (to leave DST) from March 11 2012 to April 28th 2012. The decision has not -+# been yet formalized but it will within the next days. -+# Quote from the website communication: -+# -+# 6. For the year 2012, the dates of entry into winter time will be as follows: -+# a. Saturday April 28, 2012, clocks should go back 60 minutes; that is, at -+# 23:59:59, instead of passing to 0:00, the time should be adjusted to be 23:00 -+# of the same day. -+# b. Saturday, September 1, 2012, clocks should go forward 60 minutes; that is, -+# at 23:59:59, instead of passing to 0:00, the time should be adjusted to be -+# 01:00 on September 2. -+# -+# Note that...this is yet another "temporary" change that will be reevaluated -+# AGAIN in 2013. -+ -+# NOTE: ChileAQ rules for Antarctic bases are stored separately in the -+# 'antarctica' file. -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Chile 1927 1932 - Sep 1 0:00 1:00 S - Rule Chile 1928 1932 - Apr 1 0:00 0 - -@@ -1260,8 +1293,6 @@ - Rule Chile 1998 only - Sep 27 4:00u 1:00 S - Rule Chile 1999 only - Apr 4 3:00u 0 - - Rule Chile 1999 2010 - Oct Sun>=9 4:00u 1:00 S --Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 S --Rule Chile 2012 max - Oct Sun>=9 4:00u 1:00 S - Rule Chile 2000 2007 - Mar Sun>=9 3:00u 0 - - # N.B.: the end of March 29 in Chile is March 30 in Universal time, - # which is used below in specifying the transition. -@@ -1269,7 +1300,11 @@ - Rule Chile 2009 only - Mar Sun>=9 3:00u 0 - - Rule Chile 2010 only - Apr Sun>=1 3:00u 0 - - Rule Chile 2011 only - May Sun>=2 3:00u 0 - --Rule Chile 2012 max - Mar Sun>=9 3:00u 0 - -+Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 S -+Rule Chile 2012 only - Apr Sun>=23 3:00u 0 - -+Rule Chile 2012 only - Sep Sun>=2 4:00u 1:00 S -+Rule Chile 2013 max - Mar Sun>=9 3:00u 0 - -+Rule Chile 2013 max - Oct Sun>=9 4:00u 1:00 S - # IATA SSIM anomalies: (1992-02) says 1992-03-14; - # (1996-09) says 1998-03-08. Ignore these. - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -@@ -1415,6 +1450,21 @@ - # will not revert to local mean time, but clocks will remain on Summer - # time (UTC/GMT - 3 hours) throughout the whole of 2011. Any long term - # change to local time following the trial period will be notified. -+# -+# From Andrew Newman (2012-02-24) -+# A letter from Justin McPhee, Chief Executive, -+# Cable & Wireless Falkland Islands (dated 2012-02-22) -+# states... -+# The current Atlantic/Stanley entry under South America expects the -+# clocks to go back to standard Falklands Time (FKT) on the 15th April. -+# The database entry states that in 2011 Stanley was staying on fixed -+# summer time on a trial basis only. FIG need to contact IANA and/or -+# the maintainers of the database to inform them we're adopting -+# the same policy this year and suggest recommendations for future years. -+# -+# For now we will assume permanent summer time for the Falklands -+# until advised differently (to apply for 2012 and beyond, after the 2011 -+# experiment was apparently successful.) - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Falk 1937 1938 - Sep lastSun 0:00 1:00 S - Rule Falk 1938 1942 - Mar Sun>=19 0:00 0 - -@@ -1427,14 +1477,14 @@ - Rule Falk 1985 2000 - Sep Sun>=9 0:00 1:00 S - Rule Falk 1986 2000 - Apr Sun>=16 0:00 0 - - Rule Falk 2001 2010 - Apr Sun>=15 2:00 0 - --Rule Falk 2012 max - Apr Sun>=15 2:00 0 - --Rule Falk 2001 max - Sep Sun>=1 2:00 1:00 S -+Rule Falk 2001 2010 - Sep Sun>=1 2:00 1:00 S - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Atlantic/Stanley -3:51:24 - LMT 1890 - -3:51:24 - SMT 1912 Mar 12 # Stanley Mean Time - -4:00 Falk FK%sT 1983 May # Falkland Is Time - -3:00 Falk FK%sT 1985 Sep 15 -- -4:00 Falk FK%sT -+ -4:00 Falk FK%sT 2010 Sep 5 02:00 -+ -3:00 - FKST - - # French Guiana - # Zone NAME GMTOFF RULES FORMAT [UNTIL] ---- openjdk/jdk/make/sun/javazic/tzdata/zone.tab -+++ openjdk/jdk/make/sun/javazic/tzdata/zone.tab -@@ -22,7 +22,7 @@ - # questions. - # - # <pre> --# @(#)zone.tab 8.49 -+# @(#)zone.tab 8.55 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - # -@@ -154,6 +154,7 @@ - CA +690650-1050310 America/Cambridge_Bay Mountain Time - west Nunavut - CA +6227-11421 America/Yellowknife Mountain Time - central Northwest Territories - CA +682059-1334300 America/Inuvik Mountain Time - west Northwest Territories -+CA +4906-11631 America/Creston Mountain Standard Time - Creston, British Columbia - CA +5946-12014 America/Dawson_Creek Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia - CA +4916-12307 America/Vancouver Pacific Time - west British Columbia - CA +6043-13503 America/Whitehorse Pacific Time - south Yukon -@@ -356,7 +357,7 @@ - RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad - RU +5545+03735 Europe/Moscow Moscow+00 - west Russia - RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea --RU +5312+05009 Europe/Samara Moscow - Samara, Udmurtia -+RU +5312+05009 Europe/Samara Moscow+00 - Samara, Udmurtia - RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals - RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia - RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -@@ -333,6 +333,7 @@ - "French Guiana Summer Time", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -678,7 +679,7 @@ - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, - {"Europe/Kaliningrad", FET}, -- {"Europe/Kiev", FET}, -+ {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -699,14 +700,14 @@ - "Samara Summer Time", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", FET}, -+ {"Europe/Simferopol", EET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", FET}, -+ {"Europe/Uzhgorod", EET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -715,7 +716,7 @@ - "Volgograd Summer Time", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", FET}, -+ {"Europe/Zaporozhye", EET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -@@ -333,6 +333,7 @@ - "Franz\u00f6sisch-Guiana Sommerzeit", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -678,7 +679,7 @@ - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, - {"Europe/Kaliningrad", FET}, -- {"Europe/Kiev", FET}, -+ {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -699,14 +700,14 @@ - "Samarische Sommerzeit", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", FET}, -+ {"Europe/Simferopol", EET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", FET}, -+ {"Europe/Uzhgorod", EET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -715,7 +716,7 @@ - "Wolgograder Sommerzeit", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", FET}, -+ {"Europe/Zaporozhye", EET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -@@ -333,6 +333,7 @@ - "Hora de verano de la Guayana Francesa", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -678,7 +679,7 @@ - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, - {"Europe/Kaliningrad", FET}, -- {"Europe/Kiev", FET}, -+ {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -699,14 +700,14 @@ - "Hora de verano de Samara", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", FET}, -+ {"Europe/Simferopol", EET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", FET}, -+ {"Europe/Uzhgorod", EET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -715,7 +716,7 @@ - "Hora de verano de Volgogrado", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", FET}, -+ {"Europe/Zaporozhye", EET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -@@ -333,6 +333,7 @@ - "Heure d'\u00e9t\u00e9 de Guyane fran\u00e7aise", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -678,7 +679,7 @@ - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, - {"Europe/Kaliningrad", FET}, -- {"Europe/Kiev", FET}, -+ {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -699,14 +700,14 @@ - "Heure d'\u00e9t\u00e9 de Samara", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", FET}, -+ {"Europe/Simferopol", EET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", FET}, -+ {"Europe/Uzhgorod", EET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -715,7 +716,7 @@ - "Heure d'\u00e9t\u00e9 de Volgograd", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", FET}, -+ {"Europe/Zaporozhye", EET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -@@ -333,6 +333,7 @@ - "Ora estiva della Guyana Francese", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -678,7 +679,7 @@ - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, - {"Europe/Kaliningrad", FET}, -- {"Europe/Kiev", FET}, -+ {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -699,14 +700,14 @@ - "Ora estiva di Samara", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", FET}, -+ {"Europe/Simferopol", EET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", FET}, -+ {"Europe/Uzhgorod", EET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -715,7 +716,7 @@ - "Ora estiva di Volgograd", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", FET}, -+ {"Europe/Zaporozhye", EET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -@@ -333,6 +333,7 @@ - "\u4ecf\u9818\u30ae\u30a2\u30ca\u590f\u6642\u9593", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -678,7 +679,7 @@ - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, - {"Europe/Kaliningrad", FET}, -- {"Europe/Kiev", FET}, -+ {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -699,14 +700,14 @@ - "\u30b5\u30de\u30e9\u590f\u6642\u9593", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", FET}, -+ {"Europe/Simferopol", EET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", FET}, -+ {"Europe/Uzhgorod", EET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -715,7 +716,7 @@ - "\u30dc\u30eb\u30b4\u30b0\u30e9\u30fc\u30c9\u590f\u6642\u9593", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", FET}, -+ {"Europe/Zaporozhye", EET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -@@ -333,6 +333,7 @@ - "\ud504\ub791\uc2a4\ub839 \uae30\uc544\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -678,7 +679,7 @@ - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, - {"Europe/Kaliningrad", FET}, -- {"Europe/Kiev", FET}, -+ {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -699,14 +700,14 @@ - "\uc0ac\ub9c8\ub77c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", FET}, -+ {"Europe/Simferopol", EET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", FET}, -+ {"Europe/Uzhgorod", EET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -715,7 +716,7 @@ - "\ubcfc\uace0\uadf8\ub77c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", FET}, -+ {"Europe/Zaporozhye", EET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, -diff -r 54524889bf8b -r 065fdd98fe75 src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Mon Apr 02 11:29:36 2012 -0700 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Tue Apr 03 18:21:28 2012 +0900 -@@ -333,6 +333,7 @@ - "Fuso hor\u00e1rio de ver\u00e3o da Guiana Francesa", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -678,7 +679,7 @@ - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, - {"Europe/Kaliningrad", FET}, -- {"Europe/Kiev", FET}, -+ {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -699,14 +700,14 @@ - "Fuso hor\u00e1rio de ver\u00e3o de Samara", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", FET}, -+ {"Europe/Simferopol", EET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", FET}, -+ {"Europe/Uzhgorod", EET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -715,7 +716,7 @@ - "Fuso hor\u00e1rio de ver\u00e3o de Volgogrado", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", FET}, -+ {"Europe/Zaporozhye", EET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -@@ -333,6 +333,7 @@ - "Franska Guyana, sommartid", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -678,7 +679,7 @@ - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, - {"Europe/Kaliningrad", FET}, -- {"Europe/Kiev", FET}, -+ {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -699,14 +700,14 @@ - "Samara, sommartid", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", FET}, -+ {"Europe/Simferopol", EET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", FET}, -+ {"Europe/Uzhgorod", EET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -715,7 +716,7 @@ - "Volgograd, sommartid", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", FET}, -+ {"Europe/Zaporozhye", EET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -@@ -333,6 +333,7 @@ - "\u6cd5\u5c5e\u572d\u4e9a\u90a3\u590f\u4ee4\u65f6", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -678,7 +679,7 @@ - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, - {"Europe/Kaliningrad", FET}, -- {"Europe/Kiev", FET}, -+ {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -699,14 +700,14 @@ - "\u6c99\u9a6c\u62c9\u590f\u4ee4\u65f6", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", FET}, -+ {"Europe/Simferopol", EET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", FET}, -+ {"Europe/Uzhgorod", EET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -715,7 +716,7 @@ - "\u4f0f\u5c14\u52a0\u683c\u52d2\u590f\u4ee4\u65f6", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", FET}, -+ {"Europe/Zaporozhye", EET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -@@ -333,6 +333,7 @@ - "\u6cd5\u5c6c\u572d\u4e9e\u90a3\u590f\u4ee4\u6642\u9593", "GFST"}}, - {"America/Cayman", EST}, - {"America/Chihuahua", MST}, -+ {"America/Creston", MST}, - {"America/Coral_Harbour", EST}, - {"America/Cordoba", AGT}, - {"America/Costa_Rica", CST}, -@@ -679,7 +680,7 @@ - {"Europe/Istanbul", EET}, - {"Europe/Jersey", GMTBST}, - {"Europe/Kaliningrad", FET}, -- {"Europe/Kiev", FET}, -+ {"Europe/Kiev", EET}, - {"Europe/Lisbon", WET}, - {"Europe/Ljubljana", CET}, - {"Europe/London", GMTBST}, -@@ -700,14 +701,14 @@ - "\u6c99\u99ac\u62c9\u590f\u4ee4\u6642\u9593", "SAMST"}}, - {"Europe/San_Marino", CET}, - {"Europe/Sarajevo", CET}, -- {"Europe/Simferopol", FET}, -+ {"Europe/Simferopol", EET}, - {"Europe/Skopje", CET}, - {"Europe/Sofia", EET}, - {"Europe/Stockholm", CET}, - {"Europe/Tallinn", EET}, - {"Europe/Tirane", CET}, - {"Europe/Tiraspol", EET}, -- {"Europe/Uzhgorod", FET}, -+ {"Europe/Uzhgorod", EET}, - {"Europe/Vaduz", CET}, - {"Europe/Vatican", CET}, - {"Europe/Vienna", CET}, -@@ -716,7 +717,7 @@ - "\u4f0f\u723e\u52a0\u683c\u52d2\u590f\u4ee4\u6642\u9593", "VOLST"}}, - {"Europe/Warsaw", CET}, - {"Europe/Zagreb", CET}, -- {"Europe/Zaporozhye", FET}, -+ {"Europe/Zaporozhye", EET}, - {"Europe/Zurich", CET}, - {"GB", GMTBST}, - {"GB-Eire", GMTBST},
--- a/patches/openjdk/7198570-tzdata2012f.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,841 +0,0 @@ -# HG changeset patch -# User coffeys -# Date 1349962116 -3600 -# Node ID c554456c623f1d05180b291ce0b1e4589e2bd165 -# Parent 5683b3f7f8cc58746a2983ee6294b62ccdfa159c -7198570: (tz) Support tzdata2012f -Reviewed-by: peytoia, asaha - ---- openjdk/jdk/make/sun/javazic/tzdata/VERSION -+++ openjdk/jdk/make/sun/javazic/tzdata/VERSION -@@ -21,4 +21,4 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --tzdata2012c -+tzdata2012f ---- openjdk/jdk/make/sun/javazic/tzdata/africa -+++ openjdk/jdk/make/sun/javazic/tzdata/africa -@@ -22,7 +22,6 @@ - # questions. - # - # <pre> --# @(#)africa 8.35 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -261,7 +260,7 @@ - # I received a mail from an airline which says that the daylight - # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07. - # From Jesper Norgaard Welen (2007-08-15): [The following agree:] --# http://www.nentjes.info/Bill/bill5.htm -+# http://www.nentjes.info/Bill/bill5.htm - # http://www.timeanddate.com/worldclock/city.html?n=53 - # From Steffen Thorsen (2007-09-04): The official information...: - # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm -@@ -315,18 +314,18 @@ - # in September. - - # From Steffen Thorsen (2009-08-11): --# We have been able to confirm the August change with the Egyptian Cabinet -+# We have been able to confirm the August change with the Egyptian Cabinet - # Information and Decision Support Center: - # <a href="http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html"> - # http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html - # </a> --# -+# - # The Middle East News Agency - # <a href="http://www.mena.org.eg/index.aspx"> - # http://www.mena.org.eg/index.aspx - # </a> - # also reports "Egypt starts winter time on August 21" --# today in article numbered "71, 11/08/2009 12:25 GMT." -+# today in article numbered "71, 11/08/2009 12:25 GMT." - # Only the title above is available without a subscription to their service, - # and can be found by searching for "winter" in their search engine - # (at least today). -@@ -505,7 +504,7 @@ - # From Steffen Thorsen (2008-06-25): - # Mauritius plans to observe DST from 2008-11-01 to 2009-03-31 on a trial - # basis.... --# It seems that Mauritius observed daylight saving time from 1982-10-10 to -+# It seems that Mauritius observed daylight saving time from 1982-10-10 to - # 1983-03-20 as well, but that was not successful.... - # http://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html - -@@ -529,12 +528,12 @@ - # than previously announced (2008-11-01 to 2009-03-31). The new start - # date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time - # given, but it is probably at either 2 or 3 wall clock time). --# --# A little strange though, since the article says that they moved the date --# to align itself with Europe and USA which also change time on that date, --# but that means they have not paid attention to what happened in --# USA/Canada last year (DST ends first Sunday in November). I also wonder --# why that they end on a Friday, instead of aligning with Europe which -+# -+# A little strange though, since the article says that they moved the date -+# to align itself with Europe and USA which also change time on that date, -+# but that means they have not paid attention to what happened in -+# USA/Canada last year (DST ends first Sunday in November). I also wonder -+# why that they end on a Friday, instead of aligning with Europe which - # changes two days later. - - # From Alex Krivenyshev (2008-07-11): -@@ -593,7 +592,7 @@ - # </a> - - # From Arthur David Olson (2009-07-11): --# The "mauritius-dst-will-not-repeat" wrapup includes this: -+# The "mauritius-dst-will-not-repeat" wrapup includes this: - # "The trial ended on March 29, 2009, when the clocks moved back by one hour - # at 2am (or 02:00) local time..." - -@@ -687,8 +686,8 @@ - # XXX--guess that it is only Morocco for now; guess only 2008 for now. - - # From Steffen Thorsen (2008-08-27): --# Morocco will change the clocks back on the midnight between August 31 --# and September 1. They originally planned to observe DST to near the end -+# Morocco will change the clocks back on the midnight between August 31 -+# and September 1. They originally planned to observe DST to near the end - # of September: - # - # One article about it (in French): -@@ -822,6 +821,23 @@ - # "...à partir du dernier dimance d'avril et non fins mars, - # comme annoncé précédemment." - -+# From Milamber Space Network (2012-07-17): -+# The official return to GMT is announced by the Moroccan government: -+# <a href="http://www.mmsp.gov.ma/fr/actualites.aspx?id=288"> -+# http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 [in French] -+# </a> -+# -+# Google translation, lightly edited: -+# Back to the standard time of the Kingdom (GMT) -+# Pursuant to Decree No. 2-12-126 issued on 26 Jumada (I) 1433 (April 18, -+# 2012) and in accordance with the order of Mr. President of the -+# Government No. 3-47-12 issued on 24 Sha'ban (11 July 2012), the Ministry -+# of Public Service and Administration Modernization announces the return -+# of the legal time of the Kingdom (GMT) from Friday, July 20, 2012 until -+# Monday, August 20, 2012. So the time will be delayed by 60 minutes from -+# 3:00 am Friday, July 20, 2012 and will again be advanced by 60 minutes -+# August 20, 2012 from 2:00 am. -+ - # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S - - Rule Morocco 1939 only - Sep 12 0:00 1:00 S -@@ -849,6 +865,8 @@ - Rule Morocco 2011 only - Jul 31 0 0 - - Rule Morocco 2012 max - Apr lastSun 2:00 1:00 S - Rule Morocco 2012 max - Sep lastSun 3:00 0 - -+Rule Morocco 2012 only - Jul 20 3:00 0 - -+Rule Morocco 2012 only - Aug 20 2:00 1:00 S - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 -@@ -877,7 +895,7 @@ - # Forecasting Riaan van Zyl explained that the far eastern parts of - # the country are close to 40 minutes earlier in sunrise than the rest - # of the country. --# -+# - # From Paul Eggert (2007-03-31): - # Apparently the Caprivi Strip informally observes Botswana time, but - # we have no details. In the meantime people there can use Africa/Gaborone. ---- openjdk/jdk/make/sun/javazic/tzdata/antarctica -+++ openjdk/jdk/make/sun/javazic/tzdata/antarctica -@@ -22,7 +22,6 @@ - # questions. - # - # <pre> --# @(#)antarctica 8.10 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/asia -+++ openjdk/jdk/make/sun/javazic/tzdata/asia -@@ -22,7 +22,6 @@ - # questions. - # - # <pre> --# @(#)asia 8.73 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -125,7 +124,7 @@ - # From Alexander Krivenyshev (2012-02-10): - # According to News Armenia, on Feb 9, 2012, - # http://newsarmenia.ru/society/20120209/42609695.html --# -+# - # The Armenia National Assembly adopted final reading of Amendments to the - # Law "On procedure of calculation time on the territory of the Republic of - # Armenia" according to which Armenia [is] abolishing Daylight Saving Time. -@@ -205,15 +204,15 @@ - # </a> - - # From A. N. M. Kamrus Saadat (2009-06-15): --# Finally we've got the official mail regarding DST start time where DST start --# time is mentioned as Jun 19 2009, 23:00 from BTRC (Bangladesh --# Telecommunication Regulatory Commission). -+# Finally we've got the official mail regarding DST start time where DST start -+# time is mentioned as Jun 19 2009, 23:00 from BTRC (Bangladesh -+# Telecommunication Regulatory Commission). - # - # No DST end date has been announced yet. - - # From Alexander Krivenyshev (2009-09-25): --# Bangladesh won't go back to Standard Time from October 1, 2009, --# instead it will continue DST measure till the cabinet makes a fresh decision. -+# Bangladesh won't go back to Standard Time from October 1, 2009, -+# instead it will continue DST measure till the cabinet makes a fresh decision. - # - # Following report by same newspaper-"The Daily Star Friday": - # "DST change awaits cabinet decision-Clock won't go back by 1-hr from Oct 1" -@@ -227,8 +226,8 @@ - - # From Steffen Thorsen (2009-10-13): - # IANS (Indo-Asian News Service) now reports: --# Bangladesh has decided that the clock advanced by an hour to make --# maximum use of daylight hours as an energy saving measure would -+# Bangladesh has decided that the clock advanced by an hour to make -+# maximum use of daylight hours as an energy saving measure would - # "continue for an indefinite period." - # - # One of many places where it is published: -@@ -256,7 +255,7 @@ - - # From Alexander Krivenyshev (2010-03-22): - # According to Bangladesh newspaper "The Daily Star," --# Cabinet cancels Daylight Saving Time -+# Cabinet cancels Daylight Saving Time - # <a href="http://www.thedailystar.net/newDesign/latest_news.php?nid=22817"> - # http://www.thedailystar.net/newDesign/latest_news.php?nid=22817 - # </a> -@@ -384,11 +383,11 @@ - # observing daylight saving time in 1986. - # - # From Thomas S. Mullaney (2008-02-11): --# I think you're combining two subjects that need to treated --# separately: daylight savings (which, you're correct, wasn't --# implemented until the 1980s) and the unified time zone centered near --# Beijing (which was implemented in 1949). Briefly, there was also a --# "Lhasa Time" in Tibet and "Urumqi Time" in Xinjiang. The first was -+# I think you're combining two subjects that need to treated -+# separately: daylight savings (which, you're correct, wasn't -+# implemented until the 1980s) and the unified time zone centered near -+# Beijing (which was implemented in 1949). Briefly, there was also a -+# "Lhasa Time" in Tibet and "Urumqi Time" in Xinjiang. The first was - # ceased, and the second eventually recognized (again, in the 1980s). - # - # From Paul Eggert (2008-06-30): -@@ -525,7 +524,7 @@ - # as of 2009-10-28: - # Year Period - # 1941 1 Apr to 30 Sep --# 1942 Whole year -+# 1942 Whole year - # 1943 Whole year - # 1944 Whole year - # 1945 Whole year -@@ -616,16 +615,16 @@ - # From Arthur David Olson (2010-04-07): - # Here's Google's translation of the table at the bottom of the "summert.htm" page: - # Decade Name Start and end date --# Republic of China 34 years to 40 years (AD 1945-1951 years) Summer Time May 1 to September 30 --# 41 years of the Republic of China (AD 1952) Daylight Saving Time March 1 to October 31 --# Republic of China 42 years to 43 years (AD 1953-1954 years) Daylight Saving Time April 1 to October 31 --# In the 44 years to 45 years (AD 1955-1956 years) Daylight Saving Time April 1 to September 30 --# Republic of China 46 years to 48 years (AD 1957-1959) Summer Time April 1 to September 30 --# Republic of China 49 years to 50 years (AD 1960-1961) Summer Time June 1 to September 30 --# Republic of China 51 years to 62 years (AD 1962-1973 years) Stop Summer Time --# Republic of China 63 years to 64 years (1974-1975 AD) Daylight Saving Time April 1 to September 30 --# Republic of China 65 years to 67 years (1976-1978 AD) Stop Daylight Saving Time --# Republic of China 68 years (AD 1979) Daylight Saving Time July 1 to September 30 -+# Republic of China 34 years to 40 years (AD 1945-1951 years) Summer Time May 1 to September 30 -+# 41 years of the Republic of China (AD 1952) Daylight Saving Time March 1 to October 31 -+# Republic of China 42 years to 43 years (AD 1953-1954 years) Daylight Saving Time April 1 to October 31 -+# In the 44 years to 45 years (AD 1955-1956 years) Daylight Saving Time April 1 to September 30 -+# Republic of China 46 years to 48 years (AD 1957-1959) Summer Time April 1 to September 30 -+# Republic of China 49 years to 50 years (AD 1960-1961) Summer Time June 1 to September 30 -+# Republic of China 51 years to 62 years (AD 1962-1973 years) Stop Summer Time -+# Republic of China 63 years to 64 years (1974-1975 AD) Daylight Saving Time April 1 to September 30 -+# Republic of China 65 years to 67 years (1976-1978 AD) Stop Daylight Saving Time -+# Republic of China 68 years (AD 1979) Daylight Saving Time July 1 to September 30 - # Republic of China since 69 years (AD 1980) Stop Daylight Saving Time - - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -@@ -1859,15 +1858,15 @@ - # shown 8 per cent higher consumption of electricity. - - # From Alex Krivenyshev (2008-05-15): --# --# Here is an article that Pakistan plan to introduce Daylight Saving Time -+# -+# Here is an article that Pakistan plan to introduce Daylight Saving Time - # on June 1, 2008 for 3 months. --# --# "... The federal cabinet on Wednesday announced a new conservation plan to help --# reduce load shedding by approving the closure of commercial centres at 9pm and --# moving clocks forward by one hour for the next three months. -+# -+# "... The federal cabinet on Wednesday announced a new conservation plan to help -+# reduce load shedding by approving the closure of commercial centres at 9pm and -+# moving clocks forward by one hour for the next three months. - # ...." --# -+# - # <a href="http://www.worldtimezone.net/dst_news/dst_news_pakistan01.html"> - # http://www.worldtimezone.net/dst_news/dst_news_pakistan01.html - # </a> -@@ -1927,7 +1926,7 @@ - # Government has decided to restore the previous time by moving the - # clocks backward by one hour from October 1. A formal announcement to - # this effect will be made after the Prime Minister grants approval in --# this regard." -+# this regard." - # <a href="http://www.thenews.com.pk/updates.asp?id=87168"> - # http://www.thenews.com.pk/updates.asp?id=87168 - # </a> -@@ -2223,7 +2222,7 @@ - # <a href="http://www.maannews.net/eng/ViewDetails.aspx?ID=306795"> - # http://www.maannews.net/eng/ViewDetails.aspx?ID=306795 - # </a> --# the clocks were set back one hour at 2010-08-11 00:00:00 local time in -+# the clocks were set back one hour at 2010-08-11 00:00:00 local time in - # Gaza and the West Bank. - # Some more background info: - # <a href="http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html"> -@@ -2262,7 +2261,7 @@ - # The rules for Egypt are stolen from the `africa' file. - - # From Steffen Thorsen (2011-09-30): --# West Bank did end Daylight Saving Time this morning/midnight (2011-09-30 -+# West Bank did end Daylight Saving Time this morning/midnight (2011-09-30 - # 00:00). - # So West Bank and Gaza now have the same time again. - # -@@ -2536,19 +2535,19 @@ - # having it between Wednesday and Thursday (two workdays in Syria) since the - # weekend in Syria is not Saturday and Sunday, but Friday and Saturday. So now - # it is implemented at midnight of the last workday before weekend... --# -+# - # From Steffen Thorsen (2007-10-27): - # Jesper Norgaard Welen wrote: --# -+# - # > "Winter local time in Syria will be observed at midnight of Thursday 1 - # > November 2007, and the clock will be put back 1 hour." --# -+# - # I found confirmation on this in this gov.sy-article (Arabic): - # http://wehda.alwehda.gov.sy/_print_veiw.asp?FileName=12521710520070926111247 --# -+# - # which using Google's translate tools says: --# Council of Ministers also approved the commencement of work on --# identifying the winter time as of Friday, 2/11/2007 where the 60th -+# Council of Ministers also approved the commencement of work on -+# identifying the winter time as of Friday, 2/11/2007 where the 60th - # minute delay at midnight Thursday 1/11/2007. - Rule Syria 2007 only - Nov Fri>=1 0:00 0 - - -@@ -2614,8 +2613,8 @@ - # </a> - - # From Steffen Thorsen (2009-10-27): --# The Syrian Arab News Network on 2009-09-29 reported that Syria will --# revert back to winter (standard) time on midnight between Thursday -+# The Syrian Arab News Network on 2009-09-29 reported that Syria will -+# revert back to winter (standard) time on midnight between Thursday - # 2009-10-29 and Friday 2009-10-30: - # <a href="http://www.sana.sy/ara/2/2009/09/29/247012.htm"> - # http://www.sana.sy/ara/2/2009/09/29/247012.htm (Arabic) ---- openjdk/jdk/make/sun/javazic/tzdata/australasia -+++ openjdk/jdk/make/sun/javazic/tzdata/australasia -@@ -22,7 +22,6 @@ - # questions. - # - # <pre> --# @(#)australasia 8.30 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -307,9 +306,9 @@ - # </a> - - # From Alexander Krivenyshev (2010-10-24): --# According to Radio Fiji and Fiji Times online, Fiji will end DST 3 -+# According to Radio Fiji and Fiji Times online, Fiji will end DST 3 - # weeks earlier than expected - on March 6, 2011, not March 27, 2011... --# Here is confirmation from Government of the Republic of the Fiji Islands, -+# Here is confirmation from Government of the Republic of the Fiji Islands, - # Ministry of Information (fiji.gov.fj) web site: - # <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=2608:daylight-savings&catid=71:press-releases&Itemid=155"> - # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=2608:daylight-savings&catid=71:press-releases&Itemid=155 -@@ -320,15 +319,15 @@ - # </a> - - # From Steffen Thorsen (2011-10-03): --# Now the dates have been confirmed, and at least our start date -+# Now the dates have been confirmed, and at least our start date - # assumption was correct (end date was one week wrong). - # - # <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=4966:daylight-saving-starts-in-fiji&catid=71:press-releases&Itemid=155"> - # www.fiji.gov.fj/index.php?option=com_content&view=article&id=4966:daylight-saving-starts-in-fiji&catid=71:press-releases&Itemid=155 - # </a> - # which says --# Members of the public are reminded to change their time to one hour in --# advance at 2am to 3am on October 23, 2011 and one hour back at 3am to -+# Members of the public are reminded to change their time to one hour in -+# advance at 2am to 3am on October 23, 2011 and one hour back at 3am to - # 2am on February 26 next year. - - # From Ken Rylander (2011-10-24) -@@ -345,15 +344,23 @@ - # The commencement of daylight saving will remain unchanged and start - # on the 23rd of October, 2011. - -+# From the Fiji Government Online Portal (2012-08-21) via Steffen Thorsen: -+# The Minister for Labour, Industrial Relations and Employment Mr Jone Usamate -+# today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st -+# October 2012 and end at 3 am on Sunday 20th January 2013. -+# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155 -+# -+# From Paul Eggert (2012-08-31): -+# For now, guess a pattern of the penultimate Sundays in October and January. -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S - Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - - Rule Fiji 2009 only - Nov 29 2:00 1:00 S - Rule Fiji 2010 only - Mar lastSun 3:00 0 - --Rule Fiji 2010 only - Oct 24 2:00 1:00 S -+Rule Fiji 2010 max - Oct Sun>=18 2:00 1:00 S - Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - --Rule Fiji 2011 only - Oct 23 2:00 1:00 S --Rule Fiji 2012 only - Jan 22 3:00 0 - -+Rule Fiji 2012 max - Jan Sun>=18 3:00 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Pacific/Fiji 11:53:40 - LMT 1915 Oct 26 # Suva - 12:00 Fiji FJ%sT # Fiji Time -@@ -582,7 +589,7 @@ - - # From David Zuelke (2011-05-09): - # Subject: Samoa to move timezone from east to west of international date line --# -+# - # <a href="http://www.morningstar.co.uk/uk/markets/newsfeeditem.aspx?id=138501958347963"> - # http://www.morningstar.co.uk/uk/markets/newsfeeditem.aspx?id=138501958347963 - # </a> -@@ -664,25 +671,25 @@ - # - # From Gwillim Law (2011-12-29) - # A correspondent informed me that Tokelau, like Samoa, will be skipping --# December 31 this year, thereby changing its time zone from UTC-10 to --# UTC+14. When I tried to verify this statement, I found a confirming --# article in Time magazine online --# <a href="http://www.time.com/time/world/article/0,8599,2103243,00.html"> --# (http://www.time.com/time/world/article/0,8599,2103243,00.html). --# </a> -+# December 31 this year ... - # --# From Jonathan Leffler (2011-12-29) --# Information from the BBC to the same effect: --# <a href="http://www.bbc.co.uk/news/world-asia-16351377"> --# http://www.bbc.co.uk/news/world-asia-16351377 --# </a> -+# From Steffen Thorsen (2012-07-25) -+# ... we double checked by calling hotels and offices based in Tokelau asking -+# about the time there, and they all told a time that agrees with UTC+13.... -+# Shanks says UTC-10 from 1901 [but] ... there is a good chance the change -+# actually was to UTC-11 back then. - # --# Patch supplied by Tim Parenti (2011-12-29) -+# From Paul Eggert (2012-07-25) -+# A Google Books snippet of Appendix to the Journals of the House of -+# Representatives of New Zealand, Session 1948, -+# <http://books.google.com/books?id=ZaVCAQAAIAAJ>, page 65, says Tokelau -+# was "11 hours slow on G.M.T." Go with Thorsen and assume Shanks & Pottenger -+# are off by an hour starting in 1901. - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Pacific/Fakaofo -11:24:56 - LMT 1901 -- -10:00 - TKT 2011 Dec 30 # Tokelau Time -- 14:00 - TKT -+ -11:00 - TKT 2011 Dec 30 # Tokelau Time -+ 13:00 - TKT - - # Tonga - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -@@ -1363,22 +1370,22 @@ - # See "southeast Australia" above for 2008 and later. - - # From Steffen Thorsen (2009-04-28): --# According to the official press release, South Australia's extended daylight --# saving period will continue with the same rules as used during the 2008-2009 -+# According to the official press release, South Australia's extended daylight -+# saving period will continue with the same rules as used during the 2008-2009 - # summer (southern hemisphere). --# -+# - # From - # <a href="http://www.safework.sa.gov.au/uploaded_files/DaylightDatesSet.pdf"> - # http://www.safework.sa.gov.au/uploaded_files/DaylightDatesSet.pdf - # </a> --# The extended daylight saving period that South Australia has been trialling -+# The extended daylight saving period that South Australia has been trialling - # for over the last year is now set to be ongoing. --# Daylight saving will continue to start on the first Sunday in October each -+# Daylight saving will continue to start on the first Sunday in October each - # year and finish on the first Sunday in April the following year. --# Industrial Relations Minister, Paul Caica, says this provides South Australia --# with a consistent half hour time difference with NSW, Victoria, Tasmania and -+# Industrial Relations Minister, Paul Caica, says this provides South Australia -+# with a consistent half hour time difference with NSW, Victoria, Tasmania and - # the ACT for all 52 weeks of the year... --# -+# - # We have a wrap-up here: - # <a href="http://www.timeanddate.com/news/time/south-australia-extends-dst.html"> - # http://www.timeanddate.com/news/time/south-australia-extends-dst.html ---- openjdk/jdk/make/sun/javazic/tzdata/backward -+++ openjdk/jdk/make/sun/javazic/tzdata/backward -@@ -22,7 +22,6 @@ - # questions. - # - # <pre> --# @(#)backward 8.11 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/etcetera -+++ openjdk/jdk/make/sun/javazic/tzdata/etcetera -@@ -22,7 +22,6 @@ - # questions. - # - # <pre> --# @(#)etcetera 8.3 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/europe -+++ openjdk/jdk/make/sun/javazic/tzdata/europe -@@ -22,7 +22,6 @@ - # questions. - # - # <pre> --# @(#)europe 8.41 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -598,12 +597,12 @@ - # According to Kremlin press service, Russian President Dmitry Medvedev - # signed a federal law "On calculation of time" on June 9, 2011. - # According to the law Russia is abolishing daylight saving time. --# --# Medvedev signed a law "On the Calculation of Time" (in russian): -+# -+# Medvedev signed a law "On the Calculation of Time" (in russian): - # <a href="http://bmockbe.ru/events/?ID=7583"> - # http://bmockbe.ru/events/?ID=7583 - # </a> --# -+# - # Medvedev signed a law on the calculation of the time (in russian): - # <a href="http://www.regnum.ru/news/polit/1413906.html"> - # http://www.regnum.ru/news/polit/1413906.html -@@ -1711,7 +1710,7 @@ - # From Alexander Krivenyshev (2011-10-26) - # NO need to divide Moldova into two timezones at this point. - # As of today, Transnistria (Pridnestrovie)- Tiraspol reversed its own --# decision to abolish DST this winter. -+# decision to abolish DST this winter. - # Following Moldova and neighboring Ukraine- Transnistria (Pridnestrovie)- - # Tiraspol will go back to winter time on October 30, 2011. - # News from Moldova (in russian): -@@ -2601,11 +2600,11 @@ - # http://www.alomaliye.com/bkk_2002_3769.htm - - # From Gökdeniz Karadağ (2011-03-10): --# -+# - # According to the articles linked below, Turkey will change into summer - # time zone (GMT+3) on March 28, 2011 at 3:00 a.m. instead of March 27. - # This change is due to a nationwide exam on 27th. --# -+# - # <a href="http://www.worldbulletin.net/?aType=haber&ArticleID=70872"> - # http://www.worldbulletin.net/?aType=haber&ArticleID=70872 - # </a> -@@ -2722,7 +2721,7 @@ - # time this year after all. - # - # From Udo Schwedt (2011-10-18): --# As far as I understand, the recent change to the Ukranian time zone -+# As far as I understand, the recent change to the Ukranian time zone - # (Europe/Kiev) to introduce permanent daylight saving time (similar - # to Russia) was reverted today: - # ---- openjdk/jdk/make/sun/javazic/tzdata/factory -+++ openjdk/jdk/make/sun/javazic/tzdata/factory -@@ -22,7 +22,6 @@ - # questions. - # - # <pre> --# @(#)factory 8.2 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/iso3166.tab -+++ openjdk/jdk/make/sun/javazic/tzdata/iso3166.tab -@@ -22,7 +22,6 @@ - # questions. - # - # <pre> --# @(#)iso3166.tab 8.11 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - # ISO 3166 alpha-2 country codes ---- openjdk/jdk/make/sun/javazic/tzdata/leapseconds -+++ openjdk/jdk/make/sun/javazic/tzdata/leapseconds -@@ -22,7 +22,6 @@ - # questions. - # - # <pre> --# @(#)leapseconds 8.13 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -101,8 +100,8 @@ - # - # - # A positive leap second will be introduced at the end of June 2012. --# The sequence of dates of the UTC second markers will be: --# -+# The sequence of dates of the UTC second markers will be: -+# - # 2012 June 30, 23h 59m 59s - # 2012 June 30, 23h 59m 60s - # 2012 July 1, 0h 0m 0s -@@ -119,6 +118,6 @@ - # - # - # Daniel GAMBIS --# Head -+# Head - # Earth Orientation Center of IERS - # Observatoire de Paris, France ---- openjdk/jdk/make/sun/javazic/tzdata/northamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/northamerica -@@ -22,7 +22,6 @@ - # questions. - # - # <pre> --# @(#)northamerica 8.54 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -502,7 +501,7 @@ - -8:00 US P%sT 1946 - -8:00 - PST 1969 - -8:00 US P%sT 1980 Apr 27 2:00 -- -9:00 US Y%sT 1980 Oct 26 2:00 -+ -9:00 US Y%sT 1980 Oct 26 2:00 - -8:00 US P%sT 1983 Oct 30 2:00 - -9:00 US Y%sT 1983 Nov 30 - -9:00 US AK%sT -@@ -1867,7 +1866,7 @@ - # Here is a summary of the three clock change events in Creston's history: - # 1. 1884 or 1885: adoption of Mountain Standard Time (GMT-7) - # Exact date unknown --# 2. Oct 1916: switch to Pacific Standard Time (GMT-8) -+# 2. Oct 1916: switch to Pacific Standard Time (GMT-8) - # Exact date in October unknown; Sunday October 1 is a reasonable guess. - # 3. June 1918: switch to Pacific Daylight Time (GMT-7) - # Exact date in June unknown; Sunday June 2 is a reasonable guess. -@@ -2697,20 +2696,20 @@ - # except that it switches at midnight standard time as usual. - # - # From Steffen Thorsen (2007-10-25): --# Carlos Alberto Fonseca Arauz informed me that Cuba will end DST one week -+# Carlos Alberto Fonseca Arauz informed me that Cuba will end DST one week - # earlier - on the last Sunday of October, just like in 2006. --# -+# - # He supplied these references: --# -+# - # http://www.prensalatina.com.mx/article.asp?ID=%7B4CC32C1B-A9F7-42FB-8A07-8631AFC923AF%7D&language=ES - # http://actualidad.terra.es/sociedad/articulo/cuba_llama_ahorrar_energia_cambio_1957044.htm --# -+# - # From Alex Kryvenishev (2007-10-25): - # Here is also article from Granma (Cuba): --# -+# - # [Regira] el Horario Normal desde el [proximo] domingo 28 de octubre - # http://www.granma.cubaweb.cu/2007/10/24/nacional/artic07.html --# -+# - # http://www.worldtimezone.com/dst_news/dst_news_cuba03.html - - # From Arthur David Olson (2008-03-09): -@@ -2794,7 +2793,7 @@ - # </a> - # - # From Steffen Thorsen (2011-10-30) --# Cuba will end DST two weeks later this year. Instead of going back -+# Cuba will end DST two weeks later this year. Instead of going back - # tonight, it has been delayed to 2011-11-13 at 01:00. - # - # One source (Spanish) -@@ -2806,11 +2805,11 @@ - # <a href="http://www.timeanddate.com/news/time/cuba-time-changes-2011.html"> - # http://www.timeanddate.com/news/time/cuba-time-changes-2011.html - # </a> --# -+# - # From Steffen Thorsen (2012-03-01) --# According to Radio Reloj, Cuba will start DST on Midnight between March -+# According to Radio Reloj, Cuba will start DST on Midnight between March - # 31 and April 1. --# -+# - # Radio Reloj has the following info (Spanish): - # <a href="http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529-cuba-aplicara-el-horario-de-verano-desde-el-1-de-abril"> - # http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529-cuba-aplicara-el-horario-de-verano-desde-el-1-de-abril ---- openjdk/jdk/make/sun/javazic/tzdata/pacificnew -+++ openjdk/jdk/make/sun/javazic/tzdata/pacificnew -@@ -22,7 +22,6 @@ - # questions. - # - # <pre> --# @(#)pacificnew 8.2 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/solar87 -+++ openjdk/jdk/make/sun/javazic/tzdata/solar87 -@@ -22,7 +22,6 @@ - # questions. - # - # <pre> --# @(#)solar87 8.2 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/solar88 -+++ openjdk/jdk/make/sun/javazic/tzdata/solar88 -@@ -22,7 +22,6 @@ - # questions. - # - # <pre> --# @(#)solar88 8.2 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/solar89 -+++ openjdk/jdk/make/sun/javazic/tzdata/solar89 -@@ -22,7 +22,6 @@ - # questions. - # - # <pre> --# @(#)solar89 8.2 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/southamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/southamerica -@@ -22,7 +22,6 @@ - # questions. - # - # <pre> --# @(#)southamerica 8.53 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - -@@ -255,7 +254,7 @@ - Rule Arg 2007 only - Dec 30 0:00 1:00 S - Rule Arg 2008 2009 - Mar Sun>=15 0:00 0 - - Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S -- -+ - # From Mariano Absatz (2004-05-21): - # Today it was officially published that the Province of Mendoza is changing - # its timezone this winter... starting tomorrow night.... -@@ -345,9 +344,9 @@ - # confirms what Alex Krivenyshev has earlier sent to the tz - # emailing list about that San Luis plans to return to standard - # time much earlier than the rest of the country. It also --# confirms that upon request the provinces San Juan and Mendoza --# refused to follow San Luis in this change. --# -+# confirms that upon request the provinces San Juan and Mendoza -+# refused to follow San Luis in this change. -+# - # The change is supposed to take place Monday the 21.st at 0:00 - # hours. As far as I understand it if this goes ahead, we need - # a new timezone for San Luis (although there are also documented -@@ -409,7 +408,7 @@ - # <a href="http://www.lanacion.com.ar/nota.asp?nota_id=1107912"> - # http://www.lanacion.com.ar/nota.asp?nota_id=1107912 - # </a> --# -+# - # The press release says: - # (...) anunció que el próximo domingo a las 00:00 los puntanos deberán - # atrasar una hora sus relojes. -@@ -823,8 +822,8 @@ - # - # From Alexander Krivenyshev (2011-10-04): - # State Bahia will return to Daylight savings time this year after 8 years off. --# The announcement was made by Governor Jaques Wagner in an interview to a --# television station in Salvador. -+# The announcement was made by Governor Jaques Wagner in an interview to a -+# television station in Salvador. - - # In Portuguese: - # <a href="http://g1.globo.com/bahia/noticia/2011/10/governador-jaques-wagner-confirma-horario-de-verao-na-bahia.html"> -@@ -1183,7 +1182,7 @@ - # Due to drought, Chile extends Daylight Time in three weeks. This - # is one-time change (Saturday 3/29 at 24:00 for America/Santiago - # and Saturday 3/29 at 22:00 for Pacific/Easter) --# The Supreme Decree is located at -+# The Supreme Decree is located at - # <a href="http://www.shoa.cl/servicios/supremo316.pdf"> - # http://www.shoa.cl/servicios/supremo316.pdf - # </a> -@@ -1194,7 +1193,7 @@ - - # From Jose Miguel Garrido (2008-03-05): - # ... --# You could see the announces of the change on -+# You could see the announces of the change on - # <a href="http://www.shoa.cl/noticias/2008/04hora/hora.htm"> - # http://www.shoa.cl/noticias/2008/04hora/hora.htm - # </a>. ---- openjdk/jdk/make/sun/javazic/tzdata/systemv -+++ openjdk/jdk/make/sun/javazic/tzdata/systemv -@@ -22,7 +22,6 @@ - # questions. - # - # <pre> --# @(#)systemv 8.2 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - ---- openjdk/jdk/make/sun/javazic/tzdata/zone.tab -+++ openjdk/jdk/make/sun/javazic/tzdata/zone.tab -@@ -22,7 +22,6 @@ - # questions. - # - # <pre> --# @(#)zone.tab 8.55 - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - #
--- a/patches/openjdk/8002225-tzdata2012i.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,261 +0,0 @@ -# HG changeset patch -# User coffeys -# Date 1352197189 0 -# Node ID 1f833e4211177700a66cc22a0c5a794448c1a29a -# Parent c554456c623f1d05180b291ce0b1e4589e2bd165 -8002225: (tz) Support tzdata2012i -Reviewed-by: peytoia, asaha - ---- openjdk/jdk/make/sun/javazic/tzdata/VERSION -+++ openjdk/jdk/make/sun/javazic/tzdata/VERSION -@@ -21,4 +21,4 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --tzdata2012f -+tzdata2012i ---- openjdk/jdk/make/sun/javazic/tzdata/asia -+++ openjdk/jdk/make/sun/javazic/tzdata/asia -@@ -1193,15 +1193,15 @@ - # - # ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps - --# From Paul Eggert (2005-02-22): -+# From Paul Eggert (2012-10-26): - # I used Ephraim Silverberg's dst-israel.el program - # <ftp://ftp.cs.huji.ac.il/pub/tz/software/dst-israel.el> (2005-02-20) - # along with Ed Reingold's cal-hebrew in GNU Emacs 21.4, --# to generate the transitions in this list. -+# to generate the transitions from 2005 through 2012. - # (I replaced "lastFri" with "Fri>=26" by hand.) --# The spring transitions below all correspond to the following Rule: -+# The spring transitions all correspond to the following Rule: - # --# Rule Zion 2005 max - Mar Fri>=26 2:00 1:00 D -+# Rule Zion 2005 2012 - Mar Fri>=26 2:00 1:00 D - # - # but older zic implementations (e.g., Solaris 8) do not support - # "Fri>=26" to mean April 1 in years like 2005, so for now we list the -@@ -1218,39 +1218,36 @@ - Rule Zion 2010 only - Sep 12 2:00 0 S - Rule Zion 2011 only - Apr 1 2:00 1:00 D - Rule Zion 2011 only - Oct 2 2:00 0 S --Rule Zion 2012 2015 - Mar Fri>=26 2:00 1:00 D -+Rule Zion 2012 only - Mar Fri>=26 2:00 1:00 D - Rule Zion 2012 only - Sep 23 2:00 0 S --Rule Zion 2013 only - Sep 8 2:00 0 S --Rule Zion 2014 only - Sep 28 2:00 0 S --Rule Zion 2015 only - Sep 20 2:00 0 S --Rule Zion 2016 only - Apr 1 2:00 1:00 D --Rule Zion 2016 only - Oct 9 2:00 0 S --Rule Zion 2017 2021 - Mar Fri>=26 2:00 1:00 D --Rule Zion 2017 only - Sep 24 2:00 0 S --Rule Zion 2018 only - Sep 16 2:00 0 S --Rule Zion 2019 only - Oct 6 2:00 0 S --Rule Zion 2020 only - Sep 27 2:00 0 S --Rule Zion 2021 only - Sep 12 2:00 0 S --Rule Zion 2022 only - Apr 1 2:00 1:00 D --Rule Zion 2022 only - Oct 2 2:00 0 S --Rule Zion 2023 2032 - Mar Fri>=26 2:00 1:00 D --Rule Zion 2023 only - Sep 24 2:00 0 S --Rule Zion 2024 only - Oct 6 2:00 0 S --Rule Zion 2025 only - Sep 28 2:00 0 S --Rule Zion 2026 only - Sep 20 2:00 0 S --Rule Zion 2027 only - Oct 10 2:00 0 S --Rule Zion 2028 only - Sep 24 2:00 0 S --Rule Zion 2029 only - Sep 16 2:00 0 S --Rule Zion 2030 only - Oct 6 2:00 0 S --Rule Zion 2031 only - Sep 21 2:00 0 S --Rule Zion 2032 only - Sep 12 2:00 0 S --Rule Zion 2033 only - Apr 1 2:00 1:00 D --Rule Zion 2033 only - Oct 2 2:00 0 S --Rule Zion 2034 2037 - Mar Fri>=26 2:00 1:00 D --Rule Zion 2034 only - Sep 17 2:00 0 S --Rule Zion 2035 only - Oct 7 2:00 0 S --Rule Zion 2036 only - Sep 28 2:00 0 S --Rule Zion 2037 only - Sep 13 2:00 0 S -+ -+# From Ephraim Silverberg (2012-10-18): -+ -+# Yesterday, the Interior Ministry Committee, after more than a year -+# past, approved sending the proposed June 2011 changes to the Time -+# Decree Law back to the Knesset for second and third (final) votes -+# before the upcoming elections on Jan. 22, 2013. Hence, although the -+# changes are not yet law, they are expected to be so before February 2013. -+# -+# As of 2013, DST starts at 02:00 on the Friday before the last Sunday in March. -+# DST ends at 02:00 on the first Sunday after October 1, unless it occurs on the -+# second day of the Jewish Rosh Hashana holiday, in which case DST ends a day -+# later (i.e. at 02:00 the first Monday after October 2). -+# [Rosh Hashana holidays are factored in until 2100.] -+ -+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -+Rule Zion 2013 max - Mar Fri>=23 2:00 1:00 D -+Rule Zion 2013 2026 - Oct Sun>=2 2:00 0 S -+Rule Zion 2027 only - Oct Mon>=3 2:00 0 S -+Rule Zion 2028 max - Oct Sun>=2 2:00 0 S -+# The following rules are commented out for now, as they break older -+# versions of zic that support only signed 32-bit timestamps, i.e., -+# through 2038-01-19 03:14:07 UTC. -+#Rule Zion 2028 2053 - Oct Sun>=2 2:00 0 S -+#Rule Zion 2054 only - Oct Mon>=3 2:00 0 S -+#Rule Zion 2055 2080 - Oct Sun>=2 2:00 0 S -+#Rule Zion 2081 only - Oct Mon>=3 2:00 0 S -+#Rule Zion 2082 max - Oct Sun>=2 2:00 0 S - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Asia/Jerusalem 2:20:56 - LMT 1880 -@@ -1385,6 +1382,16 @@ - # From Arthur David Olson (2009-04-06): - # We still have Jordan switching to DST on Thursdays in 2000 and 2001. - -+# From Steffen Thorsen (2012-10-25): -+# Yesterday the government in Jordan announced that they will not -+# switch back to standard time this winter, so the will stay on DST -+# until about the same time next year (at least). -+# http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950 -+# -+# From Paul Eggert (2012-10-25): -+# For now, assume this is just a one-year measure. If it becomes -+# permanent, we should move Jordan from EET to AST effective tomorrow. -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Jordan 1973 only - Jun 6 0:00 1:00 S - Rule Jordan 1973 1975 - Oct 1 0:00 0 - -@@ -1413,7 +1420,8 @@ - Rule Jordan 2003 only - Oct 24 0:00s 0 - - Rule Jordan 2004 only - Oct 15 0:00s 0 - - Rule Jordan 2005 only - Sep lastFri 0:00s 0 - --Rule Jordan 2006 max - Oct lastFri 0:00s 0 - -+Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 - -+Rule Jordan 2013 max - Oct lastFri 0:00s 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Asia/Amman 2:23:44 - LMT 1931 - 2:00 Jordan EE%sT -@@ -2316,6 +2324,8 @@ - - # From Arthur David Olson (2011-09-20): - # 2011 transitions per http://www.timeanddate.com as of 2011-09-20. -+# From Paul Eggert (2012-10-12): -+# 2012 transitions per http://www.timeanddate.com as of 2012-10-12. - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Asia/Gaza 2:17:52 - LMT 1900 Oct -@@ -2326,7 +2336,7 @@ - 2:00 Palestine EE%sT 2011 Apr 2 12:01 - 2:00 1:00 EEST 2011 Aug 1 - 2:00 - EET 2012 Mar 30 -- 2:00 1:00 EEST 2012 Sep 28 -+ 2:00 1:00 EEST 2012 Sep 21 1:00 - 2:00 - EET - - Zone Asia/Hebron 2:20:23 - LMT 1900 Oct -@@ -2341,7 +2351,7 @@ - 2:00 - EET 2011 Aug 30 - 2:00 1:00 EEST 2011 Sep 30 3:00 - 2:00 - EET 2012 Mar 30 -- 2:00 1:00 EEST 2012 Sep 28 3:00 -+ 2:00 1:00 EEST 2012 Sep 21 1:00 - 2:00 - EET - - # Paracel Is ---- openjdk/jdk/make/sun/javazic/tzdata/australasia -+++ openjdk/jdk/make/sun/javazic/tzdata/australasia -@@ -651,6 +651,23 @@ - # Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012 - # seasons, there is not yet any indication that this trend will continue on - # a regular basis. For now, we have explicitly listed the transitions below. -+# -+# From Nicky (2012-09-10): -+# Daylight Saving Time commences on Sunday 30th September 2012 and -+# ends on Sunday 7th of April 2013. -+# -+# Please find link below for more information. -+# http://www.mcil.gov.ws/mcil_publications.html -+# -+# That publication also includes dates for Summer of 2013/4 as well -+# which give the impression of a pattern in selecting dates for the -+# future, so for now, we will guess this will continue. -+ -+# Western Samoa -+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -+Rule WS 2012 max - Sep lastSun 3:00 1 D -+Rule WS 2012 max - Apr Sun>=1 4:00 0 - -+# Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 - -11:26:56 - LMT 1911 - -11:30 - SAMT 1950 # Samoa Time -@@ -658,8 +675,8 @@ - -11:00 1:00 WSDT 2011 Apr 2 4:00 - -11:00 - WST 2011 Sep 24 3:00 - -11:00 1:00 WSDT 2011 Dec 30 -- 13:00 1:00 WSDT 2012 Apr 1 4:00 -- 13:00 - WST -+ 13:00 1:00 WSDT 2012 Apr Sun>=1 4:00 -+ 13:00 WS WS%sT - - # Solomon Is - # excludes Bougainville, for which see Papua New Guinea ---- openjdk/jdk/make/sun/javazic/tzdata/northamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/northamerica -@@ -2820,6 +2820,13 @@ - # http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html - # </a> - -+# From Steffen Thorsen (2012-11-03): -+# Radio Reloj and many other sources report that Cuba is changing back -+# to standard time on 2012-11-04: -+# http://www.radioreloj.cu/index.php/noticias-radio-reloj/36-nacionales/9961-regira-horario-normal-en-cuba-desde-el-domingo-cuatro-de-noviembre -+# From Paul Eggert (2012-11-03): -+# For now, assume the future rule is first Sunday in November. -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Cuba 1928 only - Jun 10 0:00 1:00 D - Rule Cuba 1928 only - Oct 10 0:00 0 S -@@ -2857,7 +2864,7 @@ - Rule Cuba 2011 only - Mar Sun>=15 0:00s 1:00 D - Rule Cuba 2011 only - Nov 13 0:00s 0 S - Rule Cuba 2012 only - Apr 1 0:00s 1:00 D --Rule Cuba 2012 max - Oct lastSun 0:00s 0 S -+Rule Cuba 2012 max - Nov Sun>=1 0:00s 0 S - Rule Cuba 2013 max - Mar Sun>=8 0:00s 1:00 D - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] ---- openjdk/jdk/make/sun/javazic/tzdata/southamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/southamerica -@@ -852,6 +852,15 @@ - # http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6 - # </a> - -+# From Kelley Cook (2012-10-16): -+# The governor of state of Bahia in Brazil announced on Thursday that -+# due to public pressure, he is reversing the DST policy they implemented -+# last year and will not be going to Summer Time on October 21st.... -+# http://www.correio24horas.com.br/r/artigo/apos-pressoes-wagner-suspende-horario-de-verao-na-bahia -+ -+# From Rodrigo Severo (2012-10-16): -+# Tocantins state will have DST. -+# http://noticias.terra.com.br/brasil/noticias/0,,OI6232536-EI306.html - - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01) -@@ -1071,7 +1080,8 @@ - -3:00 Brazil BR%sT 1990 Sep 17 - -3:00 - BRT 1995 Sep 14 - -3:00 Brazil BR%sT 2003 Sep 24 -- -3:00 - BRT -+ -3:00 - BRT 2012 Oct 21 -+ -3:00 Brazil BR%sT - # - # Alagoas (AL), Sergipe (SE) - Zone America/Maceio -2:22:52 - LMT 1914 -@@ -1090,7 +1100,8 @@ - Zone America/Bahia -2:34:04 - LMT 1914 - -3:00 Brazil BR%sT 2003 Sep 24 - -3:00 - BRT 2011 Oct 16 -- -3:00 Brazil BR%sT -+ -3:00 Brazil BR%sT 2012 Oct 21 -+ -3:00 - BRT - # - # Goias (GO), Distrito Federal (DF), Minas Gerais (MG), - # Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR),
--- a/patches/openjdk/8009987-tzdata2013b.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2275 +0,0 @@ -# HG changeset patch -# User peytoia -# Date 1363347351 -32400 -# Node ID d0902320c58f1b4c339e2aec3f120c9d6e3ea732 -# Parent 1f833e4211177700a66cc22a0c5a794448c1a29a -8009987: (tz) Support tzdata2013b -Reviewed-by: okutsu - ---- openjdk/jdk/make/sun/javazic/tzdata/VERSION -+++ openjdk/jdk/make/sun/javazic/tzdata/VERSION -@@ -21,4 +21,4 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --tzdata2012i -+tzdata2013b ---- openjdk/jdk/make/sun/javazic/tzdata/africa -+++ openjdk/jdk/make/sun/javazic/tzdata/africa -@@ -27,9 +27,9 @@ - - # This data is by no means authoritative; if you think you know better, - # go ahead and edit the file (and please send any changes to --# tz@elsie.nci.nih.gov for general use in the future). -+# tz@iana.org for general use in the future). - --# From Paul Eggert (2006-03-22): -+# From Paul Eggert (2013-02-21): - # - # A good source for time zone historical data outside the U.S. is - # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), -@@ -48,6 +48,10 @@ - # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which - # I found in the UCLA library. - # -+# For data circa 1899, a common source is: -+# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 -+# <http://www.jstor.org/stable/1774359>. -+# - # A reliable and entertaining source about time zones is - # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). - # -@@ -139,8 +143,12 @@ - 1:00 - WAT - - # Botswana -+# From Paul Eggert (2013-02-21): -+# Milne says they were regulated by the Cape Town Signal in 1899; -+# assume they switched to 2:00 when Cape Town did. - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Africa/Gaborone 1:43:40 - LMT 1885 -+ 1:30 - SAST 1903 Mar - 2:00 - CAT 1943 Sep 19 2:00 - 2:00 1:00 CAST 1944 Mar 19 2:00 - 2:00 - CAT -@@ -212,6 +220,11 @@ - - # Egypt - -+# Milne says Cairo used 2:05:08.9, the local mean time of the Abbasizeh -+# observatory; round to nearest. Milne also says that the official time for -+# Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this -+# did not apply to Cairo, Alexandria, or Port Said. -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Egypt 1940 only - Jul 15 0:00 1:00 S - Rule Egypt 1940 only - Oct 1 0:00 0 - -@@ -352,7 +365,7 @@ - Rule Egypt 2010 only - Sep lastThu 23:00s 0 - - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone Africa/Cairo 2:05:00 - LMT 1900 Oct -+Zone Africa/Cairo 2:05:09 - LMT 1900 Oct - 2:00 Egypt EE%sT - - # Equatorial Guinea -@@ -447,6 +460,20 @@ - - # Libya - -+# From Even Scharning (2012-11-10): -+# Libya set their time one hour back at 02:00 on Saturday November 10. -+# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/ -+# Here is an official source [in Arabic]: http://ls.ly/fb6Yc -+# -+# Steffen Thorsen forwarded a translation (2012-11-10) in -+# http://mm.icann.org/pipermail/tz/2012-November/018451.html -+# -+# From Tim Parenti (2012-11-11): -+# Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1. -+# The DST rules planned for 2013 and onward roughly mirror those of Europe -+# (either two days before them or five days after them, so as to fall on -+# lastFri instead of lastSun). -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Libya 1951 only - Oct 14 2:00 1:00 S - Rule Libya 1952 only - Jan 1 0:00 0 - -@@ -461,17 +488,21 @@ - Rule Libya 1986 only - Oct 3 0:00 0 - - Rule Libya 1987 1989 - Apr 1 0:00 1:00 S - Rule Libya 1987 1989 - Oct 1 0:00 0 - -+Rule Libya 1997 only - Apr 4 0:00 1:00 S -+Rule Libya 1997 only - Oct 4 0:00 0 - -+Rule Libya 2013 max - Mar lastFri 1:00 1:00 S -+Rule Libya 2013 max - Oct lastFri 2:00 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Africa/Tripoli 0:52:44 - LMT 1920 - 1:00 Libya CE%sT 1959 - 2:00 - EET 1982 - 1:00 Libya CE%sT 1990 May 4 --# The following entries are from Shanks & Pottenger; -+# The 1996 and 1997 entries are from Shanks & Pottenger; - # the IATA SSIM data contain some obvious errors. - 2:00 - EET 1996 Sep 30 -- 1:00 - CET 1997 Apr 4 -- 1:00 1:00 CEST 1997 Oct 4 -- 2:00 - EET -+ 1:00 Libya CE%sT 1997 Oct 4 -+ 2:00 - EET 2012 Nov 10 2:00 -+ 1:00 Libya CE%sT - - # Madagascar - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -@@ -838,6 +869,41 @@ - # 3:00 am Friday, July 20, 2012 and will again be advanced by 60 minutes - # August 20, 2012 from 2:00 am. - -+# From Paul Eggert (2013-03-06): -+# Morocco's daylight-saving transitions due to Ramadan seem to be -+# announced a bit in advance. On 2012-07-11 the Moroccan government -+# announced that year's Ramadan daylight-saving transitions would be -+# 2012-07-20 and 2012-08-20; see -+# <http://www.mmsp.gov.ma/fr/actualites.aspx?id=288>. -+# -+# To estimate what the Moroccan government will do in future years, -+# transition dates for 2013 through 2021 were determined by running -+# the following program under GNU Emacs 24.3: -+# -+# (let ((islamic-year 1434)) -+# (while (< islamic-year 1444) -+# (let ((a -+# (calendar-gregorian-from-absolute -+# (calendar-islamic-to-absolute (list 9 1 islamic-year)))) -+# (b -+# (calendar-gregorian-from-absolute -+# (calendar-islamic-to-absolute (list 10 1 islamic-year))))) -+# (insert -+# (format -+# (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 3:00\t0\t-\n" -+# "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 2:00\t1:00\tS\n") -+# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a)) -+# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) -+# (setq islamic-year (+ 1 islamic-year)))) -+# -+# with the results hand-edited for 2020-2022, when the normal spring-forward -+# date falls during the estimated Ramadan. -+# -+# From 2023 through 2038 Ramadan is not predicted to overlap with -+# daylight saving time. Starting in 2039 there will be overlap again, -+# but 32-bit time_t values roll around in 2038 so for now do not worry -+# about dates after 2038. -+ - # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S - - Rule Morocco 1939 only - Sep 12 0:00 1:00 S -@@ -863,10 +929,28 @@ - Rule Morocco 2010 only - Aug 8 0:00 0 - - Rule Morocco 2011 only - Apr 3 0:00 1:00 S - Rule Morocco 2011 only - Jul 31 0 0 - --Rule Morocco 2012 max - Apr lastSun 2:00 1:00 S -+Rule Morocco 2012 2019 - Apr lastSun 2:00 1:00 S - Rule Morocco 2012 max - Sep lastSun 3:00 0 - - Rule Morocco 2012 only - Jul 20 3:00 0 - - Rule Morocco 2012 only - Aug 20 2:00 1:00 S -+Rule Morocco 2013 only - Jul 9 3:00 0 - -+Rule Morocco 2013 only - Aug 8 2:00 1:00 S -+Rule Morocco 2014 only - Jun 29 3:00 0 - -+Rule Morocco 2014 only - Jul 29 2:00 1:00 S -+Rule Morocco 2015 only - Jun 18 3:00 0 - -+Rule Morocco 2015 only - Jul 18 2:00 1:00 S -+Rule Morocco 2016 only - Jun 7 3:00 0 - -+Rule Morocco 2016 only - Jul 7 2:00 1:00 S -+Rule Morocco 2017 only - May 27 3:00 0 - -+Rule Morocco 2017 only - Jun 26 2:00 1:00 S -+Rule Morocco 2018 only - May 16 3:00 0 - -+Rule Morocco 2018 only - Jun 15 2:00 1:00 S -+Rule Morocco 2019 only - May 6 3:00 0 - -+Rule Morocco 2019 only - Jun 5 2:00 1:00 S -+Rule Morocco 2020 only - May 24 2:00 1:00 S -+Rule Morocco 2021 only - May 13 2:00 1:00 S -+Rule Morocco 2022 only - May 3 2:00 1:00 S -+Rule Morocco 2023 max - Apr lastSun 2:00 1:00 S - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 ---- openjdk/jdk/make/sun/javazic/tzdata/antarctica -+++ openjdk/jdk/make/sun/javazic/tzdata/antarctica -@@ -73,10 +73,8 @@ - Rule ChileAQ 2010 only - Apr Sun>=1 3:00u 0 - - Rule ChileAQ 2011 only - May Sun>=2 3:00u 0 - - Rule ChileAQ 2011 only - Aug Sun>=16 4:00u 1:00 S --Rule ChileAQ 2012 only - Apr Sun>=23 3:00u 0 - --Rule ChileAQ 2012 only - Sep Sun>=2 4:00u 1:00 S --Rule ChileAQ 2013 max - Mar Sun>=9 3:00u 0 - --Rule ChileAQ 2013 max - Oct Sun>=9 4:00u 1:00 S -+Rule ChileAQ 2012 max - Apr Sun>=23 3:00u 0 - -+Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S - - # These rules are stolen from the `australasia' file. - Rule AusAQ 1917 only - Jan 1 0:01 1:00 - ---- openjdk/jdk/make/sun/javazic/tzdata/asia -+++ openjdk/jdk/make/sun/javazic/tzdata/asia -@@ -27,9 +27,9 @@ - - # This data is by no means authoritative; if you think you know better, - # go ahead and edit the file (and please send any changes to --# tz@elsie.nci.nih.gov for general use in the future). -+# tz@iana.org for general use in the future). - --# From Paul Eggert (2006-03-22): -+# From Paul Eggert (2013-02-21): - # - # A good source for time zone historical data outside the U.S. is - # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), -@@ -48,6 +48,10 @@ - # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which - # I found in the UCLA library. - # -+# For data circa 1899, a common source is: -+# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 -+# <http://www.jstor.org/stable/1774359>. -+# - # A reliable and entertaining source about time zones is - # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). - # -@@ -302,9 +306,12 @@ - 8:00 - BNT - - # Burma / Myanmar -+ -+# Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon. -+ - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Asia/Rangoon 6:24:40 - LMT 1880 # or Yangon -- 6:24:36 - RMT 1920 # Rangoon Mean Time? -+ 6:24:40 - RMT 1920 # Rangoon Mean Time? - 6:30 - BURT 1942 May # Burma Time - 9:00 - JST 1945 May 3 - 6:30 - MMT # Myanmar Time -@@ -407,7 +414,8 @@ - 8:00 PRC C%sT - # Zhongyuan Time ("Central plain Time") - # most of China --Zone Asia/Shanghai 8:05:52 - LMT 1928 -+# Milne gives 8:05:56.7; round to nearest. -+Zone Asia/Shanghai 8:05:57 - LMT 1928 - 8:00 Shang C%sT 1949 - 8:00 PRC C%sT - # Long-shu Time (probably due to Long and Shu being two names of that area) -@@ -504,6 +512,10 @@ - 8:00 PRC C%sT - - -+# Hong Kong (Xianggang) -+ -+# Milne gives 7:36:41.7; round this. -+ - # From Lee Yiu Chung (2009-10-24): - # I found there are some mistakes for the...DST rule for Hong - # Kong. [According] to the DST record from Hong Kong Observatory (actually, -@@ -570,7 +582,6 @@ - # The Japanese surrender of Hong Kong was signed 1945-09-15. - # For lack of anything better, use start of those days as the transition times. - --# Hong Kong (Xianggang) - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule HK 1941 only - Apr 1 3:30 1:00 S - Rule HK 1941 only - Sep 30 3:30 0 - -@@ -592,7 +603,7 @@ - Rule HK 1979 only - May Sun>=8 3:30 1:00 S - Rule HK 1979 only - Oct Sun>=16 3:30 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone Asia/Hong_Kong 7:36:36 - LMT 1904 Oct 30 -+Zone Asia/Hong_Kong 7:36:42 - LMT 1904 Oct 30 - 8:00 HK HK%sT 1941 Dec 25 - 9:00 - JST 1945 Sep 15 - 8:00 HK HK%sT -@@ -669,6 +680,9 @@ - ############################################################################### - - # Cyprus -+# -+# Milne says the Eastern Telegraph Company used 2:14:00. Stick with LMT. -+# - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Cyprus 1975 only - Apr 13 0:00 1:00 S - Rule Cyprus 1975 only - Oct 12 0:00 0 - -@@ -1222,7 +1236,6 @@ - Rule Zion 2012 only - Sep 23 2:00 0 S - - # From Ephraim Silverberg (2012-10-18): -- - # Yesterday, the Interior Ministry Committee, after more than a year - # past, approved sending the proposed June 2011 changes to the Time - # Decree Law back to the Knesset for second and third (final) votes -@@ -1235,6 +1248,10 @@ - # later (i.e. at 02:00 the first Monday after October 2). - # [Rosh Hashana holidays are factored in until 2100.] - -+# From Ephraim Silverberg (2012-11-05): -+# The Knesset passed today (in second and final readings) the amendment to the -+# Time Decree Law making the changes ... law. -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Zion 2013 max - Mar Fri>=23 2:00 1:00 D - Rule Zion 2013 2026 - Oct Sun>=2 2:00 0 S -@@ -1824,8 +1841,11 @@ - 5:45 - NPT # Nepal Time - - # Oman -+ -+# Milne says 3:54:24 was the meridian of the Muscat Tidal Observatory. -+ - # Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone Asia/Muscat 3:54:20 - LMT 1920 -+Zone Asia/Muscat 3:54:24 - LMT 1920 - 4:00 - GST - - # Pakistan -@@ -2072,8 +2092,7 @@ - # occurred before our cutoff date of 1970. - # However, as we get more information, we may need to add entries - # for parts of the West Bank as they transitioned from Israel's rules --# to Palestine's rules. If you have more info about this, please --# send it to tz@elsie.nci.nih.gov for incorporation into future editions. -+# to Palestine's rules. - - # From IINS News Service - Israel - 1998-03-23 10:38:07 Israel time, - # forwarded by Ephraim Silverberg: -@@ -2421,6 +2440,13 @@ - # no information - - # Sri Lanka -+ -+# From Paul Eggert (2013-02-21): -+# Milne says "Madras mean time use from May 1, 1898. Prior to this Colombo -+# mean time, 5h. 4m. 21.9s. F., was used." But 5:04:21.9 differs considerably -+# from Colombo's meridian 5:19:24, so for now ignore Milne and stick with -+# Shanks and Pottenger. -+ - # From Paul Eggert (1996-09-03): - # "Sri Lanka advances clock by an hour to avoid blackout" - # (www.virtual-pc.com/lankaweb/news/items/240596-2.html, 1996-05-24, -@@ -2720,6 +2746,12 @@ - - # Vietnam - -+# From Paul Eggert (2013-02-21): -+# Milne gives 7:16:56 for the meridian of Saigon in 1899, as being -+# used in Lower Laos, Cambodia, and Annam. But this is quite a ways -+# from Saigon's location. For now, ignore this and stick with Shanks -+# and Pottenger. -+ - # From Arthur David Olson (2008-03-18): - # The English-language name of Vietnam's most populous city is "Ho Chi Min City"; - # we use Ho_Chi_Minh below to avoid a name of more than 14 characters. -@@ -2733,6 +2765,10 @@ - 7:00 - ICT - - # Yemen -+ -+# Milne says 2:59:54 was the meridian of the saluting battery at Aden, -+# and that Yemen was at 1:55:56, the meridian of the Hagia Sophia. -+ - # Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone Asia/Aden 3:00:48 - LMT 1950 -+Zone Asia/Aden 2:59:54 - LMT 1950 - 3:00 - AST ---- openjdk/jdk/make/sun/javazic/tzdata/australasia -+++ openjdk/jdk/make/sun/javazic/tzdata/australasia -@@ -269,6 +269,9 @@ - 6:30 - CCT # Cocos Islands Time - - # Fiji -+ -+# Milne gives 11:55:44 for Suva. -+ - # From Alexander Krivenyshev (2009-11-10): - # According to Fiji Broadcasting Corporation, Fiji plans to re-introduce DST - # from November 29th 2009 to April 25th 2010. -@@ -362,7 +365,7 @@ - Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - - Rule Fiji 2012 max - Jan Sun>=18 3:00 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone Pacific/Fiji 11:53:40 - LMT 1915 Oct 26 # Suva -+Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva - 12:00 Fiji FJ%sT # Fiji Time - - # French Polynesia -@@ -803,9 +806,9 @@ - - # This data is by no means authoritative; if you think you know better, - # go ahead and edit the file (and please send any changes to --# tz@elsie.nci.nih.gov for general use in the future). -+# tz@iana.org for general use in the future). - --# From Paul Eggert (2006-03-22): -+# From Paul Eggert (2013-02-21): - # A good source for time zone historical data outside the U.S. is - # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), - # San Diego: ACS Publications, Inc. (2003). -@@ -823,6 +826,10 @@ - # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which - # I found in the UCLA library. - # -+# For data circa 1899, a common source is: -+# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 -+# <http://www.jstor.org/stable/1774359>. -+# - # A reliable and entertaining source about time zones is - # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). - # ---- openjdk/jdk/make/sun/javazic/tzdata/europe -+++ openjdk/jdk/make/sun/javazic/tzdata/europe -@@ -27,7 +27,7 @@ - - # This data is by no means authoritative; if you think you know better, - # go ahead and edit the file (and please send any changes to --# tz@elsie.nci.nih.gov for general use in the future). -+# tz@iana.org for general use in the future). - - # From Paul Eggert (2006-03-22): - # A good source for time zone historical data outside the U.S. is -@@ -53,6 +53,12 @@ - # William Willett, The Waste of Daylight, 19th edition - # </a> (1914-03) - # -+# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 -+# <http://www.jstor.org/stable/1774359>. He writes: -+# "It is requested that corrections and additions to these tables -+# may be sent to Mr. John Milne, Royal Geographical Society, -+# Savile Row, London." Nowadays please email them to tz@iana.org. -+# - # Brazil's Departamento Servico da Hora (DSH), - # <a href="http://pcdsh01.on.br/HISTHV.htm"> - # History of Summer Time -@@ -689,6 +695,8 @@ - - # Austria - -+# Milne says Vienna time was 1:05:21. -+ - # From Paul Eggert (2006-03-22): Shanks & Pottenger give 1918-06-16 and - # 1945-11-18, but the Austrian Federal Office of Metrology and - # Surveying (BEV) gives 1918-09-16 and for Vienna gives the "alleged" -@@ -706,7 +714,7 @@ - Rule Austria 1980 only - Apr 6 0:00 1:00 S - Rule Austria 1980 only - Sep 28 0:00 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone Europe/Vienna 1:05:20 - LMT 1893 Apr -+Zone Europe/Vienna 1:05:21 - LMT 1893 Apr - 1:00 C-Eur CE%sT 1920 - 1:00 Austria CE%sT 1940 Apr 1 2:00s - 1:00 C-Eur CE%sT 1945 Apr 2 2:00s -@@ -1262,6 +1270,21 @@ - 1:00 Germany CE%sT 1980 - 1:00 EU CE%sT - -+# From Tobias Conradi (2011-09-12): -+# Busingen <http://www.buesingen.de>, surrounded by the Swiss canton -+# Schaffhausen, did not start observing DST in 1980 as the rest of DE -+# (West Germany at that time) and DD (East Germany at that time) did. -+# DD merged into DE, the area is currently covered by code DE in ISO 3166-1, -+# which in turn is covered by the zone Europe/Berlin. -+# -+# Source for the time in Busingen 1980: -+# http://www.srf.ch/player/video?id=c012c029-03b7-4c2b-9164-aa5902cd58d3 -+ -+# From Arthur David Olson (2012-03-03): -+# Busingen and Zurich have shared clocks since 1970. -+ -+Link Europe/Zurich Europe/Busingen -+ - # Georgia - # Please see the "asia" file for Asia/Tbilisi. - # Herodotus (Histories, IV.45) says Georgia north of the Phasis (now Rioni) -@@ -2066,6 +2089,70 @@ - - # Russia - -+# From Alexander Krivenyshev (2011-09-15): -+# Based on last Russian Government Decree # 725 on August 31, 2011 -+# (Government document -+# <a href="http://www.government.ru/gov/results/16355/print/"> -+# http://www.government.ru/gov/results/16355/print/ -+# </a> -+# in Russian) -+# there are few corrections have to be made for some Russian time zones... -+# All updated Russian Time Zones were placed in table and translated to English -+# by WorldTimeZone.com at the link below: -+# <a href="http://www.worldtimezone.com/dst_news/dst_news_russia36.htm"> -+# http://www.worldtimezone.com/dst_news/dst_news_russia36.htm -+# </a> -+ -+# From Sanjeev Gupta (2011-09-27): -+# Scans of [Decree #23 of January 8, 1992] are available at: -+# <a href="http://government.consultant.ru/page.aspx?1223966"> -+# http://government.consultant.ru/page.aspx?1223966 -+# They are in Cyrillic letters (presumably Russian). -+ -+# From Arthur David Olson (2012-05-09): -+# Regarding the instant when clocks in time-zone-shifting parts of Russia -+# changed in September 2011: -+# -+# One source is -+# < a href="http://government.ru/gov/results/16355/> -+# http://government.ru/gov/results/16355/ -+# </a> -+# which, according to translate.google.com, begins "Decree of August 31, -+# 2011 No 725" and contains no other dates or "effective date" information. -+# -+# Another source is -+# <a href="http://www.rg.ru/2011/09/06/chas-zona-dok.html"> -+# http://www.rg.ru/2011/09/06/chas-zona-dok.html -+# </a> -+# which, according to translate.google.com, begins "Resolution of the -+# Government of the Russian Federation on August 31, 2011 N 725" and also -+# contains "Date first official publication: September 6, 2011 Posted on: -+# in the 'RG' - Federal Issue number 5573 September 6, 2011" but which -+# does not contain any "effective date" information. -+# -+# Another source is -+# <a href="http://en.wikipedia.org/wiki/Oymyakonsky_District#cite_note-RuTime-7"> -+# http://en.wikipedia.org/wiki/Oymyakonsky_District#cite_note-RuTime-7 -+# </a> -+# which, in note 8, contains "Resolution #725 of August 31, 2011... -+# Effective as of after 7 days following the day of the official publication" -+# but which does not contain any reference to September 6, 2011. -+# -+# The Wikipedia article refers to -+# <a href="http://base.consultant.ru/cons/cgi/online.cgi?req=doc;base=LAW;n=118896"> -+# http://base.consultant.ru/cons/cgi/online.cgi?req=doc;base=LAW;n=118896 -+# </a> -+# which seems to copy the text of the government.ru page. -+# -+# Tobias Conradi combines Wikipedia's -+# "as of after 7 days following the day of the official publication" -+# with www.rg.ru's "Date of first official publication: September 6, 2011" to get -+# September 13, 2011 as the cutover date (unusually, a Tuesday, as Tobias Conradi notes). -+# -+# None of the sources indicates a time of day for changing clocks. -+# -+# Go with 2011-09-13 0:00s. -+ - # From Paul Eggert (2006-03-22): - # Except for Moscow after 1919-07-01, I invented the time zone abbreviations. - # Moscow time zone abbreviations after 1919-07-01, and Moscow rules after 1991, -@@ -2293,14 +2380,32 @@ - # [parts of] Respublika Sakha (Yakutiya). - - # From Oscar van Vlijmen (2009-11-29): --# The Sakha districts are: Bulunskij, Verkhoyanskij, Tomponskij, Ust'-Majskij, --# Ust'-Yanskij. -+# The Sakha districts are: Bulunskij, Verkhoyanskij, ... Ust'-Yanskij. - Zone Asia/Vladivostok 8:47:44 - LMT 1922 Nov 15 - 9:00 - VLAT 1930 Jun 21 # Vladivostok Time - 10:00 Russia VLA%sT 1991 Mar 31 2:00s - 9:00 Russia VLA%sST 1992 Jan 19 2:00s - 10:00 Russia VLA%sT 2011 Mar 27 2:00s - 11:00 - VLAT -+ -+# From Arthur David Olson (2012-05-09): -+# Tomponskij and Ust'-Majskij switched from Vladivostok time to Yakutsk time -+# in 2011. -+# -+# From Paul Eggert (2012-11-25): -+# Shanks and Pottenger (2003) has Khandyga on Yakutsk time. -+# Make a wild guess that it switched to Vladivostok time in 2004. -+# This transition is no doubt wrong, but we have no better info. -+# -+Zone Asia/Khandyga 9:02:13 - LMT 1919 Dec 15 -+ 8:00 - YAKT 1930 Jun 21 # Yakutsk Time -+ 9:00 Russia YAK%sT 1991 Mar 31 2:00s -+ 8:00 Russia YAK%sT 1992 Jan 19 2:00s -+ 9:00 Russia YAK%sT 2004 -+ 10:00 Russia VLA%sT 2011 Mar 27 2:00s -+ 11:00 - VLAT 2011 Sep 13 0:00s # Decree 725? -+ 10:00 - YAKT -+ - # - # Sakhalinskaya oblast'. - # The Zone name should be Yuzhno-Sakhalinsk, but that's too long. -@@ -2319,14 +2424,26 @@ - - # From Oscar van Vlijmen (2009-11-29): - # The Sakha districts are: Abyjskij, Allaikhovskij, Verkhhhnekolymskij, Momskij, --# Nizhnekolymskij, Ojmyakonskij, Srednekolymskij. -+# Nizhnekolymskij, ... Srednekolymskij. - Zone Asia/Magadan 10:03:12 - LMT 1924 May 2 - 10:00 - MAGT 1930 Jun 21 # Magadan Time - 11:00 Russia MAG%sT 1991 Mar 31 2:00s - 10:00 Russia MAG%sT 1992 Jan 19 2:00s - 11:00 Russia MAG%sT 2011 Mar 27 2:00s - 12:00 - MAGT --# -+ -+# From Arthur David Olson (2012-05-09): -+# Ojmyakonskij and the Kuril Islands switched from -+# Magadan time to Vladivostok time in 2011. -+Zone Asia/Ust-Nera 9:32:54 - LMT 1919 Dec 15 -+ 8:00 - YAKT 1930 Jun 21 # Yakutsk Time -+ 9:00 Russia YAKT 1981 Apr 1 -+ 11:00 Russia MAG%sT 1991 Mar 31 2:00s -+ 10:00 Russia MAG%sT 1992 Jan 19 2:00s -+ 11:00 Russia MAG%sT 2011 Mar 27 2:00s -+ 12:00 - MAGT 2011 Sep 13 0:00s # Decree 725? -+ 11:00 - VLAT -+ - # From Oscar van Vlijmen (2001-08-25): [This region consists of] - # Kamchatskaya oblast', Koryakskij avtonomnyj okrug. - # ---- openjdk/jdk/make/sun/javazic/tzdata/northamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/northamerica -@@ -29,7 +29,7 @@ - - # This data is by no means authoritative; if you think you know better, - # go ahead and edit the file (and please send any changes to --# tz@elsie.nci.nih.gov for general use in the future). -+# tz@iana.org for general use in the future). - - # From Paul Eggert (1999-03-22): - # A reliable and entertaining source about time zones is -@@ -1042,6 +1042,9 @@ - # William Willett, The Waste of Daylight, 19th edition - # </a> (1914-03) - # -+# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 -+# <http://www.jstor.org/stable/1774359>. -+# - # See the `europe' file for Greenland. - - # Canada -@@ -2577,6 +2580,8 @@ - - # Bahamas - # -+# For 1899 Milne gives -5:09:29.5; round that. -+# - # From Sue Williams (2006-12-07): - # The Bahamas announced about a month ago that they plan to change their DST - # rules to sync with the U.S. starting in 2007.... -@@ -2586,11 +2591,14 @@ - Rule Bahamas 1964 1975 - Oct lastSun 2:00 0 S - Rule Bahamas 1964 1975 - Apr lastSun 2:00 1:00 D - # Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone America/Nassau -5:09:24 - LMT 1912 Mar 2 -+Zone America/Nassau -5:09:30 - LMT 1912 Mar 2 - -5:00 Bahamas E%sT 1976 - -5:00 US E%sT - - # Barbados -+ -+# For 1899 Milne gives -3:58:29.2; round that. -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Barb 1977 only - Jun 12 2:00 1:00 D - Rule Barb 1977 1978 - Oct Sun>=1 2:00 0 S -@@ -2598,8 +2606,8 @@ - Rule Barb 1979 only - Sep 30 2:00 0 S - Rule Barb 1980 only - Sep 25 2:00 0 S - # Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone America/Barbados -3:58:28 - LMT 1924 # Bridgetown -- -3:58:28 - BMT 1932 # Bridgetown Mean Time -+Zone America/Barbados -3:58:29 - LMT 1924 # Bridgetown -+ -3:58:29 - BMT 1932 # Bridgetown Mean Time - -4:00 Barb A%sT - - # Belize -@@ -2617,6 +2625,9 @@ - - # Bermuda - -+# For 1899 Milne gives -4:19:18.3 as the meridian of the clock tower, -+# Bermuda dockyard, Ireland I; round that. -+ - # From Dan Jones, reporting in The Royal Gazette (2006-06-26): - - # Next year, however, clocks in the US will go forward on the second Sunday -@@ -2626,7 +2637,7 @@ - # http://www.theroyalgazette.com/apps/pbcs.dll/article?AID=/20060529/NEWS/105290135 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone Atlantic/Bermuda -4:19:04 - LMT 1930 Jan 1 2:00 # Hamilton -+Zone Atlantic/Bermuda -4:19:18 - LMT 1930 Jan 1 2:00 # Hamilton - -4:00 - AST 1974 Apr 28 2:00 - -4:00 Bahamas A%sT 1976 - -4:00 US A%sT -@@ -2638,6 +2649,9 @@ - -5:00 - EST - - # Costa Rica -+ -+# Milne gives -5:36:13.3 as San Jose mean time; round to nearest. -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule CR 1979 1980 - Feb lastSun 0:00 1:00 D - Rule CR 1979 1980 - Jun Sun>=1 0:00 0 S -@@ -2648,14 +2662,19 @@ - Rule CR 1992 only - Mar 15 0:00 0 S - # There are too many San Joses elsewhere, so we'll use `Costa Rica'. - # Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone America/Costa_Rica -5:36:20 - LMT 1890 # San Jose -- -5:36:20 - SJMT 1921 Jan 15 # San Jose Mean Time -+Zone America/Costa_Rica -5:36:13 - LMT 1890 # San Jose -+ -5:36:13 - SJMT 1921 Jan 15 # San Jose Mean Time - -6:00 CR C%sT - # Coco - # no information; probably like America/Costa_Rica - - # Cuba - -+# From Paul Eggert (2013-02-21): -+# Milne gives -5:28:50.45 for the observatory at Havana, -5:29:23.57 -+# for the port, and -5:30 for meteorological observations. -+# For now, stick with Shanks & Pottenger. -+ - # From Arthur David Olson (1999-03-29): - # The 1999-03-28 exhibition baseball game held in Havana, Cuba, between - # the Cuban National Team and the Baltimore Orioles was carried live on -@@ -3004,24 +3023,21 @@ - # apparently using the same start and end date as USA/Canada. - # So this means they have already changed their time. - # --# (Sources in French): --# <a href="http://www.alterpresse.org/spip.php?article12510"> - # http://www.alterpresse.org/spip.php?article12510 --# </a> --# <a href="http://radiovision2000haiti.net/home/?p=13253"> - # http://radiovision2000haiti.net/home/?p=13253 --# </a> - # --# Our coverage: --# <a href="http://www.timeanddate.com/news/time/haiti-dst-2012.html"> --# http://www.timeanddate.com/news/time/haiti-dst-2012.html --# </a> -- - # From Arthur David Olson (2012-03-11): - # The alterpresse.org source seems to show a US-style leap from 2:00 a.m. to - # 3:00 a.m. rather than the traditional Haitian jump at midnight. --# Assume a US-style fall back as well XXX. --# Do not yet assume that the change carries forward past 2012 XXX. -+# Assume a US-style fall back as well. -+ -+# From Steffen Thorsen (2013-03-10): -+# It appears that Haiti is observing DST this year as well, same rules -+# as US/Canada. They did it last year as well, and it looks like they -+# are going to observe DST every year now... -+# -+# http://radiovision2000haiti.net/public/haiti-avis-changement-dheure-dimanche/ -+# http://www.canalplushaiti.net/?p=6714 - - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Haiti 1983 only - May 8 0:00 1:00 D -@@ -3033,8 +3049,8 @@ - Rule Haiti 1988 1997 - Oct lastSun 1:00s 0 S - Rule Haiti 2005 2006 - Apr Sun>=1 0:00 1:00 D - Rule Haiti 2005 2006 - Oct lastSun 0:00 0 S --Rule Haiti 2012 only - Mar Sun>=8 2:00 1:00 D --Rule Haiti 2012 only - Nov Sun>=1 2:00 0 S -+Rule Haiti 2012 max - Mar Sun>=8 2:00 1:00 D -+Rule Haiti 2012 max - Nov Sun>=1 2:00 0 S - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone America/Port-au-Prince -4:49:20 - LMT 1890 - -4:49 - PPMT 1917 Jan 24 12:00 # P-a-P MT ---- openjdk/jdk/make/sun/javazic/tzdata/southamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/southamerica -@@ -27,13 +27,17 @@ - - # This data is by no means authoritative; if you think you know better, - # go ahead and edit the file (and please send any changes to --# tz@elsie.nci.nih.gov for general use in the future). -+# tz@iana.org for general use in the future). - - # From Paul Eggert (2006-03-22): - # A good source for time zone historical data outside the U.S. is - # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), - # San Diego: ACS Publications, Inc. (2003). - # -+# For data circa 1899, a common source is: -+# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 -+# <http://www.jstor.org/stable/1774359>. -+# - # Gwillim Law writes that a good source - # for recent time zone data is the International Air Transport - # Association's Standard Schedules Information Manual (IATA SSIM), -@@ -404,21 +408,11 @@ - # <a/> - # is the official page for the Province Government). - # --# There's also a note in only one of the major national papers (La Nación) at --# <a href="http://www.lanacion.com.ar/nota.asp?nota_id=1107912"> -+# There's also a note in only one of the major national papers ... - # http://www.lanacion.com.ar/nota.asp?nota_id=1107912 --# </a> - # --# The press release says: --# (...) anunció que el próximo domingo a las 00:00 los puntanos deberán --# atrasar una hora sus relojes. --# --# A partir de entonces, San Luis establecerá el huso horario propio de --# la Provincia. De esta manera, durante el periodo del calendario anual --# 2009, el cambio horario quedará comprendido entre las 00:00 del tercer --# domingo de marzo y las 24:00 del segundo sábado de octubre. --# Quick&dirty translation --# (...) announced that next Sunday, at 00:00, Puntanos (the San Luis -+# The press release says [quick and dirty translation]: -+# ... announced that next Sunday, at 00:00, Puntanos (the San Luis - # inhabitants) will have to turn back one hour their clocks - # - # Since then, San Luis will establish its own Province timezone. Thus, -@@ -480,6 +474,9 @@ - # rules...San Luis is still using "Western ARgentina Time" and it got - # stuck on Summer daylight savings time even though the summer is over. - -+# From Paul Eggert (2013-02-21): -+# Milne says Cordoba time was -4:16:48.2. Round to the nearest second. -+ - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - # - # Buenos Aires (BA), Capital Federal (CF), -@@ -835,9 +832,9 @@ - - # From Guilherme Bernardes Rodrigues (2011-10-07): - # There is news in the media, however there is still no decree about it. --# I just send a e-mail to Zulmira Brandão at -+# I just send a e-mail to Zulmira Brandao at - # <a href="http://pcdsh01.on.br/">http://pcdsh01.on.br/</a> the --# oficial agency about time in Brazil, and she confirmed that the old rule is -+# official agency about time in Brazil, and she confirmed that the old rule is - # still in force. - - # From Guilherme Bernardes Rodrigues (2011-10-14) -@@ -1266,9 +1263,13 @@ - # b. Saturday, September 1, 2012, clocks should go forward 60 minutes; that is, - # at 23:59:59, instead of passing to 0:00, the time should be adjusted to be - # 01:00 on September 2. --# --# Note that...this is yet another "temporary" change that will be reevaluated --# AGAIN in 2013. -+ -+# From Steffen Thorsen (2013-02-15): -+# According to several news sources, Chile has extended DST this year, -+# they will end DST later and start DST earlier than planned. They -+# hope to save energy. The new end date is 2013-04-28 00:00 and new -+# start date is 2013-09-08 00:00.... -+# http://www.gob.cl/informa/2013/02/15/gobierno-anuncia-fechas-de-cambio-de-hora-para-el-ano-2013.htm - - # NOTE: ChileAQ rules for Antarctic bases are stored separately in the - # 'antarctica' file. -@@ -1311,10 +1312,8 @@ - Rule Chile 2010 only - Apr Sun>=1 3:00u 0 - - Rule Chile 2011 only - May Sun>=2 3:00u 0 - - Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 S --Rule Chile 2012 only - Apr Sun>=23 3:00u 0 - --Rule Chile 2012 only - Sep Sun>=2 4:00u 1:00 S --Rule Chile 2013 max - Mar Sun>=9 3:00u 0 - --Rule Chile 2013 max - Oct Sun>=9 4:00u 1:00 S -+Rule Chile 2012 max - Apr Sun>=23 3:00u 0 - -+Rule Chile 2012 max - Sep Sun>=2 4:00u 1:00 S - # IATA SSIM anomalies: (1992-02) says 1992-03-14; - # (1996-09) says 1998-03-08. Ignore these. - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -@@ -1336,17 +1335,23 @@ - # San Felix, and Antarctic bases, are like America/Santiago. - - # Colombia -+ -+# Milne gives 4:56:16.4 for Bogota time in 1899; round to nearest. He writes, -+# "A variation of fifteen minutes in the public clocks of Bogota is not rare." -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule CO 1992 only - May 3 0:00 1:00 S - Rule CO 1993 only - Apr 4 0:00 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone America/Bogota -4:56:20 - LMT 1884 Mar 13 -- -4:56:20 - BMT 1914 Nov 23 # Bogota Mean Time -+Zone America/Bogota -4:56:16 - LMT 1884 Mar 13 -+ -4:56:16 - BMT 1914 Nov 23 # Bogota Mean Time - -5:00 CO CO%sT # Colombia Time - # Malpelo, Providencia, San Andres - # no information; probably like America/Bogota - - # Curacao -+ -+# Milne gives 4:35:46.9 for Curacao mean time; round to nearest. - # - # From Paul Eggert (2006-03-22): - # Shanks & Pottenger say that The Bottom and Philipsburg have been at -@@ -1363,7 +1368,7 @@ - # though, as far as we know. - # - # Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone America/Curacao -4:35:44 - LMT 1912 Feb 12 # Willemstad -+Zone America/Curacao -4:35:47 - LMT 1912 Feb 12 # Willemstad - -4:30 - ANT 1965 # Netherlands Antilles Time - -4:00 - AST - -@@ -1377,6 +1382,8 @@ - - # Ecuador - # -+# Milne says the Sentral and South American Telegraph Company used -5:24:15. -+# - # From Paul Eggert (2007-03-04): - # Apparently Ecuador had a failed experiment with DST in 1992. - # <http://midena.gov.ec/content/view/1261/208/> (2007-02-27) and -@@ -1583,6 +1590,15 @@ - # ... - Rule Para 2010 max - Oct Sun>=1 0:00 1:00 S - Rule Para 2010 max - Apr Sun>=8 0:00 0 - -+# -+# From Steffen Thorsen (2013-03-07): -+# Paraguay will end DST on 2013-03-24 00:00.... -+# They do not tell if this will be a permanent change or just this year.... -+# http://www.ande.gov.py/interna.php?id=1075 -+# -+# From Paul Eggert (2013-03-07): -+# For now, assume it's just this year. -+Rule Para 2013 only - Mar 24 0:00 0 - - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone America/Asuncion -3:50:40 - LMT 1890 ---- openjdk/jdk/make/sun/javazic/tzdata/zone.tab -+++ openjdk/jdk/make/sun/javazic/tzdata/zone.tab -@@ -182,7 +182,8 @@ - CX -1025+10543 Indian/Christmas - CY +3510+03322 Asia/Nicosia - CZ +5005+01426 Europe/Prague --DE +5230+01322 Europe/Berlin -+DE +5230+01322 Europe/Berlin most locations -+DE +4742+00841 Europe/Busingen Busingen - DJ +1136+04309 Africa/Djibouti - DK +5540+01235 Europe/Copenhagen - DM +1518-06124 America/Dominica -@@ -364,8 +365,10 @@ - RU +5601+09250 Asia/Krasnoyarsk Moscow+04 - Yenisei River - RU +5216+10420 Asia/Irkutsk Moscow+05 - Lake Baikal - RU +6200+12940 Asia/Yakutsk Moscow+06 - Lena River -+RU +623923+1353314 Asia/Khandyga Moscow+06 - Tomponsky, Ust-Maysky - RU +4310+13156 Asia/Vladivostok Moscow+07 - Amur River - RU +4658+14242 Asia/Sakhalin Moscow+07 - Sakhalin Island -+RU +643337+1431336 Asia/Ust-Nera Moscow+07 - Oymyakonsky - RU +5934+15048 Asia/Magadan Moscow+08 - Magadan - RU +5301+15839 Asia/Kamchatka Moscow+08 - Kamchatka - RU +6445+17729 Asia/Anadyr Moscow+08 - Bering Sea ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java -@@ -75,6 +75,8 @@ - "Central European Summer Time", "CEST"}; - String CHAST[] = new String[] {"Chatham Standard Time", "CHAST", - "Chatham Daylight Time", "CHADT"}; -+ String ChST[] = new String[] {"Chamorro Standard Time", "ChST", -+ "Chamorro Daylight Time", "ChDT"}; - String CHUT[] = new String[] {"Chuuk Time", "CHUT", - "Chuuk Summer Time", "CHUST"}; - String CIT[] = new String[] {"Central Indonesia Time", "CIT", -@@ -161,6 +163,8 @@ - "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"Pacific Standard Time", "PST", - "Pacific Daylight Time", "PDT"}; -+ String SAMOA[] = new String[] {"Samoa Standard Time", "SST", -+ "Samoa Daylight Time", "SDT"}; - String SAST[] = new String[] {"South Africa Standard Time", "SAST", - "South Africa Summer Time", "SAST"}; - String SBT[] = new String[] {"Solomon Is. Time", "SBT", -@@ -175,6 +179,14 @@ - "Turkmenistan Summer Time", "TMST"}; - String ULAT[]= new String[] {"Ulaanbaatar Time", "ULAT", - "Ulaanbaatar Summer Time", "ULAST"}; -+ String UTC[] = new String[] {"Coordinated Universal Time", "UTC", -+ "Coordinated Universal Time", "UTC"}; -+ String UZT[] = new String[] {"Uzbekistan Time", "UZT", -+ "Uzbekistan Summer Time", "UZST"}; -+ String VICTORIA[] = new String[] {"Eastern Standard Time (Victoria)", "EST", -+ "Eastern Summer Time (Victoria)", "EST"}; -+ String VLAT[] = new String[] {"Vladivostok Time", "VLAT", -+ "Vladivostok Summer Time", "VLAST"}; - String WART[] = new String[] {"Western Argentine Time", "WART", - "Western Argentine Summer Time", "WARST"}; - String WAT[] = new String[] {"Western African Time", "WAT", -@@ -185,18 +197,10 @@ - "West Indonesia Summer Time", "WIST"}; - String WST_AUS[] = new String[] {"Western Standard Time (Australia)", "WST", - "Western Summer Time (Australia)", "WST"}; -- String SAMOA[] = new String[] {"Samoa Standard Time", "SST", -- "Samoa Daylight Time", "SDT"}; - String WST_SAMOA[] = new String[] {"West Samoa Time", "WST", - "West Samoa Daylight Time", "WSDT"}; -- String ChST[] = new String[] {"Chamorro Standard Time", "ChST", -- "Chamorro Daylight Time", "ChDT"}; -- String VICTORIA[] = new String[] {"Eastern Standard Time (Victoria)", "EST", -- "Eastern Summer Time (Victoria)", "EST"}; -- String UTC[] = new String[] {"Coordinated Universal Time", "UTC", -- "Coordinated Universal Time", "UTC"}; -- String UZT[] = new String[] {"Uzbekistan Time", "UZT", -- "Uzbekistan Summer Time", "UZST"}; -+ String YAKT[] = new String[] {"Yakutsk Time", "YAKT", -+ "Yakutsk Summer Time", "YAKST"}; - - return new Object[][] { - {"America/Los_Angeles", PST}, -@@ -287,7 +291,7 @@ - {"Africa/Porto-Novo", WAT}, - {"Africa/Sao_Tome", GMT}, - {"Africa/Timbuktu", GMT}, -- {"Africa/Tripoli", EET}, -+ {"Africa/Tripoli", CET}, - {"Africa/Tunis", CET}, - {"Africa/Windhoek", WAT}, - {"America/Adak", HAST}, -@@ -533,6 +537,7 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -+ {"Asia/Khandyga", YAKT}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"Krasnoyarsk Time", "KRAT", - "Krasnoyarsk Summer Time", "KRAST"}}, -@@ -581,11 +586,10 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -+ {"Asia/Ust-Nera", VLAT}, - {"Asia/Vientiane", ICT}, -- {"Asia/Vladivostok", new String[] {"Vladivostok Time", "VLAT", -- "Vladivostok Summer Time", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"Yakutsk Time", "YAKT", -- "Yakutsk Summer Time", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"Asia/Yekaterinburg", new String[] {"Yekaterinburg Time", "YEKT", - "Yekaterinburg Summer Time", "YEKST"}}, - {"Asia/Yerevan", ARMT}, -@@ -669,6 +673,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -748,7 +753,7 @@ - {"Jamaica", EST}, - {"Japan", JST}, - {"Kwajalein", MHT}, -- {"Libya", EET}, -+ {"Libya", CET}, - {"MET", new String[] {"Middle Europe Time", "MET", - "Middle Europe Summer Time", "MEST"}}, - {"Mexico/BajaNorte", PST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java -@@ -75,6 +75,8 @@ - "Mitteleurop\u00e4ische Sommerzeit", "MESZ"}; - String CHAST[] = new String[] {"Chatham Normalzeit", "CHAST", - "Chatham Sommerzeit", "CHADT"}; -+ String ChST[] = new String[] {"Chamorro Normalzeit", "ChST", -+ "Chamorro Sommerzeit", "ChDT"}; - String CHUT[] = new String[] {"Chuuk Time", "CHUT", - "Chuuk Summer Time", "CHUST"}; - String CIT[] = new String[] {"Zentralindonesische Zeit", "CIT", -@@ -161,6 +163,8 @@ - "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"Pazifische Normalzeit", "PST", - "Pazifische Sommerzeit", "PDT"}; -+ String SAMOA[] = new String[] {"Samoa Normalzeit", "SST", -+ "Samoa Sommerzeit", "SDT"}; - String SAST[] = new String[] {"S\u00fcdafrikanische Normalzeit", "SAST", - "S\u00fcdafrikanische Sommerzeit", "SAST"}; - String SBT[] = new String[] {"Salomoninseln Zeit", "SBT", -@@ -175,6 +179,14 @@ - "Turkmenische Sommerzeit", "TMST"}; - String ULAT[]= new String[] {"Ulaanbaatar Zeit", "ULAT", - "Ulaanbaatar Sommerzeit", "ULAST"}; -+ String UTC[] = new String[] {"Koordinierte Universalzeit", "UTC", -+ "Koordinierte Universalzeit", "UTC"}; -+ String UZT[] = new String[] {"Usbekistan Zeit", "UZT", -+ "Usbekistan Sommerzeit", "UZST"}; -+ String VICTORIA[] = new String[] {"\u00d6stliche Normalzeit (Victoria)", "EST", -+ "\u00d6stliche Sommerzeit (Victoria)", "EST"}; -+ String VLAT[] = new String[] {"Wladiwostok Zeit", "VLAT", -+ "Wladiwostok Sommerzeit", "VLAST"}; - String WART[] = new String[] {"Westargentinische Zeit", "WART", - "Westargentinische Sommerzeit", "WARST"}; - String WAT[] = new String[] {"Westafrikanische Zeit", "WAT", -@@ -185,18 +197,10 @@ - "Westindonesische Sommerzeit", "WIST"}; - String WST_AUS[] = new String[] {"Westliche Normalzeit (Australien)", "WST", - "Westliche Sommerzeit (Australien)", "WST"}; -- String SAMOA[] = new String[] {"Samoa Normalzeit", "SST", -- "Samoa Sommerzeit", "SDT"}; - String WST_SAMOA[] = new String[] {"West Samoa Zeit", "WST", - "West Samoa Sommerzeit", "WSDT"}; -- String ChST[] = new String[] {"Chamorro Normalzeit", "ChST", -- "Chamorro Sommerzeit", "ChDT"}; -- String VICTORIA[] = new String[] {"\u00d6stliche Normalzeit (Victoria)", "EST", -- "\u00d6stliche Sommerzeit (Victoria)", "EST"}; -- String UTC[] = new String[] {"Koordinierte Universalzeit", "UTC", -- "Koordinierte Universalzeit", "UTC"}; -- String UZT[] = new String[] {"Usbekistan Zeit", "UZT", -- "Usbekistan Sommerzeit", "UZST"}; -+ String YAKT[] = new String[] {"Jakutsk Zeit", "YAKT", -+ "Jakutsk Sommerzeit", "YAKST"}; - - return new Object[][] { - {"America/Los_Angeles", PST}, -@@ -287,7 +291,7 @@ - {"Africa/Porto-Novo", WAT}, - {"Africa/Sao_Tome", GMT}, - {"Africa/Timbuktu", GMT}, -- {"Africa/Tripoli", EET}, -+ {"Africa/Tripoli", CET}, - {"Africa/Tunis", CET}, - {"Africa/Windhoek", WAT}, - {"America/Adak", HAST}, -@@ -533,6 +537,7 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -+ {"Asia/Khandyga", YAKT}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"Krasnojarsker Zeit", "KRAT", - "Krasnojarsker Sommerzeit", "KRAST"}}, -@@ -581,11 +586,10 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -+ {"Asia/Ust-Nera", VLAT}, - {"Asia/Vientiane", ICT}, -- {"Asia/Vladivostok", new String[] {"Wladiwostok Zeit", "VLAT", -- "Wladiwostok Sommerzeit", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"Jakutsk Zeit", "YAKT", -- "Jakutsk Sommerzeit", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"Asia/Yekaterinburg", new String[] {"Jekaterinburger Zeit", "YEKT", - "Jekaterinburger Sommerzeit", "YEKST"}}, - {"Asia/Yerevan", ARMT}, -@@ -669,6 +673,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -748,7 +753,7 @@ - {"Jamaica", EST}, - {"Japan", JST}, - {"Kwajalein", MHT}, -- {"Libya", EET}, -+ {"Libya", CET}, - {"MET", new String[] {"Zentraleurop\u00e4ische Zeit", "MET", - "Zentraleurop\u00e4ische Sommerzeit", "MEST"}}, - {"Mexico/BajaNorte", PST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java -@@ -75,6 +75,8 @@ - "Hora de verano de Europa Central", "CEST"}; - String CHAST[] = new String[] {"Hora est\u00e1ndar de Chatham", "CHAST", - "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 CIT[] = new String[] {"Hora de Indonesia Central", "CIT", -@@ -161,6 +163,8 @@ - "Pohnpei Summer Time", "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", -+ "Hora de verano de Samoa", "SDT"}; - String SAST[] = new String[] {"Hora est\u00e1ndar de Sud\u00e1frica", "SAST", - "Hora de verano de Sud\u00e1frica", "SAST"}; - String SBT[] = new String[] {"Hora de las Islas Solomon", "SBT", -@@ -175,6 +179,14 @@ - "Hora de verano de Turkmenist\u00e1n", "TMST"}; - String ULAT[]= new String[] {"Hora de Ulan Bator", "ULAT", - "Hora de verano de Ulan Bator", "ULAST"}; -+ String UTC[] = new String[] {"Hora Universal Coordinada", "UTC", -+ "Hora Universal Coordinada", "UTC"}; -+ String UZT[] = new String[] {"Hora de Uzbekist\u00e1n", "UZT", -+ "Hora de verano de Uzbekist\u00e1n", "UZST"}; -+ String VICTORIA[] = new String[] {"Hora est\u00e1ndar del Este (Victoria)", "EST", -+ "Hora de verano del Este (Victoria)", "EST"}; -+ String VLAT[] = new String[] {"Hora de Vladivostok", "VLAT", -+ "Hora de verano de Vladivostok", "VLAST"}; - 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", -@@ -185,18 +197,10 @@ - "Indonesia Hora de verano de Indonesia Occidental", "WIST"}; - String WST_AUS[] = new String[] {"Hora est\u00e1ndar Occidental (Australia)", "WST", - "Hora de verano Occidental (Australia)", "WST"}; -- String SAMOA[] = new String[] {"Hora est\u00e1ndar de Samoa", "SST", -- "Hora de verano de Samoa", "SDT"}; - String WST_SAMOA[] = new String[] {"Hora de Samoa Occidental", "WST", - "Hora de verano de Samoa Occidental", "WSDT"}; -- String ChST[] = new String[] {"Hora est\u00e1ndar de Chamorro", "ChST", -- "Hora de verano de Chamorro", "ChDT"}; -- String VICTORIA[] = new String[] {"Hora est\u00e1ndar del Este (Victoria)", "EST", -- "Hora de verano del Este (Victoria)", "EST"}; -- String UTC[] = new String[] {"Hora Universal Coordinada", "UTC", -- "Hora Universal Coordinada", "UTC"}; -- String UZT[] = new String[] {"Hora de Uzbekist\u00e1n", "UZT", -- "Hora de verano de Uzbekist\u00e1n", "UZST"}; -+ String YAKT[] = new String[] {"Hora de Yakutsk", "YAKT", -+ "Hora de verano de Yakutsk", "YAKST"}; - - return new Object[][] { - {"America/Los_Angeles", PST}, -@@ -287,7 +291,7 @@ - {"Africa/Porto-Novo", WAT}, - {"Africa/Sao_Tome", GMT}, - {"Africa/Timbuktu", GMT}, -- {"Africa/Tripoli", EET}, -+ {"Africa/Tripoli", CET}, - {"Africa/Tunis", CET}, - {"Africa/Windhoek", WAT}, - {"America/Adak", HAST}, -@@ -533,6 +537,7 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -+ {"Asia/Khandyga", YAKT}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"Hora de Krasnoyarsk", "KRAT", - "Hora de verano de Krasnoyarsk", "KRAST"}}, -@@ -581,11 +586,10 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -+ {"Asia/Ust-Nera", VLAT}, - {"Asia/Vientiane", ICT}, -- {"Asia/Vladivostok", new String[] {"Hora de Vladivostok", "VLAT", -- "Hora de verano de Vladivostok", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"Hora de Yakutsk", "YAKT", -- "Hora de verano de Yakutsk", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"Asia/Yekaterinburg", new String[] {"Hora de Ekaterinburgo", "YEKT", - "Hora de verano de Ekaterinburgo", "YEKST"}}, - {"Asia/Yerevan", ARMT}, -@@ -669,6 +673,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -748,7 +753,7 @@ - {"Jamaica", EST}, - {"Japan", JST}, - {"Kwajalein", MHT}, -- {"Libya", EET}, -+ {"Libya", CET}, - {"MET", new String[] {"Hora de Europa Central", "MET", - "Hora de verano de Europa Central", "MEST"}}, - {"Mexico/BajaNorte", PST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java -@@ -48,43 +48,45 @@ - String ADELAIDE[] = new String[] {"Heure standard d'Australie centrale (Australie du sud)", "CST", - "Heure d'\u00e9t\u00e9 d'Australie centrale (Australie du sud)", "CST"}; - String AGT[] = new String[] {"Heure D'Argentine", "ART", -- "Heure d'\u00e9t\u00e9 D'Argentine", "ARST"} ; -+ "Heure d'\u00e9t\u00e9 D'Argentine", "ARST"}; - String AKST[] = new String[] {"Heure normale d'Alaska", "AKST", -- "Heure avanc\u00e9e d'Alaska", "AKDT"} ; -+ "Heure avanc\u00e9e d'Alaska", "AKDT"}; - String AMT[] = new String[] {"Heure normale d'Amazonie", "AMT", -- "Heure d'\u00e9t\u00e9 d'Amazonie", "AMST"} ; -+ "Heure d'\u00e9t\u00e9 d'Amazonie", "AMST"}; - String ARAST[] = new String[] {"Heure normale d'Arabie", "AST", -- "Heure avanc\u00e9e d'Arabie", "ADT"} ; -+ "Heure avanc\u00e9e d'Arabie", "ADT"}; - String ARMT[] = new String[] {"Heure d'Arm\u00e9nie", "AMT", -- "Heure d'\u00e9t\u00e9 d'Arm\u00e9nie", "AMST"} ; -+ "Heure d'\u00e9t\u00e9 d'Arm\u00e9nie", "AMST"}; - String AST[] = new String[] {"Heure normale de l'Atlantique", "AST", -- "Heure avanc\u00e9e de l'Atlantique", "ADT"} ; -+ "Heure avanc\u00e9e de l'Atlantique", "ADT"}; - String BDT[] = new String[] {"Heure du Bangladesh", "BDT", -- "Heure d'\u00e9t\u00e9 du Bangladesh", "BDST"} ; -+ "Heure d'\u00e9t\u00e9 du Bangladesh", "BDST"}; - String BRISBANE[] = new String[] {"Heure standard d'Australie orientale (Queensland)", "EST", - "Heure d'\u00e9t\u00e9 d'Australie orientale (Queensland)", "EST"}; - String BROKEN_HILL[] = new String[] {"Heure standard d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "CST", - "Heure d'\u00e9t\u00e9 d'Australie centrale(Australie du sud/Nouvelle-Galles du sud)", "CST"}; - String BRT[] = new String[] {"Heure du Br\u00e9sil", "BRT", -- "Heure d'\u00e9t\u00e9 du Br\u00e9sil", "BRST"} ; -+ "Heure d'\u00e9t\u00e9 du Br\u00e9sil", "BRST"}; - String BTT[] = new String[] {"Heure du Bhoutan", "BTT", -- "Heure d'\u00e9t\u00e9 du Bhoutan", "BTST"} ; -+ "Heure d'\u00e9t\u00e9 du Bhoutan", "BTST"}; - String CAT[] = new String[] {"Heure d'Afrique centrale", "CAT", -- "Heure d'\u00e9t\u00e9 d'Afrique centrale", "CAST"} ; -+ "Heure d'\u00e9t\u00e9 d'Afrique centrale", "CAST"}; - String CET[] = new String[] {"Heure d'Europe centrale", "CET", -- "Heure d'\u00e9t\u00e9 d'Europe centrale", "CEST"} ; -+ "Heure d'\u00e9t\u00e9 d'Europe centrale", "CEST"}; - String CHAST[] = new String[] {"Heure standard de Chatham", "CHAST", - "Heure avanc\u00e9e de Chatham", "CHADT"}; -+ String ChST[] = new String[] {"Heure normale des \u00eeles Mariannes", "ChST", -+ "Heure d'\u00e9t\u00e9 des \u00eeles Mariannes", "ChDT"}; - String CHUT[] = new String[] {"Chuuk Time", "CHUT", - "Chuuk Summer Time", "CHUST"}; - String CIT[] = new String[] {"Heure d'Indon\u00e9sie centrale", "CIT", - "Heure d'\u00e9t\u00e9 d'Indon\u00e9sie centrale", "CIST"}; - String CLT[] = new String[] {"Heure du Chili", "CLT", -- "Heure d'\u00e9t\u00e9 du Chili", "CLST"} ; -+ "Heure d'\u00e9t\u00e9 du Chili", "CLST"}; - String CST[] = new String[] {"Heure normale du Centre", "CST", -- "Heure avanc\u00e9e du Centre", "CDT"} ; -+ "Heure avanc\u00e9e du Centre", "CDT"}; - String CTT[] = new String[] {"Heure normale de Chine", "CST", -- "Heure avanc\u00e9e de Chine", "CDT"} ; -+ "Heure avanc\u00e9e de Chine", "CDT"}; - String CUBA[] = new String[] {"Heure standard de Cuba", "CST", - "Heure d'\u00e9t\u00e9 de Cuba", "CDT"}; - String DARWIN[] = new String[] {"Heure standard d'Australie centrale (Territoire du Nord)", "CST", -@@ -92,17 +94,17 @@ - String DUBLIN[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT", - "Heure d'\u00e9t\u00e9 irlandaise", "IST"}; - String EAT[] = new String[] {"Heure d'Afrique de l'Est", "EAT", -- "Heure d'\u00e9t\u00e9 d'Afrique de l'Est", "EAST"} ; -+ "Heure d'\u00e9t\u00e9 d'Afrique de l'Est", "EAST"}; - String EASTER[] = new String[] {"Heure de l'Ile de P\u00e2ques", "EAST", - "Heure d'\u00e9t\u00e9 de l'Ile de P\u00e2ques", "EASST"}; - String EET[] = new String[] {"Heure d'Europe de l'Est", "EET", -- "Heure d'\u00e9t\u00e9 d'Europe de l'Est", "EEST"} ; -+ "Heure d'\u00e9t\u00e9 d'Europe de l'Est", "EEST"}; - String EGT[] = new String[] {"Heure du Groenland de l'Est", "EGT", -- "Heure d'\u00e9t\u00e9 du Groenland de l'Est", "EGST"} ; -+ "Heure d'\u00e9t\u00e9 du Groenland de l'Est", "EGST"}; - String EST[] = new String[] {"Heure normale de l'Est", "EST", -- "Heure avanc\u00e9e de l'Est", "EDT"} ; -+ "Heure avanc\u00e9e de l'Est", "EDT"}; - String EST_NSW[] = new String[] {"Heure normale de l'Est (Nouvelle-Galles du Sud)", "EST", -- "Heure d'\u00e9t\u00e9 de l'Est (Nouvelle-Galles du Sud)", "EST"} ; -+ "Heure d'\u00e9t\u00e9 de l'Est (Nouvelle-Galles du Sud)", "EST"}; - String FET[] = new String[] {"Further-eastern European Time", "FET", - "Further-eastern European Summer Time", "FEST"}; - String GHMT[] = new String[] {"Heure du Ghana", "GMT", -@@ -110,29 +112,29 @@ - String GAMBIER[] = new String[] {"Heure de Gambi", "GAMT", - "Heure d'\u00e9t\u00e9 de Gambi", "GAMST"}; - String GMT[] = new String[] {"Heure de Greenwich", "GMT", -- "Heure de Greenwich", "GMT"} ; -+ "Heure de Greenwich", "GMT"}; - String GMTBST[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT", - "Heure d'\u00e9t\u00e9 britannique", "BST"}; - String GST[] = new String[] {"Heure normale du Golfe", "GST", -- "Heure avanc\u00e9e du Golfe", "GDT"} ; -+ "Heure avanc\u00e9e du Golfe", "GDT"}; - String HAST[] = new String[] {"Heure normale d'Hawa\u00ef-Al\u00e9outiennes", "HAST", -- "Heure avanc\u00e9e d'Hawa\u00ef-Al\u00e9outiennes", "HADT"} ; -+ "Heure avanc\u00e9e d'Hawa\u00ef-Al\u00e9outiennes", "HADT"}; - String HKT[] = new String[] {"Heure de Hong Kong", "HKT", - "Heure d'\u00e9t\u00e9 de Hong Kong", "HKST"}; - String HST[] = new String[] {"Heure normale d'Hawa\u00ef", "HST", -- "Heure avanc\u00e9e d'Hawa\u00ef", "HDT"} ; -+ "Heure avanc\u00e9e d'Hawa\u00ef", "HDT"}; - String ICT[] = new String[] {"Heure d'Indochine", "ICT", -- "Heure d'\u00e9t\u00e9 d'Indochine", "ICST"} ; -+ "Heure d'\u00e9t\u00e9 d'Indochine", "ICST"}; - String IRT[] = new String[] {"Heure normale d'Iran", "IRST", -- "Heure avanc\u00e9e d'Iran", "IRDT"} ; -+ "Heure avanc\u00e9e d'Iran", "IRDT"}; - String ISRAEL[] = new String[] {"Heure standard d'Isra\u00ebl", "IST", - "Heure avanc\u00e9e d'Isra\u00ebl", "IDT"}; - String IST[] = new String[] {"Heure normale d'Inde", "IST", -- "Heure avanc\u00e9e d'Inde", "IDT"} ; -+ "Heure avanc\u00e9e d'Inde", "IDT"}; - String JST[] = new String[] {"Heure normale du Japon", "JST", -- "Heure avanc\u00e9e du Japon", "JDT"} ; -+ "Heure avanc\u00e9e du Japon", "JDT"}; - String KST[] = new String[] {"Heure normale de Cor\u00e9e", "KST", -- "Heure avanc\u00e9e de Cor\u00e9e", "KDT"} ; -+ "Heure avanc\u00e9e de Cor\u00e9e", "KDT"}; - String LORD_HOWE[] = new String[] {"Heure standard de Lord Howe", "LHST", - "Heure d'\u00e9t\u00e9 de Lord Howe", "LHST"}; - String MHT[] = new String[] {"Heure des Iles Marshall", "MHT", -@@ -140,7 +142,7 @@ - String MSK[] = new String[] {"Heure standard de Moscou", "MSK", - "Heure avanc\u00e9e de Moscou", "MSD"}; - String MST[] = new String[] {"Heure normale des Rocheuses", "MST", -- "Heure avanc\u00e9e des Rocheuses", "MDT"} ; -+ "Heure avanc\u00e9e des Rocheuses", "MDT"}; - String MYT[] = new String[] {"Heure de Malaisie", "MYT", - "Heure d'\u00e9t\u00e9 de Malaisie", "MYST"}; - String NORONHA[] = new String[] {"Heure de Fernando de Noronha", "FNT", -@@ -150,21 +152,23 @@ - String NPT[] = new String[] {"Heure du N\u00e9pal", "NPT", - "Heure d'\u00e9t\u00e9 du N\u00e9pal", "NPST"}; - String NST[] = new String[] {"Heure normale de Terre-Neuve", "NST", -- "Heure avanc\u00e9e de Terre-Neuve", "NDT"} ; -+ "Heure avanc\u00e9e de Terre-Neuve", "NDT"}; - String NZST[] = new String[] {"Heure normale de Nouvelle-Z\u00e9lande", "NZST", -- "Heure avanc\u00e9e de Nouvelle-Z\u00e9lande", "NZDT"} ; -+ "Heure avanc\u00e9e de Nouvelle-Z\u00e9lande", "NZDT"}; - String PITCAIRN[] = new String[] {"Heure standard des Pitcairn", "PST", - "heure avanc\u00e9e des Pitcairn", "PDT"}; - String PKT[] = new String[] {"Heure du Pakistan", "PKT", -- "Heure d'\u00e9t\u00e9 du Pakistan", "PKST"} ; -+ "Heure d'\u00e9t\u00e9 du Pakistan", "PKST"}; - String PONT[] = new String[] {"Pohnpei Time", "PONT", - "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"Heure normale du Pacifique", "PST", -- "Heure avanc\u00e9e du Pacifique", "PDT"} ; -+ "Heure avanc\u00e9e du Pacifique", "PDT"}; -+ String SAMOA[] = new String[] {"Heure standard de Samoa", "SST", -+ "Heure avanc\u00e9e de Samoa", "SDT"}; - String SAST[] = new String[] {"Heure normale d'Afrique du Sud", "SAST", -- "Heure d'\u00e9t\u00e9 d'Afrique du Sud", "SAST"} ; -+ "Heure d'\u00e9t\u00e9 d'Afrique du Sud", "SAST"}; - String SBT[] = new String[] {"Heure des \u00celes Salomon", "SBT", -- "Heure d'\u00e9t\u00e9 des \u00celes Salomon", "SBST"} ; -+ "Heure d'\u00e9t\u00e9 des \u00celes Salomon", "SBST"}; - String SGT[] = new String[] {"Heure de Singapour", "SGT", - "Heure d'\u00e9t\u00e9 de Singapour", "SGST"}; - String SLST[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT", -@@ -172,31 +176,31 @@ - String TASMANIA[] = new String[] {"Heure standard d'Australie orientale (Tasmanie)", "EST", - "Heure d'\u00e9t\u00e9 d'Australie orientale (Tasmanie)", "EST"}; - String TMT[] = new String[] {"Heure du Turkm\u00e9nistan", "TMT", -- "Heure d'\u00e9t\u00e9 du Turkm\u00e9nistan", "TMST"} ; -+ "Heure d'\u00e9t\u00e9 du Turkm\u00e9nistan", "TMST"}; - String ULAT[]= new String[] {"Heure de l'Ulaanbaatar", "ULAT", -- "Heure d'\u00e9t\u00e9 de l'Ulaanbaatar", "ULAST"} ; -- String WART[] = new String[] {"Heure D'Argentine de l'Ouest", "WART", -- "Heure d'\u00e9t\u00e9 D'Argentine de l'Ouest", "WARST"} ; -- String WAT[] = new String[] {"Heure d'Afrique de l'Ouest", "WAT", -- "Heure d'\u00e9t\u00e9 d'Afrique de l'Ouest", "WAST"} ; -- String WET[] = new String[] {"Heure d'Europe de l'Ouest", "WET", -- "Heure d'\u00e9t\u00e9 d'Europe de l'Ouest", "WEST"} ; -- String WIT[] = new String[] {"Heure de l'Indon\u00e9sie occidentale", "WIT", -- "Heure d'\u00e9t\u00e9 de l'Indon\u00e9sie occidentale", "WIST"}; -- String WST_AUS[] = new String[] {"Heure normale de l'Ouest (Australie)", "WST", -- "Heure d'\u00e9t\u00e9 de l'Ouest (Australie)", "WST"} ; -- String SAMOA[] = new String[] {"Heure standard de Samoa", "SST", -- "Heure avanc\u00e9e de Samoa", "SDT"}; -- String WST_SAMOA[] = new String[] {"Heure des Samoas occidentales", "WST", -- "Heure d'\u00e9t\u00e9 des Samoas occidentales", "WSDT"} ; -- String ChST[] = new String[] {"Heure normale des \u00eeles Mariannes", "ChST", -- "Heure d'\u00e9t\u00e9 des \u00eeles Mariannes", "ChDT"}; -- String VICTORIA[] = new String[] {"Heure standard d'Australie orientale (Victoria)", "EST", -- "Heure d'\u00e9t\u00e9 d'Australie orientale (Victoria)", "EST"}; -+ "Heure d'\u00e9t\u00e9 de l'Ulaanbaatar", "ULAST"}; - String UTC[] = new String[] {"Temps universel coordonn\u00e9", "UTC", - "Temps universel coordonn\u00e9", "UTC"}; - String UZT[] = new String[] {"Heure de l'Ouzb\u00e9kistan", "UZT", - "Heure d'\u00e9t\u00e9 de l'Ouzb\u00e9kistan", "UZST"}; -+ String VICTORIA[] = new String[] {"Heure standard d'Australie orientale (Victoria)", "EST", -+ "Heure d'\u00e9t\u00e9 d'Australie orientale (Victoria)", "EST"}; -+ String VLAT[] = new String[] {"Heure de Vladivostok", "VLAT", -+ "Heure d'\u00e9t\u00e9 de Vladivostok", "VLAST"}; -+ String WART[] = new String[] {"Heure D'Argentine de l'Ouest", "WART", -+ "Heure d'\u00e9t\u00e9 D'Argentine de l'Ouest", "WARST"}; -+ String WAT[] = new String[] {"Heure d'Afrique de l'Ouest", "WAT", -+ "Heure d'\u00e9t\u00e9 d'Afrique de l'Ouest", "WAST"}; -+ String WET[] = new String[] {"Heure d'Europe de l'Ouest", "WET", -+ "Heure d'\u00e9t\u00e9 d'Europe de l'Ouest", "WEST"}; -+ String WIT[] = new String[] {"Heure de l'Indon\u00e9sie occidentale", "WIT", -+ "Heure d'\u00e9t\u00e9 de l'Indon\u00e9sie occidentale", "WIST"}; -+ String WST_AUS[] = new String[] {"Heure normale de l'Ouest (Australie)", "WST", -+ "Heure d'\u00e9t\u00e9 de l'Ouest (Australie)", "WST"}; -+ String WST_SAMOA[] = new String[] {"Heure des Samoas occidentales", "WST", -+ "Heure d'\u00e9t\u00e9 des Samoas occidentales", "WSDT"}; -+ String YAKT[] = new String[] {"Heure du Iakoutsk", "YAKT", -+ "Heure d'\u00e9t\u00e9 du Iakoutsk", "YAKST"}; - - return new Object[][] { - {"America/Los_Angeles", PST}, -@@ -287,7 +291,7 @@ - {"Africa/Porto-Novo", WAT}, - {"Africa/Sao_Tome", GMT}, - {"Africa/Timbuktu", GMT}, -- {"Africa/Tripoli", EET}, -+ {"Africa/Tripoli", CET}, - {"Africa/Tunis", CET}, - {"Africa/Windhoek", WAT}, - {"America/Adak", HAST}, -@@ -533,6 +537,7 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -+ {"Asia/Khandyga", YAKT}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"Heure de Krasno\u00efarsk", "KRAT", - "Heure d'\u00e9t\u00e9 de Krasno\u00efarsk", "KRAST"}}, -@@ -581,11 +586,10 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -+ {"Asia/Ust-Nera", VLAT}, - {"Asia/Vientiane", ICT}, -- {"Asia/Vladivostok", new String[] {"Heure de Vladivostok", "VLAT", -- "Heure d'\u00e9t\u00e9 de Vladivostok", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"Heure du Iakoutsk", "YAKT", -- "Heure d'\u00e9t\u00e9 du Iakoutsk", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"Asia/Yekaterinburg", new String[] {"Heure de Yekaterinburg", "YEKT", - "Heure d'\u00e9t\u00e9 de Yekaterinburg", "YEKST"}}, - {"Asia/Yerevan", ARMT}, -@@ -669,6 +673,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -748,7 +753,7 @@ - {"Jamaica", EST}, - {"Japan", JST}, - {"Kwajalein", MHT}, -- {"Libya", EET}, -+ {"Libya", CET}, - {"MET", new String[] {"Heure de l'Europe centrale", "MET", - "Heure d'\u00e9t\u00e9 de l'Europe centrale", "MEST"}}, - {"Mexico/BajaNorte", PST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java -@@ -77,6 +77,8 @@ - "Ora legale di Chatham", "CHADT"}; - String CHUT[] = new String[] {"Chuuk Time", "CHUT", - "Chuuk Summer Time", "CHUST"}; -+ String ChST[] = new String[] {"Ora standard di Chamorro", "ChST", -+ "Ora legale di Chamorro", "ChDT"}; - String CIT[] = new String[] {"Ora dell'Indonesia centrale", "CIT", - "Ora estiva dell'Indonesia centrale", "CIST"}; - String CLT[] = new String[] {"Ora del Cile", "CLT", -@@ -161,6 +163,8 @@ - "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"Ora solare della costa occidentale USA", "PST", - "Ora legale della costa occidentale USA", "PDT"}; -+ String SAMOA[] = new String[] {"Ora standard di Samoa", "SST", -+ "Ora legale di Samoa", "SDT"}; - String SAST[] = new String[] {"Ora solare del Sudafrica", "SAST", - "Ora estiva del Sudafrica", "SAST"}; - String SBT[] = new String[] {"Ora delle Isole Salomone", "SBT", -@@ -175,6 +179,14 @@ - "Ora estiva del Turkmenistan", "TMST"}; - String ULAT[]= new String[] {"Ora di Ulaanbaatar", "ULAT", - "Ora estiva di Ulaanbaatar", "ULAST"}; -+ String UTC[] = new String[] {"Tempo universale coordinato", "UTC", -+ "Tempo universale coordinato", "UTC"}; -+ String UZT[] = new String[] {"Ora dell'Uzbekistan", "UZT", -+ "Ora estiva dell'Uzbekistan", "UZST"}; -+ String VICTORIA[] = new String[] {"Ora orientale standard (Victoria)", "EST", -+ "Ora estiva orientale (Victoria)", "EST"}; -+ String VLAT[] = new String[] {"Ora di Vladivostok", "VLAT", -+ "Ora estiva di Vladivostok", "VLAST"}; - String WART[] = new String[] {"Ora dell'Argentina occidentale", "WART", - "Ora estiva dell'Argentina occidentale", "WARST"}; - String WAT[] = new String[] {"Ora dell'Africa occidentale", "WAT", -@@ -185,18 +197,10 @@ - "Ora estiva dell'Indonesia occidentale", "WIST"}; - String WST_AUS[] = new String[] {"Ora solare dell'Australia occidentale", "WST", - "Ora estiva dell'Australia occidentale", "WST"}; -- String SAMOA[] = new String[] {"Ora standard di Samoa", "SST", -- "Ora legale di Samoa", "SDT"}; - String WST_SAMOA[] = new String[] {"Ora di Samoa", "WST", - "Ora estiva di Samoa", "WSDT"}; -- String ChST[] = new String[] {"Ora standard di Chamorro", "ChST", -- "Ora legale di Chamorro", "ChDT"}; -- String VICTORIA[] = new String[] {"Ora orientale standard (Victoria)", "EST", -- "Ora estiva orientale (Victoria)", "EST"}; -- String UTC[] = new String[] {"Tempo universale coordinato", "UTC", -- "Tempo universale coordinato", "UTC"}; -- String UZT[] = new String[] {"Ora dell'Uzbekistan", "UZT", -- "Ora estiva dell'Uzbekistan", "UZST"}; -+ String YAKT[] = new String[] {"Ora di Jakutsk", "YAKT", -+ "Ora estiva di Jakutsk", "YAKST"}; - - return new Object[][] { - {"America/Los_Angeles", PST}, -@@ -287,7 +291,7 @@ - {"Africa/Porto-Novo", WAT}, - {"Africa/Sao_Tome", GMT}, - {"Africa/Timbuktu", GMT}, -- {"Africa/Tripoli", EET}, -+ {"Africa/Tripoli", CET}, - {"Africa/Tunis", CET}, - {"Africa/Windhoek", WAT}, - {"America/Adak", HAST}, -@@ -533,6 +537,7 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -+ {"Asia/Khandyga", YAKT}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"Ora di Krasnojarsk", "KRAT", - "Ora estiva di Krasnojarsk", "KRAST"}}, -@@ -581,11 +586,10 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -+ {"Asia/Ust-Nera", VLAT}, - {"Asia/Vientiane", ICT}, -- {"Asia/Vladivostok", new String[] {"Ora di Vladivostok", "VLAT", -- "Ora estiva di Vladivostok", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"Ora di Jakutsk", "YAKT", -- "Ora estiva di Jakutsk", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"Asia/Yekaterinburg", new String[] {"Ora di Ekaterinburg", "YEKT", - "Ora estiva di Ekaterinburg", "YEKST"}}, - {"Asia/Yerevan", ARMT}, -@@ -669,6 +673,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -748,7 +753,7 @@ - {"Jamaica", EST}, - {"Japan", JST}, - {"Kwajalein", MHT}, -- {"Libya", EET}, -+ {"Libya", CET}, - {"MET", new String[] {"Ora dell'Europa centrale", "MET", - "Ora estiva dell'Europa centrale", "MEST"}}, - {"Mexico/BajaNorte", PST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java -@@ -75,6 +75,8 @@ - "\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "CEST"}; - String CHAST[] = new String[] {"\u30c1\u30e3\u30bf\u30e0\u6a19\u6e96\u6642", "CHAST", - "\u30c1\u30e3\u30bf\u30e0\u590f\u6642\u9593", "CHADT"}; -+ String ChST[] = new String[] {"\u30b0\u30a2\u30e0\u6a19\u6e96\u6642", "ChST", -+ "\u30b0\u30a2\u30e0\u590f\u6642\u9593", "ChDT"}; - String CHUT[] = new String[] {"Chuuk Time", "CHUT", - "Chuuk Summer Time", "CHUST"}; - String CIT[] = new String[] {"\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "CIT", -@@ -161,6 +163,8 @@ - "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642", "PST", - "\u592a\u5e73\u6d0b\u590f\u6642\u9593", "PDT"}; -+ String SAMOA[] = new String[] {"\u30b5\u30e2\u30a2\u6a19\u6e96\u6642", "SST", -+ "\u30b5\u30e2\u30a2\u590f\u6642\u9593", "SDT"}; - String SAST[] = new String[] {"\u5357\u30a2\u30d5\u30ea\u30ab\u6a19\u6e96\u6642", "SAST", - "\u5357\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "SAST"}; - String SBT[] = new String[] {"\u30bd\u30ed\u30e2\u30f3\u8af8\u5cf6\u6642\u9593", "SBT", -@@ -175,6 +179,14 @@ - "\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u590f\u6642\u9593", "TMST"}; - String ULAT[]= new String[] {"\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u6642\u9593", "ULAT", - "\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u590f\u6642\u9593", "ULAST"}; -+ String UTC[] = new String[] {"\u5354\u5b9a\u4e16\u754c\u6642", "UTC", -+ "\u5354\u5b9a\u4e16\u754c\u6642", "UTC"}; -+ String UZT[] = new String[] {"\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "UZT", -+ "\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "UZST"}; -+ String VICTORIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30d3\u30af\u30c8\u30ea\u30a2)", "EST", -+ "\u6771\u90e8\u590f\u6642\u9593 (\u30d3\u30af\u30c8\u30ea\u30a2)", "EST"}; -+ String VLAT[] = new String[] {"\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u6642\u9593", "VLAT", -+ "\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u590f\u6642\u9593", "VLAST"}; - String WART[] = new String[] {"\u897f\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "WART", - "\u897f\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "WARST"}; - String WAT[] = new String[] {"\u897f\u30a2\u30d5\u30ea\u30ab\u6642\u9593", "WAT", -@@ -185,18 +197,10 @@ - "\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "WIST"}; - String WST_AUS[] = new String[] {"\u897f\u90e8\u6a19\u6e96\u6642 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "WST", - "\u897f\u90e8\u590f\u6642\u9593 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "WST"}; -- String SAMOA[] = new String[] {"\u30b5\u30e2\u30a2\u6a19\u6e96\u6642", "SST", -- "\u30b5\u30e2\u30a2\u590f\u6642\u9593", "SDT"}; - String WST_SAMOA[] = new String[] {"\u897f\u30b5\u30e2\u30a2\u6642\u9593", "WST", - "\u897f\u30b5\u30e2\u30a2\u590f\u6642\u9593", "WSDT"}; -- String ChST[] = new String[] {"\u30b0\u30a2\u30e0\u6a19\u6e96\u6642", "ChST", -- "\u30b0\u30a2\u30e0\u590f\u6642\u9593", "ChDT"}; -- String VICTORIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30d3\u30af\u30c8\u30ea\u30a2)", "EST", -- "\u6771\u90e8\u590f\u6642\u9593 (\u30d3\u30af\u30c8\u30ea\u30a2)", "EST"}; -- String UTC[] = new String[] {"\u5354\u5b9a\u4e16\u754c\u6642", "UTC", -- "\u5354\u5b9a\u4e16\u754c\u6642", "UTC"}; -- String UZT[] = new String[] {"\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "UZT", -- "\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "UZST"}; -+ String YAKT[] = new String[] {"\u30e4\u30af\u30fc\u30c4\u30af\u6642\u9593", "YAKT", -+ "\u30e4\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "YAKST"}; - - return new Object[][] { - {"America/Los_Angeles", PST}, -@@ -287,7 +291,7 @@ - {"Africa/Porto-Novo", WAT}, - {"Africa/Sao_Tome", GMT}, - {"Africa/Timbuktu", GMT}, -- {"Africa/Tripoli", EET}, -+ {"Africa/Tripoli", CET}, - {"Africa/Tunis", CET}, - {"Africa/Windhoek", WAT}, - {"America/Adak", HAST}, -@@ -533,6 +537,7 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -+ {"Asia/Khandyga", YAKT}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u6642\u9593", "KRAT", - "\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u590f\u6642\u9593", "KRAST"}}, -@@ -581,11 +586,10 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -+ {"Asia/Ust-Nera", VLAT}, - {"Asia/Vientiane", ICT}, -- {"Asia/Vladivostok", new String[] {"\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u6642\u9593", "VLAT", -- "\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u590f\u6642\u9593", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"\u30e4\u30af\u30fc\u30c4\u30af\u6642\u9593", "YAKT", -- "\u30e4\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"Asia/Yekaterinburg", new String[] {"\u30a8\u30ab\u30c6\u30ea\u30f3\u30d6\u30eb\u30b0\u6642\u9593", "YEKT", - "\u30a8\u30ab\u30c6\u30ea\u30f3\u30d6\u30eb\u30b0\u590f\u6642\u9593", "YEKST"}}, - {"Asia/Yerevan", ARMT}, -@@ -669,6 +673,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -748,7 +753,7 @@ - {"Jamaica", EST}, - {"Japan", JST}, - {"Kwajalein", MHT}, -- {"Libya", EET}, -+ {"Libya", CET}, - {"MET", new String[] {"\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "MET", - "\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "MEST"}}, - {"Mexico/BajaNorte", PST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java -@@ -75,6 +75,8 @@ - "\uc911\uc559 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CEST"}; - String CHAST[] = new String[] {"Chatham \ud45c\uc900\uc2dc", "CHAST", - "Chatham \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CHADT"}; -+ String ChST[] = new String[] {"\ucc28\ubaa8\ub85c \ud45c\uc900\uc2dc", "ChST", -+ "\ucc28\ubaa8\ub85c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ChDT"}; - String CHUT[] = new String[] {"Chuuk Time", "CHUT", - "Chuuk Summer Time", "CHUST"}; - String CIT[] = new String[] {"\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "CIT", -@@ -161,6 +163,8 @@ - "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"\ud0dc\ud3c9\uc591 \ud45c\uc900\uc2dc", "PST", - "\ud0dc\ud3c9\uc591 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PDT"}; -+ String SAMOA[] = new String[] {"\uc0ac\ubaa8\uc544 \ud45c\uc900\uc2dc", "SST", -+ "\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SDT"}; - String SAST[] = new String[] {"\ub0a8\uc544\ud504\ub9ac\uce74 \ud45c\uc900\uc2dc", "SAST", - "\ub0a8\uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SAST"}; - String SBT[] = new String[] {"\uc194\ub85c\ubaac \uad70\ub3c4 \uc2dc\uac04", "SBT", -@@ -175,6 +179,14 @@ - "\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TMST"}; - String ULAT[]= new String[] {"\uc6b8\ub780\ubc14\ud0c0\ub974 \uc2dc\uac04", "ULAT", - "\uc6b8\ub780\ubc14\ud0c0\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ULAST"}; -+ String UTC[] = new String[] {"\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC", -+ "\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC"}; -+ String UZT[] = new String[] {"\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "UZT", -+ "\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "UZST"}; -+ String VICTORIA[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ube45\ud1a0\ub9ac\uc544)", "EST", -+ "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ube45\ud1a0\ub9ac\uc544)", "EST"}; -+ String VLAT[] = new String[] {"\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc2dc\uac04", "VLAT", -+ "\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VLAST"}; - String WART[] = new String[] {"\uc11c\ubd80 \uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "WART", - "\uc11c\ubd80 \uc544\ub974\ud5e8\ud2f0\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WARST"}; - String WAT[] = new String[] {"\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc2dc\uac04", "WAT", -@@ -185,18 +197,10 @@ - "\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WIST"}; - String WST_AUS[] = new String[] {"\uc11c\ubd80 \ud45c\uc900\uc2dc(\ud638\uc8fc)", "WST", - "\uc11c\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ud638\uc8fc)", "WST"}; -- String SAMOA[] = new String[] {"\uc0ac\ubaa8\uc544 \ud45c\uc900\uc2dc", "SST", -- "\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SDT"}; - String WST_SAMOA[] = new String[] {"\uc11c\uc0ac\ubaa8\uc544 \uc2dc\uac04", "WST", - "\uc11c\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WSDT"}; -- String ChST[] = new String[] {"\ucc28\ubaa8\ub85c \ud45c\uc900\uc2dc", "ChST", -- "\ucc28\ubaa8\ub85c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ChDT"}; -- String VICTORIA[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ube45\ud1a0\ub9ac\uc544)", "EST", -- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ube45\ud1a0\ub9ac\uc544)", "EST"}; -- String UTC[] = new String[] {"\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC", -- "\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC"}; -- String UZT[] = new String[] {"\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "UZT", -- "\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "UZST"}; -+ String YAKT[] = new String[] {"\uc57c\uce20\ud06c \uc2dc\uac04", "YAKT", -+ "\uc57c\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "YAKST"}; - - return new Object[][] { - {"America/Los_Angeles", PST}, -@@ -287,7 +291,7 @@ - {"Africa/Porto-Novo", WAT}, - {"Africa/Sao_Tome", GMT}, - {"Africa/Timbuktu", GMT}, -- {"Africa/Tripoli", EET}, -+ {"Africa/Tripoli", CET}, - {"Africa/Tunis", CET}, - {"Africa/Windhoek", WAT}, - {"America/Adak", HAST}, -@@ -533,6 +537,7 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -+ {"Asia/Khandyga", YAKT}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc2dc\uac04", "KRAT", - "\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KRAST"}}, -@@ -581,11 +586,10 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -+ {"Asia/Ust-Nera", VLAT}, - {"Asia/Vientiane", ICT}, -- {"Asia/Vladivostok", new String[] {"\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc2dc\uac04", "VLAT", -- "\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"\uc57c\uce20\ud06c \uc2dc\uac04", "YAKT", -- "\uc57c\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"Asia/Yekaterinburg", new String[] {"\uc608\uce74\ud14c\ub9b0\ubc84\uadf8 \uc2dc\uac04", "YEKT", - "\uc608\uce74\ud14c\ub9b0\ubc84\uadf8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "YEKST"}}, - {"Asia/Yerevan", ARMT}, -@@ -669,6 +673,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -748,7 +753,7 @@ - {"Jamaica", EST}, - {"Japan", JST}, - {"Kwajalein", MHT}, -- {"Libya", EET}, -+ {"Libya", CET}, - {"MET", new String[] {"\uc911\ubd80 \uc720\ub7fd \uc2dc\uac04", "MET", - "\uc911\ubd80 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MEST"}}, - {"Mexico/BajaNorte", PST}, -diff -r b03bbdef3a88 -r b8009df64dc8 src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Mon Mar 11 14:11:30 2013 -0700 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Fri Mar 15 20:35:51 2013 +0900 -@@ -75,6 +75,8 @@ - "Fuso hor\u00e1rio de ver\u00e3o da Europa Central", "CEST"}; - String CHAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chatham", "CHAST", - "Hor\u00e1rio de luz natural de Chatham", "CHADT"}; -+ String ChST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chamorro", "ChST", -+ "Hor\u00e1rio de luz natural de Chamorro", "ChDT"}; - String CIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Central", "CIT", - "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Central", "CIST"}; - String CLT[] = new String[] {"Fuso hor\u00e1rio do Chile", "CLT", -@@ -159,6 +161,8 @@ - "Fuso hor\u00e1rio de ver\u00e3o de Pohnpei", "PONST"}; - String PST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Pac\u00edfico", "PST", - "Hor\u00e1rio de luz natural do Pac\u00edfico", "PDT"}; -+ String SAMOA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Samoa", "SST", -+ "Hor\u00e1rio de luz natural de Samoa", "SDT"}; - String SAST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da \u00c1frica do Sul", "SAST", - "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica do Sul", "SAST"}; - String SBT[] = new String[] {"Fuso hor\u00e1rio das Ilhas Salom\u00e3o", "SBT", -@@ -175,6 +179,16 @@ - "Fuso hor\u00e1rio de ver\u00e3o de Chuuk", "CHUST"}; - String ULAT[]= new String[] {"Fuso hor\u00e1rio de Ulan Bator", "ULAT", - "Fuso hor\u00e1rio de ver\u00e3o de Ulan Bator", "ULAST"}; -+ String UTC[] = new String[] {"Tempo universal coordenado", "UTC", -+ "Tempo universal coordenado", "UTC"}; -+ String UZT[] = new String[] {"Fuso hor\u00e1rio do Uzbequist\u00e3o", "UZT", -+ "Fuso hor\u00e1rio de ver\u00e3o do Uzbequist\u00e3o", "UZST"}; -+ String VICTORIA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Victoria)", "EST", -+ "Fuso hor\u00e1rio de ver\u00e3o oriental (Victoria)", "EST"}; -+ String VLAT[] = new String[] {"Fuso hor\u00e1rio de Vladivostok", "VLAT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Vladivostok", "VLAST"}; -+ String WART[] = new String[] {"Fuso hor\u00e1rio da Argentina Ocidental", "WART", -+ "Fuso hor\u00e1rio de ver\u00e3o da Argentina Ocidental", "WARST"}; - String WAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Ocidental", "WAT", - "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica Ocidental", "WAST"}; - String WET[] = new String[] {"Fuso hor\u00e1rio da Europa Ocidental", "WET", -@@ -183,20 +197,10 @@ - "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Ocidental", "WIST"}; - String WST_AUS[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o ocidental (Austr\u00e1lia)", "WST", - "Fuso hor\u00e1rio de ver\u00e3o ocidental (Austr\u00e1lia)", "WST"}; -- String SAMOA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Samoa", "SST", -- "Hor\u00e1rio de luz natural de Samoa", "SDT"}; - String WST_SAMOA[] = new String[] {"Fuso hor\u00e1rio de Samoa Ocidental", "WST", - "Fuso hor\u00e1rio de ver\u00e3o de Samoa Ocidental", "WSDT"}; -- String ChST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chamorro", "ChST", -- "Hor\u00e1rio de luz natural de Chamorro", "ChDT"}; -- String VICTORIA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Victoria)", "EST", -- "Fuso hor\u00e1rio de ver\u00e3o oriental (Victoria)", "EST"}; -- String UTC[] = new String[] {"Tempo universal coordenado", "UTC", -- "Tempo universal coordenado", "UTC"}; -- String UZT[] = new String[] {"Fuso hor\u00e1rio do Uzbequist\u00e3o", "UZT", -- "Fuso hor\u00e1rio de ver\u00e3o do Uzbequist\u00e3o", "UZST"}; -- String WART[] = new String[] {"Fuso hor\u00e1rio da Argentina Ocidental", "WART", -- "Fuso hor\u00e1rio de ver\u00e3o da Argentina Ocidental", "WARST"}; -+ String YAKT[] = new String[] {"Fuso hor\u00e1rio de Yakutsk", "YAKT", -+ "Fuso hor\u00e1rio de ver\u00e3o de Yakutsk", "YAKST"}; - - return new Object[][] { - {"America/Los_Angeles", PST}, -@@ -287,7 +291,7 @@ - {"Africa/Porto-Novo", WAT}, - {"Africa/Sao_Tome", GMT}, - {"Africa/Timbuktu", GMT}, -- {"Africa/Tripoli", EET}, -+ {"Africa/Tripoli", CET}, - {"Africa/Tunis", CET}, - {"Africa/Windhoek", WAT}, - {"America/Adak", HAST}, -@@ -533,6 +537,7 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -+ {"Asia/Khandyga", YAKT}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"Fuso hor\u00e1rio de Krasnoyarsk", "KRAT", - "Fuso hor\u00e1rio de ver\u00e3o de Krasnoyarsk", "KRAST"}}, -@@ -581,11 +586,10 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -+ {"Asia/Ust-Nera", VLAT}, - {"Asia/Vientiane", ICT}, -- {"Asia/Vladivostok", new String[] {"Fuso hor\u00e1rio de Vladivostok", "VLAT", -- "Fuso hor\u00e1rio de ver\u00e3o de Vladivostok", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"Fuso hor\u00e1rio de Yakutsk", "YAKT", -- "Fuso hor\u00e1rio de ver\u00e3o de Yakutsk", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"Asia/Yekaterinburg", new String[] {"Fuso hor\u00e1rio de Yekaterinburgo", "YEKT", - "Fuso hor\u00e1rio de ver\u00e3o de Yekaterinburgo", "YEKST"}}, - {"Asia/Yerevan", ARMT}, -@@ -669,6 +673,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -748,7 +753,7 @@ - {"Jamaica", EST}, - {"Japan", JST}, - {"Kwajalein", MHT}, -- {"Libya", EET}, -+ {"Libya", CET}, - {"MET", new String[] {"Fuso hor\u00e1rio da Europa M\u00e9dia", "MET", - "Fuso hor\u00e1rio de ver\u00e3o da Europa M\u00e9dia", "MEST"}}, - {"Mexico/BajaNorte", PST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java -@@ -75,6 +75,8 @@ - "Centraleuropeisk sommartid", "CEST"}; - String CHAST[] = new String[] {"Chatham, normaltid", "CHAST", - "Chatham, sommartid", "CHADT"}; -+ String ChST[] = new String[] {"Chamorro, normaltid", "ChST", -+ "Chamorro, sommartid", "ChDT"}; - String CHUT[] = new String[] {"Chuuk Time", "CHUT", - "Chuuk Summer Time", "CHUST"}; - String CIT[] = new String[] {"Centralindonesisk tid", "CIT", -@@ -161,6 +163,8 @@ - "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"Stilla havet, normaltid", "PST", - "Stilla havet, sommartid", "PDT"}; -+ String SAMOA[] = new String[] {"Samoa, normaltid", "SST", -+ "Samoa, sommartid", "SDT"}; - String SAST[] = new String[] {"Sydafrika, normaltid", "SAST", - "Sydafrika, sommartid", "SAST"}; - String SBT[] = new String[] {"Salomon\u00f6arna, normaltid", "SBT", -@@ -175,6 +179,14 @@ - "Turkmenistan, sommartid", "TMST"}; - String ULAT[]= new String[] {"Ulaanbaatar, normaltid", "ULAT", - "Ulaanbaatar, sommartid", "ULAST"}; -+ String UTC[] = new String[] {"Koordinerad universell tid", "UTC", -+ "Koordinerad universell tid", "UTC"}; -+ String UZT[] = new String[] {"Uzbekistan, normaltid", "UZT", -+ "Uzbekistan, sommartid", "UZST"}; -+ String VICTORIA[] = new String[] {"\u00d6stlig normaltid (Victoria)", "EST", -+ "\u00d6stlig sommartid (Victoria)", "EST"}; -+ String VLAT[] = new String[] {"Vladivostok, normaltid", "VLAT", -+ "Vladivostok, sommartid", "VLAST"}; - String WART[] = new String[] {"V\u00e4stargentina, normaltid", "WART", - "V\u00e4stargentina, sommartid", "WARST"}; - String WAT[] = new String[] {"V\u00e4stafrikansk tid", "WAT", -@@ -185,18 +197,10 @@ - "V\u00e4stindonesisk sommartid", "WIST"}; - String WST_AUS[] = new String[] {"V\u00e4stlig normaltid (Australien)", "WST", - "V\u00e4stlig sommartid (Australien)", "WST"}; -- String SAMOA[] = new String[] {"Samoa, normaltid", "SST", -- "Samoa, sommartid", "SDT"}; - String WST_SAMOA[] = new String[] {"V\u00e4stsamoansk tid", "WST", - "V\u00e4stsamoansk sommartid", "WSDT"}; -- String ChST[] = new String[] {"Chamorro, normaltid", "ChST", -- "Chamorro, sommartid", "ChDT"}; -- String VICTORIA[] = new String[] {"\u00d6stlig normaltid (Victoria)", "EST", -- "\u00d6stlig sommartid (Victoria)", "EST"}; -- String UTC[] = new String[] {"Koordinerad universell tid", "UTC", -- "Koordinerad universell tid", "UTC"}; -- String UZT[] = new String[] {"Uzbekistan, normaltid", "UZT", -- "Uzbekistan, sommartid", "UZST"}; -+ String YAKT[] = new String[] {"Jakutsk, normaltid", "YAKT", -+ "Jakutsk, sommartid", "YAKST"}; - - return new Object[][] { - {"America/Los_Angeles", PST}, -@@ -287,7 +291,7 @@ - {"Africa/Porto-Novo", WAT}, - {"Africa/Sao_Tome", GMT}, - {"Africa/Timbuktu", GMT}, -- {"Africa/Tripoli", EET}, -+ {"Africa/Tripoli", CET}, - {"Africa/Tunis", CET}, - {"Africa/Windhoek", WAT}, - {"America/Adak", HAST}, -@@ -533,6 +537,7 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -+ {"Asia/Khandyga", YAKT}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"Krasnojarsk, normaltid", "KRAT", - "Krasnojarsk, sommartid", "KRAST"}}, -@@ -581,11 +586,10 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -+ {"Asia/Ust-Nera", VLAT}, - {"Asia/Vientiane", ICT}, -- {"Asia/Vladivostok", new String[] {"Vladivostok, normaltid", "VLAT", -- "Vladivostok, sommartid", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"Jakutsk, normaltid", "YAKT", -- "Jakutsk, sommartid", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"Asia/Yekaterinburg", new String[] {"Jekaterinburg, normaltid", "YEKT", - "Jekaterinburg, sommartid", "YEKST"}}, - {"Asia/Yerevan", ARMT}, -@@ -669,6 +673,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -748,7 +753,7 @@ - {"Jamaica", EST}, - {"Japan", JST}, - {"Kwajalein", MHT}, -- {"Libya", EET}, -+ {"Libya", CET}, - {"MET", new String[] {"Mellaneuropeisk tid", "MET", - "Mellaneuropeisk sommartid", "MEST"}}, - {"Mexico/BajaNorte", PST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java -@@ -75,6 +75,8 @@ - "\u4e2d\u6b27\u590f\u4ee4\u65f6", "CEST"}; - String CHAST[] = new String[] {"\u67e5\u8428\u59c6\u6807\u51c6\u65f6\u95f4", "CHAST", - "\u67e5\u8428\u59c6\u590f\u4ee4\u65f6", "CHADT"}; -+ String ChST[] = new String[] {"Chamorro \u6807\u51c6\u65f6\u95f4", "ChST", -+ "Chamorro \u590f\u4ee4\u65f6", "ChDT"}; - String CHUT[] = new String[] {"Chuuk Time", "CHUT", - "Chuuk Summer Time", "CHUST"}; - String CIT[] = new String[] {"\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "CIT", -@@ -161,6 +163,8 @@ - "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6807\u51c6\u65f6\u95f4", "PST", - "\u592a\u5e73\u6d0b\u590f\u4ee4\u65f6", "PDT"}; -+ String SAMOA[] = new String[] {"\u8428\u6469\u4e9a\u7fa4\u5c9b\u6807\u51c6\u65f6\u95f4", "SST", -+ "\u8428\u6469\u4e9a\u7fa4\u5c9b\u590f\u4ee4\u65f6", "SDT"}; - String SAST[] = new String[] {"\u5357\u975e\u6807\u51c6\u65f6\u95f4", "SAST", - "\u5357\u975e\u590f\u4ee4\u65f6", "SAST"}; - String SBT[] = new String[] {"\u6240\u7f57\u95e8\u7fa4\u5c9b\u65f6\u95f4", "SBT", -@@ -175,6 +179,14 @@ - "\u571f\u5e93\u66fc\u590f\u4ee4\u65f6", "TMST"}; - String ULAT[]= new String[] {"\u5e93\u4f26\u65f6\u95f4", "ULAT", - "\u5e93\u4f26\u590f\u4ee4\u65f6", "ULAST"}; -+ String UTC[] = new String[] {"\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC", -+ "\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC"}; -+ String UZT[] = new String[] {"\u4e4c\u5179\u522b\u514b\u65af\u5766\u65f6\u95f4", "UZT", -+ "\u4e4c\u5179\u522b\u514b\u65af\u5766\u590f\u4ee4\u65f6", "UZST"}; -+ String VICTORIA[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u7ef4\u591a\u5229\u4e9a\uff09", "EST", -+ "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u7ef4\u591a\u5229\u4e9a\uff09", "EST"}; -+ String VLAT[] = new String[] {"\u6d77\u53c2\u5d34\u65f6\u95f4", "VLAT", -+ "\u6d77\u53c2\u5d34\u590f\u4ee4\u65f6", "VLAST"}; - String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u65f6\u95f4", "WART", - "\u897f\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "WARST"}; - String WAT[] = new String[] {"\u897f\u975e\u65f6\u95f4", "WAT", -@@ -185,18 +197,10 @@ - "\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "WIST"}; - String WST_AUS[] = new String[] {"\u897f\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "WST", - "\u897f\u90e8\u590f\u4ee4\u65f6\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "WST"}; -- String SAMOA[] = new String[] {"\u8428\u6469\u4e9a\u7fa4\u5c9b\u6807\u51c6\u65f6\u95f4", "SST", -- "\u8428\u6469\u4e9a\u7fa4\u5c9b\u590f\u4ee4\u65f6", "SDT"}; - String WST_SAMOA[] = new String[] {"\u897f\u8428\u6469\u4e9a\u65f6\u95f4", "WST", - "\u897f\u8428\u6469\u4e9a\u590f\u4ee4\u65f6", "WSDT"}; -- String ChST[] = new String[] {"Chamorro \u6807\u51c6\u65f6\u95f4", "ChST", -- "Chamorro \u590f\u4ee4\u65f6", "ChDT"}; -- String VICTORIA[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u7ef4\u591a\u5229\u4e9a\uff09", "EST", -- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u7ef4\u591a\u5229\u4e9a\uff09", "EST"}; -- String UTC[] = new String[] {"\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC", -- "\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC"}; -- String UZT[] = new String[] {"\u4e4c\u5179\u522b\u514b\u65af\u5766\u65f6\u95f4", "UZT", -- "\u4e4c\u5179\u522b\u514b\u65af\u5766\u590f\u4ee4\u65f6", "UZST"}; -+ String YAKT[] = new String[] {"\u4e9a\u5e93\u6b21\u514b\u65f6\u95f4", "YAKT", -+ "\u4e9a\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "YAKST"}; - - return new Object[][] { - {"America/Los_Angeles", PST}, -@@ -287,7 +291,7 @@ - {"Africa/Porto-Novo", WAT}, - {"Africa/Sao_Tome", GMT}, - {"Africa/Timbuktu", GMT}, -- {"Africa/Tripoli", EET}, -+ {"Africa/Tripoli", CET}, - {"Africa/Tunis", CET}, - {"Africa/Windhoek", WAT}, - {"America/Adak", HAST}, -@@ -533,6 +537,7 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -+ {"Asia/Khandyga", YAKT}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u65f6\u95f4", "KRAT", - "\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u590f\u4ee4\u65f6", "KRAST"}}, -@@ -581,11 +586,10 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -+ {"Asia/Ust-Nera", VLAT}, - {"Asia/Vientiane", ICT}, -- {"Asia/Vladivostok", new String[] {"\u6d77\u53c2\u5d34\u65f6\u95f4", "VLAT", -- "\u6d77\u53c2\u5d34\u590f\u4ee4\u65f6", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"\u4e9a\u5e93\u6b21\u514b\u65f6\u95f4", "YAKT", -- "\u4e9a\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"Asia/Yekaterinburg", new String[] {"Yekaterinburg \u65f6\u95f4", "YEKT", - "Yekaterinburg \u590f\u4ee4\u65f6", "YEKST"}}, - {"Asia/Yerevan", ARMT}, -@@ -669,6 +673,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -748,7 +753,7 @@ - {"Jamaica", EST}, - {"Japan", JST}, - {"Kwajalein", MHT}, -- {"Libya", EET}, -+ {"Libya", CET}, - {"MET", new String[] {"\u4e2d\u6b27\u65f6\u95f4", "MET", - "\u4e2d\u6b27\u590f\u4ee4\u65f6", "MEST"}}, - {"Mexico/BajaNorte", PST}, ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java -@@ -75,6 +75,8 @@ - "\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "CEST"}; - String CHAST[] = new String[] {"\u67e5\u5766\u6a19\u6e96\u6642\u9593", "CHAST", - "\u67e5\u5766\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CHADT"}; -+ String ChST[] = new String[] {"\u67e5\u83ab\u6d1b\u6a19\u6e96\u6642\u9593", "ChST", -+ "\u67e5\u83ab\u6d1b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ChDT"}; - String CHUT[] = new String[] {"Chuuk Time", "CHUT", - "Chuuk Summer Time", "CHUST"}; - String CIT[] = new String[] {"\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "CIT", -@@ -161,6 +163,8 @@ - "Pohnpei Summer Time", "PONST"}; - String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642\u9593", "PST", - "\u592a\u5e73\u6d0b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PDT"}; -+ String SAMOA[] = new String[] {"\u85a9\u6469\u4e9e\u6a19\u6e96\u6642\u9593", "SST", -+ "\u85a9\u6469\u4e9e\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "SDT"}; - String SAST[] = new String[] {"\u5357\u975e\u6a19\u6e96\u6642\u9593", "SAST", - "\u5357\u975e\u590f\u4ee4\u6642\u9593", "SAST"}; - String SBT[] = new String[] {"\u6240\u7f85\u9580\u7fa4\u5cf6\u6642\u9593", "SBT", -@@ -175,7 +179,15 @@ - "\u571f\u5eab\u66fc\u590f\u4ee4\u6642\u9593", "TMST"}; - String ULAT[]= new String[] {"\u5eab\u502b\u6642\u9593", "ULAT", - "\u5eab\u502b\u590f\u4ee4\u6642\u9593", "ULAST"}; -- String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u6642\u9593", "WART", -+ String UTC[] = new String[] {"\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC", -+ "\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC"}; -+ String UZT[] = new String[] {"\u70cf\u8332\u5225\u514b\u65af\u5766\u6642\u9593", "UZT", -+ "\u70cf\u8332\u5225\u514b\u65af\u5766\u590f\u4ee4\u6642\u9593", "UZST"}; -+ String VICTORIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642\u9593 (\u7dad\u591a\u5229\u4e9e\u90a6)", "EST", -+ "\u6771\u90e8\u590f\u4ee4\u6642\u9593 (\u7dad\u591a\u5229\u4e9e\u90a6)", "EST"}; -+ String VLAT[] = new String[] {"\u6d77\u53c3\u5d34\u6642\u9593", "VLAT", -+ "\u6d77\u53c3\u5d34\u590f\u4ee4\u6642\u9593", "VLAST"}; -+ String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u6642\u9593", "WART", - "\u897f\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "WARST"}; - String WAT[] = new String[] {"\u897f\u975e\u6642\u9593", "WAT", - "\u897f\u975e\u590f\u4ee4\u6642\u9593", "WAST"}; -@@ -185,18 +197,10 @@ - "\u897f\u5370\u5c3c\u590f\u4ee4\u6642\u9593", "WIST"}; - String WST_AUS[] = new String[] {"\u897f\u65b9\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "WST", - "\u897f\u65b9\u590f\u4ee4\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "WST"}; -- String SAMOA[] = new String[] {"\u85a9\u6469\u4e9e\u6a19\u6e96\u6642\u9593", "SST", -- "\u85a9\u6469\u4e9e\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "SDT"}; - String WST_SAMOA[] = new String[] {"\u897f\u85a9\u6469\u4e9e\u6642\u9593", "WST", - "\u897f\u85a9\u6469\u4e9e\u590f\u4ee4\u6642\u9593", "WSDT"}; -- String ChST[] = new String[] {"\u67e5\u83ab\u6d1b\u6a19\u6e96\u6642\u9593", "ChST", -- "\u67e5\u83ab\u6d1b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ChDT"}; -- String VICTORIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642\u9593 (\u7dad\u591a\u5229\u4e9e\u90a6)", "EST", -- "\u6771\u90e8\u590f\u4ee4\u6642\u9593 (\u7dad\u591a\u5229\u4e9e\u90a6)", "EST"}; -- String UTC[] = new String[] {"\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC", -- "\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC"}; -- String UZT[] = new String[] {"\u70cf\u8332\u5225\u514b\u65af\u5766\u6642\u9593", "UZT", -- "\u70cf\u8332\u5225\u514b\u65af\u5766\u590f\u4ee4\u6642\u9593", "UZST"}; -+ String YAKT[] = new String[] {"\u4e9e\u5eab\u6b21\u514b\u6642\u9593", "YAKT", -+ "\u4e9e\u5eab\u6b21\u514b\u590f\u4ee4\u6642\u9593", "YAKST"}; - - return new Object[][] { - {"America/Los_Angeles", PST}, -@@ -287,7 +291,7 @@ - {"Africa/Porto-Novo", WAT}, - {"Africa/Sao_Tome", GMT}, - {"Africa/Timbuktu", GMT}, -- {"Africa/Tripoli", EET}, -+ {"Africa/Tripoli", CET}, - {"Africa/Tunis", CET}, - {"Africa/Windhoek", WAT}, - {"America/Adak", HAST}, -@@ -533,6 +537,7 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -+ {"Asia/Khandyga", YAKT}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u6642\u9593", "KRAT", - "\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u590f\u4ee4\u6642\u9593", "KRAST"}}, -@@ -582,11 +587,10 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -+ {"Asia/Ust-Nera", VLAT}, - {"Asia/Vientiane", ICT}, -- {"Asia/Vladivostok", new String[] {"\u6d77\u53c3\u5d34\u6642\u9593", "VLAT", -- "\u6d77\u53c3\u5d34\u590f\u4ee4\u6642\u9593", "VLAST"}}, -- {"Asia/Yakutsk", new String[] {"\u4e9e\u5eab\u6b21\u514b\u6642\u9593", "YAKT", -- "\u4e9e\u5eab\u6b21\u514b\u590f\u4ee4\u6642\u9593", "YAKST"}}, -+ {"Asia/Vladivostok", VLAT}, -+ {"Asia/Yakutsk", YAKT}, - {"Asia/Yekaterinburg", new String[] {"Yekaterinburg \u6642\u9593", "YEKT", - "Yekaterinburg \u590f\u4ee4\u6642\u9593", "YEKST"}}, - {"Asia/Yerevan", ARMT}, -@@ -670,6 +674,7 @@ - {"Europe/Bratislava", CET}, - {"Europe/Brussels", CET}, - {"Europe/Budapest", CET}, -+ {"Europe/Busingen", CET}, - {"Europe/Chisinau", EET}, - {"Europe/Copenhagen", CET}, - {"Europe/Dublin", DUBLIN}, -@@ -749,7 +754,7 @@ - {"Jamaica", EST}, - {"Japan", JST}, - {"Kwajalein", MHT}, -- {"Libya", EET}, -+ {"Libya", CET}, - {"MET", new String[] {"\u4e2d\u6b50\u6642\u9593", "MET", - "\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "MEST"}}, - {"Mexico/BajaNorte", PST},
--- a/patches/openjdk/8014469-tzdata2013c.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,276 +0,0 @@ -# HG changeset patch -# User peytoia -# Date 1369892058 -32400 -# Thu May 30 14:34:18 2013 +0900 -# Node ID 1dad45fa401d88fd42b795a2bd0ca796f6842ba5 -# Parent a1ec65ac926d41ccca2545dbc3b62bb7c12282af -8014469: (tz) Support tzdata2013c -8015570: Use long comparison in Rule.getRules(). -Reviewed-by: okutsu - -diff --git a/make/sun/javazic/tzdata/VERSION b/make/sun/javazic/tzdata/VERSION ---- openjdk/jdk/make/sun/javazic/tzdata/VERSION -+++ openjdk/jdk/make/sun/javazic/tzdata/VERSION -@@ -21,4 +21,4 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --tzdata2013b -+tzdata2013c -diff --git a/make/sun/javazic/tzdata/antarctica b/make/sun/javazic/tzdata/antarctica ---- openjdk/jdk/make/sun/javazic/tzdata/antarctica -+++ openjdk/jdk/make/sun/javazic/tzdata/antarctica -@@ -76,34 +76,6 @@ - Rule ChileAQ 2012 max - Apr Sun>=23 3:00u 0 - - Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S - --# These rules are stolen from the `australasia' file. --Rule AusAQ 1917 only - Jan 1 0:01 1:00 - --Rule AusAQ 1917 only - Mar 25 2:00 0 - --Rule AusAQ 1942 only - Jan 1 2:00 1:00 - --Rule AusAQ 1942 only - Mar 29 2:00 0 - --Rule AusAQ 1942 only - Sep 27 2:00 1:00 - --Rule AusAQ 1943 1944 - Mar lastSun 2:00 0 - --Rule AusAQ 1943 only - Oct 3 2:00 1:00 - --Rule ATAQ 1967 only - Oct Sun>=1 2:00s 1:00 - --Rule ATAQ 1968 only - Mar lastSun 2:00s 0 - --Rule ATAQ 1968 1985 - Oct lastSun 2:00s 1:00 - --Rule ATAQ 1969 1971 - Mar Sun>=8 2:00s 0 - --Rule ATAQ 1972 only - Feb lastSun 2:00s 0 - --Rule ATAQ 1973 1981 - Mar Sun>=1 2:00s 0 - --Rule ATAQ 1982 1983 - Mar lastSun 2:00s 0 - --Rule ATAQ 1984 1986 - Mar Sun>=1 2:00s 0 - --Rule ATAQ 1986 only - Oct Sun>=15 2:00s 1:00 - --Rule ATAQ 1987 1990 - Mar Sun>=15 2:00s 0 - --Rule ATAQ 1987 only - Oct Sun>=22 2:00s 1:00 - --Rule ATAQ 1988 1990 - Oct lastSun 2:00s 1:00 - --Rule ATAQ 1991 1999 - Oct Sun>=1 2:00s 1:00 - --Rule ATAQ 1991 2005 - Mar lastSun 2:00s 0 - --Rule ATAQ 2000 only - Aug lastSun 2:00s 1:00 - --Rule ATAQ 2001 max - Oct Sun>=1 2:00s 1:00 - --Rule ATAQ 2006 only - Apr Sun>=1 2:00s 0 - --Rule ATAQ 2007 only - Mar lastSun 2:00s 0 - --Rule ATAQ 2008 max - Apr Sun>=1 2:00s 0 - -- - # Argentina - year-round bases - # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05 - # Esperanza, San Martin Land, -6323-05659, since 1952-12-17 -@@ -145,10 +117,7 @@ - # </a> - - # From Steffen Thorsen (2010-03-10): --# We got these changes from the Australian Antarctic Division: --# - Macquarie Island will stay on UTC+11 for winter and therefore not --# switch back from daylight savings time when other parts of Australia do --# on 4 April. -+# We got these changes from the Australian Antarctic Division: ... - # - # - Casey station reverted to its normal time of UTC+8 on 5 March 2010. - # The change to UTC+11 is being considered as a regular summer thing but -@@ -159,9 +128,6 @@ - # - # - Mawson station stays on UTC+5. - # --# In addition to the Rule changes for Casey/Davis, it means that Macquarie --# will no longer be like Hobart and will have to have its own Zone created. --# - # Background: - # <a href="http://www.timeanddate.com/news/time/antartica-time-changes-2010.html"> - # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html -@@ -188,12 +154,6 @@ - 6:00 - MAWT 2009 Oct 18 2:00 - # Mawson Time - 5:00 - MAWT --Zone Antarctica/Macquarie 0 - zzz 1911 -- 10:00 - EST 1916 Oct 1 2:00 -- 10:00 1:00 EST 1917 Feb -- 10:00 AusAQ EST 1967 -- 10:00 ATAQ EST 2010 Apr 4 3:00 -- 11:00 - MIST # Macquarie Island Time - # References: - # <a href="http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html"> - # Casey Weather (1998-02-26) -diff --git a/make/sun/javazic/tzdata/asia b/make/sun/javazic/tzdata/asia ---- openjdk/jdk/make/sun/javazic/tzdata/asia -+++ openjdk/jdk/make/sun/javazic/tzdata/asia -@@ -2314,11 +2314,20 @@ - # http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html - # </a> - --# From Arthur David Olson (2012-03-27): --# The timeanddate article for 2012 says that "the end date has not yet been --# announced" and that "Last year, both...paused daylight saving time during... --# Ramadan. It is not yet known [for] 2012." --# For now, assume both switch back on the last Friday in September. XXX -+# From Steffen Thorsen (2013-03-26): -+# The following news sources tells that Palestine will "start daylight saving -+# time from midnight on Friday, March 29, 2013" (translated). -+# [These are in Arabic and are for Gaza and for Ramallah, respectively.] -+# http://www.samanews.com/index.php?act=Show&id=154120 -+# http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html -+ -+# From Paul Eggert (2013-04-15): -+# For future dates, guess the last Thursday in March at 24:00 through -+# the first Friday on or after September 21 at 01:00. This is consistent with -+# the predictions in today's editions of the following URLs, -+# which are for Gaza and Hebron respectively: -+# http://www.timeanddate.com/worldclock/timezone.html?n=702 -+# http://www.timeanddate.com/worldclock/timezone.html?n=2364 - - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule EgyptAsia 1957 only - May 10 0:00 1:00 S -@@ -2332,19 +2341,20 @@ - Rule Palestine 1999 2003 - Oct Fri>=15 0:00 0 - - Rule Palestine 2004 only - Oct 1 1:00 0 - - Rule Palestine 2005 only - Oct 4 2:00 0 - --Rule Palestine 2006 2008 - Apr 1 0:00 1:00 S -+Rule Palestine 2006 2007 - Apr 1 0:00 1:00 S - Rule Palestine 2006 only - Sep 22 0:00 0 - - Rule Palestine 2007 only - Sep Thu>=8 2:00 0 - --Rule Palestine 2008 only - Aug lastFri 0:00 0 - --Rule Palestine 2009 only - Mar lastFri 0:00 1:00 S --Rule Palestine 2009 only - Sep Fri>=1 2:00 0 - --Rule Palestine 2010 only - Mar lastSat 0:01 1:00 S -+Rule Palestine 2008 2009 - Mar lastFri 0:00 1:00 S -+Rule Palestine 2008 only - Sep 1 0:00 0 - -+Rule Palestine 2009 only - Sep Fri>=1 1:00 0 - -+Rule Palestine 2010 only - Mar 26 0:00 1:00 S - Rule Palestine 2010 only - Aug 11 0:00 0 - -- --# From Arthur David Olson (2011-09-20): --# 2011 transitions per http://www.timeanddate.com as of 2011-09-20. --# From Paul Eggert (2012-10-12): --# 2012 transitions per http://www.timeanddate.com as of 2012-10-12. -+Rule Palestine 2011 only - Apr 1 0:01 1:00 S -+Rule Palestine 2011 only - Aug 1 0:00 0 - -+Rule Palestine 2011 only - Aug 30 0:00 1:00 S -+Rule Palestine 2011 only - Sep 30 0:00 0 - -+Rule Palestine 2012 max - Mar lastThu 24:00 1:00 S -+Rule Palestine 2012 max - Sep Fri>=21 1:00 0 - - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Asia/Gaza 2:17:52 - LMT 1900 Oct -@@ -2352,26 +2362,20 @@ - 2:00 EgyptAsia EE%sT 1967 Jun 5 - 2:00 Zion I%sT 1996 - 2:00 Jordan EE%sT 1999 -- 2:00 Palestine EE%sT 2011 Apr 2 12:01 -- 2:00 1:00 EEST 2011 Aug 1 -- 2:00 - EET 2012 Mar 30 -- 2:00 1:00 EEST 2012 Sep 21 1:00 -- 2:00 - EET -+ 2:00 Palestine EE%sT 2008 Aug 29 0:00 -+ 2:00 - EET 2008 Sep -+ 2:00 Palestine EE%sT 2010 -+ 2:00 - EET 2010 Mar 27 0:01 -+ 2:00 Palestine EE%sT 2011 Aug 1 -+ 2:00 - EET 2012 -+ 2:00 Palestine EE%sT - - Zone Asia/Hebron 2:20:23 - LMT 1900 Oct - 2:00 Zion EET 1948 May 15 - 2:00 EgyptAsia EE%sT 1967 Jun 5 - 2:00 Zion I%sT 1996 - 2:00 Jordan EE%sT 1999 -- 2:00 Palestine EE%sT 2008 Aug -- 2:00 1:00 EEST 2008 Sep -- 2:00 Palestine EE%sT 2011 Apr 1 12:01 -- 2:00 1:00 EEST 2011 Aug 1 -- 2:00 - EET 2011 Aug 30 -- 2:00 1:00 EEST 2011 Sep 30 3:00 -- 2:00 - EET 2012 Mar 30 -- 2:00 1:00 EEST 2012 Sep 21 1:00 -- 2:00 - EET -+ 2:00 Palestine EE%sT - - # Paracel Is - # no information -diff --git a/make/sun/javazic/tzdata/australasia b/make/sun/javazic/tzdata/australasia ---- openjdk/jdk/make/sun/javazic/tzdata/australasia -+++ openjdk/jdk/make/sun/javazic/tzdata/australasia -@@ -241,9 +241,26 @@ - # no times are set - # - # Macquarie --# permanent occupation (scientific station) since 1948; --# sealing and penguin oil station operated 1888/1917 --# like Australia/Hobart -+# Permanent occupation (scientific station) 1911-1915 and since 25 March 1948; -+# sealing and penguin oil station operated Nov 1899 to Apr 1919. See the -+# Tasmania Parks & Wildlife Service history of sealing at Macquarie Island -+# <http://www.parks.tas.gov.au/index.aspx?base=1828> -+# <http://www.parks.tas.gov.au/index.aspx?base=1831>. -+# Guess that it was like Australia/Hobart while inhabited before 2010. -+# -+# From Steffen Thorsen (2010-03-10): -+# We got these changes from the Australian Antarctic Division: -+# - Macquarie Island will stay on UTC+11 for winter and therefore not -+# switch back from daylight savings time when other parts of Australia do -+# on 4 April. -+Zone Antarctica/Macquarie 0 - zzz 1899 Nov -+ 10:00 - EST 1916 Oct 1 2:00 -+ 10:00 1:00 EST 1917 Feb -+ 10:00 Aus EST 1919 Apr -+ 0 - zzz 1948 Mar 25 -+ 10:00 Aus EST 1967 -+ 10:00 AT EST 2010 Apr 4 3:00 -+ 11:00 - MIST # Macquarie I Standard Time - - # Christmas - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -diff --git a/make/sun/javazic/tzdata/southamerica b/make/sun/javazic/tzdata/southamerica ---- openjdk/jdk/make/sun/javazic/tzdata/southamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/southamerica -@@ -1589,16 +1589,16 @@ - # forward 60 minutes, in all the territory of the Paraguayan Republic. - # ... - Rule Para 2010 max - Oct Sun>=1 0:00 1:00 S --Rule Para 2010 max - Apr Sun>=8 0:00 0 - -+Rule Para 2010 2012 - Apr Sun>=8 0:00 0 - - # - # From Steffen Thorsen (2013-03-07): - # Paraguay will end DST on 2013-03-24 00:00.... --# They do not tell if this will be a permanent change or just this year.... - # http://www.ande.gov.py/interna.php?id=1075 - # --# From Paul Eggert (2013-03-07): --# For now, assume it's just this year. --Rule Para 2013 only - Mar 24 0:00 0 - -+# From Carlos Raul Perasso (2013-03-15): -+# The change in Paraguay is now final. Decree number 10780 -+# http://www.presidencia.gov.py/uploads/pdf/presidencia-3b86ff4b691c79d4f5927ca964922ec74772ce857c02ca054a52a37b49afc7fb.pdf -+Rule Para 2013 max - Mar Sun>=22 0:00 0 - - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone America/Asuncion -3:50:40 - LMT 1890 -diff --git a/make/sun/javazic/tzdata/zone.tab b/make/sun/javazic/tzdata/zone.tab ---- openjdk/jdk/make/sun/javazic/tzdata/zone.tab -+++ openjdk/jdk/make/sun/javazic/tzdata/zone.tab -@@ -65,7 +65,6 @@ - AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok - AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie - AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I --AQ -5430+15857 Antarctica/Macquarie Macquarie Island Station, Macquarie Island - AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) - AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, MN, SE, SF) - AR -2447-06525 America/Argentina/Salta (SA, LP, NQ, RN) -@@ -81,6 +80,7 @@ - AS -1416-17042 Pacific/Pago_Pago - AT +4813+01620 Europe/Vienna - AU -3133+15905 Australia/Lord_Howe Lord Howe Island -+AU -5430+15857 Antarctica/Macquarie Macquarie Island - AU -4253+14719 Australia/Hobart Tasmania - most locations - AU -3956+14352 Australia/Currie Tasmania - King Island - AU -3749+14458 Australia/Melbourne Victoria -diff --git a/make/tools/src/build/tools/javazic/Rule.java b/make/tools/src/build/tools/javazic/Rule.java ---- openjdk/jdk/make/tools/src/build/tools/javazic/Rule.java -+++ openjdk/jdk/make/tools/src/build/tools/javazic/Rule.java -@@ -119,7 +119,7 @@ - r1.getDay(), r1.getTime().getTime()); - long t2 = Time.getLocalTime(y, r2.getMonth(), - r2.getDay(), r2.getTime().getTime()); -- return (int)(t1 - t2); -+ return (t1 > t2) ? 1 : (t1 < t2) ? -1 : 0; - } - public boolean equals(Object o) { - return this == o;
--- a/patches/openjdk/8020054-tzdata2013d.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,314 +0,0 @@ -# HG changeset patch -# User igerasim -# Date 1373612209 -14400 -# Fri Jul 12 10:56:49 2013 +0400 -# Node ID dbf9b854ae55750afe3c8b3e319e3ccf5cfd2901 -# Parent 1dad45fa401d88fd42b795a2bd0ca796f6842ba5 -8020054: (tz) Support tzdata2013d -Reviewed-by: coffeys, peytoia - -diff --git a/make/sun/javazic/tzdata/VERSION b/make/sun/javazic/tzdata/VERSION ---- openjdk/jdk/make/sun/javazic/tzdata/VERSION -+++ openjdk/jdk/make/sun/javazic/tzdata/VERSION -@@ -21,4 +21,4 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --tzdata2013c -+tzdata2013d -diff --git a/make/sun/javazic/tzdata/africa b/make/sun/javazic/tzdata/africa ---- openjdk/jdk/make/sun/javazic/tzdata/africa -+++ openjdk/jdk/make/sun/javazic/tzdata/africa -@@ -875,12 +875,18 @@ - # announced that year's Ramadan daylight-saving transitions would be - # 2012-07-20 and 2012-08-20; see - # <http://www.mmsp.gov.ma/fr/actualites.aspx?id=288>. --# -+ -+# From Andrew Paprocki (2013-07-02): -+# Morocco announced that the year's Ramadan daylight-savings -+# transitions would be 2013-07-07 and 2013-08-10; see: -+# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10 -+ -+# From Paul Eggert (2013-07-03): - # To estimate what the Moroccan government will do in future years, --# transition dates for 2013 through 2021 were determined by running -+# transition dates for 2014 through 2021 were determined by running - # the following program under GNU Emacs 24.3: - # --# (let ((islamic-year 1434)) -+# (let ((islamic-year 1435)) - # (while (< islamic-year 1444) - # (let ((a - # (calendar-gregorian-from-absolute -@@ -933,8 +939,8 @@ - Rule Morocco 2012 max - Sep lastSun 3:00 0 - - Rule Morocco 2012 only - Jul 20 3:00 0 - - Rule Morocco 2012 only - Aug 20 2:00 1:00 S --Rule Morocco 2013 only - Jul 9 3:00 0 - --Rule Morocco 2013 only - Aug 8 2:00 1:00 S -+Rule Morocco 2013 only - Jul 7 3:00 0 - -+Rule Morocco 2013 only - Aug 10 2:00 1:00 S - Rule Morocco 2014 only - Jun 29 3:00 0 - - Rule Morocco 2014 only - Jul 29 2:00 1:00 S - Rule Morocco 2015 only - Jun 18 3:00 0 - -diff --git a/make/sun/javazic/tzdata/asia b/make/sun/javazic/tzdata/asia ---- openjdk/jdk/make/sun/javazic/tzdata/asia -+++ openjdk/jdk/make/sun/javazic/tzdata/asia -@@ -1235,39 +1235,21 @@ - Rule Zion 2012 only - Mar Fri>=26 2:00 1:00 D - Rule Zion 2012 only - Sep 23 2:00 0 S - --# From Ephraim Silverberg (2012-10-18): --# Yesterday, the Interior Ministry Committee, after more than a year --# past, approved sending the proposed June 2011 changes to the Time --# Decree Law back to the Knesset for second and third (final) votes --# before the upcoming elections on Jan. 22, 2013. Hence, although the --# changes are not yet law, they are expected to be so before February 2013. -+# From Ephraim Silverberg (2013-06-27): -+# On June 23, 2013, the Israeli government approved changes to the -+# Time Decree Law. The next day, the changes passed the First Reading -+# in the Knesset. The law is expected to pass the Second and Third -+# (final) Readings by the beginning of September 2013. - # --# As of 2013, DST starts at 02:00 on the Friday before the last Sunday in March. --# DST ends at 02:00 on the first Sunday after October 1, unless it occurs on the --# second day of the Jewish Rosh Hashana holiday, in which case DST ends a day --# later (i.e. at 02:00 the first Monday after October 2). --# [Rosh Hashana holidays are factored in until 2100.] -- --# From Ephraim Silverberg (2012-11-05): --# The Knesset passed today (in second and final readings) the amendment to the --# Time Decree Law making the changes ... law. -+# As of 2013, DST starts at 02:00 on the Friday before the last Sunday -+# in March. DST ends at 02:00 on the last Sunday of October. - - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Zion 2013 max - Mar Fri>=23 2:00 1:00 D --Rule Zion 2013 2026 - Oct Sun>=2 2:00 0 S --Rule Zion 2027 only - Oct Mon>=3 2:00 0 S --Rule Zion 2028 max - Oct Sun>=2 2:00 0 S --# The following rules are commented out for now, as they break older --# versions of zic that support only signed 32-bit timestamps, i.e., --# through 2038-01-19 03:14:07 UTC. --#Rule Zion 2028 2053 - Oct Sun>=2 2:00 0 S --#Rule Zion 2054 only - Oct Mon>=3 2:00 0 S --#Rule Zion 2055 2080 - Oct Sun>=2 2:00 0 S --#Rule Zion 2081 only - Oct Mon>=3 2:00 0 S --#Rule Zion 2082 max - Oct Sun>=2 2:00 0 S -+Rule Zion 2013 max - Oct lastSun 2:00 0 S - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone Asia/Jerusalem 2:20:56 - LMT 1880 -+Zone Asia/Jerusalem 2:20:54 - LMT 1880 - 2:20:40 - JMT 1918 # Jerusalem Mean Time? - 2:00 Zion I%sT - -@@ -2570,8 +2552,8 @@ - Rule Syria 2007 only - Mar lastFri 0:00 1:00 S - # From Jesper Norgard (2007-10-27): - # The sister center ICARDA of my work CIMMYT is confirming that Syria DST will --# not take place 1.st November at 0:00 o'clock but 1.st November at 24:00 or --# rather Midnight between Thursday and Friday. This does make more sence than -+# not take place 1st November at 0:00 o'clock but 1st November at 24:00 or -+# rather Midnight between Thursday and Friday. This does make more sense than - # having it between Wednesday and Thursday (two workdays in Syria) since the - # weekend in Syria is not Saturday and Sunday, but Friday and Saturday. So now - # it is implemented at midnight of the last workday before weekend... -diff --git a/make/sun/javazic/tzdata/australasia b/make/sun/javazic/tzdata/australasia ---- openjdk/jdk/make/sun/javazic/tzdata/australasia -+++ openjdk/jdk/make/sun/javazic/tzdata/australasia -@@ -253,10 +253,16 @@ - # - Macquarie Island will stay on UTC+11 for winter and therefore not - # switch back from daylight savings time when other parts of Australia do - # on 4 April. -+# -+# From Arthur David Olson (2013-05-23): -+# The 1919 transition is overspecified below so pre-2013 zics -+# will produce a binary file with an EST-type as the first 32-bit type; -+# this is required for correct handling of times before 1916 by -+# pre-2013 versions of localtime. - Zone Antarctica/Macquarie 0 - zzz 1899 Nov - 10:00 - EST 1916 Oct 1 2:00 - 10:00 1:00 EST 1917 Feb -- 10:00 Aus EST 1919 Apr -+ 10:00 Aus EST 1919 Apr 1 0:00s - 0 - zzz 1948 Mar 25 - 10:00 Aus EST 1967 - 10:00 AT EST 2010 Apr 4 3:00 -@@ -1498,12 +1504,12 @@ - # From Paul Eggert (2000-01-08): - # IATA SSIM (1999-09) says DST ends 0100 local time. Go with McDow. - --# From the BBC World Service (1998-10-31 11:32 UTC): -+# From the BBC World Service in -+# http://news.bbc.co.uk/2/hi/asia-pacific/205226.stm (1998-10-31 16:03 UTC): - # The Fijiian government says the main reasons for the time change is to --# improve productivity and reduce road accidents. But correspondents say it --# also hopes the move will boost Fiji's ability to compete with other pacific --# islands in the effort to attract tourists to witness the dawning of the new --# millenium. -+# improve productivity and reduce road accidents.... [T]he move is also -+# intended to boost Fiji's ability to attract tourists to witness the dawning -+# of the new millennium. - - # http://www.fiji.gov.fj/press/2000_09/2000_09_13-05.shtml (2000-09-13) - # reports that Fiji has discontinued DST. -@@ -1648,7 +1654,7 @@ - # Shanks & Pottenger say the transition was on 1968-10-01; go with Mundell. - - # From Eric Ulevik (1999-05-03): --# Tonga's director of tourism, who is also secretary of the National Millenium -+# Tonga's director of tourism, who is also secretary of the National Millennium - # Committee, has a plan to get Tonga back in front. - # He has proposed a one-off move to tropical daylight saving for Tonga from - # October to March, which has won approval in principle from the Tongan -diff --git a/make/sun/javazic/tzdata/europe b/make/sun/javazic/tzdata/europe ---- openjdk/jdk/make/sun/javazic/tzdata/europe -+++ openjdk/jdk/make/sun/javazic/tzdata/europe -@@ -546,7 +546,7 @@ - # It seems that Paris, Monaco, Rule France, Rule Belgium all agree on - # 2:00 standard time, e.g. 3:00 local time. However there are no - # countries that use C-Eur rules in September 1945, so the only items --# affected are apparently these ficticious zones that translates acronyms -+# affected are apparently these fictitious zones that translate acronyms - # CET and MET: - # - # Zone CET 1:00 C-Eur CE%sT -@@ -2802,9 +2802,9 @@ - - # Ukraine - # --# From Igor Karpov, who works for the Ukranian Ministry of Justice, -+# From Igor Karpov, who works for the Ukrainian Ministry of Justice, - # via Garrett Wollman (2003-01-27): --# BTW, I've found the official document on this matter. It's goverment -+# BTW, I've found the official document on this matter. It's government - # regulations number 509, May 13, 1996. In my poor translation it says: - # "Time in Ukraine is set to second timezone (Kiev time). Each last Sunday - # of March at 3am the time is changing to 4am and each last Sunday of -@@ -2838,7 +2838,7 @@ - # time this year after all. - # - # From Udo Schwedt (2011-10-18): --# As far as I understand, the recent change to the Ukranian time zone -+# As far as I understand, the recent change to the Ukrainian time zone - # (Europe/Kiev) to introduce permanent daylight saving time (similar - # to Russia) was reverted today: - # -diff --git a/make/sun/javazic/tzdata/iso3166.tab b/make/sun/javazic/tzdata/iso3166.tab ---- openjdk/jdk/make/sun/javazic/tzdata/iso3166.tab -+++ openjdk/jdk/make/sun/javazic/tzdata/iso3166.tab -@@ -26,14 +26,12 @@ - # 2009-05-17 by Arthur David Olson. - # ISO 3166 alpha-2 country codes - # --# From Paul Eggert (2006-09-27): -+# From Paul Eggert (2013-05-27): - # - # This file contains a table with the following columns: - # 1. ISO 3166-1 alpha-2 country code, current as of --# ISO 3166-1 Newsletter VI-1 (2007-09-21). See: --# <a href="http://www.iso.org/iso/en/prods-services/iso3166ma/index.html"> --# ISO 3166 Maintenance agency (ISO 3166/MA) --# </a>. -+# ISO 3166-1 Newsletter VI-15 (2013-05-10). See: Updates on ISO 3166 -+# http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm - # 2. The usual English name for the country, - # chosen so that alphabetic sorting of subsets produces helpful lists. - # This is not the same as the English name in the ISO 3166 tables. -@@ -43,8 +41,9 @@ - # - # Lines beginning with `#' are comments. - # --# From Arthur David Olson (2011-08-17): --# Resynchronized today with the ISO 3166 site (adding SS for South Sudan). -+# This table is intended as an aid for users, to help them select time -+# zone data appropriate for their practical needs. It is not intended -+# to take or endorse any position on legal or territorial claims. - # - #country- - #code country name -@@ -77,7 +76,7 @@ - BM Bermuda - BN Brunei - BO Bolivia --BQ Bonaire Sint Eustatius & Saba -+BQ Bonaire, St Eustatius & Saba - BR Brazil - BS Bahamas - BT Bhutan -@@ -258,7 +257,7 @@ - SS South Sudan - ST Sao Tome & Principe - SV El Salvador --SX Sint Maarten -+SX St Maarten (Dutch part) - SY Syria - SZ Swaziland - TC Turks & Caicos Is -diff --git a/make/sun/javazic/tzdata/southamerica b/make/sun/javazic/tzdata/southamerica ---- openjdk/jdk/make/sun/javazic/tzdata/southamerica -+++ openjdk/jdk/make/sun/javazic/tzdata/southamerica -@@ -994,7 +994,7 @@ - # adopted by the same states as before. - Rule Brazil 2007 only - Oct Sun>=8 0:00 1:00 S - # From Frederico A. C. Neves (2008-09-10): --# Acording to this decree -+# According to this decree - # <a href="http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm"> - # http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm - # </a> -@@ -1226,7 +1226,7 @@ - # http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651 - # </a> - # --# This is not yet reflected in the offical "cambio de hora" site, but -+# This is not yet reflected in the official "cambio de hora" site, but - # probably will be soon: - # <a href="http://www.horaoficial.cl/cambio.htm"> - # http://www.horaoficial.cl/cambio.htm -diff --git a/make/sun/javazic/tzdata/zone.tab b/make/sun/javazic/tzdata/zone.tab ---- openjdk/jdk/make/sun/javazic/tzdata/zone.tab -+++ openjdk/jdk/make/sun/javazic/tzdata/zone.tab -@@ -27,15 +27,19 @@ - # - # TZ zone descriptions - # --# From Paul Eggert (1996-08-05): -+# From Paul Eggert (2013-05-27): - # - # This file contains a table with the following columns: - # 1. ISO 3166 2-character country code. See the file `iso3166.tab'. -+# This identifies a country that overlaps the zone. The country may -+# overlap other zones and the zone may overlap other countries. - # 2. Latitude and longitude of the zone's principal location - # in ISO 6709 sign-degrees-minutes-seconds format, - # either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS, - # first latitude (+ is north), then longitude (+ is east). -+# This location need not lie within the column-1 country. - # 3. Zone name used in value of TZ environment variable. -+# Please see the 'Theory' file for how zone names are chosen. - # 4. Comments; present if and only if the country has multiple rows. - # - # Columns are separated by a single tab. -@@ -45,6 +49,10 @@ - # - # Lines beginning with `#' are comments. - # -+# This table is intended as an aid for users, to help them select time -+# zone data appropriate for their practical needs. It is not intended -+# to take or endorse any position on legal or territorial claims. -+# - #country- - #code coordinates TZ comments - AD +4230+00131 Europe/Andorra -@@ -239,7 +247,7 @@ - ID -0507+11924 Asia/Makassar east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor - ID -0232+14042 Asia/Jayapura west New Guinea (Irian Jaya) & Malukus (Moluccas) - IE +5320-00615 Europe/Dublin --IL +3146+03514 Asia/Jerusalem -+IL +314650+0351326 Asia/Jerusalem - IM +5409-00428 Europe/Isle_of_Man - IN +2232+08822 Asia/Kolkata - IO -0720+07225 Indian/Chagos
--- a/patches/openjdk/8025255-tzdata2013g.patch Mon Jan 19 17:52:30 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3976 +0,0 @@ -# HG changeset patch -# User aefimov -# Date 1382620458 -14400 -# Thu Oct 24 17:14:18 2013 +0400 -# Node ID 3d28326a9e5d165695b0294a274d75d3b4020c57 -# Parent fd7850833158b4374584452dd65b1a56ab6ca2f9 -8025255: (tz) Support tzdata2013g -8026772: test/sun/util/resources/TimeZone/Bug6317929.java failing -Reviewed-by: okutsu, mfang - -diff -r fd7850833158 -r 3d28326a9e5d make/sun/javazic/tzdata/VERSION ---- openjdk/jdk/make/sun/javazic/tzdata/VERSION Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/make/sun/javazic/tzdata/VERSION Thu Oct 24 17:14:18 2013 +0400 -@@ -21,4 +21,4 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --tzdata2013d -+tzdata2013g -diff -r fd7850833158 -r 3d28326a9e5d make/sun/javazic/tzdata/africa ---- openjdk/jdk/make/sun/javazic/tzdata/africa Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/make/sun/javazic/tzdata/africa Thu Oct 24 17:14:18 2013 +0400 -@@ -1,22 +1,22 @@ - # - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# -+# - # This code is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License version 2 only, as - # published by the Free Software Foundation. Oracle designates this - # particular file as subject to the "Classpath" exception as provided - # by Oracle in the LICENSE file that accompanied this code. --# -+# - # This code is distributed in the hope that it will be useful, but WITHOUT - # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - # version 2 for more details (a copy is included in the LICENSE file that - # accompanied this code). --# -+# - # You should have received a copy of the GNU General Public License version - # 2 along with this work; if not, write to the Free Software Foundation, - # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# -+# - # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - # or visit www.oracle.com if you need additional information or have any - # questions. -@@ -881,13 +881,23 @@ - # transitions would be 2013-07-07 and 2013-08-10; see: - # http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10 - --# From Paul Eggert (2013-07-03): -+# From Steffen Thorsen (2013-09-28): -+# Morocco extends DST by one month, on very short notice, just 1 day -+# before it was going to end. There is a new decree (2.13.781) for -+# this, where DST from now on goes from last Sunday of March at 02:00 -+# to last Sunday of October at 03:00, similar to EU rules. Official -+# source (French): -+# http://www.maroc.gov.ma/fr/actualites/lhoraire-dete-gmt1-maintenu-jusquau-27-octobre-2013 -+# Another source (specifying the time for start and end in the decree): -+# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html -+ -+# From Paul Eggert (2013-09-30): - # To estimate what the Moroccan government will do in future years, --# transition dates for 2014 through 2021 were determined by running -+# transition dates for 2014 through 2037 were determined by running - # the following program under GNU Emacs 24.3: - # - # (let ((islamic-year 1435)) --# (while (< islamic-year 1444) -+# (while (< islamic-year 1460) - # (let ((a - # (calendar-gregorian-from-absolute - # (calendar-islamic-to-absolute (list 9 1 islamic-year)))) -@@ -902,13 +912,14 @@ - # (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) - # (setq islamic-year (+ 1 islamic-year)))) - # --# with the results hand-edited for 2020-2022, when the normal spring-forward --# date falls during the estimated Ramadan. --# --# From 2023 through 2038 Ramadan is not predicted to overlap with --# daylight saving time. Starting in 2039 there will be overlap again, -+# with spring-forward transitions removed for 2023-2025, when the -+# normal spring-forward date falls during the estimated Ramadan; with -+# all transitions removed for 2026-2035, where the estimated Ramadan -+# falls entirely outside daylight-saving time; and with fall-back -+# transitions removed for 2036-2037, where the normal fall-back -+# date falls during the estimated Ramadan. Problems continue after that, - # but 32-bit time_t values roll around in 2038 so for now do not worry --# about dates after 2038. -+# about dates after 2037. - - # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S - -@@ -935,12 +946,14 @@ - Rule Morocco 2010 only - Aug 8 0:00 0 - - Rule Morocco 2011 only - Apr 3 0:00 1:00 S - Rule Morocco 2011 only - Jul 31 0 0 - --Rule Morocco 2012 2019 - Apr lastSun 2:00 1:00 S --Rule Morocco 2012 max - Sep lastSun 3:00 0 - -+Rule Morocco 2012 2013 - Apr lastSun 2:00 1:00 S -+Rule Morocco 2012 only - Sep 30 3:00 0 - - Rule Morocco 2012 only - Jul 20 3:00 0 - - Rule Morocco 2012 only - Aug 20 2:00 1:00 S - Rule Morocco 2013 only - Jul 7 3:00 0 - - Rule Morocco 2013 only - Aug 10 2:00 1:00 S -+Rule Morocco 2013 2035 - Oct lastSun 3:00 0 - -+Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S - Rule Morocco 2014 only - Jun 29 3:00 0 - - Rule Morocco 2014 only - Jul 29 2:00 1:00 S - Rule Morocco 2015 only - Jun 18 3:00 0 - -@@ -953,10 +966,21 @@ - Rule Morocco 2018 only - Jun 15 2:00 1:00 S - Rule Morocco 2019 only - May 6 3:00 0 - - Rule Morocco 2019 only - Jun 5 2:00 1:00 S -+Rule Morocco 2020 only - Apr 24 3:00 0 - - Rule Morocco 2020 only - May 24 2:00 1:00 S -+Rule Morocco 2021 only - Apr 13 3:00 0 - - Rule Morocco 2021 only - May 13 2:00 1:00 S -+Rule Morocco 2022 only - Apr 3 3:00 0 - - Rule Morocco 2022 only - May 3 2:00 1:00 S --Rule Morocco 2023 max - Apr lastSun 2:00 1:00 S -+Rule Morocco 2023 only - Apr 22 2:00 1:00 S -+Rule Morocco 2024 only - Apr 10 2:00 1:00 S -+Rule Morocco 2025 only - Mar 31 2:00 1:00 S -+Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S -+Rule Morocco 2036 only - Oct 21 3:00 0 - -+Rule Morocco 2037 only - Oct 11 3:00 0 - -+Rule Morocco 2038 only - Sep 30 3:00 0 - -+Rule Morocco 2038 only - Oct 30 2:00 1:00 S -+Rule Morocco 2038 max - Oct lastSun 3:00 0 - - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 -@@ -1123,9 +1147,7 @@ - 3:00 - EAT - - # South Sudan --Zone Africa/Juba 2:06:24 - LMT 1931 -- 2:00 Sudan CA%sT 2000 Jan 15 12:00 -- 3:00 - EAT -+Link Africa/Khartoum Africa/Juba - - # Swaziland - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -diff -r fd7850833158 -r 3d28326a9e5d make/sun/javazic/tzdata/antarctica ---- openjdk/jdk/make/sun/javazic/tzdata/antarctica Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/make/sun/javazic/tzdata/antarctica Thu Oct 24 17:14:18 2013 +0400 -@@ -1,22 +1,22 @@ - # - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# -+# - # This code is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License version 2 only, as - # published by the Free Software Foundation. Oracle designates this - # particular file as subject to the "Classpath" exception as provided - # by Oracle in the LICENSE file that accompanied this code. --# -+# - # This code is distributed in the hope that it will be useful, but WITHOUT - # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - # version 2 for more details (a copy is included in the LICENSE file that - # accompanied this code). --# -+# - # You should have received a copy of the GNU General Public License version - # 2 along with this work; if not, write to the Free Software Foundation, - # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# -+# - # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - # or visit www.oracle.com if you need additional information or have any - # questions. -@@ -39,9 +39,9 @@ - # - # Except for the French entries, - # I made up all time zone abbreviations mentioned here; corrections welcome! --# FORMAT is `zzz' and GMTOFF is 0 for locations while uninhabited. -+# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited. - --# These rules are stolen from the `southamerica' file. -+# These rules are stolen from the 'southamerica' file. - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule ArgAQ 1964 1966 - Mar 1 0:00 0 - - Rule ArgAQ 1964 1966 - Oct 15 0:00 1:00 S -@@ -251,9 +251,10 @@ - # Scott Island (never inhabited) - # - # year-round base --# Scott, Ross Island, since 1957-01, is like Antarctica/McMurdo. -+# Scott Base, Ross Island, since 1957-01. -+# See Pacific/Auckland. - # --# These rules for New Zealand are stolen from the `australasia' file. -+# These rules for New Zealand are stolen from the 'australasia' file. - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D - Rule NZAQ 1975 1988 - Oct lastSun 2:00s 1:00 D -@@ -291,11 +292,11 @@ - # From Lee Hotz (2001-03-08): - # I queried the folks at Columbia who spent the summer at Vostok and this is - # what they had to say about time there: --# ``in the US Camp (East Camp) we have been on New Zealand (McMurdo) -+# "in the US Camp (East Camp) we have been on New Zealand (McMurdo) - # time, which is 12 hours ahead of GMT. The Russian Station Vostok was - # 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead - # of GMT). This is a time zone I think two hours east of Moscow. The --# natural time zone is in between the two: 8 hours ahead of GMT.'' -+# natural time zone is in between the two: 8 hours ahead of GMT." - # - # From Paul Eggert (2001-05-04): - # This seems to be hopelessly confusing, so I asked Lee Hotz about it -@@ -360,16 +361,8 @@ - -4:00 ChileAQ CL%sT - # - # --# McMurdo, Ross Island, since 1955-12 --# Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone Antarctica/McMurdo 0 - zzz 1956 -- 12:00 NZAQ NZ%sT --# --# Amundsen-Scott, South Pole, continuously occupied since 1956-11-20 --# --# From Paul Eggert (1996-09-03): --# Normally it wouldn't have a separate entry, since it's like the --# larger Antarctica/McMurdo since 1970, but it's too famous to omit. -+# McMurdo Station, Ross Island, since 1955-12 -+# Amundsen-Scott South Pole Station, continuously occupied since 1956-11-20 - # - # From Chris Carrier (1996-06-27): - # Siple, the first commander of the South Pole station, -@@ -391,4 +384,4 @@ - # we have to go around and set them back 5 minutes or so. - # Maybe if we let them run fast all of the time, we'd get to leave here sooner!! - # --Link Antarctica/McMurdo Antarctica/South_Pole -+# See 'australasia' for Antarctica/McMurdo. -diff -r fd7850833158 -r 3d28326a9e5d make/sun/javazic/tzdata/asia ---- openjdk/jdk/make/sun/javazic/tzdata/asia Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/make/sun/javazic/tzdata/asia Thu Oct 24 17:14:18 2013 +0400 -@@ -1,22 +1,22 @@ - # - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# -+# - # This code is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License version 2 only, as - # published by the Free Software Foundation. Oracle designates this - # particular file as subject to the "Classpath" exception as provided - # by Oracle in the LICENSE file that accompanied this code. --# -+# - # This code is distributed in the hope that it will be useful, but WITHOUT - # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - # version 2 for more details (a copy is included in the LICENSE file that - # accompanied this code). --# -+# - # You should have received a copy of the GNU General Public License version - # 2 along with this work; if not, write to the Free Software Foundation, - # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# -+# - # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - # or visit www.oracle.com if you need additional information or have any - # questions. -@@ -29,7 +29,7 @@ - # go ahead and edit the file (and please send any changes to - # tz@iana.org for general use in the future). - --# From Paul Eggert (2013-02-21): -+# From Paul Eggert (2013-08-11): - # - # A good source for time zone historical data outside the U.S. is - # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), -@@ -67,11 +67,11 @@ - # 4:00 GST Gulf* - # 5:30 IST India - # 7:00 ICT Indochina* --# 7:00 WIT west Indonesia --# 8:00 CIT central Indonesia -+# 7:00 WIB west Indonesia (Waktu Indonesia Barat) -+# 8:00 WITA central Indonesia (Waktu Indonesia Tengah) - # 8:00 CST China - # 9:00 CJT Central Japanese Time (1896/1937)* --# 9:00 EIT east Indonesia -+# 9:00 WIT east Indonesia (Waktu Indonesia Timur) - # 9:00 JST JDT Japan - # 9:00 KST KDT Korea - # 9:30 CST (Australian) Central Standard Time -@@ -779,7 +779,7 @@ - 8:00 - TLT 1942 Feb 21 23:00 # E Timor Time - 9:00 - JST 1945 Sep 23 - 9:00 - TLT 1976 May 3 -- 8:00 - CIT 2000 Sep 17 00:00 -+ 8:00 - WITA 2000 Sep 17 00:00 - 9:00 - TLT - - # India -@@ -816,36 +816,53 @@ - # (Hollandia). For now, assume all Indonesian locations other than Jayapura - # switched on 1945-09-23. - # -+# From Paul Eggert (2013-08-11): -+# Normally the tz database uses English-language abbreviations, but in -+# Indonesia it's typical to use Indonesian-language abbreviations even -+# when writing in English. For example, see the English-language -+# summary published by the Time and Frequency Laboratory of the -+# Research Center for Calibration, Instrumentation and Metrology, -+# Indonesia, <http://time.kim.lipi.go.id/time-eng.php> (2006-09-29). -+# The abbreviations are: -+# -+# WIB - UTC+7 - Waktu Indonesia Barat (Indonesia western time) -+# WITA - UTC+8 - Waktu Indonesia Tengah (Indonesia central time) -+# WIT - UTC+9 - Waktu Indonesia Timur (Indonesia eastern time) -+# - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -+# Java, Sumatra - Zone Asia/Jakarta 7:07:12 - LMT 1867 Aug 10 - # Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13, - # but this must be a typo. -- 7:07:12 - JMT 1923 Dec 31 23:47:12 # Jakarta -+ 7:07:12 - BMT 1923 Dec 31 23:47:12 # Batavia - 7:20 - JAVT 1932 Nov # Java Time -- 7:30 - WIT 1942 Mar 23 -+ 7:30 - WIB 1942 Mar 23 - 9:00 - JST 1945 Sep 23 -- 7:30 - WIT 1948 May -- 8:00 - WIT 1950 May -- 7:30 - WIT 1964 -- 7:00 - WIT -+ 7:30 - WIB 1948 May -+ 8:00 - WIB 1950 May -+ 7:30 - WIB 1964 -+ 7:00 - WIB -+# west and central Borneo - Zone Asia/Pontianak 7:17:20 - LMT 1908 May - 7:17:20 - PMT 1932 Nov # Pontianak MT -- 7:30 - WIT 1942 Jan 29 -+ 7:30 - WIB 1942 Jan 29 - 9:00 - JST 1945 Sep 23 -- 7:30 - WIT 1948 May -- 8:00 - WIT 1950 May -- 7:30 - WIT 1964 -- 8:00 - CIT 1988 Jan 1 -- 7:00 - WIT -+ 7:30 - WIB 1948 May -+ 8:00 - WIB 1950 May -+ 7:30 - WIB 1964 -+ 8:00 - WITA 1988 Jan 1 -+ 7:00 - WIB -+# Sulawesi, Lesser Sundas, east and south Borneo - Zone Asia/Makassar 7:57:36 - LMT 1920 - 7:57:36 - MMT 1932 Nov # Macassar MT -- 8:00 - CIT 1942 Feb 9 -+ 8:00 - WITA 1942 Feb 9 - 9:00 - JST 1945 Sep 23 -- 8:00 - CIT -+ 8:00 - WITA -+# Maluku Islands, West Papua, Papua - Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov -- 9:00 - EIT 1944 Sep 1 -+ 9:00 - WIT 1944 Sep 1 - 9:30 - CST 1964 -- 9:00 - EIT -+ 9:00 - WIT - - # Iran - -@@ -1387,9 +1404,11 @@ - # until about the same time next year (at least). - # http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950 - # --# From Paul Eggert (2012-10-25): --# For now, assume this is just a one-year measure. If it becomes --# permanent, we should move Jordan from EET to AST effective tomorrow. -+# From Paul Eggert (2013-09-21): -+# It's looking like this change will be permanent; see -+# Petra News Agency, Cancelling winter saved Jordan $7 million (2013-02-20) -+# <http://www.albawaba.com/business/jordan-winter-electricity--472005>. -+# So move Jordan to UTC+3 as of the abovementioned date. - - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Jordan 1973 only - Jun 6 0:00 1:00 S -@@ -1415,15 +1434,15 @@ - Rule Jordan 1999 only - Jul 1 0:00s 1:00 S - Rule Jordan 1999 2002 - Sep lastFri 0:00s 0 - - Rule Jordan 2000 2001 - Mar lastThu 0:00s 1:00 S --Rule Jordan 2002 max - Mar lastThu 24:00 1:00 S -+Rule Jordan 2002 2012 - Mar lastThu 24:00 1:00 S - Rule Jordan 2003 only - Oct 24 0:00s 0 - - Rule Jordan 2004 only - Oct 15 0:00s 0 - - Rule Jordan 2005 only - Sep lastFri 0:00s 0 - --Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 - --Rule Jordan 2013 max - Oct lastFri 0:00s 0 - -+Rule Jordan 2006 2012 - Oct lastFri 0:00s 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Asia/Amman 2:23:44 - LMT 1931 -- 2:00 Jordan EE%sT -+ 2:00 Jordan EE%sT 2012 Oct 26 0:00s -+ 3:00 - AST - - - # Kazakhstan -@@ -2303,9 +2322,18 @@ - # http://www.samanews.com/index.php?act=Show&id=154120 - # http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html - --# From Paul Eggert (2013-04-15): -+# From Steffen Thorsen (2013-09-24): -+# The Gaza and West Bank are ending DST Thursday at midnight -+# (2013-09-27 00:00:00) (one hour earlier than last year...). -+# This source in English, says "that winter time will go into effect -+# at midnight on Thursday in the West Bank and Gaza Strip": -+# http://english.wafa.ps/index.php?action=detail&id=23246 -+# official source...: -+# http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252 -+ -+# From Paul Eggert (2013-09-24): - # For future dates, guess the last Thursday in March at 24:00 through --# the first Friday on or after September 21 at 01:00. This is consistent with -+# the first Friday on or after September 21 at 00:00. This is consistent with - # the predictions in today's editions of the following URLs, - # which are for Gaza and Hebron respectively: - # http://www.timeanddate.com/worldclock/timezone.html?n=702 -@@ -2336,7 +2364,8 @@ - Rule Palestine 2011 only - Aug 30 0:00 1:00 S - Rule Palestine 2011 only - Sep 30 0:00 0 - - Rule Palestine 2012 max - Mar lastThu 24:00 1:00 S --Rule Palestine 2012 max - Sep Fri>=21 1:00 0 - -+Rule Palestine 2012 only - Sep 21 1:00 0 - -+Rule Palestine 2013 max - Sep Fri>=21 0:00 0 - - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Asia/Gaza 2:17:52 - LMT 1900 Oct -diff -r fd7850833158 -r 3d28326a9e5d make/sun/javazic/tzdata/australasia ---- openjdk/jdk/make/sun/javazic/tzdata/australasia Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/make/sun/javazic/tzdata/australasia Thu Oct 24 17:14:18 2013 +0400 -@@ -1,22 +1,22 @@ - # - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# -+# - # This code is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License version 2 only, as - # published by the Free Software Foundation. Oracle designates this - # particular file as subject to the "Classpath" exception as provided - # by Oracle in the LICENSE file that accompanied this code. --# -+# - # This code is distributed in the hope that it will be useful, but WITHOUT - # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - # version 2 for more details (a copy is included in the LICENSE file that - # accompanied this code). --# -+# - # You should have received a copy of the GNU General Public License version - # 2 along with this work; if not, write to the Free Software Foundation, - # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# -+# - # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - # or visit www.oracle.com if you need additional information or have any - # questions. -@@ -375,16 +375,25 @@ - # today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st - # October 2012 and end at 3 am on Sunday 20th January 2013. - # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155 -+ -+# From the Fijian Government Media Center (2013-08-30) via David Wheeler: -+# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am -+# on Sunday 19th January, 2014.... move clocks forward by one hour from 2am -+# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx - # --# From Paul Eggert (2012-08-31): --# For now, guess a pattern of the penultimate Sundays in October and January. -+# From Paul Eggert (2013-09-09): -+# For now, guess that Fiji springs forward the Sunday before the fourth -+# Monday in October. This matches both recent practice and -+# timeanddate.com's current spring-forward prediction. -+# For the January 2014 transition we guessed right while timeanddate.com -+# guessed wrong, so leave the fall-back prediction alone. - - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S - Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - - Rule Fiji 2009 only - Nov 29 2:00 1:00 S - Rule Fiji 2010 only - Mar lastSun 3:00 0 - --Rule Fiji 2010 max - Oct Sun>=18 2:00 1:00 S -+Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S - Rule Fiji 2011 only - Mar Sun>=1 3:00 0 - - Rule Fiji 2012 max - Jan Sun>=18 3:00 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -@@ -510,6 +519,7 @@ - Zone Pacific/Chatham 12:13:48 - LMT 1957 Jan 1 - 12:45 Chatham CHA%sT - -+Link Pacific/Auckland Antarctica/McMurdo - - # Auckland Is - # uninhabited; Maori and Moriori, colonial settlers, pastoralists, sealers, -@@ -759,7 +769,7 @@ - # 1886-1891; Baker was similar but exact dates are not known. - # Inhabited by civilians 1935-1942; U.S. military bases 1943-1944; - # uninhabited thereafter. --# Howland observed Hawaii Standard Time (UTC-10:30) in 1937; -+# Howland observed Hawaii Standard Time (UT-10:30) in 1937; - # see page 206 of Elgen M. Long and Marie K. Long, - # Amelia Earhart: the Mystery Solved, Simon & Schuster (2000). - # So most likely Howland and Baker observed Hawaii Time from 1935 -@@ -772,8 +782,17 @@ - # no information; was probably like Pacific/Kiritimati - - # Johnston --# Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone Pacific/Johnston -10:00 - HST -+# -+# From Paul Eggert (2013-09-03): -+# In his memoirs of June 6th to October 4, 1945 -+# <http://www.315bw.org/Herb_Bach.htm> (2005), Herbert C. Bach writes, -+# "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM -+# Johnston time, 1:30 AM Kwajalein time." This was in June 1945, and -+# confirms that Johnston kept the same time as Honolulu in summer 1945. -+# We have no better information, so for now, assume this has been true -+# indefinitely into the past. -+# -+# See 'northamerica' for Pacific/Johnston. - - # Kingman - # uninhabited -diff -r fd7850833158 -r 3d28326a9e5d make/sun/javazic/tzdata/backward ---- openjdk/jdk/make/sun/javazic/tzdata/backward Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/make/sun/javazic/tzdata/backward Thu Oct 24 17:14:18 2013 +0400 -@@ -1,22 +1,22 @@ - # - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# -+# - # This code is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License version 2 only, as - # published by the Free Software Foundation. Oracle designates this - # particular file as subject to the "Classpath" exception as provided - # by Oracle in the LICENSE file that accompanied this code. --# -+# - # This code is distributed in the hope that it will be useful, but WITHOUT - # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - # version 2 for more details (a copy is included in the LICENSE file that - # accompanied this code). --# -+# - # You should have received a copy of the GNU General Public License version - # 2 along with this work; if not, write to the Free Software Foundation, - # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# -+# - # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - # or visit www.oracle.com if you need additional information or have any - # questions. -@@ -45,15 +45,17 @@ - Link America/Argentina/Mendoza America/Mendoza - Link America/Rio_Branco America/Porto_Acre - Link America/Argentina/Cordoba America/Rosario --Link America/St_Thomas America/Virgin -+Link America/Denver America/Shiprock -+Link America/Port_of_Spain America/Virgin -+Link Pacific/Auckland Antarctica/South_Pole - Link Asia/Ashgabat Asia/Ashkhabad -+Link Asia/Kolkata Asia/Calcutta - Link Asia/Chongqing Asia/Chungking - Link Asia/Dhaka Asia/Dacca - Link Asia/Kathmandu Asia/Katmandu --Link Asia/Kolkata Asia/Calcutta - Link Asia/Macau Asia/Macao -+Link Asia/Ho_Chi_Minh Asia/Saigon - Link Asia/Jerusalem Asia/Tel_Aviv --Link Asia/Ho_Chi_Minh Asia/Saigon - Link Asia/Thimphu Asia/Thimbu - Link Asia/Makassar Asia/Ujung_Pandang - Link Asia/Ulaanbaatar Asia/Ulan_Bator -@@ -111,10 +113,10 @@ - Link Pacific/Chatham NZ-CHAT - Link America/Denver Navajo - Link Asia/Shanghai PRC -+Link Pacific/Pohnpei Pacific/Ponape - Link Pacific/Pago_Pago Pacific/Samoa -+Link Pacific/Chuuk Pacific/Truk - Link Pacific/Chuuk Pacific/Yap --Link Pacific/Chuuk Pacific/Truk --Link Pacific/Pohnpei Pacific/Ponape - Link Europe/Warsaw Poland - Link Europe/Lisbon Portugal - Link Asia/Taipei ROC -diff -r fd7850833158 -r 3d28326a9e5d make/sun/javazic/tzdata/etcetera ---- openjdk/jdk/make/sun/javazic/tzdata/etcetera Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/make/sun/javazic/tzdata/etcetera Thu Oct 24 17:14:18 2013 +0400 -@@ -1,22 +1,22 @@ - # - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# -+# - # This code is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License version 2 only, as - # published by the Free Software Foundation. Oracle designates this - # particular file as subject to the "Classpath" exception as provided - # by Oracle in the LICENSE file that accompanied this code. --# -+# - # This code is distributed in the hope that it will be useful, but WITHOUT - # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - # version 2 for more details (a copy is included in the LICENSE file that - # accompanied this code). --# -+# - # You should have received a copy of the GNU General Public License version - # 2 along with this work; if not, write to the Free Software Foundation, - # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# -+# - # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - # or visit www.oracle.com if you need additional information or have any - # questions. -@@ -54,9 +54,9 @@ - # even though this is the opposite of what many people expect. - # POSIX has positive signs west of Greenwich, but many people expect - # positive signs east of Greenwich. For example, TZ='Etc/GMT+4' uses --# the abbreviation "GMT+4" and corresponds to 4 hours behind UTC -+# the abbreviation "GMT+4" and corresponds to 4 hours behind UT - # (i.e. west of Greenwich) even though many people would expect it to --# mean 4 hours ahead of UTC (i.e. east of Greenwich). -+# mean 4 hours ahead of UT (i.e. east of Greenwich). - # - # In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for - # TZ='<GMT-4>+4'; if you want time zone abbreviations conforming to -diff -r fd7850833158 -r 3d28326a9e5d make/sun/javazic/tzdata/europe ---- openjdk/jdk/make/sun/javazic/tzdata/europe Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/make/sun/javazic/tzdata/europe Thu Oct 24 17:14:18 2013 +0400 -@@ -1,22 +1,22 @@ - # - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# -+# - # This code is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License version 2 only, as - # published by the Free Software Foundation. Oracle designates this - # particular file as subject to the "Classpath" exception as provided - # by Oracle in the LICENSE file that accompanied this code. --# -+# - # This code is distributed in the hope that it will be useful, but WITHOUT - # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - # version 2 for more details (a copy is included in the LICENSE file that - # accompanied this code). --# -+# - # You should have received a copy of the GNU General Public License version - # 2 along with this work; if not, write to the Free Software Foundation, - # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# -+# - # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - # or visit www.oracle.com if you need additional information or have any - # questions. -@@ -65,7 +65,7 @@ - # </a> (1998-09-21, in Portuguese) - - # --# I invented the abbreviations marked `*' in the following table; -+# I invented the abbreviations marked '*' in the following table; - # the rest are from earlier versions of this file, or from other sources. - # Corrections are welcome! - # std dst 2dst -@@ -119,7 +119,7 @@ - # and a sketch map showing some of the sightlines involved. One paragraph - # of the text said: - # --# `An old stone obelisk marking a forgotten terrestrial meridian stands -+# 'An old stone obelisk marking a forgotten terrestrial meridian stands - # beside the river at Kew. In the 18th century, before time and longitude - # was standardised by the Royal Observatory in Greenwich, scholars observed - # this stone and the movement of stars from Kew Observatory nearby. They -@@ -163,7 +163,7 @@ - # From Paul Eggert (2003-09-27): - # Summer Time was first seriously proposed by William Willett (1857-1915), - # a London builder and member of the Royal Astronomical Society --# who circulated a pamphlet ``The Waste of Daylight'' (1907) -+# who circulated a pamphlet "The Waste of Daylight" (1907) - # that proposed advancing clocks 20 minutes on each of four Sundays in April, - # and retarding them by the same amount on four Sundays in September. - # A bill was drafted in 1909 and introduced in Parliament several times, -@@ -188,10 +188,10 @@ - # </a> - - # From Paul Eggert (1996-09-03): --# The OED Supplement says that the English originally said ``Daylight Saving'' -+# The OED Supplement says that the English originally said "Daylight Saving" - # when they were debating the adoption of DST in 1908; but by 1916 this - # term appears only in quotes taken from DST's opponents, whereas the --# proponents (who eventually won the argument) are quoted as using ``Summer''. -+# proponents (who eventually won the argument) are quoted as using "Summer". - - # From Arthur David Olson (1989-01-19): - # -@@ -231,9 +231,9 @@ - # which could not be said to run counter to any official description. - - # From Paul Eggert (2000-10-02): --# Howse writes (p 157) `DBST' too, but `BDST' seems to have been common -+# Howse writes (p 157) 'DBST' too, but 'BDST' seems to have been common - # and follows the more usual convention of putting the location name first, --# so we use `BDST'. -+# so we use 'BDST'. - - # Peter Ilieve (1998-04-19) described at length - # the history of summer time legislation in the United Kingdom. -@@ -454,6 +454,8 @@ - Rule GB-Eire 1990 1995 - Oct Sun>=22 1:00u 0 GMT - # Summer Time Order 1997 (S.I. 1997/2982) - # See EU for rules starting in 1996. -+# -+# Use Europe/London for Jersey, Guernsey, and the Isle of Man. - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Europe/London -0:01:15 - LMT 1847 Dec 1 0:00s -@@ -820,7 +822,7 @@ - 1:00 EU CE%sT - - # Bosnia and Herzegovina --# see Serbia -+# See Europe/Belgrade. - - # Bulgaria - # -@@ -848,10 +850,10 @@ - 2:00 EU EE%sT - - # Croatia --# see Serbia -+# See Europe/Belgrade. - - # Cyprus --# Please see the `asia' file for Asia/Nicosia. -+# Please see the 'asia' file for Asia/Nicosia. - - # Czech Republic - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -@@ -868,6 +870,7 @@ - 1:00 C-Eur CE%sT 1944 Sep 17 2:00s - 1:00 Czech CE%sT 1979 - 1:00 EU CE%sT -+# Use Europe/Prague also for Slovakia. - - # Denmark, Faroe Islands, and Greenland - -@@ -1031,12 +1034,12 @@ - # From Peter Ilieve (1996-10-28): - # [IATA SSIM (1992/1996) claims that the Baltic republics switch at 01:00s, - # but a relative confirms that Estonia still switches at 02:00s, writing:] --# ``I do not [know] exactly but there are some little different -+# "I do not [know] exactly but there are some little different - # (confusing) rules for International Air and Railway Transport Schedules - # conversion in Sunday connected with end of summer time in Estonia.... - # A discussion is running about the summer time efficiency and effect on - # human physiology. It seems that Estonia maybe will not change to --# summer time next spring.'' -+# summer time next spring." - - # From Peter Ilieve (1998-11-04), heavily edited: - # <a href="http://trip.rk.ee/cgi-bin/thw?${BASE}=akt&${OOHTML}=rtd&TA=1998&TO=1&AN=1390"> -@@ -1091,7 +1094,7 @@ - # Well, here in Helsinki we're just changing from summer time to regular one, - # and it's supposed to change at 4am... - --# From Janne Snabb (2010-0715): -+# From Janne Snabb (2010-07-15): - # - # I noticed that the Finland data is not accurate for years 1981 and 1982. - # During these two first trial years the DST adjustment was made one hour -@@ -1148,7 +1151,7 @@ - - - # --# Shank & Pottenger seem to use `24:00' ambiguously; resolve it with Whitman. -+# Shank & Pottenger seem to use '24:00' ambiguously; resolve it with Whitman. - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule France 1916 only - Jun 14 23:00s 1:00 S - Rule France 1916 1919 - Oct Sun>=1 23:00s 0 - -@@ -1438,7 +1441,7 @@ - # <a href="http://toi.iriti.cnr.it/uk/ienitlt.html"> - # Day-light Saving Time in Italy (2006-02-03) - # </a> --# (`FP' below), taken from an Italian National Electrotechnical Institute -+# ('FP' below), taken from an Italian National Electrotechnical Institute - # publication. When the three sources disagree, guess who's right, as follows: - # - # year FP Shanks&P. (S) Whitman (W) Go with: -@@ -1584,10 +1587,22 @@ - 2:00 EU EE%sT - - # Liechtenstein --# Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone Europe/Vaduz 0:38:04 - LMT 1894 Jun -- 1:00 - CET 1981 -- 1:00 EU CE%sT -+ -+# From Paul Eggert (2013-09-09): -+# Shanks & Pottenger say Vaduz is like Zurich. -+ -+# From Alois Treindl (2013-09-18): -+# http://www.eliechtensteinensia.li/LIJ/1978/1938-1978/1941.pdf -+# ... confirms on p. 6 that Liechtenstein followed Switzerland in 1941 and 1942. -+# I ... translate only the last two paragraphs: -+# ... during second world war, in the years 1941 and 1942, Liechtenstein -+# introduced daylight saving time, adapting to Switzerland. From 1943 on -+# central European time was in force throughout the year. -+# From a report of the duke's government to the high council, -+# regarding the introduction of a time law, of 31 May 1977. -+ -+Link Europe/Zurich Europe/Vaduz -+ - - # Lithuania - -@@ -1675,7 +1690,7 @@ - 1:00 EU CE%sT - - # Macedonia --# see Serbia -+# See Europe/Belgrade. - - # Malta - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -@@ -1768,7 +1783,7 @@ - 1:00 EU CE%sT - - # Montenegro --# see Serbia -+# See Europe/Belgrade. - - # Netherlands - -@@ -1883,7 +1898,7 @@ - # before 1895, and therefore probably changed the local time somewhere - # between 1895 and 1925 (inclusive). - --# From Paul Eggert (2001-05-01): -+# From Paul Eggert (2013-09-04): - # - # Actually, Jan Mayen was never occupied by Germany during World War II, - # so it must have diverged from Oslo time during the war, as Oslo was -@@ -1894,7 +1909,7 @@ - # 1941 with a small Norwegian garrison and continued operations despite - # frequent air ttacks from Germans. In 1943 the Americans established a - # radiolocating station on the island, called "Atlantic City". Possibly --# the UTC offset changed during the war, but I think it unlikely that -+# the UT offset changed during the war, but I think it unlikely that - # Jan Mayen used German daylight-saving rules. - # - # Svalbard is more complicated, as it was raided in August 1941 by an -@@ -1907,9 +1922,8 @@ - # the German armed forces at the Svalbard weather station code-named - # Haudegen did not surrender to the Allies until September 1945. - # --# All these events predate our cutoff date of 1970. Unless we can --# come up with more definitive info about the timekeeping during the --# war years it's probably best just do...the following for now: -+# All these events predate our cutoff date of 1970, so use Europe/Oslo -+# for these regions. - Link Europe/Oslo Arctic/Longyearbyen - - # Poland -@@ -2167,7 +2181,7 @@ - # so we (Novosibirsk) simply did not switch. - # - # From Andrey A. Chernov (1996-10-04): --# `MSK' and `MSD' were born and used initially on Moscow computers with -+# 'MSK' and 'MSD' were born and used initially on Moscow computers with - # UNIX-like OSes by several developer groups (e.g. Demos group, Kiae group).... - # The next step was the UUCP network, the Relcom predecessor - # (used mainly for mail), and MSK/MSD was actively used there. -@@ -2466,6 +2480,9 @@ - 11:00 Russia ANA%sT 2011 Mar 27 2:00s - 12:00 - ANAT - -+# San Marino -+# See Europe/Rome. -+ - # Serbia - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Europe/Belgrade 1:22:00 - LMT 1884 -@@ -2488,7 +2505,7 @@ - Link Europe/Prague Europe/Bratislava - - # Slovenia --# see Serbia -+# See Europe/Belgrade. - - # Spain - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -@@ -2622,7 +2639,7 @@ - # and their performance improved enormously. Communities began to keep - # mean time in preference to apparent time -- Geneva from 1780 .... - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S --# From Whitman (who writes ``Midnight?''): -+# From Whitman (who writes "Midnight?"): - # Rule Swiss 1940 only - Nov 2 0:00 1:00 S - # Rule Swiss 1940 only - Dec 31 0:00 0 - - # From Shanks & Pottenger: -@@ -2667,23 +2684,53 @@ - # The 1940 rules must be deleted. - # - # One further detail for Switzerland, which is probably out of scope for --# most users of tzdata: --# The zone file --# Zone Europe/Zurich 0:34:08 - LMT 1848 Sep 12 --# 0:29:44 - BMT 1894 Jun #Bern Mean Time --# 1:00 Swiss CE%sT 1981 --# 1:00 EU CE%sT -+# most users of tzdata: The [Europe/Zurich zone] ... - # describes all of Switzerland correctly, with the exception of - # the Cantone Geneve (Geneva, Genf). Between 1848 and 1894 Geneve did not - # follow Bern Mean Time but kept its own local mean time. - # To represent this, an extra zone would be needed. -+# -+# From Alois Treindl (2013-09-11): -+# The Federal regulations say -+# http://www.admin.ch/opc/de/classified-compilation/20071096/index.html -+# ... the meridian for Bern mean time ... is 7 degrees 26'22.50". -+# Expressed in time, it is 0h29m45.5s. -+ -+# From Pierre-Yves Berger (2013-09-11): -+# the "Circulaire du conseil federal" (December 11 1893) -+# <http://www.amtsdruckschriften.bar.admin.ch/viewOrigDoc.do?id=10071353> ... -+# clearly states that the [1894-06-01] change should be done at midnight -+# but if no one is present after 11 at night, could be postponed until one -+# hour before the beginning of service. -+ -+# From Paul Eggert (2013-09-11): -+# Round BMT to the nearest even second, 0:29:46. -+# -+# We can find no reliable source for Shanks's assertion that all of Switzerland -+# except Geneva switched to Bern Mean Time at 00:00 on 1848-09-12. This book: -+# -+# Jakob Messerli. Gleichmassig, punktlich, schnell: Zeiteinteilung und -+# Zeitgebrauch in der Schweiz im 19. Jahrhundert. Chronos, Zurich 1995, -+# ISBN 3-905311-68-2, OCLC 717570797. -+# -+# suggests that the transition was more gradual, and that the Swiss did not -+# agree about civil time during the transition. The timekeeping it gives the -+# most detail for is postal and telegraph time: here, federal legislation (the -+# "Bundesgesetz uber die Erstellung von elektrischen Telegraphen") passed on -+# 1851-11-23, and an official implementation notice was published 1853-07-16 -+# (Bundesblatt 1853, Bd. II, S. 859). On p 72 Messerli writes that in -+# practice since July 1853 Bernese time was used in "all postal and telegraph -+# offices in Switzerland from Geneva to St. Gallen and Basel to Chiasso" -+# (Google translation). For now, model this transition as occurring on -+# 1853-07-16, though it probably occurred at some other date in Zurich, and -+# legal civil time probably changed at still some other transition date. - - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Swiss 1941 1942 - May Mon>=1 1:00 1:00 S - Rule Swiss 1941 1942 - Oct Mon>=1 2:00 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone Europe/Zurich 0:34:08 - LMT 1848 Sep 12 -- 0:29:44 - BMT 1894 Jun # Bern Mean Time -+Zone Europe/Zurich 0:34:08 - LMT 1853 Jul 16 # See above comment. -+ 0:29:46 - BMT 1894 Jun # Bern Mean Time - 1:00 Swiss CE%sT 1981 - 1:00 EU CE%sT - -@@ -2907,7 +2954,7 @@ - # From Paul Eggert (2006-03-22): - # The _Economist_ (1994-05-28, p 45) reports that central Crimea switched - # from Kiev to Moscow time sometime after the January 1994 elections. --# Shanks (1999) says ``date of change uncertain'', but implies that it happened -+# Shanks (1999) says "date of change uncertain", but implies that it happened - # sometime between the 1994 DST switches. Shanks & Pottenger simply say - # 1994-09-25 03:00, but that can't be right. For now, guess it - # changed in May. -@@ -2921,6 +2968,9 @@ - 3:00 - MSK 1997 Mar lastSun 1:00u - 2:00 EU EE%sT - -+# Vatican City -+# See Europe/Rome. -+ - ############################################################################### - - # One source shows that Bulgaria, Cyprus, Finland, and Greece observe DST from -diff -r fd7850833158 -r 3d28326a9e5d make/sun/javazic/tzdata/factory ---- openjdk/jdk/make/sun/javazic/tzdata/factory Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/make/sun/javazic/tzdata/factory Thu Oct 24 17:14:18 2013 +0400 -@@ -1,22 +1,22 @@ - # - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# -+# - # This code is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License version 2 only, as - # published by the Free Software Foundation. Oracle designates this - # particular file as subject to the "Classpath" exception as provided - # by Oracle in the LICENSE file that accompanied this code. --# -+# - # This code is distributed in the hope that it will be useful, but WITHOUT - # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - # version 2 for more details (a copy is included in the LICENSE file that - # accompanied this code). --# -+# - # You should have received a copy of the GNU General Public License version - # 2 along with this work; if not, write to the Free Software Foundation, - # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# -+# - # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - # or visit www.oracle.com if you need additional information or have any - # questions. -diff -r fd7850833158 -r 3d28326a9e5d make/sun/javazic/tzdata/iso3166.tab ---- openjdk/jdk/make/sun/javazic/tzdata/iso3166.tab Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/make/sun/javazic/tzdata/iso3166.tab Thu Oct 24 17:14:18 2013 +0400 -@@ -1,30 +1,30 @@ - # - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# -+# - # This code is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License version 2 only, as - # published by the Free Software Foundation. Oracle designates this - # particular file as subject to the "Classpath" exception as provided - # by Oracle in the LICENSE file that accompanied this code. --# -+# - # This code is distributed in the hope that it will be useful, but WITHOUT - # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - # version 2 for more details (a copy is included in the LICENSE file that - # accompanied this code). --# -+# - # You should have received a copy of the GNU General Public License version - # 2 along with this work; if not, write to the Free Software Foundation, - # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# -+# - # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - # or visit www.oracle.com if you need additional information or have any - # questions. - # --# <pre> -+# ISO 3166 alpha-2 country codes -+# - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. --# ISO 3166 alpha-2 country codes - # - # From Paul Eggert (2013-05-27): - # -@@ -32,7 +32,7 @@ - # 1. ISO 3166-1 alpha-2 country code, current as of - # ISO 3166-1 Newsletter VI-15 (2013-05-10). See: Updates on ISO 3166 - # http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm --# 2. The usual English name for the country, -+# 2. The usual English name for the coded region, - # chosen so that alphabetic sorting of subsets produces helpful lists. - # This is not the same as the English name in the ISO 3166 tables. - # -@@ -46,7 +46,7 @@ - # to take or endorse any position on legal or territorial claims. - # - #country- --#code country name -+#code name of country, territory, area, or subdivision - AD Andorra - AE United Arab Emirates - AF Afghanistan -@@ -76,7 +76,7 @@ - BM Bermuda - BN Brunei - BO Bolivia --BQ Bonaire, St Eustatius & Saba -+BQ Caribbean Netherlands - BR Brazil - BS Bahamas - BT Bhutan -diff -r fd7850833158 -r 3d28326a9e5d make/sun/javazic/tzdata/leapseconds ---- openjdk/jdk/make/sun/javazic/tzdata/leapseconds Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/make/sun/javazic/tzdata/leapseconds Thu Oct 24 17:14:18 2013 +0400 -@@ -1,37 +1,43 @@ - # - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# -+# - # This code is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License version 2 only, as - # published by the Free Software Foundation. Oracle designates this - # particular file as subject to the "Classpath" exception as provided - # by Oracle in the LICENSE file that accompanied this code. --# -+# - # This code is distributed in the hope that it will be useful, but WITHOUT - # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - # version 2 for more details (a copy is included in the LICENSE file that - # accompanied this code). --# -+# - # You should have received a copy of the GNU General Public License version - # 2 along with this work; if not, write to the Free Software Foundation, - # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# -+# - # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - # or visit www.oracle.com if you need additional information or have any - # questions. --# --# <pre> --# This file is in the public domain, so clarified as of --# 2009-05-17 by Arthur David Olson. - - # Allowance for leapseconds added to each timezone file. - -+# This file is in the public domain. -+ -+# This file is generated automatically from the data in the public-domain -+# leap-seconds.list file available from most NIST time servers. -+# If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work, -+# you should be able to pick up leap-seconds.list from a secondary NIST server. -+# For more about leap-seconds.list, please see -+# The NTP Timescale and Leap Seconds -+# <http://www.eecis.udel.edu/~mills/leap.html>. -+ - # The International Earth Rotation Service periodically uses leap seconds - # to keep UTC to within 0.9 s of UT1 - # (which measures the true angular orientation of the earth in space); see - # Terry J Quinn, The BIPM and the accurate measure of time, --# Proc IEEE 79, 7 (July 1991), 894-905. -+# Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>. - # There were no leap seconds before 1972, because the official mechanism - # accounting for the discrepancy between atomic time and the earth's rotation - # did not exist until the early 1970s. -@@ -42,8 +48,8 @@ - # or - # Leap YEAR MON DAY 23:59:59 - R/S - --# If the leapsecond is Rolling (R) the given time is local time --# If the leapsecond is Stationary (S) the given time is UTC -+# If the leapsecond is Rolling (R) the given time is local time. -+# If the leapsecond is Stationary (S) the given time is UTC. - - # Leap YEAR MONTH DAY HH:MM:SS CORR R/S - Leap 1972 Jun 30 23:59:60 + S -@@ -71,53 +77,3 @@ - Leap 2005 Dec 31 23:59:60 + S - Leap 2008 Dec 31 23:59:60 + S - Leap 2012 Jun 30 23:59:60 + S -- --# INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS) --# --# SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE --# --# --# SERVICE DE LA ROTATION TERRESTRE --# OBSERVATOIRE DE PARIS --# 61, Av. de l'Observatoire 75014 PARIS (France) --# Tel. : 33 (0) 1 40 51 22 26 --# FAX : 33 (0) 1 40 51 22 91 --# e-mail : (E-Mail Removed) --# http://hpiers.obspm.fr/eop-pc --# --# Paris, 5 January 2012 --# --# --# Bulletin C 43 --# --# To authorities responsible --# for the measurement and --# distribution of time --# --# --# UTC TIME STEP --# on the 1st of July 2012 --# --# --# A positive leap second will be introduced at the end of June 2012. --# The sequence of dates of the UTC second markers will be: --# --# 2012 June 30, 23h 59m 59s --# 2012 June 30, 23h 59m 60s --# 2012 July 1, 0h 0m 0s --# --# The difference between UTC and the International Atomic Time TAI is: --# --# from 2009 January 1, 0h UTC, to 2012 July 1 0h UTC : UTC-TAI = - 34s --# from 2012 July 1, 0h UTC, until further notice : UTC-TAI = - 35s --# --# Leap seconds can be introduced in UTC at the end of the months of December --# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every --# six months, either to announce a time step in UTC or to confirm that there --# will be no time step at the next possible date. --# --# --# Daniel GAMBIS --# Head --# Earth Orientation Center of IERS --# Observatoire de Paris, France -diff -r fd7850833158 -r 3d28326a9e5d make/sun/javazic/tzdata/northamerica ---- openjdk/jdk/make/sun/javazic/tzdata/northamerica Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/make/sun/javazic/tzdata/northamerica Thu Oct 24 17:14:18 2013 +0400 -@@ -1,22 +1,22 @@ - # - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# -+# - # This code is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License version 2 only, as - # published by the Free Software Foundation. Oracle designates this - # particular file as subject to the "Classpath" exception as provided - # by Oracle in the LICENSE file that accompanied this code. --# -+# - # This code is distributed in the hope that it will be useful, but WITHOUT - # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - # version 2 for more details (a copy is included in the LICENSE file that - # accompanied this code). --# -+# - # You should have received a copy of the GNU General Public License version - # 2 along with this work; if not, write to the Free Software Foundation, - # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# -+# - # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - # or visit www.oracle.com if you need additional information or have any - # questions. -@@ -43,7 +43,7 @@ - # Howse writes (pp 121-125) that time zones were invented by - # Professor Charles Ferdinand Dowd (1825-1904), - # Principal of Temple Grove Ladies' Seminary (Saratoga Springs, NY). --# His pamphlet ``A System of National Time for Railroads'' (1870) -+# His pamphlet "A System of National Time for Railroads" (1870) - # was the result of his proposals at the Convention of Railroad Trunk Lines - # in New York City (1869-10). His 1870 proposal was based on Washington, DC, - # but in 1872-05 he moved the proposed origin to Greenwich. -@@ -63,8 +63,8 @@ - - # From Paul Eggert (2001-03-06): - # Daylight Saving Time was first suggested as a joke by Benjamin Franklin --# in his whimsical essay ``An Economical Project for Diminishing the Cost --# of Light'' published in the Journal de Paris (1784-04-26). -+# in his whimsical essay "An Economical Project for Diminishing the Cost -+# of Light" published in the Journal de Paris (1784-04-26). - # Not everyone is happy with the results: - # - # I don't really care how time is reckoned so long as there is some -@@ -190,8 +190,8 @@ - # of the Aleutian islands. No DST. - - # From Paul Eggert (1995-12-19): --# The tables below use `NST', not `NT', for Nome Standard Time. --# I invented `CAWT' for Central Alaska War Time. -+# The tables below use 'NST', not 'NT', for Nome Standard Time. -+# I invented 'CAWT' for Central Alaska War Time. - - # From U. S. Naval Observatory (1989-01-19): - # USA EASTERN 5 H BEHIND UTC NEW YORK, WASHINGTON -@@ -260,9 +260,9 @@ - # H.R. 6, Energy Policy Act of 2005, SEC. 110. DAYLIGHT SAVINGS. - # (a) Amendment- Section 3(a) of the Uniform Time Act of 1966 (15 - # U.S.C. 260a(a)) is amended-- --# (1) by striking `first Sunday of April' and inserting `second -+# (1) by striking 'first Sunday of April' and inserting 'second - # Sunday of March'; and --# (2) by striking `last Sunday of October' and inserting `first -+# (2) by striking 'last Sunday of October' and inserting 'first - # Sunday of November'. - # (b) Effective Date- Subsection (a) shall take effect 1 year after the - # date of enactment of this Act or March 1, 2007, whichever is later. -@@ -623,6 +623,8 @@ - -10:30 - HST 1947 Jun 8 2:00 #Schmitt&Cox+2 - -10:00 - HST - -+Link Pacific/Honolulu Pacific/Johnston -+ - # Now we turn to US areas that have diverged from the consensus since 1970. - - # Arizona mostly uses MST. -@@ -659,8 +661,9 @@ - # Navajo Nation participates in the Daylight Saving Time policy, due to its - # large size and location in three states." (The "only" means that other - # tribal nations don't use DST.) -- --Link America/Denver America/Shiprock -+# -+# From Paul Eggert (2013-08-26): -+# See America/Denver for a zone appropriate for the Navajo Nation. - - # Southern Idaho (Ada, Adams, Bannock, Bear Lake, Bingham, Blaine, - # Boise, Bonneville, Butte, Camas, Canyon, Caribou, Cassia, Clark, -@@ -700,13 +703,13 @@ - # and Switzerland counties have their own time zone histories as noted below. - # - # Shanks partitioned Indiana into 345 regions, each with its own time history, --# and wrote ``Even newspaper reports present contradictory information.'' -+# and wrote "Even newspaper reports present contradictory information." - # Those Hoosiers! Such a flighty and changeable people! - # Fortunately, most of the complexity occurred before our cutoff date of 1970. - # - # Other than Indianapolis, the Indiana place names are so nondescript --# that they would be ambiguous if we left them at the `America' level. --# So we reluctantly put them all in a subdirectory `America/Indiana'. -+# that they would be ambiguous if we left them at the 'America' level. -+# So we reluctantly put them all in a subdirectory 'America/Indiana'. - - # From Paul Eggert (2005-08-16): - # http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006. -@@ -970,8 +973,8 @@ - # This story is too entertaining to be false, so go with Howse over Shanks. - # - # From Paul Eggert (2001-03-06): --# Garland (1927) writes ``Cleveland and Detroit advanced their clocks --# one hour in 1914.'' This change is not in Shanks. We have no more -+# Garland (1927) writes "Cleveland and Detroit advanced their clocks -+# one hour in 1914." This change is not in Shanks. We have no more - # info, so omit this for now. - # - # Most of Michigan observed DST from 1973 on, but was a bit late in 1975. -@@ -1011,7 +1014,7 @@ - # occupied 1857/1900 by the Navassa Phosphate Co - # US lighthouse 1917/1996-09 - # currently uninhabited --# see Mark Fineman, ``An Isle Rich in Guano and Discord'', -+# see Mark Fineman, "An Isle Rich in Guano and Discord", - # _Los Angeles Times_ (1998-11-10), A1, A10; it cites - # Jimmy Skaggs, _The Great Guano Rush_ (1994). - -@@ -1045,7 +1048,7 @@ - # Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 - # <http://www.jstor.org/stable/1774359>. - # --# See the `europe' file for Greenland. -+# See the 'europe' file for Greenland. - - # Canada - -@@ -1246,7 +1249,7 @@ - - # most of east Labrador - --# The name `Happy Valley-Goose Bay' is too long; use `Goose Bay'. -+# The name 'Happy Valley-Goose Bay' is too long; use 'Goose Bay'. - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone America/Goose_Bay -4:01:40 - LMT 1884 # Happy Valley-Goose Bay - -3:30:52 - NST 1918 -@@ -1363,25 +1366,27 @@ - - # Quebec - --# From Paul Eggert (2006-07-09): --# Shanks & Pottenger write that since 1970 most of Quebec has been --# like Montreal. -+# From Paul Eggert (2013-08-30): -+# Since 1970 most of Quebec has been like Toronto. -+# However, because earlier versions of the tz database mistakenly relied on data -+# from Shanks & Pottenger saying that Quebec differed from Ontario after 1970, -+# a separate entry was created for most of Quebec. We're loath to lose -+# its pre-1970 info, even though the tz database is normally limited to -+# zones that differ after 1970, so keep this otherwise out-of-scope entry. - --# From Paul Eggert (2006-06-27): - # Matthews and Vincent (1998) also write that Quebec east of the -63 - # meridian is supposed to observe AST, but residents as far east as - # Natashquan use EST/EDT, and residents east of Natashquan use AST. --# In "Official time in Quebec" the Quebec department of justice writes in --# http://www.justice.gouv.qc.ca/english/publications/generale/temps-regl-1-a.htm --# that "The residents of the Municipality of the --# Cote-Nord-du-Golfe-Saint-Laurent and the municipalities of Saint-Augustin, --# Bonne-Esperance and Blanc-Sablon apply the Official Time Act as it is --# written and use Atlantic standard time all year round. The same applies to --# the residents of the Native facilities along the lower North Shore." --# <http://www.assnat.qc.ca/eng/37legislature2/Projets-loi/Publics/06-a002.htm> -+# The Quebec department of justice writes in -+# "The situation in Minganie and Basse-Cote-Nord" -+# http://www.justice.gouv.qc.ca/english/publications/generale/temps-minganie-a.htm -+# that the coastal strip from just east of Natashquan to Blanc-Sablon -+# observes Atlantic standard time all year round. -+# http://www.assnat.qc.ca/Media/Process.aspx?MediaId=ANQ.Vigie.Bll.DocumentGenerique_8845en - # says this common practice was codified into law as of 2007. - # For lack of better info, guess this practice began around 1970, contra to - # Shanks & Pottenger who have this region observing AST/ADT. -+# for post-1970 data America/Puerto_Rico. - - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Mont 1917 only - Mar 25 2:00 1:00 D -@@ -1425,7 +1430,6 @@ - -5:00 Mont E%sT 1974 - -5:00 Canada E%sT - -- - # Ontario - - # From Paul Eggert (2006-07-09): -@@ -1644,7 +1648,7 @@ - -6:00 - CST 1910 - -5:00 - EST 1942 - -5:00 Canada E%sT 1970 -- -5:00 Mont E%sT 1973 -+ -5:00 Toronto E%sT 1973 - -5:00 - EST 1974 - -5:00 Canada E%sT - Zone America/Nipigon -5:53:04 - LMT 1895 -@@ -2231,7 +2235,7 @@ - # From Paul Eggert (1996-06-12): - # For an English translation of the decree, see - # <a href="http://mexico-travel.com/extra/timezone_eng.html"> --# ``Diario Oficial: Time Zone Changeover'' (1996-01-04). -+# "Diario Oficial: Time Zone Changeover" (1996-01-04). - # </a> - - # From Rives McDow (1998-10-08): -@@ -2568,9 +2572,7 @@ - ############################################################################### - - # Anguilla --# Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone America/Anguilla -4:12:16 - LMT 1912 Mar 2 -- -4:00 - AST -+# See 'southamerica'. - - # Antigua and Barbuda - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -@@ -2639,13 +2641,13 @@ - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Atlantic/Bermuda -4:19:18 - LMT 1930 Jan 1 2:00 # Hamilton - -4:00 - AST 1974 Apr 28 2:00 -- -4:00 Bahamas A%sT 1976 -+ -4:00 Canada A%sT 1976 - -4:00 US A%sT - - # Cayman Is - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown -- -5:07:12 - KMT 1912 Feb # Kingston Mean Time -+ -5:07:11 - KMT 1912 Feb # Kingston Mean Time - -5:00 - EST - - # Costa Rica -@@ -2660,7 +2662,7 @@ - # go with Shanks & Pottenger. - Rule CR 1991 only - Jul 1 0:00 0 S - Rule CR 1992 only - Mar 15 0:00 0 S --# There are too many San Joses elsewhere, so we'll use `Costa Rica'. -+# There are too many San Joses elsewhere, so we'll use 'Costa Rica'. - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone America/Costa_Rica -5:36:13 - LMT 1890 # San Jose - -5:36:13 - SJMT 1921 Jan 15 # San Jose Mean Time -@@ -2892,9 +2894,7 @@ - -5:00 Cuba C%sT - - # Dominica --# Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone America/Dominica -4:05:36 - LMT 1911 Jul 1 0:01 # Roseau -- -4:00 - AST -+# See 'southamerica'. - - # Dominican Republic - -@@ -2943,18 +2943,10 @@ - -6:00 Salv C%sT - - # Grenada --# Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone America/Grenada -4:07:00 - LMT 1911 Jul # St George's -- -4:00 - AST -- - # Guadeloupe --# Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone America/Guadeloupe -4:06:08 - LMT 1911 Jun 8 # Pointe a Pitre -- -4:00 - AST - # St Barthelemy --Link America/Guadeloupe America/St_Barthelemy - # St Martin (French part) --Link America/Guadeloupe America/Marigot -+# See 'southamerica'. - - # Guatemala - # -@@ -3097,17 +3089,12 @@ - # Great Swan I ceded by US to Honduras in 1972 - - # Jamaica -- --# From Bob Devine (1988-01-28): --# Follows US rules. -- --# From U. S. Naval Observatory (1989-01-19): --# JAMAICA 5 H BEHIND UTC -- --# From Shanks & Pottenger: -+# Shanks & Pottenger give -5:07:12, but Milne records -5:07:10.41 from an -+# unspecified official document, and says "This time is used throughout the -+# island". Go with Milne. Round to the nearest second as required by zic. - # Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone America/Jamaica -5:07:12 - LMT 1890 # Kingston -- -5:07:12 - KMT 1912 Feb # Kingston Mean Time -+Zone America/Jamaica -5:07:11 - LMT 1890 # Kingston -+ -5:07:11 - KMT 1912 Feb # Kingston Mean Time - -5:00 - EST 1974 Apr 28 2:00 - -5:00 US E%sT 1984 - -5:00 - EST -@@ -3121,12 +3108,7 @@ - -4:00 - AST - - # Montserrat --# From Paul Eggert (2006-03-22): --# In 1995 volcanic eruptions forced evacuation of Plymouth, the capital. --# world.gazetteer.com says Cork Hill is the most populous location now. --# Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone America/Montserrat -4:08:52 - LMT 1911 Jul 1 0:01 # Cork Hill -- -4:00 - AST -+# See 'southamerica'. - - # Nicaragua - # -@@ -3200,7 +3182,7 @@ - -5:00 - EST - - # Puerto Rico --# There are too many San Juans elsewhere, so we'll use `Puerto_Rico'. -+# There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'. - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone America/Puerto_Rico -4:24:25 - LMT 1899 Mar 28 12:00 # San Juan - -4:00 - AST 1942 May 3 -@@ -3208,18 +3190,11 @@ - -4:00 - AST - - # St Kitts-Nevis --# Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone America/St_Kitts -4:10:52 - LMT 1912 Mar 2 # Basseterre -- -4:00 - AST -- - # St Lucia --# Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone America/St_Lucia -4:04:00 - LMT 1890 # Castries -- -4:04:00 - CMT 1912 # Castries Mean Time -- -4:00 - AST -+# See 'southamerica'. - - # St Pierre and Miquelon --# There are too many St Pierres elsewhere, so we'll use `Miquelon'. -+# There are too many St Pierres elsewhere, so we'll use 'Miquelon'. - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone America/Miquelon -3:44:40 - LMT 1911 May 15 # St Pierre - -4:00 - AST 1980 May -@@ -3227,10 +3202,7 @@ - -3:00 Canada PM%sT - - # St Vincent and the Grenadines --# Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone America/St_Vincent -4:04:56 - LMT 1890 # Kingstown -- -4:04:56 - KMT 1912 # Kingstown Mean Time -- -4:00 - AST -+# See 'southamerica'. - - # Turks and Caicos - # -@@ -3260,15 +3232,9 @@ - Rule TC 2007 max - Nov Sun>=1 2:00 0 S - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone America/Grand_Turk -4:44:32 - LMT 1890 -- -5:07:12 - KMT 1912 Feb # Kingston Mean Time -+ -5:07:11 - KMT 1912 Feb # Kingston Mean Time - -5:00 TC E%sT - - # British Virgin Is --# Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone America/Tortola -4:18:28 - LMT 1911 Jul # Road Town -- -4:00 - AST -- - # Virgin Is --# Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone America/St_Thomas -4:19:44 - LMT 1911 Jul # Charlotte Amalie -- -4:00 - AST -+# See 'southamerica'. -diff -r fd7850833158 -r 3d28326a9e5d make/sun/javazic/tzdata/pacificnew ---- openjdk/jdk/make/sun/javazic/tzdata/pacificnew Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/make/sun/javazic/tzdata/pacificnew Thu Oct 24 17:14:18 2013 +0400 -@@ -1,22 +1,22 @@ - # - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# -+# - # This code is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License version 2 only, as - # published by the Free Software Foundation. Oracle designates this - # particular file as subject to the "Classpath" exception as provided - # by Oracle in the LICENSE file that accompanied this code. --# -+# - # This code is distributed in the hope that it will be useful, but WITHOUT - # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - # version 2 for more details (a copy is included in the LICENSE file that - # accompanied this code). --# -+# - # You should have received a copy of the GNU General Public License version - # 2 along with this work; if not, write to the Free Software Foundation, - # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# -+# - # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - # or visit www.oracle.com if you need additional information or have any - # questions. -diff -r fd7850833158 -r 3d28326a9e5d make/sun/javazic/tzdata/solar87 ---- openjdk/jdk/make/sun/javazic/tzdata/solar87 Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/make/sun/javazic/tzdata/solar87 Thu Oct 24 17:14:18 2013 +0400 -@@ -1,22 +1,22 @@ - # - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# -+# - # This code is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License version 2 only, as - # published by the Free Software Foundation. Oracle designates this - # particular file as subject to the "Classpath" exception as provided - # by Oracle in the LICENSE file that accompanied this code. --# -+# - # This code is distributed in the hope that it will be useful, but WITHOUT - # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - # version 2 for more details (a copy is included in the LICENSE file that - # accompanied this code). --# -+# - # You should have received a copy of the GNU General Public License version - # 2 along with this work; if not, write to the Free Software Foundation, - # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# -+# - # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - # or visit www.oracle.com if you need additional information or have any - # questions. -diff -r fd7850833158 -r 3d28326a9e5d make/sun/javazic/tzdata/solar88 ---- openjdk/jdk/make/sun/javazic/tzdata/solar88 Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/make/sun/javazic/tzdata/solar88 Thu Oct 24 17:14:18 2013 +0400 -@@ -1,22 +1,22 @@ - # - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# -+# - # This code is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License version 2 only, as - # published by the Free Software Foundation. Oracle designates this - # particular file as subject to the "Classpath" exception as provided - # by Oracle in the LICENSE file that accompanied this code. --# -+# - # This code is distributed in the hope that it will be useful, but WITHOUT - # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - # version 2 for more details (a copy is included in the LICENSE file that - # accompanied this code). --# -+# - # You should have received a copy of the GNU General Public License version - # 2 along with this work; if not, write to the Free Software Foundation, - # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# -+# - # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - # or visit www.oracle.com if you need additional information or have any - # questions. -diff -r fd7850833158 -r 3d28326a9e5d make/sun/javazic/tzdata/solar89 ---- openjdk/jdk/make/sun/javazic/tzdata/solar89 Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/make/sun/javazic/tzdata/solar89 Thu Oct 24 17:14:18 2013 +0400 -@@ -1,22 +1,22 @@ - # - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# -+# - # This code is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License version 2 only, as - # published by the Free Software Foundation. Oracle designates this - # particular file as subject to the "Classpath" exception as provided - # by Oracle in the LICENSE file that accompanied this code. --# -+# - # This code is distributed in the hope that it will be useful, but WITHOUT - # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - # version 2 for more details (a copy is included in the LICENSE file that - # accompanied this code). --# -+# - # You should have received a copy of the GNU General Public License version - # 2 along with this work; if not, write to the Free Software Foundation, - # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# -+# - # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - # or visit www.oracle.com if you need additional information or have any - # questions. -diff -r fd7850833158 -r 3d28326a9e5d make/sun/javazic/tzdata/southamerica ---- openjdk/jdk/make/sun/javazic/tzdata/southamerica Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/make/sun/javazic/tzdata/southamerica Thu Oct 24 17:14:18 2013 +0400 -@@ -1,22 +1,22 @@ - # - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# -+# - # This code is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License version 2 only, as - # published by the Free Software Foundation. Oracle designates this - # particular file as subject to the "Classpath" exception as provided - # by Oracle in the LICENSE file that accompanied this code. --# -+# - # This code is distributed in the hope that it will be useful, but WITHOUT - # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - # version 2 for more details (a copy is included in the LICENSE file that - # accompanied this code). --# -+# - # You should have received a copy of the GNU General Public License version - # 2 along with this work; if not, write to the Free Software Foundation, - # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# -+# - # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - # or visit www.oracle.com if you need additional information or have any - # questions. -@@ -474,6 +474,17 @@ - # rules...San Luis is still using "Western ARgentina Time" and it got - # stuck on Summer daylight savings time even though the summer is over. - -+# From Paul Eggert (2013-09-05): -+# Perhaps San Luis operates on the legal fiction that it is at UTC-4 -+# with perpetual summer time, but ordinary usage typically seems to -+# just say it's at UTC-3; see, for example, -+# <http://es.wikipedia.org/wiki/Hora_oficial_argentina>. -+# We've documented similar situations as being plain changes to -+# standard time, so let's do that here too. This does not change UTC -+# offsets, only tm_isdst and the time zone abbreviations. One minor -+# plus is that this silences a zic complaint that there's no POSIX TZ -+# setting for time stamps past 2038. -+ - # From Paul Eggert (2013-02-21): - # Milne says Cordoba time was -4:16:48.2. Round to the nearest second. - -@@ -611,7 +622,7 @@ - # San Luis (SL) - - Rule SanLuis 2008 2009 - Mar Sun>=8 0:00 0 - --Rule SanLuis 2007 2009 - Oct Sun>=8 0:00 1:00 S -+Rule SanLuis 2007 2008 - Oct Sun>=8 0:00 1:00 S - - Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31 - -4:16:48 - CMT 1920 May -@@ -627,7 +638,8 @@ - -3:00 - ART 2004 May 31 - -4:00 - WART 2004 Jul 25 - -3:00 Arg AR%sT 2008 Jan 21 -- -4:00 SanLuis WAR%sT -+ -4:00 SanLuis WAR%sT 2009 Oct 11 -+ -3:00 - ART - # - # Santa Cruz (SC) - Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31 -@@ -654,10 +666,7 @@ - -3:00 - ART - - # Aruba --# Zone NAME GMTOFF RULES FORMAT [UNTIL] --Zone America/Aruba -4:40:24 - LMT 1912 Feb 12 # Oranjestad -- -4:30 - ANT 1965 # Netherlands Antilles Time -- -4:00 - AST -+Link America/Curacao America/Aruba - - # Bolivia - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -@@ -859,6 +868,12 @@ - # Tocantins state will have DST. - # http://noticias.terra.com.br/brasil/noticias/0,,OI6232536-EI306.html - -+# From Steffen Thorsen (2013-09-20): -+# Tocantins in Brazil is very likely not to observe DST from October.... -+# http://conexaoto.com.br/2013/09/18/ministerio-confirma-que-tocantins-esta-fora-do-horario-de-verao-em-2013-mas-falta-publicacao-de-decreto -+# We will keep this article updated when this is confirmed: -+# http://www.timeanddate.com/news/time/brazil-starts-dst-2013.html -+ - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01) - # Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10) -@@ -1078,7 +1093,8 @@ - -3:00 - BRT 1995 Sep 14 - -3:00 Brazil BR%sT 2003 Sep 24 - -3:00 - BRT 2012 Oct 21 -- -3:00 Brazil BR%sT -+ -3:00 Brazil BR%sT 2013 Sep -+ -3:00 - BRT - # - # Alagoas (AL), Sergipe (SE) - Zone America/Maceio -2:22:52 - LMT 1914 -@@ -1373,12 +1389,12 @@ - -4:00 - AST - - # From Arthur David Olson (2011-06-15): --# At least for now, use links for places with new iso3166 codes. -+# use links for places with new iso3166 codes. - # The name "Lower Prince's Quarter" is both longer than fourteen charaters - # and contains an apostrophe; use "Lower_Princes" below. - --Link America/Curacao America/Lower_Princes # Sint Maarten --Link America/Curacao America/Kralendijk # Bonaire, Sint Estatius and Saba -+Link America/Curacao America/Lower_Princes # Sint Maarten -+Link America/Curacao America/Kralendijk # Caribbean Netherlands - - # Ecuador - # -@@ -1519,10 +1535,16 @@ - -4:00 - GYT - - # Paraguay -+# - # From Paul Eggert (2006-03-22): - # Shanks & Pottenger say that spring transitions are from 01:00 -> 02:00, - # and autumn transitions are from 00:00 -> 23:00. Go with pre-1999 - # editions of Shanks, and with the IATA, who say transitions occur at 00:00. -+# -+# From Waldemar Villamayor-Venialbo (2013-09-20): -+# No time of the day is established for the adjustment, so people normally -+# adjust their clocks at 0 hour of the given dates. -+# - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S - Rule Para 1975 1988 - Oct 1 0:00 1:00 S - Rule Para 1975 1978 - Mar 1 0:00 0 - -@@ -1656,6 +1678,19 @@ - Zone America/Port_of_Spain -4:06:04 - LMT 1912 Mar 2 - -4:00 - AST - -+Link America/Port_of_Spain America/Anguilla -+Link America/Port_of_Spain America/Dominica -+Link America/Port_of_Spain America/Grenada -+Link America/Port_of_Spain America/Guadeloupe -+Link America/Port_of_Spain America/Marigot -+Link America/Port_of_Spain America/Montserrat -+Link America/Port_of_Spain America/St_Barthelemy -+Link America/Port_of_Spain America/St_Kitts -+Link America/Port_of_Spain America/St_Lucia -+Link America/Port_of_Spain America/St_Thomas -+Link America/Port_of_Spain America/St_Vincent -+Link America/Port_of_Spain America/Tortola -+ - # Uruguay - # From Paul Eggert (1993-11-18): - # Uruguay wins the prize for the strangest peacetime manipulation of the rules. -@@ -1673,7 +1708,7 @@ - # Whitman gives 1937 Oct 3; go with Shanks & Pottenger. - Rule Uruguay 1937 1940 - Oct lastSun 0:00 0:30 HS - # Whitman gives 1941 Oct 24 - 1942 Mar 27, 1942 Dec 14 - 1943 Apr 13, --# and 1943 Apr 13 ``to present time''; go with Shanks & Pottenger. -+# and 1943 Apr 13 "to present time"; go with Shanks & Pottenger. - Rule Uruguay 1941 only - Aug 1 0:00 0:30 HS - Rule Uruguay 1942 only - Jan 1 0:00 0 - - Rule Uruguay 1942 only - Dec 14 0:00 1:00 S -diff -r fd7850833158 -r 3d28326a9e5d make/sun/javazic/tzdata/systemv ---- openjdk/jdk/make/sun/javazic/tzdata/systemv Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/make/sun/javazic/tzdata/systemv Thu Oct 24 17:14:18 2013 +0400 -@@ -1,22 +1,22 @@ - # - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# -+# - # This code is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License version 2 only, as - # published by the Free Software Foundation. Oracle designates this - # particular file as subject to the "Classpath" exception as provided - # by Oracle in the LICENSE file that accompanied this code. --# -+# - # This code is distributed in the hope that it will be useful, but WITHOUT - # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - # version 2 for more details (a copy is included in the LICENSE file that - # accompanied this code). --# -+# - # You should have received a copy of the GNU General Public License version - # 2 along with this work; if not, write to the Free Software Foundation, - # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# -+# - # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - # or visit www.oracle.com if you need additional information or have any - # questions. -diff -r fd7850833158 -r 3d28326a9e5d make/sun/javazic/tzdata/zone.tab ---- openjdk/jdk/make/sun/javazic/tzdata/zone.tab Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/make/sun/javazic/tzdata/zone.tab Thu Oct 24 17:14:18 2013 +0400 -@@ -1,53 +1,55 @@ - # - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# -+# - # This code is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License version 2 only, as - # published by the Free Software Foundation. Oracle designates this - # particular file as subject to the "Classpath" exception as provided - # by Oracle in the LICENSE file that accompanied this code. --# -+# - # This code is distributed in the hope that it will be useful, but WITHOUT - # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - # version 2 for more details (a copy is included in the LICENSE file that - # accompanied this code). --# -+# - # You should have received a copy of the GNU General Public License version - # 2 along with this work; if not, write to the Free Software Foundation, - # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# -+# - # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - # or visit www.oracle.com if you need additional information or have any - # questions. - # --# <pre> -+# TZ zone descriptions -+# - # This file is in the public domain, so clarified as of - # 2009-05-17 by Arthur David Olson. - # --# TZ zone descriptions -+# From Paul Eggert (2013-08-14): - # --# From Paul Eggert (2013-05-27): -+# This file contains a table where each row stands for an area that is -+# the intersection of a region identified by a country code and of a -+# zone where civil clocks have agreed since 1970. The columns of the -+# table are as follows: - # --# This file contains a table with the following columns: --# 1. ISO 3166 2-character country code. See the file `iso3166.tab'. --# This identifies a country that overlaps the zone. The country may --# overlap other zones and the zone may overlap other countries. --# 2. Latitude and longitude of the zone's principal location -+# 1. ISO 3166 2-character country code. See the file 'iso3166.tab'. -+# 2. Latitude and longitude of the area's principal location - # in ISO 6709 sign-degrees-minutes-seconds format, - # either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS, - # first latitude (+ is north), then longitude (+ is east). --# This location need not lie within the column-1 country. - # 3. Zone name used in value of TZ environment variable. - # Please see the 'Theory' file for how zone names are chosen. -+# If multiple zones overlap a country, each has a row in the -+# table, with column 1 being duplicated. - # 4. Comments; present if and only if the country has multiple rows. - # - # Columns are separated by a single tab. - # The table is sorted first by country, then an order within the country that - # (1) makes some geographical sense, and --# (2) puts the most populous zones first, where that does not contradict (1). -+# (2) puts the most populous areas first, where that does not contradict (1). - # --# Lines beginning with `#' are comments. -+# Lines beginning with '#' are comments. - # - # This table is intended as an aid for users, to help them select time - # zone data appropriate for their practical needs. It is not intended -@@ -63,8 +65,7 @@ - AL +4120+01950 Europe/Tirane - AM +4011+04430 Asia/Yerevan - AO -0848+01314 Africa/Luanda --AQ -7750+16636 Antarctica/McMurdo McMurdo Station, Ross Island --AQ -9000+00000 Antarctica/South_Pole Amundsen-Scott Station, South Pole -+AQ -7750+16636 Antarctica/McMurdo McMurdo, South Pole, Scott (New Zealand time) - AQ -6734-06808 Antarctica/Rothera Rothera Station, Adelaide Island - AQ -6448-06406 Antarctica/Palmer Palmer Station, Anvers Island - AQ -6736+06253 Antarctica/Mawson Mawson Station, Holme Bay -@@ -144,8 +145,7 @@ - CA +4606-06447 America/Moncton Atlantic Time - New Brunswick - CA +5320-06025 America/Goose_Bay Atlantic Time - Labrador - most locations - CA +5125-05707 America/Blanc-Sablon Atlantic Standard Time - Quebec - Lower North Shore --CA +4531-07334 America/Montreal Eastern Time - Quebec - most locations --CA +4339-07923 America/Toronto Eastern Time - Ontario - most locations -+CA +4339-07923 America/Toronto Eastern Time - Ontario & Quebec - most locations - CA +4901-08816 America/Nipigon Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973 - CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario - CA +6344-06828 America/Iqaluit Eastern Time - east Nunavut - most locations -@@ -256,7 +256,7 @@ - IS +6409-02151 Atlantic/Reykjavik - IT +4154+01229 Europe/Rome - JE +4912-00207 Europe/Jersey --JM +1800-07648 America/Jamaica -+JM +175805-0764736 America/Jamaica - JO +3157+03556 Asia/Amman - JP +353916+1394441 Asia/Tokyo - KE -0117+03649 Africa/Nairobi -@@ -445,8 +445,7 @@ - US +471551-1014640 America/North_Dakota/Beulah Central Time - North Dakota - Mercer County - US +394421-1045903 America/Denver Mountain Time - US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon --US +364708-1084111 America/Shiprock Mountain Time - Navajo --US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona -+US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo) - US +340308-1181434 America/Los_Angeles Pacific Time - US +611305-1495401 America/Anchorage Alaska Time - US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle -diff -r fd7850833158 -r 3d28326a9e5d src/share/classes/sun/util/resources/TimeZoneNames.java ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java Thu Oct 24 17:14:18 2013 +0400 -@@ -43,8 +43,6 @@ - public final class TimeZoneNames extends TimeZoneNamesBundle { - - protected final Object[][] getContents() { -- String ACT[] = new String[] {"Acre Time", "ACT", -- "Acre Summer Time", "ACST"}; - String ADELAIDE[] = new String[] {"Central Standard Time (South Australia)", "CST", - "Central Summer Time (South Australia)", "CST"}; - String AGT[] = new String[] {"Argentine Time", "ART", -@@ -79,7 +77,7 @@ - "Chamorro Daylight Time", "ChDT"}; - String CHUT[] = new String[] {"Chuuk Time", "CHUT", - "Chuuk Summer Time", "CHUST"}; -- String CIT[] = new String[] {"Central Indonesia Time", "CIT", -+ String CIT[] = new String[] {"Central Indonesia Time", "WITA", - "Central Indonesia Summer Time", "CIST"}; - String CLT[] = new String[] {"Chile Time", "CLT", - "Chile Summer Time", "CLST"}; -@@ -193,7 +191,7 @@ - "Western African Summer Time", "WAST"}; - String WET[] = new String[] {"Western European Time", "WET", - "Western European Summer Time", "WEST"}; -- String WIT[] = new String[] {"West Indonesia Time", "WIT", -+ String WIT[] = new String[] {"West Indonesia Time", "WIB", - "West Indonesia Summer Time", "WIST"}; - String WST_AUS[] = new String[] {"Western Standard Time (Australia)", "WST", - "Western Summer Time (Australia)", "WST"}; -@@ -308,7 +306,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -483,7 +481,7 @@ - {"Asia/Aden", ARAST}, - {"Asia/Almaty", new String[] {"Alma-Ata Time", "ALMT", - "Alma-Ata Summer Time", "ALMST"}}, -- {"Asia/Amman", EET}, -+ {"Asia/Amman", ARAST}, - {"Asia/Anadyr", new String[] {"Anadyr Time", "ANAT", - "Anadyr Summer Time", "ANAST"}}, - {"Asia/Aqtau", new String[] {"Aqtau Time", "AQTT", -@@ -527,7 +525,7 @@ - "Irkutsk Summer Time", "IRKST"}}, - {"Asia/Istanbul", EET}, - {"Asia/Jakarta", WIT}, -- {"Asia/Jayapura", new String[] {"East Indonesia Time", "EIT", -+ {"Asia/Jayapura", new String[] {"East Indonesia Time", "WIT", - "East Indonesia Summer Time", "EIST"}}, - {"Asia/Kabul", new String[] {"Afghanistan Time", "AFT", - "Afghanistan Summer Time", "AFST"}}, -@@ -537,7 +535,8 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -- {"Asia/Khandyga", YAKT}, -+ {"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT", -+ "Khandyga Summer Time", "YAKST"}}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"Krasnoyarsk Time", "KRAT", - "Krasnoyarsk Summer Time", "KRAST"}}, -@@ -586,7 +585,8 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -- {"Asia/Ust-Nera", VLAT}, -+ {"Asia/Ust-Nera", new String[] {"Ust-Nera Time", "VLAT", -+ "Ust-Nera Summer Time", "VLAST"}}, - {"Asia/Vientiane", ICT}, - {"Asia/Vladivostok", VLAT}, - {"Asia/Yakutsk", YAKT}, -diff -r fd7850833158 -r 3d28326a9e5d src/share/classes/sun/util/resources/TimeZoneNames_de.java ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java Thu Oct 24 17:14:18 2013 +0400 -@@ -43,10 +43,8 @@ - public final class TimeZoneNames_de extends TimeZoneNamesBundle { - - protected final Object[][] getContents() { -- String ACT[] = new String[] {"Acre Normalzeit", "ACT", -- "Acre Sommerzeit", "ACST"}; -- String ADELAIDE[] = new String[] {"Zentrale Normalzeit (S\u00fcdaustralien)", "CST", -- "Zentrale Sommerzeit (S\u00fcdaustralien)", "CST"}; -+ String ADELAIDE[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien)", "CST", -+ "Zentrale Sommerzeit (S\u00FCdaustralien)", "CST"}; - String AGT[] = new String[] {"Argentinische Zeit", "ART", - "Argentinische Sommerzeit", "ARST"}; - String AKST[] = new String[] {"Alaska Normalzeit", "AKST", -@@ -61,10 +59,10 @@ - "Atlantik Sommerzeit", "ADT"}; - String BDT[] = new String[] {"Bangladesch Zeit", "BDT", - "Bangladesch Sommerzeit", "BDST"}; -- String BRISBANE[] = new String[] {"\u00d6stliche Normalzeit (Queensland)", "EST", -- "\u00d6stliche Sommerzeit (Queensland)", "EST"}; -- String BROKEN_HILL[] = new String[] {"Zentrale Normalzeit (S\u00fcdaustralien/New South Wales)", "CST", -- "Zentrale Sommerzeit (S\u00fcdaustralien/New South Wales)", "CST"}; -+ String BRISBANE[] = new String[] {"\u00D6stliche Normalzeit (Queensland)", "EST", -+ "\u00D6stliche Sommerzeit (Queensland)", "EST"}; -+ String BROKEN_HILL[] = new String[] {"Zentrale Normalzeit (S\u00FCdaustralien/New South Wales)", "CST", -+ "Zentrale Sommerzeit (S\u00FCdaustralien/New South Wales)", "CST"}; - String BRT[] = new String[] {"Brasilianische Zeit", "BRT", - "Brasilianische Sommerzeit", "BRST"}; - String BTT[] = new String[] {"Bhutanische Zeit", "BTT", -@@ -77,9 +75,9 @@ - "Chatham Sommerzeit", "CHADT"}; - String ChST[] = new String[] {"Chamorro Normalzeit", "ChST", - "Chamorro Sommerzeit", "ChDT"}; -- String CHUT[] = new String[] {"Chuuk Time", "CHUT", -- "Chuuk Summer Time", "CHUST"}; -- String CIT[] = new String[] {"Zentralindonesische Zeit", "CIT", -+ String CHUT[] = new String[] {"Chuuk Zeit", "CHUT", -+ "Chuuk Sommerzeit", "CHUST"}; -+ String CIT[] = new String[] {"Zentralindonesische Zeit", "WITA", - "Zentralindonesische Sommerzeit", "CIST"}; - String CLT[] = new String[] {"Chilenische Zeit", "CLT", - "Chilenische Sommerzeit", "CLST"}; -@@ -89,7 +87,7 @@ - "Chinesische Sommerzeit", "CDT"}; - String CUBA[] = new String[] {"Kubanische Normalzeit", "CST", - "Kubanische Sommerzeit", "CDT"}; -- String DARWIN[] = new String[] {"Zentrale Normalzeit (Northern Territory)", "CST", -+ String DARWIN[] = new String[] {"Central Normalzeit (Northern Territory)", "CST", - "Zentrale Sommerzeit (Northern Territory)", "CST"}; - String DUBLIN[] = new String[] {"Greenwich Zeit", "GMT", - "Irische Sommerzeit", "IST"}; -@@ -103,10 +101,10 @@ - "Ostgr\u00f6nl\u00e4ndische Sommerzeit", "EGST"}; - String EST[] = new String[] {"\u00d6stliche Normalzeit", "EST", - "\u00d6stliche Sommerzeit", "EDT"}; -- String EST_NSW[] = new String[] {"\u00d6stliche Normalzeit (New South Wales)", "EST", -- "\u00d6stliche Sommerzeit (New South Wales)", "EST"}; -- String FET[] = new String[] {"Further-eastern European Time", "FET", -- "Further-eastern European Summer Time", "FEST"}; -+ String EST_NSW[] = new String[] {"Eastern Normalzeit (Neus\u00FCdwales)", "EST", -+ "\u00D6stliche Sommerzeit (New South Wales)", "EST"}; -+ String FET[] = new String[] {"Kaliningrader Zeit", "FET", -+ "Kaliningrader Sommerzeit", "FEST"}; - String GHMT[] = new String[] {"Ghanaische Normalzeit", "GMT", - "Ghanaische Sommerzeit", "GHST"}; - String GAMBIER[] = new String[] {"Gambier Zeit", "GAMT", -@@ -159,8 +157,8 @@ - "Pitcairn Sommerzeit", "PDT"}; - String PKT[] = new String[] {"Pakistanische Zeit", "PKT", - "Pakistanische Sommerzeit", "PKST"}; -- String PONT[] = new String[] {"Pohnpei Time", "PONT", -- "Pohnpei Summer Time", "PONST"}; -+ String PONT[] = new String[] {"Pohnpei Zeit", "PONT", -+ "Pohnpei Sommerzeit", "PONST"}; - String PST[] = new String[] {"Pazifische Normalzeit", "PST", - "Pazifische Sommerzeit", "PDT"}; - String SAMOA[] = new String[] {"Samoa Normalzeit", "SST", -@@ -173,8 +171,8 @@ - "Singapur Sommerzeit", "SGST"}; - String SLST[] = new String[] {"Greenwich Normalzeit", "GMT", - "Sierra Leone Sommerzeit", "SLST"}; -- String TASMANIA[] = new String[] {"\u00d6stliche Normalzeit (Tasmanien)", "EST", -- "\u00d6stliche Sommerzeit (Tasmanien)", "EST"}; -+ String TASMANIA[] = new String[] {"\u00D6stliche Normalzeit (Tasmanien)", "EST", -+ "\u00D6stliche Sommerzeit (Tasmanien)", "EST"}; - String TMT[] = new String[] {"Turkmenische Zeit", "TMT", - "Turkmenische Sommerzeit", "TMST"}; - String ULAT[]= new String[] {"Ulaanbaatar Zeit", "ULAT", -@@ -183,8 +181,8 @@ - "Koordinierte Universalzeit", "UTC"}; - String UZT[] = new String[] {"Usbekistan Zeit", "UZT", - "Usbekistan Sommerzeit", "UZST"}; -- String VICTORIA[] = new String[] {"\u00d6stliche Normalzeit (Victoria)", "EST", -- "\u00d6stliche Sommerzeit (Victoria)", "EST"}; -+ String VICTORIA[] = new String[] {"\u00D6stliche Normalzeit (Victoria)", "EST", -+ "\u00D6stliche Sommerzeit (Victoria)", "EST"}; - String VLAT[] = new String[] {"Wladiwostok Zeit", "VLAT", - "Wladiwostok Sommerzeit", "VLAST"}; - String WART[] = new String[] {"Westargentinische Zeit", "WART", -@@ -193,7 +191,7 @@ - "Westafrikanische Sommerzeit", "WAST"}; - String WET[] = new String[] {"Westeurop\u00e4ische Zeit", "WEZ", - "Westeurop\u00e4ische Sommerzeit", "WESZ"}; -- String WIT[] = new String[] {"Westindonesische Zeit", "WIT", -+ String WIT[] = new String[] {"Westindonesische Zeit", "WIB", - "Westindonesische Sommerzeit", "WIST"}; - String WST_AUS[] = new String[] {"Westliche Normalzeit (Australien)", "WST", - "Westliche Sommerzeit (Australien)", "WST"}; -@@ -308,7 +306,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -401,8 +399,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[] {"Metlakatla Normalzeit", "MeST", -+ "Metlakatla Sommerzeit", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"Pierre & Miquelon Normalzeit", "PMST", - "Pierre & Miquelon Sommerzeit", "PMDT"}}, -@@ -466,8 +464,8 @@ - "Davis Sommerzeit", "DAVST"}}, - {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville Zeit", "DDUT", - "Dumont-d'Urville Sommerzeit", "DDUST"}}, -- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", -- "Macquarie Island Summer Time", "MIST"}}, -+ {"Antarctica/Macquarie", new String[] {"Macquarieinsel Zeit", "MIST", -+ "Macquarieinsel Sommerzeit", "MIST"}}, - {"Antarctica/Mawson", new String[] {"Mawson Zeit", "MAWT", - "Mawson Sommerzeit", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -483,7 +481,7 @@ - {"Asia/Aden", ARAST}, - {"Asia/Almaty", new String[] {"Alma Ata Zeit", "ALMT", - "Alma-Ata Sommerzeit", "ALMST"}}, -- {"Asia/Amman", EET}, -+ {"Asia/Amman", ARAST}, - {"Asia/Anadyr", new String[] {"Anadyr Zeit", "ANAT", - "Anadyr Sommerzeit", "ANAST"}}, - {"Asia/Aqtau", new String[] {"Aqtau Zeit", "AQTT", -@@ -527,7 +525,7 @@ - "Irkutsk Sommerzeit", "IRKST"}}, - {"Asia/Istanbul", EET}, - {"Asia/Jakarta", WIT}, -- {"Asia/Jayapura", new String[] {"Ostindonesische Zeit", "EIT", -+ {"Asia/Jayapura", new String[] {"Ostindonesische Zeit", "WIT", - "Ostindonesische Sommerzeit", "EIST"}}, - {"Asia/Kabul", new String[] {"Afghanistanische Zeit", "AFT", - "Afghanistanische Sommerzeit", "AFST"}}, -@@ -537,7 +535,8 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -- {"Asia/Khandyga", YAKT}, -+ {"Asia/Khandyga", new String[] {"Chandyga Zeit", "YAKT", -+ "Chandyga Sommerzeit", "YAKST"}}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"Krasnojarsker Zeit", "KRAT", - "Krasnojarsker Sommerzeit", "KRAST"}}, -@@ -586,7 +585,8 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -- {"Asia/Ust-Nera", VLAT}, -+ {"Asia/Ust-Nera", new String[] {"Ust-Nera Zeit", "VLAT", -+ "Ust-Nera Sommerzeit", "VLAST"}}, - {"Asia/Vientiane", ICT}, - {"Asia/Vladivostok", VLAT}, - {"Asia/Yakutsk", YAKT}, -diff -r fd7850833158 -r 3d28326a9e5d src/share/classes/sun/util/resources/TimeZoneNames_es.java ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java Thu Oct 24 17:14:18 2013 +0400 -@@ -43,9 +43,7 @@ - public final class TimeZoneNames_es extends TimeZoneNamesBundle { - - protected final Object[][] getContents() { -- String ACT[] = new String[] {"Hora de Acre", "ACT", -- "Hora de verano de Acre", "ACST"}; -- String ADELAIDE[] = new String[] {"Hora est\u00e1ndar Central (Sur de Australia)", "CST", -+ String ADELAIDE[] = new String[] {"Hora est\u00E1ndar Central (Sur de Australia)", "CST", - "Hora de verano Central (Sur de Australia)", "CST"}; - String AGT[] = new String[] {"Hora de Argentina", "ART", - "Hora de verano de Argentina", "ARST"}; -@@ -61,9 +59,9 @@ - "Hora de verano Atl\u00e1ntico", "ADT"}; - String BDT[] = new String[] {"Hora de Bangladesh", "BDT", - "Hora de verano de Bangladesh", "BDST"}; -- String BRISBANE[] = new String[] {"Hora est\u00e1ndar del Este (Queensland)", "EST", -- "Hora de verano del Este (Queensland)", "EST"}; -- String BROKEN_HILL[] = new String[] {"Hora est\u00e1ndar Central (Sur de Australia/Nueva Gales del Sur)", "CST", -+ String BRISBANE[] = new String[] {"Hora est\u00E1ndar del Este (Queensland)", "EST", -+ "Hora est\u00E1ndar de verano del Este (Queensland)", "EST"}; -+ 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"}; - String BRT[] = new String[] {"Hora de Brasil", "BRT", - "Hora de verano de Brasil", "BRST"}; -@@ -79,7 +77,7 @@ - "Hora de verano de Chamorro", "ChDT"}; - String CHUT[] = new String[] {"Chuuk Time", "CHUT", - "Chuuk Summer Time", "CHUST"}; -- String CIT[] = new String[] {"Hora de Indonesia Central", "CIT", -+ String CIT[] = new String[] {"Hora de Indonesia Central", "WITA", - "Hora de verano de Indonesia Central", "CIST"}; - String CLT[] = new String[] {"Hora de Chile", "CLT", - "Hora de verano de Chile", "CLST"}; -@@ -89,7 +87,7 @@ - "Hora de verano de China", "CDT"}; - String CUBA[] = new String[] {"Hora est\u00e1ndar de Cuba", "CST", - "Hora de verano de Cuba", "CDT"}; -- String DARWIN[] = new String[] {"Hora est\u00e1ndar Central (territorio del Norte)", "CST", -+ String DARWIN[] = new String[] {"Hora est\u00E1ndar Central (territorio del Norte)", "CST", - "Hora de verano Central (territorio del Norte)", "CST"}; - String DUBLIN[] = new String[] {"Hora del Meridiano de Greenwich", "GMT", - "Hora de verano de Irlanda", "IST"}; -@@ -103,10 +101,10 @@ - "Hora de verano de Groenlandia Oriental", "EGST"}; - String EST[] = new String[] {"Hora est\u00e1ndar Oriental", "EST", - "Hora de verano Oriental", "EDT"}; -- String EST_NSW[] = new String[] {"Hora est\u00e1ndar Oriental (Nueva Gales del Sur)", "EST", -+ String EST_NSW[] = new String[] {"Hora est\u00E1ndar Oriental (Nueva Gales del Sur)", "EST", - "Hora de verano Oriental (Nueva Gales del Sur)", "EST"}; -- String FET[] = new String[] {"Further-eastern European Time", "FET", -- "Further-eastern European Summer Time", "FEST"}; -+ String FET[] = new String[] {"Hora de Europa m\u00E1s Oriental", "FET", -+ "Hora de verano de Europa m\u00E1s Oriental", "FEST"}; - String GHMT[] = new String[] {"Hora central de Ghana", "GMT", - "Hora de verano de Ghana", "GHST"}; - String GAMBIER[] = new String[] {"Hora de Gambier", "GAMT", -@@ -173,7 +171,7 @@ - "Hora de verano de Singapur", "SGST"}; - String SLST[] = new String[] {"Hora del Meridiano de Greenwich", "GMT", - "Hora de verano de Sierra Leona", "SLST"}; -- String TASMANIA[] = new String[] {"Hora est\u00e1ndar del Este (Tasmania)", "EST", -+ String TASMANIA[] = new String[] {"Hora est\u00E1ndar del Este (Tasmania)", "EST", - "Hora de verano del Este (Tasmania)", "EST"}; - String TMT[] = new String[] {"Hora de Turkmenist\u00e1n", "TMT", - "Hora de verano de Turkmenist\u00e1n", "TMST"}; -@@ -183,7 +181,7 @@ - "Hora Universal Coordinada", "UTC"}; - String UZT[] = new String[] {"Hora de Uzbekist\u00e1n", "UZT", - "Hora de verano de Uzbekist\u00e1n", "UZST"}; -- String VICTORIA[] = new String[] {"Hora est\u00e1ndar del Este (Victoria)", "EST", -+ String VICTORIA[] = new String[] {"Hora est\u00E1ndar del Este (Victoria)", "EST", - "Hora de verano del Este (Victoria)", "EST"}; - String VLAT[] = new String[] {"Hora de Vladivostok", "VLAT", - "Hora de verano de Vladivostok", "VLAST"}; -@@ -193,9 +191,9 @@ - "Hora de verano de \u00c1frica Occidental", "WAST"}; - String WET[] = new String[] {"Hora de Europa Occidental", "WET", - "Hora de verano de Europa Occidental", "WEST"}; -- String WIT[] = new String[] {"Hora de Indonesia Occidental", "WIT", -+ String WIT[] = new String[] {"Hora de Indonesia Occidental", "WIB", - "Indonesia Hora de verano de Indonesia Occidental", "WIST"}; -- String WST_AUS[] = new String[] {"Hora est\u00e1ndar Occidental (Australia)", "WST", -+ String WST_AUS[] = new String[] {"Hora est\u00E1ndar Occidental (Australia)", "WST", - "Hora de verano Occidental (Australia)", "WST"}; - String WST_SAMOA[] = new String[] {"Hora de Samoa Occidental", "WST", - "Hora de verano de Samoa Occidental", "WSDT"}; -@@ -308,7 +306,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -483,7 +481,7 @@ - {"Asia/Aden", ARAST}, - {"Asia/Almaty", new String[] {"Hora de Alma-Ata", "ALMT", - "Hora de verano de Alma-Ata", "ALMST"}}, -- {"Asia/Amman", EET}, -+ {"Asia/Amman", ARAST}, - {"Asia/Anadyr", new String[] {"Hora de Anadyr", "ANAT", - "Hora de verano de Anadyr", "ANAST"}}, - {"Asia/Aqtau", new String[] {"Hora de Aqtau", "AQTT", -@@ -527,7 +525,7 @@ - "Hora de verano de Irkutsk", "IRKST"}}, - {"Asia/Istanbul", EET}, - {"Asia/Jakarta", WIT}, -- {"Asia/Jayapura", new String[] {"Hora de Indonesia Oriental", "EIT", -+ {"Asia/Jayapura", new String[] {"Hora de Indonesia Oriental", "WIT", - "Hora de verano de Indonesia Oriental", "EIST"}}, - {"Asia/Kabul", new String[] {"Hora de Afganist\u00e1n", "AFT", - "Hora de verano de Afganist\u00e1n", "AFST"}}, -@@ -537,7 +535,8 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -- {"Asia/Khandyga", YAKT}, -+ {"Asia/Khandyga", new String[] {"Hora de Khandyga", "YAKT", -+ "Hora de verano de Khandyga", "YAKST"}}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"Hora de Krasnoyarsk", "KRAT", - "Hora de verano de Krasnoyarsk", "KRAST"}}, -@@ -586,7 +585,8 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -- {"Asia/Ust-Nera", VLAT}, -+ {"Asia/Ust-Nera", new String[] {"Hora de Ust-Nera", "VLAT", -+ "Hora de verano de Ust-Nera", "VLAST"}}, - {"Asia/Vientiane", ICT}, - {"Asia/Vladivostok", VLAT}, - {"Asia/Yakutsk", YAKT}, -@@ -616,8 +616,8 @@ - {"Australia/Canberra", EST_NSW}, - {"Australia/Currie", EST_NSW}, - {"Australia/Darwin", DARWIN}, -- {"Australia/Eucla", new String[] {"Hora est\u00e1ndar de Australia Central y Occidental", "CWST", -- "Hora de verano de Australia Central y Occidental", "CWST"}}, -+ {"Australia/Eucla", new String[] {"Hora est\u00E1ndar de Australia Central y Occidental", "CWST", -+ "Hora est\u00E1ndar de verano de Australia Central y Occidental", "CWST"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, -diff -r fd7850833158 -r 3d28326a9e5d src/share/classes/sun/util/resources/TimeZoneNames_fr.java ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Thu Oct 24 17:14:18 2013 +0400 -@@ -43,10 +43,8 @@ - public final class TimeZoneNames_fr extends TimeZoneNamesBundle { - - protected final Object[][] getContents() { -- String ACT[] = new String[] {"Heure de l'Acre", "ACT", -- "Heure d'\u00e9t\u00e9 de l'Acre", "ACST"}; - String ADELAIDE[] = new String[] {"Heure standard d'Australie centrale (Australie du sud)", "CST", -- "Heure d'\u00e9t\u00e9 d'Australie centrale (Australie du sud)", "CST"}; -+ "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud)", "CST"}; - String AGT[] = new String[] {"Heure D'Argentine", "ART", - "Heure d'\u00e9t\u00e9 D'Argentine", "ARST"}; - String AKST[] = new String[] {"Heure normale d'Alaska", "AKST", -@@ -62,9 +60,9 @@ - String BDT[] = new String[] {"Heure du Bangladesh", "BDT", - "Heure d'\u00e9t\u00e9 du Bangladesh", "BDST"}; - String BRISBANE[] = new String[] {"Heure standard d'Australie orientale (Queensland)", "EST", -- "Heure d'\u00e9t\u00e9 d'Australie orientale (Queensland)", "EST"}; -+ "Heure d'\u00E9t\u00E9 d'Australie orientale (Queensland)", "EST"}; - String BROKEN_HILL[] = new String[] {"Heure standard d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "CST", -- "Heure d'\u00e9t\u00e9 d'Australie centrale(Australie du sud/Nouvelle-Galles du sud)", "CST"}; -+ "Heure d'\u00E9t\u00E9 d'Australie centrale (Australie du sud/Nouvelle-Galles du sud)", "CST"}; - String BRT[] = new String[] {"Heure du Br\u00e9sil", "BRT", - "Heure d'\u00e9t\u00e9 du Br\u00e9sil", "BRST"}; - String BTT[] = new String[] {"Heure du Bhoutan", "BTT", -@@ -77,9 +75,9 @@ - "Heure avanc\u00e9e de Chatham", "CHADT"}; - String ChST[] = new String[] {"Heure normale des \u00eeles Mariannes", "ChST", - "Heure d'\u00e9t\u00e9 des \u00eeles Mariannes", "ChDT"}; -- String CHUT[] = new String[] {"Chuuk Time", "CHUT", -- "Chuuk Summer Time", "CHUST"}; -- String CIT[] = new String[] {"Heure d'Indon\u00e9sie centrale", "CIT", -+ String CHUT[] = new String[] {"Heure de Chuuk", "CHUT", -+ "Heure d'\u00E9t\u00E9 de Chuuk", "CHUST"}; -+ String CIT[] = new String[] {"Heure d'Indon\u00e9sie centrale", "WITA", - "Heure d'\u00e9t\u00e9 d'Indon\u00e9sie centrale", "CIST"}; - String CLT[] = new String[] {"Heure du Chili", "CLT", - "Heure d'\u00e9t\u00e9 du Chili", "CLST"}; -@@ -90,7 +88,7 @@ - String CUBA[] = new String[] {"Heure standard de Cuba", "CST", - "Heure d'\u00e9t\u00e9 de Cuba", "CDT"}; - String DARWIN[] = new String[] {"Heure standard d'Australie centrale (Territoire du Nord)", "CST", -- "Heure d'\u00e9t\u00e9 d'Australie centrale (Territoire du Nord)", "CST"}; -+ "Heure d'\u00E9t\u00E9 d'Australie centrale (Territoire du Nord)", "CST"}; - String DUBLIN[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT", - "Heure d'\u00e9t\u00e9 irlandaise", "IST"}; - String EAT[] = new String[] {"Heure d'Afrique de l'Est", "EAT", -@@ -104,9 +102,9 @@ - String EST[] = new String[] {"Heure normale de l'Est", "EST", - "Heure avanc\u00e9e de l'Est", "EDT"}; - String EST_NSW[] = new String[] {"Heure normale de l'Est (Nouvelle-Galles du Sud)", "EST", -- "Heure d'\u00e9t\u00e9 de l'Est (Nouvelle-Galles du Sud)", "EST"}; -- String FET[] = new String[] {"Further-eastern European Time", "FET", -- "Further-eastern European Summer Time", "FEST"}; -+ "Heure d'\u00E9t\u00E9 de l'Est (Nouvelle-Galles du Sud)", "EST"}; -+ String FET[] = new String[] {"Heure d'Europe de l'Est UTC+3", "FET", -+ "Heure d'\u00E9t\u00E9 d'Europe de l'Est UTC+3", "FEST"}; - String GHMT[] = new String[] {"Heure du Ghana", "GMT", - "Heure d'\u00e9t\u00e9 du Ghana", "GHST"}; - String GAMBIER[] = new String[] {"Heure de Gambi", "GAMT", -@@ -159,8 +157,8 @@ - "heure avanc\u00e9e des Pitcairn", "PDT"}; - String PKT[] = new String[] {"Heure du Pakistan", "PKT", - "Heure d'\u00e9t\u00e9 du Pakistan", "PKST"}; -- String PONT[] = new String[] {"Pohnpei Time", "PONT", -- "Pohnpei Summer Time", "PONST"}; -+ String PONT[] = new String[] {"Heure de Pohnpei", "PONT", -+ "Heure d'\u00E9t\u00E9 de Pohnpei", "PONST"}; - String PST[] = new String[] {"Heure normale du Pacifique", "PST", - "Heure avanc\u00e9e du Pacifique", "PDT"}; - String SAMOA[] = new String[] {"Heure standard de Samoa", "SST", -@@ -174,7 +172,7 @@ - String SLST[] = new String[] {"Heure du m\u00e9ridien de Greenwich", "GMT", - "Heure d'\u00e9t\u00e9 de Sierra Leone", "SLST"}; - String TASMANIA[] = new String[] {"Heure standard d'Australie orientale (Tasmanie)", "EST", -- "Heure d'\u00e9t\u00e9 d'Australie orientale (Tasmanie)", "EST"}; -+ "Heure d'\u00E9t\u00E9 d'Australie orientale (Tasmanie)", "EST"}; - String TMT[] = new String[] {"Heure du Turkm\u00e9nistan", "TMT", - "Heure d'\u00e9t\u00e9 du Turkm\u00e9nistan", "TMST"}; - String ULAT[]= new String[] {"Heure de l'Ulaanbaatar", "ULAT", -@@ -184,7 +182,7 @@ - String UZT[] = new String[] {"Heure de l'Ouzb\u00e9kistan", "UZT", - "Heure d'\u00e9t\u00e9 de l'Ouzb\u00e9kistan", "UZST"}; - String VICTORIA[] = new String[] {"Heure standard d'Australie orientale (Victoria)", "EST", -- "Heure d'\u00e9t\u00e9 d'Australie orientale (Victoria)", "EST"}; -+ "Heure d'\u00E9t\u00E9 d'Australie orientale (Victoria)", "EST"}; - String VLAT[] = new String[] {"Heure de Vladivostok", "VLAT", - "Heure d'\u00e9t\u00e9 de Vladivostok", "VLAST"}; - String WART[] = new String[] {"Heure D'Argentine de l'Ouest", "WART", -@@ -193,10 +191,10 @@ - "Heure d'\u00e9t\u00e9 d'Afrique de l'Ouest", "WAST"}; - String WET[] = new String[] {"Heure d'Europe de l'Ouest", "WET", - "Heure d'\u00e9t\u00e9 d'Europe de l'Ouest", "WEST"}; -- String WIT[] = new String[] {"Heure de l'Indon\u00e9sie occidentale", "WIT", -+ String WIT[] = new String[] {"Heure de l'Indon\u00e9sie occidentale", "WIB", - "Heure d'\u00e9t\u00e9 de l'Indon\u00e9sie occidentale", "WIST"}; - String WST_AUS[] = new String[] {"Heure normale de l'Ouest (Australie)", "WST", -- "Heure d'\u00e9t\u00e9 de l'Ouest (Australie)", "WST"}; -+ "Heure d'\u00E9t\u00E9 de l'Ouest (Australie)", "WST"}; - String WST_SAMOA[] = new String[] {"Heure des Samoas occidentales", "WST", - "Heure d'\u00e9t\u00e9 des Samoas occidentales", "WSDT"}; - String YAKT[] = new String[] {"Heure du Iakoutsk", "YAKT", -@@ -308,7 +306,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -401,8 +399,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[] {"Heure normale de Metlakatla", "MeST", -+ "Heure avanc\u00E9e de Metlakatla", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"Heure normale de Saint-Pierre et Miquelon", "PMST", - "Heure avanc\u00e9e de Saint-Pierre et Miquelon", "PMDT"}}, -@@ -466,8 +464,8 @@ - "Heure d'\u00e9t\u00e9 de Davis", "DAVST"}}, - {"Antarctica/DumontDUrville", new String[] {"Heure de Dumont-d'Urville", "DDUT", - "Heure d'\u00e9t\u00e9 de Dumont-d'Urville", "DDUST"}}, -- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", -- "Macquarie Island Summer Time", "MIST"}}, -+ {"Antarctica/Macquarie", new String[] {"Heure de l'Ile Macquarie", "MIST", -+ "Heure d'\u00E9t\u00E9 de l'Ile Macquarie", "MIST"}}, - {"Antarctica/Mawson", new String[] {"Heure de Mawson", "MAWT", - "Heure d'\u00e9t\u00e9 de Mawson", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -483,7 +481,7 @@ - {"Asia/Aden", ARAST}, - {"Asia/Almaty", new String[] {"Heure d'Alma-Ata", "ALMT", - "Heure d'\u00e9t\u00e9 d'Alma-Ata", "ALMST"}}, -- {"Asia/Amman", EET}, -+ {"Asia/Amman", ARAST}, - {"Asia/Anadyr", new String[] {"Heure d'Anadyr", "ANAT", - "Heure d'\u00e9t\u00e9 d'Anadyr", "ANAST"}}, - {"Asia/Aqtau", new String[] {"Heure d'Aqtau", "AQTT", -@@ -527,7 +525,7 @@ - "Heure d'\u00e9t\u00e9 d'Irkutsk", "IRKST"}}, - {"Asia/Istanbul", EET}, - {"Asia/Jakarta", WIT}, -- {"Asia/Jayapura", new String[] {"Heure d'Indon\u00e9sie orientale", "EIT", -+ {"Asia/Jayapura", new String[] {"Heure d'Indon\u00e9sie orientale", "WIT", - "Heure d'\u00e9t\u00e9 d'Indon\u00e9sie orientale", "EIST"}}, - {"Asia/Kabul", new String[] {"Heure d'Afghanistan", "AFT", - "Heure d'\u00e9t\u00e9 d'Afghanistan", "AFST"}}, -@@ -537,7 +535,8 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -- {"Asia/Khandyga", YAKT}, -+ {"Asia/Khandyga", new String[] {"Heure de Khandyga", "YAKT", -+ "Heure d'\u00E9t\u00E9 de Khandyga", "YAKST"}}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"Heure de Krasno\u00efarsk", "KRAT", - "Heure d'\u00e9t\u00e9 de Krasno\u00efarsk", "KRAST"}}, -@@ -586,7 +585,8 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -- {"Asia/Ust-Nera", VLAT}, -+ {"Asia/Ust-Nera", new String[] {"Heure d'Ust-Nera", "VLAT", -+ "Heure d'\u00E9t\u00E9 d'Ust-Nera", "VLAST"}}, - {"Asia/Vientiane", ICT}, - {"Asia/Vladivostok", VLAT}, - {"Asia/Yakutsk", YAKT}, -@@ -617,7 +617,7 @@ - {"Australia/Currie", EST_NSW}, - {"Australia/Darwin", DARWIN}, - {"Australia/Eucla", new String[] {"Heure standard de l'Australie occidentale (centre)", "CWST", -- "Heure d'\u00e9t\u00e9 de l'Australie occidentale (centre)", "CWST"}}, -+ "Heure d'\u00E9t\u00E9 de l'Australie occidentale (centre)", "CWST"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, -diff -r fd7850833158 -r 3d28326a9e5d src/share/classes/sun/util/resources/TimeZoneNames_it.java ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java Thu Oct 24 17:14:18 2013 +0400 -@@ -43,10 +43,8 @@ - public final class TimeZoneNames_it extends TimeZoneNamesBundle { - - protected final Object[][] getContents() { -- String ACT[] = new String[] {"Ora di Acre", "ACT", -- "Ora estiva di Acre", "ACST"}; -- String ADELAIDE[] = new String[] {"Ora centrale standard (Australia del Sud)", "CST", -- "Ora estiva standard (Australia del Sud)", "CST"}; -+ String ADELAIDE[] = new String[] {"Ora standard centrale (Australia del Sud)", "CST", -+ "Ora estiva centrale (Australia del Sud)", "CST"}; - String AGT[] = new String[] {"Ora dell'Argentina", "ART", - "Ora estiva dell'Argentina", "ARST"}; - String AKST[] = new String[] {"Ora solare dell'Alaska", "AKST", -@@ -61,9 +59,9 @@ - "Ora legale dell'Atlantico occidentale", "ADT"}; - String BDT[] = new String[] {"Ora del Bangladesh", "BDT", - "Ora estiva del Bangladesh", "BDST"}; -- String BRISBANE[] = new String[] {"Ora orientale standard (Queensland)", "EST", -+ String BRISBANE[] = new String[] {"Ora standard orientale (Queensland)", "EST", - "Ora estiva orientale (Queensland)", "EST"}; -- String BROKEN_HILL[] = new String[] {"Ora centrale standard (Australia del Sud/Nuovo Galles del Sud)", "CST", -+ String BROKEN_HILL[] = new String[] {"Ora standard centrale (Australia del Sud/Nuovo Galles del Sud)", "CST", - "Ora estiva centrale (Australia del Sud/Nuovo Galles del Sud)", "CST"}; - String BRT[] = new String[] {"Ora del Brasile", "BRT", - "Ora estiva del Brasile", "BRST"}; -@@ -75,11 +73,11 @@ - "Ora estiva dell'Europa centrale", "CEST"}; - String CHAST[] = new String[] {"Ora di Chatham standard", "CHAST", - "Ora legale di Chatham", "CHADT"}; -- String CHUT[] = new String[] {"Chuuk Time", "CHUT", -- "Chuuk Summer Time", "CHUST"}; -+ String CHUT[] = new String[] {"Ora di Chuuk", "CHUT", -+ "Ora estiva di Chuuk", "CHUST"}; - String ChST[] = new String[] {"Ora standard di Chamorro", "ChST", - "Ora legale di Chamorro", "ChDT"}; -- String CIT[] = new String[] {"Ora dell'Indonesia centrale", "CIT", -+ String CIT[] = new String[] {"Ora dell'Indonesia centrale", "WITA", - "Ora estiva dell'Indonesia centrale", "CIST"}; - String CLT[] = new String[] {"Ora del Cile", "CLT", - "Ora estiva del Cile", "CLST"}; -@@ -89,7 +87,7 @@ - "Ora legale della Cina", "CDT"}; - String CUBA[] = new String[] {"Ora solare Cuba", "CST", - "Ora legale Cuba", "CDT"}; -- String DARWIN[] = new String[] {"Ora centrale standard (Territori del Nord)", "CST", -+ String DARWIN[] = new String[] {"Ora standard centrale (Territori del Nord)", "CST", - "Ora estiva centrale (Territori del Nord)", "CST"}; - String DUBLIN[] = new String[] {"Ora media di Greenwich", "GMT", - "Ora estiva irlandese", "IST"}; -@@ -103,10 +101,10 @@ - "Ora estiva della Groenlandia orientale", "EGST"}; - String EST[] = new String[] {"Ora solare USA orientale", "EST", - "Ora legale USA orientale", "EDT"}; -- String EST_NSW[] = new String[] {"Ora solare dell'Australia orientale (Nuovo Galles del Sud)", "EST", -+ String EST_NSW[] = new String[] {"Ora standard dell'Australia orientale (Nuovo Galles del Sud)", "EST", - "Ora estiva dell'Australia orientale (Nuovo Galles del Sud)", "EST"}; -- String FET[] = new String[] {"Further-eastern European Time", "FET", -- "Further-eastern European Summer Time", "FEST"}; -+ String FET[] = new String[] {"Ora dei paesi europei pi\u00F9 orientali", "FET", -+ "Ora estiva dei paesi europei pi\u00F9 orientali", "FEST"}; - String GHMT[] = new String[] {"Ora media del Ghana", "GMT", - "Ora legale del Ghana", "GHST"}; - String GAMBIER[] = new String[] {"Ora di Gambier", "GAMT", -@@ -159,8 +157,8 @@ - "Ora legale di Pitcairn", "PDT"}; - String PKT[] = new String[] {"Ora del Pakistan", "PKT", - "Ora estiva del Pakistan", "PKST"}; -- String PONT[] = new String[] {"Pohnpei Time", "PONT", -- "Pohnpei Summer Time", "PONST"}; -+ String PONT[] = new String[] {"Ora di Pohnpei", "PONT", -+ "Ora estiva di Pohnpei", "PONST"}; - String PST[] = new String[] {"Ora solare della costa occidentale USA", "PST", - "Ora legale della costa occidentale USA", "PDT"}; - String SAMOA[] = new String[] {"Ora standard di Samoa", "SST", -@@ -173,7 +171,7 @@ - "Ora estiva di Singapore", "SGST"}; - String SLST[] = new String[] {"Ora media di Greenwich", "GMT", - "Ora legale della Sierra Leone", "SLST"}; -- String TASMANIA[] = new String[] {"Ora orientale standard (Tasmania)", "EST", -+ String TASMANIA[] = new String[] {"Ora standard orientale (Tasmania)", "EST", - "Ora estiva orientale (Tasmania)", "EST"}; - String TMT[] = new String[] {"Ora del Turkmenistan", "TMT", - "Ora estiva del Turkmenistan", "TMST"}; -@@ -183,7 +181,7 @@ - "Tempo universale coordinato", "UTC"}; - String UZT[] = new String[] {"Ora dell'Uzbekistan", "UZT", - "Ora estiva dell'Uzbekistan", "UZST"}; -- String VICTORIA[] = new String[] {"Ora orientale standard (Victoria)", "EST", -+ String VICTORIA[] = new String[] {"Ora standard orientale (Victoria)", "EST", - "Ora estiva orientale (Victoria)", "EST"}; - String VLAT[] = new String[] {"Ora di Vladivostok", "VLAT", - "Ora estiva di Vladivostok", "VLAST"}; -@@ -193,9 +191,9 @@ - "Ora estiva dell'Africa occidentale", "WAST"}; - String WET[] = new String[] {"Ora dell'Europa occidentale", "WET", - "Ora estiva dell'Europa occidentale", "WEST"}; -- String WIT[] = new String[] {"Ora dell'Indonesia occidentale", "WIT", -+ String WIT[] = new String[] {"Ora dell'Indonesia occidentale", "WIB", - "Ora estiva dell'Indonesia occidentale", "WIST"}; -- String WST_AUS[] = new String[] {"Ora solare dell'Australia occidentale", "WST", -+ String WST_AUS[] = new String[] {"Ora standard dell'Australia occidentale", "WST", - "Ora estiva dell'Australia occidentale", "WST"}; - String WST_SAMOA[] = new String[] {"Ora di Samoa", "WST", - "Ora estiva di Samoa", "WSDT"}; -@@ -308,7 +306,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -401,8 +399,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[] {"Ora standard di Metlakatla", "MeST", -+ "Ora legale di Metlakatla", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"Ora solare di Saint-Pierre e Miquelon", "PMST", - "Ora legale di Saint-Pierre e Miquelon", "PMDT"}}, -@@ -466,8 +464,8 @@ - "Ora estiva di Davis", "DAVST"}}, - {"Antarctica/DumontDUrville", new String[] {"Ora di Dumont-d'Urville", "DDUT", - "Ora estiva di Dumont-d'Urville", "DDUST"}}, -- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", -- "Macquarie Island Summer Time", "MIST"}}, -+ {"Antarctica/Macquarie", new String[] {"Ora dell'Isola Macquarie", "MIST", -+ "Ora estiva dell'Isola Macquarie", "MIST"}}, - {"Antarctica/Mawson", new String[] {"Ora di Mawson", "MAWT", - "Ora estiva di Mawson", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -483,7 +481,7 @@ - {"Asia/Aden", ARAST}, - {"Asia/Almaty", new String[] {"Ora di Alma-Ata", "ALMT", - "Ora estiva di Alma-Ata", "ALMST"}}, -- {"Asia/Amman", EET}, -+ {"Asia/Amman", ARAST}, - {"Asia/Anadyr", new String[] {"Ora di Anadyr", "ANAT", - "Ora estiva di Anadyr", "ANAST"}}, - {"Asia/Aqtau", new String[] {"Ora di Aqtau", "AQTT", -@@ -527,7 +525,7 @@ - "Ora estiva di Irkutsk", "IRKST"}}, - {"Asia/Istanbul", EET}, - {"Asia/Jakarta", WIT}, -- {"Asia/Jayapura", new String[] {"Ora dell'Indonesia orientale", "EIT", -+ {"Asia/Jayapura", new String[] {"Ora dell'Indonesia orientale", "WIT", - "Ora estiva dell'Indonesia orientale", "EIST"}}, - {"Asia/Kabul", new String[] {"Ora dell'Afghanistan", "AFT", - "Ora estiva dell'Afghanistan", "AFST"}}, -@@ -537,7 +535,8 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -- {"Asia/Khandyga", YAKT}, -+ {"Asia/Khandyga", new String[] {"Ora di Khandyga", "YAKT", -+ "Ora estiva di Khandyga", "YAKST"}}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"Ora di Krasnojarsk", "KRAT", - "Ora estiva di Krasnojarsk", "KRAST"}}, -@@ -586,7 +585,8 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -- {"Asia/Ust-Nera", VLAT}, -+ {"Asia/Ust-Nera", new String[] {"Ora di Ust-Nera", "VLAT", -+ "Ora estiva di Ust-Nera", "VLAST"}}, - {"Asia/Vientiane", ICT}, - {"Asia/Vladivostok", VLAT}, - {"Asia/Yakutsk", YAKT}, -@@ -616,8 +616,8 @@ - {"Australia/Canberra", EST_NSW}, - {"Australia/Currie", EST_NSW}, - {"Australia/Darwin", DARWIN}, -- {"Australia/Eucla", new String[] {"Ora solare Australia centrorientale", "CWST", -- "Ora estiva Australia centrorientale", "CWST"}}, -+ {"Australia/Eucla", new String[] {"Ora standard Australia centro-occidentale", "CWST", -+ "Ora estiva Australia centro-occidentale", "CWST"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, -diff -r fd7850833158 -r 3d28326a9e5d src/share/classes/sun/util/resources/TimeZoneNames_ja.java ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Thu Oct 24 17:14:18 2013 +0400 -@@ -43,10 +43,8 @@ - public final class TimeZoneNames_ja extends TimeZoneNamesBundle { - - protected final Object[][] getContents() { -- String ACT[] = new String[] {"\u30a2\u30af\u30ec\u6642\u9593", "ACT", -- "\u30a2\u30af\u30ec\u590f\u6642\u9593", "ACST"}; -- String ADELAIDE[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CST", -- "\u4e2d\u90e8\u590f\u6642\u9593 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CST"}; -+ String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CST", -+ "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CST"}; - String AGT[] = new String[] {"\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "ART", - "\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u590f\u6642\u9593", "ARST"}; - String AKST[] = new String[] {"\u30a2\u30e9\u30b9\u30ab\u6a19\u6e96\u6642", "AKST", -@@ -61,10 +59,10 @@ - "\u5927\u897f\u6d0b\u590f\u6642\u9593", "ADT"}; - String BDT[] = new String[] {"\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5\u6642\u9593", "BDT", - "\u30d0\u30f3\u30b0\u30e9\u30c7\u30b7\u30e5\u590f\u6642\u9593", "BDST"}; -- String BRISBANE[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30af\u30a4\u30fc\u30f3\u30ba\u30e9\u30f3\u30c9)", "EST", -- "\u6771\u90e8\u590f\u6642\u9593 (\u30af\u30a4\u30fc\u30f3\u30ba\u30e9\u30f3\u30c9)", "EST"}; -- String BROKEN_HILL[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2/\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "CST", -- "\u4e2d\u90e8\u590f\u6642\u9593 (\u5357\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2/\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "CST"}; -+ String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "EST", -+ "\u6771\u90E8\u590F\u6642\u9593(\u30AF\u30A4\u30FC\u30F3\u30BA\u30E9\u30F3\u30C9)", "EST"}; -+ String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "CST", -+ "\u4E2D\u90E8\u590F\u6642\u9593(\u5357\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2/\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "CST"}; - String BRT[] = new String[] {"\u30d6\u30e9\u30b8\u30eb\u6642\u9593", "BRT", - "\u30d6\u30e9\u30b8\u30eb\u590f\u6642\u9593", "BRST"}; - String BTT[] = new String[] {"\u30d6\u30fc\u30bf\u30f3\u6642\u9593", "BTT", -@@ -77,9 +75,9 @@ - "\u30c1\u30e3\u30bf\u30e0\u590f\u6642\u9593", "CHADT"}; - String ChST[] = new String[] {"\u30b0\u30a2\u30e0\u6a19\u6e96\u6642", "ChST", - "\u30b0\u30a2\u30e0\u590f\u6642\u9593", "ChDT"}; -- String CHUT[] = new String[] {"Chuuk Time", "CHUT", -- "Chuuk Summer Time", "CHUST"}; -- String CIT[] = new String[] {"\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "CIT", -+ String CHUT[] = new String[] {"\u30C1\u30E5\u30FC\u30AF\u6642\u9593", "CHUT", -+ "Chuuk Time", "CHUST"}; -+ String CIT[] = new String[] {"\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WITA", - "\u4e2d\u592e\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "CIST"}; - String CLT[] = new String[] {"\u30c1\u30ea\u6642\u9593", "CLT", - "\u30c1\u30ea\u590f\u6642\u9593", "CLST"}; -@@ -89,8 +87,8 @@ - "\u4e2d\u56fd\u590f\u6642\u9593", "CDT"}; - String CUBA[] = new String[] {"\u30ad\u30e5\u30fc\u30d0\u6a19\u6e96\u6642", "CST", - "\u30ad\u30e5\u30fc\u30d0\u590f\u6642\u9593", "CDT"}; -- String DARWIN[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642 (\u30ce\u30fc\u30b6\u30f3\u30c6\u30ea\u30c8\u30ea\u30fc)", "CST", -- "\u4e2d\u90e8\u590f\u6642\u9593 (\u30ce\u30fc\u30b6\u30f3\u30c6\u30ea\u30c8\u30ea\u30fc)", "CST"}; -+ String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "CST", -+ "\u4E2D\u90E8\u590F\u6642\u9593(\u30CE\u30FC\u30B6\u30F3\u30C6\u30EA\u30C8\u30EA\u30FC)", "CST"}; - String DUBLIN[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT", - "\u30a2\u30a4\u30eb\u30e9\u30f3\u30c9\u590f\u6642\u9593", "IST"}; - String EAT[] = new String[] {"\u6771\u30a2\u30d5\u30ea\u30ab\u6642\u9593", "EAT", -@@ -103,10 +101,10 @@ - "\u6771\u30b0\u30ea\u30fc\u30f3\u30e9\u30f3\u30c9\u590f\u6642\u9593", "EGST"}; - String EST[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642", "EST", - "\u6771\u90e8\u590f\u6642\u9593", "EDT"}; -- String EST_NSW[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "EST", -- "\u6771\u90e8\u590f\u6642\u9593 (\u30cb\u30e5\u30fc\u30b5\u30a6\u30b9\u30a6\u30a7\u30fc\u30eb\u30ba)", "EST"}; -- String FET[] = new String[] {"Further-eastern European Time", "FET", -- "Further-eastern European Summer Time", "FEST"}; -+ String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "EST", -+ "\u6771\u90E8\u590F\u6642\u9593(\u30CB\u30E5\u30FC\u30B5\u30A6\u30B9\u30A6\u30A7\u30FC\u30EB\u30BA)", "EST"}; -+ String FET[] = new String[] {"\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u6642\u9593", "FET", -+ "\u6975\u6771\u30E8\u30FC\u30ED\u30C3\u30D1\u590F\u6642\u9593", "FEST"}; - String GHMT[] = new String[] {"\u30ac\u30fc\u30ca\u6a19\u6e96\u6642", "GMT", - "\u30ac\u30fc\u30ca\u590f\u6642\u9593", "GHST"}; - String GAMBIER[] = new String[] {"\u30ac\u30f3\u30d3\u30a2\u6642\u9593", "GAMT", -@@ -159,8 +157,8 @@ - "\u30d4\u30c8\u30b1\u30eb\u30f3\u5cf6\u590f\u6642\u9593", "PDT"}; - String PKT[] = new String[] {"\u30d1\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "PKT", - "\u30d1\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "PKST"}; -- String PONT[] = new String[] {"Pohnpei Time", "PONT", -- "Pohnpei Summer Time", "PONST"}; -+ String PONT[] = new String[] {"\u30DD\u30F3\u30DA\u30A4\u6642\u9593", "PONT", -+ "\u30DD\u30F3\u30DA\u30A4\u590F\u6642\u9593", "PONST"}; - String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642", "PST", - "\u592a\u5e73\u6d0b\u590f\u6642\u9593", "PDT"}; - String SAMOA[] = new String[] {"\u30b5\u30e2\u30a2\u6a19\u6e96\u6642", "SST", -@@ -173,8 +171,8 @@ - "\u30b7\u30f3\u30ac\u30dd\u30fc\u30eb\u590f\u6642\u9593", "SGST"}; - String SLST[] = new String[] {"\u30b0\u30ea\u30cb\u30c3\u30b8\u6a19\u6e96\u6642", "GMT", - "\u30b7\u30a8\u30e9\u30ec\u30aa\u30cd\u590f\u6642\u9593", "SLST"}; -- String TASMANIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30bf\u30b9\u30de\u30cb\u30a2)", "EST", -- "\u6771\u90e8\u590f\u6642\u9593 (\u30bf\u30b9\u30de\u30cb\u30a2)", "EST"}; -+ String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30BF\u30B9\u30DE\u30CB\u30A2)", "EST", -+ "\u6771\u90E8\u590F\u6642\u9593(\u30BF\u30B9\u30DE\u30CB\u30A2)", "EST"}; - String TMT[] = new String[] {"\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u6642\u9593", "TMT", - "\u30c8\u30eb\u30af\u30e1\u30cb\u30b9\u30bf\u30f3\u590f\u6642\u9593", "TMST"}; - String ULAT[]= new String[] {"\u30a6\u30e9\u30fc\u30f3\u30d0\u30fc\u30c8\u30eb\u6642\u9593", "ULAT", -@@ -183,8 +181,8 @@ - "\u5354\u5b9a\u4e16\u754c\u6642", "UTC"}; - String UZT[] = new String[] {"\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u6642\u9593", "UZT", - "\u30a6\u30ba\u30d9\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "UZST"}; -- String VICTORIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642 (\u30d3\u30af\u30c8\u30ea\u30a2)", "EST", -- "\u6771\u90e8\u590f\u6642\u9593 (\u30d3\u30af\u30c8\u30ea\u30a2)", "EST"}; -+ String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642(\u30D3\u30AF\u30C8\u30EA\u30A2)", "EST", -+ "\u6771\u90E8\u590F\u6642\u9593(\u30D3\u30AF\u30C8\u30EA\u30A2)", "EST"}; - String VLAT[] = new String[] {"\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u6642\u9593", "VLAT", - "\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u590f\u6642\u9593", "VLAST"}; - String WART[] = new String[] {"\u897f\u30a2\u30eb\u30bc\u30f3\u30c1\u30f3\u6642\u9593", "WART", -@@ -193,10 +191,10 @@ - "\u897f\u30a2\u30d5\u30ea\u30ab\u590f\u6642\u9593", "WAST"}; - String WET[] = new String[] {"\u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u6642\u9593", "WET", - "\u897f\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "WEST"}; -- String WIT[] = new String[] {"\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIT", -+ String WIT[] = new String[] {"\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIB", - "\u897f\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "WIST"}; -- String WST_AUS[] = new String[] {"\u897f\u90e8\u6a19\u6e96\u6642 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "WST", -- "\u897f\u90e8\u590f\u6642\u9593 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "WST"}; -+ String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "WST", -+ "\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "WST"}; - String WST_SAMOA[] = new String[] {"\u897f\u30b5\u30e2\u30a2\u6642\u9593", "WST", - "\u897f\u30b5\u30e2\u30a2\u590f\u6642\u9593", "WSDT"}; - String YAKT[] = new String[] {"\u30e4\u30af\u30fc\u30c4\u30af\u6642\u9593", "YAKT", -@@ -308,7 +306,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -401,8 +399,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[] {"\u30E1\u30C8\u30E9\u30AB\u30C8\u30E9\u6A19\u6E96\u6642\u9593", "MeST", -+ "\u30E1\u30C8\u30E9\u30AB\u30C8\u30E9\u590F\u6642\u9593", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u6a19\u6e96\u6642", "PMST", - "\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u590f\u6642\u9593", "PMDT"}}, -@@ -466,8 +464,8 @@ - "\u30c7\u30a4\u30d3\u30b9\u590f\u6642\u9593", "DAVST"}}, - {"Antarctica/DumontDUrville", new String[] {"\u30c7\u30e5\u30e2\u30f3\u30c7\u30e5\u30eb\u30f4\u30a3\u30eb\u6642\u9593", "DDUT", - "\u30c7\u30e5\u30e2\u30f3\u30c7\u30e5\u30eb\u30f4\u30a3\u30eb\u590f\u6642\u9593", "DDUST"}}, -- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", -- "Macquarie Island Summer Time", "MIST"}}, -+ {"Antarctica/Macquarie", new String[] {"\u30DE\u30C3\u30B3\u30FC\u30EA\u30FC\u5CF6\u6642\u9593", "MIST", -+ "\u30DE\u30C3\u30B3\u30FC\u30EA\u30FC\u5CF6\u590F\u6642\u9593", "MIST"}}, - {"Antarctica/Mawson", new String[] {"\u30e2\u30fc\u30bd\u30f3\u6642\u9593", "MAWT", - "\u30e2\u30fc\u30bd\u30f3\u590f\u6642\u9593", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -483,7 +481,7 @@ - {"Asia/Aden", ARAST}, - {"Asia/Almaty", new String[] {"\u30a2\u30eb\u30de\u30a2\u30bf\u6642\u9593", "ALMT", - "\u30a2\u30eb\u30de\u30a2\u30bf\u590f\u6642\u9593", "ALMST"}}, -- {"Asia/Amman", EET}, -+ {"Asia/Amman", ARAST}, - {"Asia/Anadyr", new String[] {"\u30a2\u30ca\u30c9\u30a5\u30a4\u30ea\u6642\u9593", "ANAT", - "\u30a2\u30ca\u30c9\u30a5\u30a4\u30ea\u590f\u6642\u9593", "ANAST"}}, - {"Asia/Aqtau", new String[] {"\u30a2\u30af\u30bf\u30a6\u6642\u9593", "AQTT", -@@ -527,7 +525,7 @@ - "\u30a4\u30eb\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "IRKST"}}, - {"Asia/Istanbul", EET}, - {"Asia/Jakarta", WIT}, -- {"Asia/Jayapura", new String[] {"\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "EIT", -+ {"Asia/Jayapura", new String[] {"\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u6642\u9593", "WIT", - "\u6771\u30a4\u30f3\u30c9\u30cd\u30b7\u30a2\u590f\u6642\u9593", "EIST" }}, - {"Asia/Kabul", new String[] {"\u30a2\u30d5\u30ac\u30cb\u30b9\u30bf\u30f3\u6642\u9593", "AFT", - "\u30a2\u30d5\u30ac\u30cb\u30b9\u30bf\u30f3\u590f\u6642\u9593", "AFST"}}, -@@ -537,7 +535,8 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -- {"Asia/Khandyga", YAKT}, -+ {"Asia/Khandyga", new String[] {"\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u6642\u9593", "YAKT", -+ "\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u590F\u6642\u9593", "YAKST"}}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u6642\u9593", "KRAT", - "\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u590f\u6642\u9593", "KRAST"}}, -@@ -586,7 +585,8 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -- {"Asia/Ust-Nera", VLAT}, -+ {"Asia/Ust-Nera", new String[] {"\u30A6\u30B9\u30C1\u30CD\u30E9\u6642\u9593", "VLAT", -+ "\u30A6\u30B9\u30C1\u30CD\u30E9\u590F\u6642\u9593", "VLAST"}}, - {"Asia/Vientiane", ICT}, - {"Asia/Vladivostok", VLAT}, - {"Asia/Yakutsk", YAKT}, -@@ -616,8 +616,8 @@ - {"Australia/Canberra", EST_NSW}, - {"Australia/Currie", EST_NSW}, - {"Australia/Darwin", DARWIN}, -- {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6a19\u6e96\u6642 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CWST", -- "\u4e2d\u897f\u90e8\u590f\u6642\u9593 (\u30aa\u30fc\u30b9\u30c8\u30e9\u30ea\u30a2)", "CWST"}}, -+ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CWST", -+ "\u4E2D\u897F\u90E8\u590F\u6642\u9593(\u30AA\u30FC\u30B9\u30C8\u30E9\u30EA\u30A2)", "CWST"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, -diff -r fd7850833158 -r 3d28326a9e5d src/share/classes/sun/util/resources/TimeZoneNames_ko.java ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Thu Oct 24 17:14:18 2013 +0400 -@@ -43,10 +43,8 @@ - public final class TimeZoneNames_ko extends TimeZoneNamesBundle { - - protected final Object[][] getContents() { -- String ACT[] = new String[] {"\uc5d0\uc774\ucee4 \uc2dc\uac04", "ACT", -- "\uc5d0\uc774\ucee4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ACST"}; -- String ADELAIDE[] = new String[] {"\uc911\ubd80 \ud45c\uc900\uc2dc(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CST", -- "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CST"}; -+ String ADELAIDE[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CST", -+ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CST"}; - String AGT[] = new String[] {"\uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "ART", - "\uc544\ub974\ud5e8\ud2f0\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ARST"}; - String AKST[] = new String[] {"\uc54c\ub798\uc2a4\uce74 \ud45c\uc900\uc2dc", "AKST", -@@ -61,10 +59,10 @@ - "\ub300\uc11c\uc591 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ADT"}; - String BDT[] = new String[] {"\ubc29\uae00\ub77c\ub370\uc2dc \uc2dc\uac04", "BDT", - "\ubc29\uae00\ub77c\ub370\uc2dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BDST"}; -- String BRISBANE[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ud038\uc990\ub79c\ub4dc)", "EST", -- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ud038\uc990\ub79c\ub4dc)", "EST"}; -- String BROKEN_HILL[] = new String[] {"\uc911\ubd80 \ud45c\uc900\uc2dc(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544/\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "CST", -- "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\uc0ac\uc6b0\uc2a4 \uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544/\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "CST"}; -+ String BRISBANE[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD038\uC990\uB79C\uB4DC)", "EST", -+ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD038\uC990\uB79C\uB4DC)", "EST"}; -+ String BROKEN_HILL[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "CST", -+ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB0A8\uBD80 \uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544/\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "CST"}; - String BRT[] = new String[] {"\ube0c\ub77c\uc9c8\ub9ac\uc544 \uc2dc\uac04", "BRT", - "\ube0c\ub77c\uc9c8\ub9ac\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BRST"}; - String BTT[] = new String[] {"\ubd80\ud0c4 \uc2dc\uac04", "BTT", -@@ -77,9 +75,9 @@ - "Chatham \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CHADT"}; - String ChST[] = new String[] {"\ucc28\ubaa8\ub85c \ud45c\uc900\uc2dc", "ChST", - "\ucc28\ubaa8\ub85c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ChDT"}; -- String CHUT[] = new String[] {"Chuuk Time", "CHUT", -- "Chuuk Summer Time", "CHUST"}; -- String CIT[] = new String[] {"\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "CIT", -+ String CHUT[] = new String[] {"\uCD94\uD06C \uD45C\uC900\uC2DC", "CHUT", -+ "\uCD94\uD06C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "CHUST"}; -+ String CIT[] = new String[] {"\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WITA", - "\uc911\uc559 \uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CIST"}; - String CLT[] = new String[] {"\uce60\ub808 \uc2dc\uac04", "CLT", - "\uce60\ub808 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CLST"}; -@@ -89,8 +87,8 @@ - "\uc911\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"}; - String CUBA[] = new String[] {"\ucfe0\ubc14 \ud45c\uc900\uc2dc", "CST", - "\ucfe0\ubc14 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CDT"}; -- String DARWIN[] = new String[] {"\uc911\ubd80 \ud45c\uc900\uc2dc(\ub178\ub358 \uc9c0\uc5ed)", "CST", -- "\uc911\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ub178\ub358 \uc9c0\uc5ed)", "CST"}; -+ String DARWIN[] = new String[] {"\uC911\uBD80 \uD45C\uC900\uC2DC(\uBD81\uBD80 \uC9C0\uC5ED)", "CST", -+ "\uC911\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBD81\uBD80 \uC9C0\uC5ED)", "CST"}; - String DUBLIN[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT", - "\uc544\uc77c\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IST"}; - String EAT[] = new String[] {"\ub3d9\ubd80 \uc544\ud504\ub9ac\uce74 \uc2dc\uac04", "EAT", -@@ -103,10 +101,10 @@ - "\ub3d9\ubd80 \uadf8\ub9b0\ub79c\ub4dc \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EGST"}; - String EST[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc", "EST", - "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EDT"}; -- String EST_NSW[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "EST", -- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ub274 \uc0ac\uc6b0\uc2a4 \uc6e8\uc77c\uc988)", "EST"}; -- String FET[] = new String[] {"Further-eastern European Time", "FET", -- "Further-eastern European Summer Time", "FEST"}; -+ String EST_NSW[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "EST", -+ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uB274\uC0AC\uC6B0\uC2A4\uC6E8\uC77C\uC988)", "EST"}; -+ String FET[] = new String[] {"\uADF9\uB3D9 \uC720\uB7FD \uD45C\uC900\uC2DC", "FET", -+ "\uADF9\uB3D9 \uC720\uB7FD \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "FEST"}; - String GHMT[] = new String[] {"\uac00\ub098 \ud45c\uc900\uc2dc", "GMT", - "\uac00\ub098 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "GHST"}; - String GAMBIER[] = new String[] {"\uac10\ube44\uc544 \uc2dc\uac04", "GAMT", -@@ -159,8 +157,8 @@ - "Pitcairn \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PDT"}; - String PKT[] = new String[] {"\ud30c\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "PKT", - "\ud30c\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PKST"}; -- String PONT[] = new String[] {"Pohnpei Time", "PONT", -- "Pohnpei Summer Time", "PONST"}; -+ String PONT[] = new String[] {"\uD3F0\uD398\uC774 \uD45C\uC900\uC2DC", "PONT", -+ "\uD3F0\uD398\uC774 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "PONST"}; - String PST[] = new String[] {"\ud0dc\ud3c9\uc591 \ud45c\uc900\uc2dc", "PST", - "\ud0dc\ud3c9\uc591 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PDT"}; - String SAMOA[] = new String[] {"\uc0ac\ubaa8\uc544 \ud45c\uc900\uc2dc", "SST", -@@ -173,8 +171,8 @@ - "\uc2f1\uac00\ud3ec\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SGST"}; - String SLST[] = new String[] {"\uadf8\ub9ac\ub2c8\uce58 \ud45c\uc900\uc2dc", "GMT", - "\uc2dc\uc5d0\ub77c\ub9ac\uc628 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SLST"}; -- String TASMANIA[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ud0dc\uc988\uba54\uc774\ub2c8\uc544)", "EST", -- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ud0dc\uc988\uba54\uc774\ub2c8\uc544)", "EST"}; -+ String TASMANIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "EST", -+ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uD0DC\uC988\uBA54\uC774\uB2C8\uC544)", "EST"}; - String TMT[] = new String[] {"\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc2dc\uac04", "TMT", - "\ud22c\ub974\ud06c\uba54\ub2c8\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TMST"}; - String ULAT[]= new String[] {"\uc6b8\ub780\ubc14\ud0c0\ub974 \uc2dc\uac04", "ULAT", -@@ -183,8 +181,8 @@ - "\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC"}; - String UZT[] = new String[] {"\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc2dc\uac04", "UZT", - "\uc6b0\uc988\ubca0\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "UZST"}; -- String VICTORIA[] = new String[] {"\ub3d9\ubd80 \ud45c\uc900\uc2dc(\ube45\ud1a0\ub9ac\uc544)", "EST", -- "\ub3d9\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ube45\ud1a0\ub9ac\uc544)", "EST"}; -+ String VICTORIA[] = new String[] {"\uB3D9\uBD80 \uD45C\uC900\uC2DC(\uBE45\uD1A0\uB9AC\uC544)", "EST", -+ "\uB3D9\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uBE45\uD1A0\uB9AC\uC544)", "EST"}; - String VLAT[] = new String[] {"\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc2dc\uac04", "VLAT", - "\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VLAST"}; - String WART[] = new String[] {"\uc11c\ubd80 \uc544\ub974\ud5e8\ud2f0\ub098 \uc2dc\uac04", "WART", -@@ -193,10 +191,10 @@ - "\uc11c\ubd80 \uc544\ud504\ub9ac\uce74 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WAST"}; - String WET[] = new String[] {"\uc11c\uc720\ub7fd \uc2dc\uac04", "WET", - "\uc11c\uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WEST"}; -- String WIT[] = new String[] {"\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIT", -+ String WIT[] = new String[] {"\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIB", - "\uc11c\uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WIST"}; -- String WST_AUS[] = new String[] {"\uc11c\ubd80 \ud45c\uc900\uc2dc(\ud638\uc8fc)", "WST", -- "\uc11c\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\ud638\uc8fc)", "WST"}; -+ String WST_AUS[] = new String[] {"\uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "WST", -+ "\uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "WST"}; - String WST_SAMOA[] = new String[] {"\uc11c\uc0ac\ubaa8\uc544 \uc2dc\uac04", "WST", - "\uc11c\uc0ac\ubaa8\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "WSDT"}; - String YAKT[] = new String[] {"\uc57c\uce20\ud06c \uc2dc\uac04", "YAKT", -@@ -308,7 +306,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -401,8 +399,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[] {"\uBA54\uD2B8\uB77C\uCE74\uD2B8\uB77C \uD45C\uC900\uC2DC", "MeST", -+ "\uBA54\uD2B8\uB77C\uCE74\uD2B8\uB77C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \ud45c\uc900\uc2dc", "PMST", - "\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PMDT"}}, -@@ -466,8 +464,8 @@ - "Davis \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "DAVST"}}, - {"Antarctica/DumontDUrville", new String[] {"\ub4a4\ubabd \ub4a4\ub974\ube4c \uc2dc\uac04", "DDUT", - "\ub4a4\ubabd \ub4a4\ub974\ube4c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "DDUST"}}, -- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", -- "Macquarie Island Summer Time", "MIST"}}, -+ {"Antarctica/Macquarie", new String[] {"\uB9E4\uCF70\uB9AC \uC12C \uD45C\uC900\uC2DC", "MIST", -+ "\uB9E4\uCF70\uB9AC \uC12C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "MIST"}}, - {"Antarctica/Mawson", new String[] {"\ubaa8\uc2a8 \uc2dc\uac04", "MAWT", - "\ubaa8\uc2a8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -483,7 +481,7 @@ - {"Asia/Aden", ARAST}, - {"Asia/Almaty", new String[] {"\uc54c\ub9c8\uc544\ud0c0 \uc2dc\uac04", "ALMT", - "\uc54c\ub9c8\uc544\ud0c0 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ALMST"}}, -- {"Asia/Amman", EET}, -+ {"Asia/Amman", ARAST}, - {"Asia/Anadyr", new String[] {"\uc544\ub098\ub514\ub974 \uc2dc\uac04", "ANAT", - "\uc544\ub098\ub514\ub974 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "ANAST"}}, - {"Asia/Aqtau", new String[] {"\uc545\ud0c0\uc6b0 \uc2dc\uac04", "AQTT", -@@ -527,7 +525,7 @@ - "\uc774\ub974\ucfe0\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "IRKST"}}, - {"Asia/Istanbul", EET}, - {"Asia/Jakarta", WIT}, -- {"Asia/Jayapura", new String[] {"\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "EIT", -+ {"Asia/Jayapura", new String[] {"\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc2dc\uac04", "WIT", - "\ub3d9\ubd80 \uc778\ub3c4\ub124\uc2dc\uc544 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "EIST"}}, - {"Asia/Kabul", new String[] {"\uc544\ud504\uac00\ub2c8\uc2a4\ud0c4 \uc2dc\uac04", "AFT", - "\uc544\ud504\uac00\ub2c8\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "AFST"}}, -@@ -537,7 +535,8 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -- {"Asia/Khandyga", YAKT}, -+ {"Asia/Khandyga", new String[] {"\uD55C\uB514\uAC00 \uD45C\uC900\uC2DC", "YAKT", -+ "\uD55C\uB514\uAC00 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "YAKST"}}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc2dc\uac04", "KRAT", - "\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KRAST"}}, -@@ -586,7 +585,8 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -- {"Asia/Ust-Nera", VLAT}, -+ {"Asia/Ust-Nera", new String[] {"\uC6B0\uC2A4\uD2F0\uB124\uB77C \uD45C\uC900\uC2DC", "VLAT", -+ "\uC6B0\uC2A4\uD2F0\uB124\uB77C \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "VLAST"}}, - {"Asia/Vientiane", ICT}, - {"Asia/Vladivostok", VLAT}, - {"Asia/Yakutsk", YAKT}, -@@ -616,8 +616,8 @@ - {"Australia/Canberra", EST_NSW}, - {"Australia/Currie", EST_NSW}, - {"Australia/Darwin", DARWIN}, -- {"Australia/Eucla", new String[] {"\uc911\uc11c\ubd80 \ud45c\uc900\uc2dc(\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CWST", -- "\uc911\uc11c\ubd80 \uc77c\uad11\uc808\uc57d\uc2dc\uac04(\uc624\uc2a4\ud2b8\ub808\uc77c\ub9ac\uc544)", "CWST"}}, -+ {"Australia/Eucla", new String[] {"\uC911\uC559 \uC11C\uBD80 \uD45C\uC900\uC2DC(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CWST", -+ "\uC911\uC559 \uC11C\uBD80 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04(\uC624\uC2A4\uD2B8\uB808\uC77C\uB9AC\uC544)", "CWST"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, -diff -r fd7850833158 -r 3d28326a9e5d src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java Thu Oct 24 17:14:18 2013 +0400 -@@ -43,10 +43,8 @@ - public final class TimeZoneNames_pt_BR extends TimeZoneNamesBundle { - - protected final Object[][] getContents() { -- String ACT[] = new String[] {"Fuso hor\u00e1rio do Acre", "ACT", -- "Fuso hor\u00e1rio de ver\u00e3o do Acre", "ACST"}; -- String ADELAIDE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Austr\u00e1lia do Sul)", "CST", -- "Fuso hor\u00e1rio de ver\u00e3o central (Austr\u00e1lia do Sul)", "CST"}; -+ String ADELAIDE[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Austr\u00E1lia do Sul)", "CST", -+ "Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul)", "CST"}; - String AGT[] = new String[] {"Fuso hor\u00e1rio da Argentina", "ART", - "Fuso hor\u00e1rio de ver\u00e3o da Argentina", "ARST"}; - String AKST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Alaska", "AKST", -@@ -61,10 +59,10 @@ - "Hor\u00e1rio de luz natural do Atl\u00e2ntico", "ADT"}; - String BDT[] = new String[] {"Fuso hor\u00e1rio de Bangladesh", "BDT", - "Fuso hor\u00e1rio de ver\u00e3o de Bangladesh", "BDST"}; -- String BRISBANE[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Queensland)", "EST", -- "Fuso hor\u00e1rio de ver\u00e3o oriental (Queensland)", "EST"}; -- String BROKEN_HILL[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Austr\u00e1lia do Sul/Nova Gales do Sul)", "CST", -- "Fuso hor\u00e1rio de ver\u00e3o central (Austr\u00e1lia do Sul/Nova Gales do Sul)", "CST"}; -+ String BRISBANE[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Queensland)", "EST", -+ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Queensland)", "EST"}; -+ String BROKEN_HILL[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "CST", -+ "Fuso Hor\u00E1rio de Ver\u00E3o Central (Austr\u00E1lia do Sul/Nova Gales do Sul)", "CST"}; - String BRT[] = new String[] {"Fuso hor\u00e1rio de Bras\u00edlia", "BRT", - "Fuso hor\u00e1rio de ver\u00e3o de Bras\u00edlia", "BRST"}; - String BTT[] = new String[] {"Fuso hor\u00e1rio de But\u00e3o", "BTT", -@@ -77,7 +75,7 @@ - "Hor\u00e1rio de luz natural de Chatham", "CHADT"}; - String ChST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Chamorro", "ChST", - "Hor\u00e1rio de luz natural de Chamorro", "ChDT"}; -- String CIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Central", "CIT", -+ String CIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Central", "WITA", - "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Central", "CIST"}; - String CLT[] = new String[] {"Fuso hor\u00e1rio do Chile", "CLT", - "Fuso hor\u00e1rio de ver\u00e3o do Chile", "CLST"}; -@@ -87,8 +85,8 @@ - "Hor\u00e1rio de luz natural da China", "CDT"}; - String CUBA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Cuba", "CST", - "Hor\u00e1rio de luz natural de Cuba", "CDT"}; -- String DARWIN[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o central (Territ\u00f3rio do Norte)", "CST", -- "Fuso hor\u00e1rio de ver\u00e3o central (Territ\u00f3rio do Norte)", "CST"}; -+ String DARWIN[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Central (Territ\u00F3rio do Norte)", "CST", -+ "Fuso Hor\u00E1rio de Ver\u00E3o Central (Territ\u00F3rio do Norte)", "CST"}; - String DUBLIN[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT", - "Fuso hor\u00e1rio de ver\u00e3o da Irlanda", "IST"}; - String EAT[] = new String[] {"Fuso hor\u00e1rio da \u00c1frica Oriental", "EAT", -@@ -101,10 +99,10 @@ - "Fuso hor\u00e1rio de ver\u00e3o da Groenl\u00e2ndia Oriental", "EGST"}; - String EST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental", "EST", - "Hor\u00e1rio de luz natural oriental", "EDT"}; -- String EST_NSW[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Nova Gales do Sul)", "EST", -- "Fuso hor\u00e1rio de ver\u00e3o oriental (Nova Gales do Sul)", "EST"}; -- String FET[] = new String[] {"Further-eastern European Time", "FET", -- "Further-eastern European Summer Time", "FEST"}; -+ String EST_NSW[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Oriental (Nova Gales do Sul)", "EST", -+ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Nova Gales do Sul)", "EST"}; -+ String FET[] = new String[] {"Hor\u00E1rio do Extremo Leste Europeu (FET)", "FET", -+ "Fuso Hor\u00E1rio de Ver\u00E3o do Extremo Leste Europeu", "FEST"}; - String GHMT[] = new String[] {"Fuso hor\u00e1rio do meridiano de Gana", "GMT", - "Fuso hor\u00e1rio de ver\u00e3o de Gana", "GHST"}; - String GAMBIER[] = new String[] {"Fuso hor\u00e1rio de Gambier", "GAMT", -@@ -157,8 +155,8 @@ - "Hor\u00e1rio de luz natural de Pitcairn", "PDT"}; - String PKT[] = new String[] {"Fuso hor\u00e1rio do Paquist\u00e3o", "PKT", - "Fuso hor\u00e1rio de ver\u00e3o do Paquist\u00e3o", "PKST"}; -- String PONT[] = new String[] {"Fuso hor\u00e1rio de Pohnpei", "PONT", -- "Fuso hor\u00e1rio de ver\u00e3o de Pohnpei", "PONST"}; -+ String PONT[] = new String[] {"Fuso Hor\u00E1rio de Pohnpei", "PONT", -+ "Fuso Hor\u00E1rio de Ver\u00E3o de Pohnpei", "PONST"}; - String PST[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o do Pac\u00edfico", "PST", - "Hor\u00e1rio de luz natural do Pac\u00edfico", "PDT"}; - String SAMOA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o de Samoa", "SST", -@@ -171,20 +169,20 @@ - "Fuso hor\u00e1rio de ver\u00e1 de Cingapura", "SGST"}; - String SLST[] = new String[] {"Fuso hor\u00e1rio do meridiano de Greenwich", "GMT", - "Fuso hor\u00e1rio de ver\u00e3o de Serra Leoa", "SLST"}; -- String TASMANIA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Tasm\u00e2nia)", "EST", -- "Fuso hor\u00e1rio de ver\u00e3o oriental (Tasm\u00e2nia)", "EST"}; -+ String TASMANIA[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Tasm\u00E2nia)", "EST", -+ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Tasm\u00E2nia)", "EST"}; - String TMT[] = new String[] {"Fuso hor\u00e1rio do Turcomenist\u00e3o", "TMT", - "Fuso hor\u00e1rio de ver\u00e3o do Turcomenist\u00e3o", "TMST"}; -- String TRUT[] = new String[] {"Fuso hor\u00e1rio de Chuuk", "CHUT", -- "Fuso hor\u00e1rio de ver\u00e3o de Chuuk", "CHUST"}; -+ String TRUT[] = new String[] {"Fuso Hor\u00E1rio de Chuuk", "CHUT", -+ "Fuso Hor\u00E1rio de Ver\u00E3o de Chuuk", "CHUST"}; - String ULAT[]= new String[] {"Fuso hor\u00e1rio de Ulan Bator", "ULAT", - "Fuso hor\u00e1rio de ver\u00e3o de Ulan Bator", "ULAST"}; - String UTC[] = new String[] {"Tempo universal coordenado", "UTC", - "Tempo universal coordenado", "UTC"}; - String UZT[] = new String[] {"Fuso hor\u00e1rio do Uzbequist\u00e3o", "UZT", - "Fuso hor\u00e1rio de ver\u00e3o do Uzbequist\u00e3o", "UZST"}; -- String VICTORIA[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o oriental (Victoria)", "EST", -- "Fuso hor\u00e1rio de ver\u00e3o oriental (Victoria)", "EST"}; -+ String VICTORIA[] = new String[] {"Hor\u00E1rio-Padr\u00E3o do Leste (Victoria)", "EST", -+ "Fuso Hor\u00E1rio de Ver\u00E3o Oriental (Victoria)", "EST"}; - String VLAT[] = new String[] {"Fuso hor\u00e1rio de Vladivostok", "VLAT", - "Fuso hor\u00e1rio de ver\u00e3o de Vladivostok", "VLAST"}; - String WART[] = new String[] {"Fuso hor\u00e1rio da Argentina Ocidental", "WART", -@@ -193,10 +191,10 @@ - "Fuso hor\u00e1rio de ver\u00e3o da \u00c1frica Ocidental", "WAST"}; - String WET[] = new String[] {"Fuso hor\u00e1rio da Europa Ocidental", "WET", - "Fuso hor\u00e1rio de ver\u00e3o da Europa Ocidental", "WEST"}; -- String WIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Ocidental", "WIT", -+ String WIT[] = new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Ocidental", "WIB", - "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Ocidental", "WIST"}; -- String WST_AUS[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o ocidental (Austr\u00e1lia)", "WST", -- "Fuso hor\u00e1rio de ver\u00e3o ocidental (Austr\u00e1lia)", "WST"}; -+ String WST_AUS[] = new String[] {"Hor\u00E1rio-Padr\u00E3o Ocidental (Austr\u00E1lia)", "WST", -+ "Fuso Hor\u00E1rio de Ver\u00E3o Ocidental (Austr\u00E1lia)", "WST"}; - String WST_SAMOA[] = new String[] {"Fuso hor\u00e1rio de Samoa Ocidental", "WST", - "Fuso hor\u00e1rio de ver\u00e3o de Samoa Ocidental", "WSDT"}; - String YAKT[] = new String[] {"Fuso hor\u00e1rio de Yakutsk", "YAKT", -@@ -308,7 +306,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -401,8 +399,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[] {"Hor\u00E1rio Padr\u00E3o de Metlakatla", "MeST", -+ "Hor\u00E1rio de Luz Natural de Metlakatla", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"Fuso hor\u00e1rio padr\u00e3o de S\u00e3o Pedro e Miquelon", "PMST", - "Hor\u00e1rio de luz natural de S\u00e3o Pedro e Miquelon", "PMDT"}}, -@@ -466,8 +464,8 @@ - "Fuso hor\u00e1rio de ver\u00e3o de Davis", "DAVST"}}, - {"Antarctica/DumontDUrville", new String[] {"Fuso hor\u00e1rio de Dumont-d'Urville", "DDUT", - "Fuso hor\u00e1rio de ver\u00e3o de Dumont-d'Urville", "DDUST"}}, -- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", -- "Macquarie Island Summer Time", "MIST"}}, -+ {"Antarctica/Macquarie", new String[] {"Fuso Hor\u00E1rio da Ilha de Macquarie", "MIST", -+ "Fuso Hor\u00E1rio de Ver\u00E3o da Ilha de Macquarie", "MIST"}}, - {"Antarctica/Mawson", new String[] {"Fuso hor\u00e1rio de Mawson", "MAWT", - "Fuso hor\u00e1rio de ver\u00e3o de Mawson", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -483,7 +481,7 @@ - {"Asia/Aden", ARAST}, - {"Asia/Almaty", new String[] {"Fuso hor\u00e1rio de Alma-Ata", "ALMT", - "Fuso hor\u00e1rio de ver\u00e3o de Alma-Ata", "ALMST"}}, -- {"Asia/Amman", EET}, -+ {"Asia/Amman", ARAST}, - {"Asia/Anadyr", new String[] {"Fuso hor\u00e1rio de Anadyr", "ANAT", - "Fuso hor\u00e1rio de ver\u00e3o de Anadyr", "ANAST"}}, - {"Asia/Aqtau", new String[] {"Fuso hor\u00e1rio de Aqtau", "AQTT", -@@ -527,7 +525,7 @@ - "Fuso hor\u00e1rio de ver\u00e3o de Irkutsk", "IRKST"}}, - {"Asia/Istanbul", EET}, - {"Asia/Jakarta", WIT}, -- {"Asia/Jayapura", new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Oriental", "EIT", -+ {"Asia/Jayapura", new String[] {"Fuso hor\u00e1rio da Indon\u00e9sia Oriental", "WIT", - "Fuso hor\u00e1rio de ver\u00e3o da Indon\u00e9sia Oriental", "EIST"}}, - {"Asia/Kabul", new String[] {"Fuso hor\u00e1rio do Afeganist\u00e3o", "AFT", - "Fuso hor\u00e1rio de ver\u00e3o do Afeganist\u00e3o", "AFST"}}, -@@ -537,7 +535,8 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -- {"Asia/Khandyga", YAKT}, -+ {"Asia/Khandyga", new String[] {"Hor\u00E1rio de Khandyga", "YAKT", -+ "Hor\u00E1rio de Ver\u00E3o de Khandyga", "YAKST"}}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"Fuso hor\u00e1rio de Krasnoyarsk", "KRAT", - "Fuso hor\u00e1rio de ver\u00e3o de Krasnoyarsk", "KRAST"}}, -@@ -586,7 +585,8 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -- {"Asia/Ust-Nera", VLAT}, -+ {"Asia/Ust-Nera", new String[] {"Hor\u00E1rio de Ust-Nera", "VLAT", -+ "Hor\u00E1rio de Ver\u00E3o de Ust-Nera", "VLAST"}}, - {"Asia/Vientiane", ICT}, - {"Asia/Vladivostok", VLAT}, - {"Asia/Yakutsk", YAKT}, -@@ -616,8 +616,8 @@ - {"Australia/Canberra", EST_NSW}, - {"Australia/Currie", EST_NSW}, - {"Australia/Darwin", DARWIN}, -- {"Australia/Eucla", new String[] {"Fuso hor\u00e1rio ocidental central (Austr\u00e1lia)", "CWST", -- "Fuso hor\u00e1rio de ver\u00e3o ocidental central (Austr\u00e1lia)", "CWST"}}, -+ {"Australia/Eucla", new String[] {"Fuso Hor\u00E1rio Ocidental Central (Austr\u00E1lia)", "CWST", -+ "Fuso Hor\u00E1rio de Ver\u00E3o Ocidental Central (Austr\u00E1lia)", "CWST"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, -diff -r fd7850833158 -r 3d28326a9e5d src/share/classes/sun/util/resources/TimeZoneNames_sv.java ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Thu Oct 24 17:14:18 2013 +0400 -@@ -43,10 +43,8 @@ - public final class TimeZoneNames_sv extends TimeZoneNamesBundle { - - protected final Object[][] getContents() { -- String ACT[] = new String[] {"Acre, normaltid", "ACT", -- "Acre, sommartid", "ACST"}; -- String ADELAIDE[] = new String[] {"Central normaltid (S\u00f6dra Australien)", "CST", -- "Central sommartid (S\u00f6dra Australien)", "CST"}; -+ String ADELAIDE[] = new String[] {"Central standardtid (Sydaustralien)", "CST", -+ "Central sommartid (South Australia)", "CST"}; - String AGT[] = new String[] {"Argentina, normaltid", "ART", - "Argentina, sommartid", "ARST"}; - String AKST[] = new String[] {"Alaska, normaltid", "AKST", -@@ -61,10 +59,10 @@ - "Atlantisk sommartid", "ADT"}; - String BDT[] = new String[] {"Bangladesh, normaltid", "BDT", - "Bangladesh, sommartid", "BDST"}; -- String BRISBANE[] = new String[] {"\u00d6stlig normaltid (Queensland)", "EST", -- "\u00d6stlig sommartid (Queensland)", "EST"}; -- String BROKEN_HILL[] = new String[] {"Central normaltid (S\u00f6dra Australien/Nya Sydwales)", "CST", -- "Central sommartid (S\u00f6dra Australien/Nya Sydwales)", "CST"}; -+ String BRISBANE[] = new String[] {"\u00D6stlig standardtid (Queensland)", "EST", -+ "\u00D6stlig sommartid (Queensland)", "EST"}; -+ 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"}; - String BTT[] = new String[] {"Bhutan, normaltid", "BTT", -@@ -77,9 +75,9 @@ - "Chatham, sommartid", "CHADT"}; - String ChST[] = new String[] {"Chamorro, normaltid", "ChST", - "Chamorro, sommartid", "ChDT"}; -- String CHUT[] = new String[] {"Chuuk Time", "CHUT", -- "Chuuk Summer Time", "CHUST"}; -- String CIT[] = new String[] {"Centralindonesisk tid", "CIT", -+ String CHUT[] = new String[] {"Chuuk, normaltid", "CHUT", -+ "Chuuk, sommartid", "CHUST"}; -+ String CIT[] = new String[] {"Centralindonesisk tid", "WITA", - "Centralindonesisk sommartid", "CIST"}; - String CLT[] = new String[] {"Chile, normaltid", "CLT", - "Chile, sommartid", "CLST"}; -@@ -89,7 +87,7 @@ - "Kina, sommartid", "CDT"}; - String CUBA[] = new String[] {"Kuba, normaltid", "CST", - "Kuba, sommartid", "CDT"}; -- String DARWIN[] = new String[] {"Central normaltid (Nordterritoriet)", "CST", -+ String DARWIN[] = new String[] {"Central standardtid (Nordterritoriet)", "CST", - "Central sommartid (Nordterritoriet)", "CST"}; - String DUBLIN[] = new String[] {"Greenwichtid", "GMT", - "Irland, sommartid", "IST"}; -@@ -103,10 +101,10 @@ - "\u00d6stgr\u00f6nl\u00e4ndsk sommartid", "EGST"}; - String EST[] = new String[] {"Eastern, normaltid", "EST", - "Eastern, sommartid", "EDT"}; -- String EST_NSW[] = new String[] {"Eastern, normaltid (Nya Sydwales)", "EST", -- "Eastern, sommartid (Nya Sydwales)", "EST"}; -- String FET[] = new String[] {"Further-eastern European Time", "FET", -- "Further-eastern European Summer Time", "FEST"}; -+ String EST_NSW[] = new String[] {"\u00D6stlig standardtid (New South Wales)", "EST", -+ "\u00D6stlig sommartid (New South Wales)", "EST"}; -+ String FET[] = new String[] {"Kaliningradtid", "FET", -+ "\u00D6steuropeisk sommartid", "FEST"}; - String GHMT[] = new String[] {"Ghana, normaltid", "GMT", - "Ghana, sommartid", "GHST"}; - String GAMBIER[] = new String[] {"Gambier, normaltid", "GAMT", -@@ -159,8 +157,8 @@ - "Pitcairn, sommartid", "PDT"}; - String PKT[] = new String[] {"Pakistan, normaltid", "PKT", - "Pakistan, sommartid", "PKST"}; -- String PONT[] = new String[] {"Pohnpei Time", "PONT", -- "Pohnpei Summer Time", "PONST"}; -+ String PONT[] = new String[] {"Pohnpei, normaltid", "PONT", -+ "Pohnpei, sommartid", "PONST"}; - String PST[] = new String[] {"Stilla havet, normaltid", "PST", - "Stilla havet, sommartid", "PDT"}; - String SAMOA[] = new String[] {"Samoa, normaltid", "SST", -@@ -173,8 +171,8 @@ - "Singapore, sommartid", "SGST"}; - String SLST[] = new String[] {"Greenwichtid", "GMT", - "Sierra Leone, sommartid", "SLST"}; -- String TASMANIA[] = new String[] {"Eastern, normaltid (Tasmanien)", "EST", -- "Eastern, sommartid (Tasmanien)", "EST"}; -+ String TASMANIA[] = new String[] {"\u00D6stlig standardtid (Tasmania)", "EST", -+ "\u00D6stlig sommartid (Tasmanien)", "EST"}; - String TMT[] = new String[] {"Turkmenistan, normaltid", "TMT", - "Turkmenistan, sommartid", "TMST"}; - String ULAT[]= new String[] {"Ulaanbaatar, normaltid", "ULAT", -@@ -183,8 +181,8 @@ - "Koordinerad universell tid", "UTC"}; - String UZT[] = new String[] {"Uzbekistan, normaltid", "UZT", - "Uzbekistan, sommartid", "UZST"}; -- String VICTORIA[] = new String[] {"\u00d6stlig normaltid (Victoria)", "EST", -- "\u00d6stlig sommartid (Victoria)", "EST"}; -+ String VICTORIA[] = new String[] {"\u00D6stlig standardtid (Victoria)", "EST", -+ "\u00D6stlig sommartid (Victoria)", "EST"}; - String VLAT[] = new String[] {"Vladivostok, normaltid", "VLAT", - "Vladivostok, sommartid", "VLAST"}; - String WART[] = new String[] {"V\u00e4stargentina, normaltid", "WART", -@@ -193,10 +191,10 @@ - "V\u00e4stafrikansk sommartid", "WAST"}; - String WET[] = new String[] {"V\u00e4steuropeisk tid", "WET", - "V\u00e4steuropeisk sommartid", "WEST"}; -- String WIT[] = new String[] {"V\u00e4stindonesisk tid", "WIT", -+ String WIT[] = new String[] {"V\u00e4stindonesisk tid", "WIB", - "V\u00e4stindonesisk sommartid", "WIST"}; -- String WST_AUS[] = new String[] {"V\u00e4stlig normaltid (Australien)", "WST", -- "V\u00e4stlig sommartid (Australien)", "WST"}; -+ String WST_AUS[] = new String[] {"Western Standard Time (Australien)", "WST", -+ "V\u00E4stlig sommartid (Australien)", "WST"}; - String WST_SAMOA[] = new String[] {"V\u00e4stsamoansk tid", "WST", - "V\u00e4stsamoansk sommartid", "WSDT"}; - String YAKT[] = new String[] {"Jakutsk, normaltid", "YAKT", -@@ -308,7 +306,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -401,8 +399,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[] {"Metlakatla, normaltid", "MeST", -+ "Metlakatla, sommartid", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"Saint-Pierre-et-Miquelon, normaltid", "PMST", - "Saint-Pierre-et-Miquelon, sommartid", "PMDT"}}, -@@ -466,8 +464,8 @@ - "Davis, sommartid", "DAVST"}}, - {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville, normaltid", "DDUT", - "Dumont-d'Urville, sommartid", "DDUST"}}, -- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", -- "Macquarie Island Summer Time", "MIST"}}, -+ {"Antarctica/Macquarie", new String[] {"Macquarie\u00F6n, normaltid", "MIST", -+ "Macquarie\u00F6n, sommartid", "MIST"}}, - {"Antarctica/Mawson", new String[] {"Mawson, normaltid", "MAWT", - "Mawson, sommartid", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -483,7 +481,7 @@ - {"Asia/Aden", ARAST}, - {"Asia/Almaty", new String[] {"Alma-Ata, normaltid", "ALMT", - "Alma-Ata, sommartid", "ALMST"}}, -- {"Asia/Amman", EET}, -+ {"Asia/Amman", ARAST}, - {"Asia/Anadyr", new String[] {"Anadyr, normaltid", "ANAT", - "Anadyr, sommartid", "ANAST"}}, - {"Asia/Aqtau", new String[] {"Aqtau, normaltid", "AQTT", -@@ -527,7 +525,7 @@ - "Irkutsk, sommartid", "IRKST"}}, - {"Asia/Istanbul", EET}, - {"Asia/Jakarta", WIT}, -- {"Asia/Jayapura", new String[] {"\u00d6stindonesisk tid", "EIT", -+ {"Asia/Jayapura", new String[] {"\u00d6stindonesisk tid", "WIT", - "\u00d6stindonesisk sommartid", "EIST"}}, - {"Asia/Kabul", new String[] {"Afghanistan, normaltid", "AFT", - "Afghanistan, sommartid", "AFST"}}, -@@ -537,7 +535,8 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -- {"Asia/Khandyga", YAKT}, -+ {"Asia/Khandyga", new String[] {"Khandyga, normaltid", "YAKT", -+ "Khandyga, sommartid", "YAKST"}}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"Krasnojarsk, normaltid", "KRAT", - "Krasnojarsk, sommartid", "KRAST"}}, -@@ -586,7 +585,8 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -- {"Asia/Ust-Nera", VLAT}, -+ {"Asia/Ust-Nera", new String[] {"Ust-Nera, normaltid", "VLAT", -+ "Ust-Nera, sommartid", "VLAST"}}, - {"Asia/Vientiane", ICT}, - {"Asia/Vladivostok", VLAT}, - {"Asia/Yakutsk", YAKT}, -@@ -616,8 +616,8 @@ - {"Australia/Canberra", EST_NSW}, - {"Australia/Currie", EST_NSW}, - {"Australia/Darwin", DARWIN}, -- {"Australia/Eucla", new String[] {"Central v\u00e4stlig normaltid (Australien)", "CWST", -- "Central v\u00e4stlig sommartid (Australien)", "CWST"}}, -+ {"Australia/Eucla", new String[] {"Central v\u00E4stlig normaltid (Australien)", "CWST", -+ "Central v\u00E4stlig sommartid (Australien)", "CWST"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, -diff -r fd7850833158 -r 3d28326a9e5d src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Thu Oct 24 17:14:18 2013 +0400 -@@ -43,10 +43,8 @@ - public final class TimeZoneNames_zh_CN extends TimeZoneNamesBundle { - - protected final Object[][] getContents() { -- String ACT[] = new String[] {"Acre \u65f6\u95f4", "ACT", -- "Acre \u590f\u4ee4\u65f6", "ACST"}; -- String ADELAIDE[] = new String[] {"\u4e2d\u592e\u6807\u51c6\u65f6\u95f4\uff08\u5357\u6fb3\u5927\u5229\u4e9a\uff09", "CST", -- "\u4e2d\u592e\u590f\u4ee4\u65f6\uff08\u5357\u6fb3\u5927\u5229\u4e9a\uff09", "CST"}; -+ String ADELAIDE[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A)", "CST", -+ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A)", "CST"}; - String AGT[] = new String[] {"\u963f\u6839\u5ef7\u65f6\u95f4", "ART", - "\u963f\u6839\u5ef7\u590f\u4ee4\u65f6", "ARST"}; - String AKST[] = new String[] {"\u963f\u62c9\u65af\u52a0\u6807\u51c6\u65f6\u95f4", "AKST", -@@ -61,10 +59,10 @@ - "\u5927\u897f\u6d0b\u590f\u4ee4\u65f6", "ADT"}; - String BDT[] = new String[] {"\u5b5f\u52a0\u62c9\u65f6\u95f4", "BDT", - "\u5b5f\u52a0\u62c9\u590f\u4ee4\u65f6", "BDST"}; -- String BRISBANE[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u6606\u58eb\u5170\uff09", "EST", -- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u6606\u58eb\u5170\uff09", "EST"}; -- String BROKEN_HILL[] = new String[] {"\u4e2d\u592e\u6807\u51c6\u65f6\u95f4\uff08\u5357\u6fb3\u5927\u5229\u4e9a/\u65b0\u5357\u5a01\u5c14\u65af\uff09", "CST", -- "\u4e2d\u592e\u590f\u4ee4\u65f6\uff08\u5357\u6fb3\u5927\u5229\u4e9a/\u65b0\u5357\u5a01\u5c14\u65af\uff09", "CST"}; -+ String BRISBANE[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u6606\u58EB\u5170)", "EST", -+ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u6606\u58EB\u5170)", "EST"}; -+ String BROKEN_HILL[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "CST", -+ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5357\u6FB3\u5927\u5229\u4E9A/\u65B0\u5357\u5A01\u5C14\u65AF)", "CST"}; - String BRT[] = new String[] {"\u5df4\u897f\u5229\u4e9a\u65f6\u95f4", "BRT", - "\u5df4\u897f\u5229\u4e9a\u590f\u4ee4\u65f6", "BRST"}; - String BTT[] = new String[] {"\u4e0d\u4e39\u65f6\u95f4", "BTT", -@@ -77,9 +75,9 @@ - "\u67e5\u8428\u59c6\u590f\u4ee4\u65f6", "CHADT"}; - String ChST[] = new String[] {"Chamorro \u6807\u51c6\u65f6\u95f4", "ChST", - "Chamorro \u590f\u4ee4\u65f6", "ChDT"}; -- String CHUT[] = new String[] {"Chuuk Time", "CHUT", -- "Chuuk Summer Time", "CHUST"}; -- String CIT[] = new String[] {"\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "CIT", -+ String CHUT[] = new String[] {"\u4E18\u514B\u65F6\u95F4", "CHUT", -+ "\u4E18\u514B\u590F\u4EE4\u65F6", "CHUST"}; -+ String CIT[] = new String[] {"\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WITA", - "\u4e2d\u90e8\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "CIST"}; - String CLT[] = new String[] {"\u667a\u5229\u65f6\u95f4", "CLT", - "\u667a\u5229\u590f\u4ee4\u65f6", "CLST"}; -@@ -89,8 +87,8 @@ - "\u4e2d\u56fd\u590f\u4ee4\u65f6", "CDT"}; - String CUBA[] = new String[] {"\u53e4\u5df4\u6807\u51c6\u65f6\u95f4", "CST", - "\u53e4\u5df4\u590f\u4ee4\u65f6", "CDT"}; -- String DARWIN[] = new String[] {"\u4e2d\u592e\u6807\u51c6\u65f6\u95f4\uff08\u5317\u9886\u5730\uff09", "CST", -- "\u4e2d\u592e\u590f\u4ee4\u65f6\uff08\u5317\u9886\u5730\uff09", "CST"}; -+ String DARWIN[] = new String[] {"\u4E2D\u592E\u6807\u51C6\u65F6\u95F4 (\u5317\u9886\u5730)", "CST", -+ "\u4E2D\u592E\u590F\u4EE4\u65F6 (\u5317\u9886\u5730)", "CST"}; - String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT", - "\u7231\u5c14\u5170\u590f\u4ee4\u65f6", "IST"}; - String EAT[] = new String[] {"\u4e1c\u975e\u65f6\u95f4", "EAT", -@@ -103,10 +101,10 @@ - "\u4e1c\u683c\u6797\u5c9b\u590f\u4ee4\u65f6", "EGST"}; - String EST[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4", "EST", - "\u4e1c\u90e8\u590f\u4ee4\u65f6", "EDT"}; -- String EST_NSW[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u65b0\u5357\u5a01\u5c14\u65af\uff09", "EST", -- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u65b0\u5357\u5a01\u5c14\u65af\uff09", "EST"}; -- String FET[] = new String[] {"Further-eastern European Time", "FET", -- "Further-eastern European Summer Time", "FEST"}; -+ String EST_NSW[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u65B0\u5357\u5A01\u5C14\u65AF)", "EST", -+ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u65B0\u5357\u5A01\u5C14\u65AF)", "EST"}; -+ String FET[] = new String[] {"\u8FDC\u4E1C\u6B27\u65F6\u95F4", "FET", -+ "\u8FDC\u4E1C\u6B27\u590F\u4EE4\u65F6", "FEST"}; - String GHMT[] = new String[] {"\u52a0\u7eb3\u65f6\u95f4", "GMT", - "\u52a0\u7eb3\u590f\u4ee4\u65f6", "GHST"}; - String GAMBIER[] = new String[] {"\u5188\u6bd4\u4e9a\u65f6\u95f4", "GAMT", -@@ -159,8 +157,8 @@ - "\u76ae\u7279\u5eb7\u5c9b\u590f\u4ee4\u65f6", "PDT"}; - String PKT[] = new String[] {"\u5df4\u57fa\u65af\u5766\u65f6\u95f4", "PKT", - "\u5df4\u57fa\u65af\u5766\u590f\u4ee4\u65f6", "PKST"}; -- String PONT[] = new String[] {"Pohnpei Time", "PONT", -- "Pohnpei Summer Time", "PONST"}; -+ String PONT[] = new String[] {"\u6CE2\u7EB3\u4F69\u65F6\u95F4", "PONT", -+ "\u6CE2\u7EB3\u4F69\u590F\u4EE4\u65F6", "PONST"}; - String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6807\u51c6\u65f6\u95f4", "PST", - "\u592a\u5e73\u6d0b\u590f\u4ee4\u65f6", "PDT"}; - String SAMOA[] = new String[] {"\u8428\u6469\u4e9a\u7fa4\u5c9b\u6807\u51c6\u65f6\u95f4", "SST", -@@ -173,8 +171,8 @@ - "\u65b0\u52a0\u5761\u590f\u4ee4\u65f6", "SGST"}; - String SLST[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u65f6\u95f4", "GMT", - "\u585e\u62c9\u5229\u6602\u590f\u4ee4\u65f6", "SLST"}; -- String TASMANIA[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u5854\u65af\u9a6c\u5c3c\u4e9a\uff09", "EST", -- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u5854\u65af\u9a6c\u5c3c\u4e9a\uff09", "EST"}; -+ String TASMANIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "EST", -+ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u5854\u65AF\u9A6C\u5C3C\u4E9A)", "EST"}; - String TMT[] = new String[] {"\u571f\u5e93\u66fc\u65f6\u95f4", "TMT", - "\u571f\u5e93\u66fc\u590f\u4ee4\u65f6", "TMST"}; - String ULAT[]= new String[] {"\u5e93\u4f26\u65f6\u95f4", "ULAT", -@@ -183,8 +181,8 @@ - "\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC"}; - String UZT[] = new String[] {"\u4e4c\u5179\u522b\u514b\u65af\u5766\u65f6\u95f4", "UZT", - "\u4e4c\u5179\u522b\u514b\u65af\u5766\u590f\u4ee4\u65f6", "UZST"}; -- String VICTORIA[] = new String[] {"\u4e1c\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u7ef4\u591a\u5229\u4e9a\uff09", "EST", -- "\u4e1c\u90e8\u590f\u4ee4\u65f6\uff08\u7ef4\u591a\u5229\u4e9a\uff09", "EST"}; -+ String VICTORIA[] = new String[] {"\u4E1C\u90E8\u6807\u51C6\u65F6\u95F4 (\u7EF4\u591A\u5229\u4E9A)", "EST", -+ "\u4E1C\u90E8\u590F\u4EE4\u65F6 (\u7EF4\u591A\u5229\u4E9A)", "EST"}; - String VLAT[] = new String[] {"\u6d77\u53c2\u5d34\u65f6\u95f4", "VLAT", - "\u6d77\u53c2\u5d34\u590f\u4ee4\u65f6", "VLAST"}; - String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u65f6\u95f4", "WART", -@@ -193,10 +191,10 @@ - "\u897f\u975e\u590f\u4ee4\u65f6", "WAST"}; - String WET[] = new String[] {"\u897f\u6b27\u65f6\u95f4", "WET", - "\u897f\u6b27\u590f\u4ee4\u65f6", "WEST"}; -- String WIT[] = new String[] {"\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIT", -+ String WIT[] = new String[] {"\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIB", - "\u897f\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "WIST"}; -- String WST_AUS[] = new String[] {"\u897f\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "WST", -- "\u897f\u90e8\u590f\u4ee4\u65f6\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "WST"}; -+ String WST_AUS[] = new String[] {"\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "WST", -+ "\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "WST"}; - String WST_SAMOA[] = new String[] {"\u897f\u8428\u6469\u4e9a\u65f6\u95f4", "WST", - "\u897f\u8428\u6469\u4e9a\u590f\u4ee4\u65f6", "WSDT"}; - String YAKT[] = new String[] {"\u4e9a\u5e93\u6b21\u514b\u65f6\u95f4", "YAKT", -@@ -308,7 +306,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -401,8 +399,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[] {"\u6885\u7279\u62C9\u5361\u7279\u62C9\u6807\u51C6\u65F6\u95F4", "MeST", -+ "\u6885\u7279\u62C9\u5361\u7279\u62C9\u590F\u4EE4\u65F6", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u6807\u51c6\u65f6\u95f4", "PMST", - "\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u590f\u4ee4\u65f6", "PMDT"}}, -@@ -466,8 +464,8 @@ - "\u6234\u7ef4\u65af\u590f\u4ee4\u65f6", "DAVST"}}, - {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville \u65f6\u95f4", "DDUT", - "Dumont-d'Urville \u590f\u4ee4\u65f6", "DDUST"}}, -- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", -- "Macquarie Island Summer Time", "MIST"}}, -+ {"Antarctica/Macquarie", new String[] {"\u9EA6\u5938\u91CC\u5C9B\u65F6\u95F4", "MIST", -+ "\u9EA6\u5938\u91CC\u5C9B\u590F\u4EE4\u65F6", "MIST"}}, - {"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u65f6\u95f4", "MAWT", - "\u83ab\u68ee\u590f\u4ee4\u65f6", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -483,7 +481,7 @@ - {"Asia/Aden", ARAST}, - {"Asia/Almaty", new String[] {"Alma-Ata \u65f6\u95f4", "ALMT", - "Alma-Ata \u590f\u4ee4\u65f6", "ALMST"}}, -- {"Asia/Amman", EET}, -+ {"Asia/Amman", ARAST}, - {"Asia/Anadyr", new String[] {"\u963f\u90a3\u5e95\u6cb3\u65f6\u95f4", "ANAT", - "\u963f\u90a3\u5e95\u6cb3\u590f\u4ee4\u65f6", "ANAST"}}, - {"Asia/Aqtau", new String[] {"Aqtau \u65f6\u95f4", "AQTT", -@@ -527,7 +525,7 @@ - "\u4f0a\u5c14\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "IRKST"}}, - {"Asia/Istanbul", EET}, - {"Asia/Jakarta", WIT}, -- {"Asia/Jayapura", new String[] {"\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "EIT", -+ {"Asia/Jayapura", new String[] {"\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u65f6\u95f4", "WIT", - "\u4e1c\u5370\u5ea6\u5c3c\u897f\u4e9a\u590f\u4ee4\u65f6", "EIST"}}, - {"Asia/Kabul", new String[] {"\u963f\u5bcc\u6c57\u65f6\u95f4", "AFT", - "\u963f\u5bcc\u6c57\u590f\u4ee4\u65f6", "AFST"}}, -@@ -537,7 +535,8 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -- {"Asia/Khandyga", YAKT}, -+ {"Asia/Khandyga", new String[] {"\u6C49\u5FB7\u52A0\u65F6\u95F4", "YAKT", -+ "\u6C49\u5FB7\u52A0\u590F\u4EE4\u65F6", "YAKST"}}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u65f6\u95f4", "KRAT", - "\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u590f\u4ee4\u65f6", "KRAST"}}, -@@ -586,7 +585,8 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -- {"Asia/Ust-Nera", VLAT}, -+ {"Asia/Ust-Nera", new String[] {"\u4E4C\u65AF\u5B63\u6D85\u62C9\u65F6\u95F4", "VLAT", -+ "\u4E4C\u65AF\u5B63\u6D85\u62C9\u590F\u4EE4\u65F6", "VLAST"}}, - {"Asia/Vientiane", ICT}, - {"Asia/Vladivostok", VLAT}, - {"Asia/Yakutsk", YAKT}, -@@ -616,8 +616,8 @@ - {"Australia/Canberra", EST_NSW}, - {"Australia/Currie", EST_NSW}, - {"Australia/Darwin", DARWIN}, -- {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6807\u51c6\u65f6\u95f4\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "CWST", -- "\u4e2d\u897f\u90e8\u590f\u4ee4\u65f6\uff08\u6fb3\u5927\u5229\u4e9a\uff09", "CWST"}}, -+ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6807\u51C6\u65F6\u95F4 (\u6FB3\u5927\u5229\u4E9A)", "CWST", -+ "\u4E2D\u897F\u90E8\u590F\u4EE4\u65F6 (\u6FB3\u5927\u5229\u4E9A)", "CWST"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE}, -diff -r fd7850833158 -r 3d28326a9e5d src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java ---- openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Mon Oct 28 20:26:05 2013 +0400 -+++ openjdk/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Thu Oct 24 17:14:18 2013 +0400 -@@ -43,10 +43,8 @@ - public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle { - - protected final Object[][] getContents() { -- String ACT[] = new String[] {"Acre \u6642\u9593", "ACT", -- "Acre \u590f\u4ee4\u6642\u9593", "ACST"}; -- String ADELAIDE[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340)", "CST", -- "\u4e2d\u90e8\u590f\u4ee4\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340)", "CST"}; -+ String ADELAIDE[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u90E8)", "CST", -+ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340)", "CST"}; - String AGT[] = new String[] {"\u963f\u6839\u5ef7\u6642\u9593", "ART", - "\u963f\u6839\u5ef7\u590f\u4ee4\u6642\u9593", "ARST"}; - String AKST[] = new String[] {"\u963f\u62c9\u65af\u52a0\u6a19\u6e96\u6642\u9593", "AKST", -@@ -61,10 +59,10 @@ - "\u5927\u897f\u6d0b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ADT"}; - String BDT[] = new String[] {"\u5b5f\u52a0\u62c9\u6642\u9593", "BDT", - "\u5b5f\u52a0\u62c9\u590f\u4ee4\u6642\u9593", "BDST"}; -- String BRISBANE[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642\u9593 (\u6606\u58eb\u862d)", "EST", -- "\u6771\u90e8\u590f\u4ee4\u6642\u9593 (\u6606\u58eb\u862d)", "EST"}; -- String BROKEN_HILL[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340/\u65b0\u5357\u5a01\u723e\u65af)", "CST", -- "\u4e2d\u90e8\u590f\u4ee4\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e\u5357\u5340/\u65b0\u5357\u5a01\u723e\u65af)", "CST"}; -+ String BRISBANE[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u6606\u58EB\u862D)", "EST", -+ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u6606\u58EB\u862D)", "EST"}; -+ String BROKEN_HILL[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "CST", -+ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E\u5357\u5340/\u65B0\u5357\u5A01\u723E\u65AF)", "CST"}; - String BRT[] = new String[] {"\u5df4\u897f\u5229\u4e9e\u6642\u9593", "BRT", - "\u5df4\u897f\u5229\u4e9e\u590f\u4ee4\u6642\u9593", "BRST"}; - String BTT[] = new String[] {"\u4e0d\u4e39\u6642\u9593", "BTT", -@@ -77,9 +75,9 @@ - "\u67e5\u5766\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CHADT"}; - String ChST[] = new String[] {"\u67e5\u83ab\u6d1b\u6a19\u6e96\u6642\u9593", "ChST", - "\u67e5\u83ab\u6d1b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "ChDT"}; -- String CHUT[] = new String[] {"Chuuk Time", "CHUT", -- "Chuuk Summer Time", "CHUST"}; -- String CIT[] = new String[] {"\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "CIT", -+ String CHUT[] = new String[] {"\u695A\u514B\u6642\u9593", "CHUT", -+ "\u695A\u514B\u590F\u4EE4\u6642\u9593", "CHUST"}; -+ String CIT[] = new String[] {"\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "WITA", - "\u4e2d\u5370\u5ea6\u5c3c\u897f\u4e9e\u590f\u4ee4\u6642\u9593", "CIST"}; - String CLT[] = new String[] {"\u667a\u5229\u6642\u9593", "CLT", - "\u667a\u5229\u590f\u4ee4\u6642\u9593", "CLST"}; -@@ -89,8 +87,8 @@ - "\u4e2d\u570b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"}; - String CUBA[] = new String[] {"\u53e4\u5df4\u6a19\u6e96\u6642\u9593", "CST", - "\u53e4\u5df4\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "CDT"}; -- String DARWIN[] = new String[] {"\u4e2d\u90e8\u6a19\u6e96\u6642\u9593 (\u5317\u90e8\u5404\u5730\u5340)", "CST", -- "\u4e2d\u90e8\u590f\u4ee4\u6642\u9593 (\u5317\u90e8\u5404\u5730\u5340)", "CST"}; -+ String DARWIN[] = new String[] {"\u4E2D\u90E8\u6A19\u6E96\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "CST", -+ "\u4E2D\u90E8\u590F\u4EE4\u6642\u9593 (\u5317\u90E8\u5404\u5730\u5340)", "CST"}; - String DUBLIN[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT", - "\u611b\u723e\u862d\u590f\u4ee4\u6642\u9593", "IST"}; - String EAT[] = new String[] {"\u6771\u975e\u6642\u9593", "EAT", -@@ -103,10 +101,10 @@ - "\u6771\u683c\u6797\u5cf6\u590f\u4ee4\u6642\u9593", "EGST"}; - String EST[] = new String[] {"\u6771\u65b9\u6a19\u6e96\u6642\u9593", "EST", - "\u6771\u65b9\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "EDT"}; -- String EST_NSW[] = new String[] {"\u6771\u65b9\u6a19\u6e96\u6642\u9593 (\u65b0\u5357\u5a01\u723e\u65af)", "EST", -- "\u6771\u65b9\u590f\u4ee4\u6642\u9593 (\u65b0\u5357\u5a01\u723e\u65af)", "EST"}; -- String FET[] = new String[] {"Further-eastern European Time", "FET", -- "Further-eastern European Summer Time", "FEST"}; -+ String EST_NSW[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "EST", -+ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u65B0\u5357\u5A01\u723E\u65AF)", "EST"}; -+ String FET[] = new String[] {"\u6771\u6B50\u5167\u9678\u6642\u9593", "FET", -+ "\u6771\u6B50\u5167\u9678\u590F\u4EE4\u6642\u9593", "FEST"}; - String GHMT[] = new String[] {"\u8fe6\u7d0d\u5e73\u5747\u6642\u9593", "GMT", - "\u8fe6\u7d0d\u590f\u4ee4\u6642\u9593", "GHST"}; - String GAMBIER[] = new String[] {"\u7518\u6bd4\u723e\u6642\u9593", "GAMT", -@@ -159,8 +157,8 @@ - "\u76ae\u7279\u5eb7\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PDT"}; - String PKT[] = new String[] {"\u5df4\u57fa\u65af\u5766\u6642\u9593", "PKT", - "\u5df4\u57fa\u65af\u5766\u590f\u4ee4\u6642\u9593", "PKST"}; -- String PONT[] = new String[] {"Pohnpei Time", "PONT", -- "Pohnpei Summer Time", "PONST"}; -+ String PONT[] = new String[] {"\u6CE2\u7D0D\u4F69\u6642\u9593", "PONT", -+ "\u6CE2\u7D0D\u4F69\u590F\u4EE4\u6642\u9593", "PONST"}; - String PST[] = new String[] {"\u592a\u5e73\u6d0b\u6a19\u6e96\u6642\u9593", "PST", - "\u592a\u5e73\u6d0b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PDT"}; - String SAMOA[] = new String[] {"\u85a9\u6469\u4e9e\u6a19\u6e96\u6642\u9593", "SST", -@@ -173,8 +171,8 @@ - "\u65b0\u52a0\u5761\u590f\u4ee4\u6642\u9593", "SGST"}; - String SLST[] = new String[] {"\u683c\u6797\u5a01\u6cbb\u5e73\u5747\u6642\u9593", "GMT", - "\u7345\u5b50\u5c71\u590f\u4ee4\u6642\u9593", "SLST"}; -- String TASMANIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642\u9593 (\u5854\u65af\u6885\u5c3c\u4e9e\u5cf6)", "EST", -- "\u6771\u90e8\u590f\u4ee4\u6642\u9593 (\u5854\u65af\u6885\u5c3c\u4e9e\u5cf6)", "EST"}; -+ String TASMANIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "EST", -+ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u5854\u65AF\u6885\u5C3C\u4E9E\u5CF6)", "EST"}; - String TMT[] = new String[] {"\u571f\u5eab\u66fc\u6642\u9593", "TMT", - "\u571f\u5eab\u66fc\u590f\u4ee4\u6642\u9593", "TMST"}; - String ULAT[]= new String[] {"\u5eab\u502b\u6642\u9593", "ULAT", -@@ -183,8 +181,8 @@ - "\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC"}; - String UZT[] = new String[] {"\u70cf\u8332\u5225\u514b\u65af\u5766\u6642\u9593", "UZT", - "\u70cf\u8332\u5225\u514b\u65af\u5766\u590f\u4ee4\u6642\u9593", "UZST"}; -- String VICTORIA[] = new String[] {"\u6771\u90e8\u6a19\u6e96\u6642\u9593 (\u7dad\u591a\u5229\u4e9e\u90a6)", "EST", -- "\u6771\u90e8\u590f\u4ee4\u6642\u9593 (\u7dad\u591a\u5229\u4e9e\u90a6)", "EST"}; -+ String VICTORIA[] = new String[] {"\u6771\u90E8\u6A19\u6E96\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "EST", -+ "\u6771\u90E8\u590F\u4EE4\u6642\u9593 (\u7DAD\u591A\u5229\u4E9E\u90A6)", "EST"}; - String VLAT[] = new String[] {"\u6d77\u53c3\u5d34\u6642\u9593", "VLAT", - "\u6d77\u53c3\u5d34\u590f\u4ee4\u6642\u9593", "VLAST"}; - String WART[] = new String[] {"\u897f\u963f\u6839\u5ef7\u6642\u9593", "WART", -@@ -193,10 +191,10 @@ - "\u897f\u975e\u590f\u4ee4\u6642\u9593", "WAST"}; - String WET[] = new String[] {"\u897f\u6b50\u6642\u9593", "WET", - "\u897f\u6b50\u590f\u4ee4\u6642\u9593", "WEST"}; -- String WIT[] = new String[] {"\u897f\u5370\u5c3c\u6642\u9593", "WIT", -+ String WIT[] = new String[] {"\u897f\u5370\u5c3c\u6642\u9593", "WIB", - "\u897f\u5370\u5c3c\u590f\u4ee4\u6642\u9593", "WIST"}; -- String WST_AUS[] = new String[] {"\u897f\u65b9\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "WST", -- "\u897f\u65b9\u590f\u4ee4\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "WST"}; -+ String WST_AUS[] = new String[] {"\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "WST", -+ "\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "WST"}; - String WST_SAMOA[] = new String[] {"\u897f\u85a9\u6469\u4e9e\u6642\u9593", "WST", - "\u897f\u85a9\u6469\u4e9e\u590f\u4ee4\u6642\u9593", "WSDT"}; - String YAKT[] = new String[] {"\u4e9e\u5eab\u6b21\u514b\u6642\u9593", "YAKT", -@@ -308,7 +306,7 @@ - {"America/Argentina/Rio_Gallegos", AGT}, - {"America/Argentina/Salta", AGT}, - {"America/Argentina/San_Juan", AGT}, -- {"America/Argentina/San_Luis", WART}, -+ {"America/Argentina/San_Luis", AGT}, - {"America/Argentina/Tucuman", AGT}, - {"America/Argentina/Ushuaia", AGT}, - {"America/Aruba", AST}, -@@ -401,8 +399,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[] {"\u6885\u7279\u62C9\u5361\u7279\u62C9\u6A19\u6E96\u6642\u9593", "MeST", -+ "\u6885\u7279\u62C9\u5361\u7279\u62C9\u65E5\u5149\u7BC0\u7D04\u6642\u9593", "MeDT"}}, - {"America/Mexico_City", CST}, - {"America/Miquelon", new String[] {"\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u6a19\u6e96\u6642\u9593", "PMST", - "\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PMDT"}}, -@@ -466,8 +464,8 @@ - "\u81fa\u7dad\u65af\u590f\u4ee4\u6642\u9593", "DAVST"}}, - {"Antarctica/DumontDUrville", new String[] {"Dumont-d'Urville \u6642\u9593", "DDUT", - "Dumont-d'Urville \u590f\u4ee4\u6642\u9593", "DDUST"}}, -- {"Antarctica/Macquarie", new String[] {"Macquarie Island Time", "MIST", -- "Macquarie Island Summer Time", "MIST"}}, -+ {"Antarctica/Macquarie", new String[] {"\u9EA5\u5938\u5229\u5CF6\u6642\u9593", "MIST", -+ "\u9EA5\u5938\u5229\u5CF6\u590F\u4EE4\u6642\u9593", "MIST"}}, - {"Antarctica/Mawson", new String[] {"\u83ab\u68ee\u6642\u9593", "MAWT", - "\u83ab\u68ee\u590f\u4ee4\u6642\u9593", "MAWST"}}, - {"Antarctica/McMurdo", NZST}, -@@ -483,7 +481,7 @@ - {"Asia/Aden", ARAST}, - {"Asia/Almaty", new String[] {"Alma-Ata \u6642\u9593", "ALMT", - "Alma-Ata \u590f\u4ee4\u6642\u9593", "ALMST"}}, -- {"Asia/Amman", EET}, -+ {"Asia/Amman", ARAST}, - {"Asia/Anadyr", new String[] {"\u963f\u90a3\u5e95\u6cb3\u6642\u9593", "ANAT", - "\u963f\u90a3\u5e95\u6cb3\u590f\u4ee4\u6642\u9593", "ANAST"}}, - {"Asia/Aqtau", new String[] {"Aqtau \u6642\u9593", "AQTT", -@@ -527,7 +525,7 @@ - "Irkutsk \u590f\u4ee4\u6642\u9593", "IRKST"}}, - {"Asia/Istanbul", EET}, - {"Asia/Jakarta", WIT}, -- {"Asia/Jayapura", new String[] {"\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "EIT", -+ {"Asia/Jayapura", new String[] {"\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u6642\u9593", "WIT", - "\u6771\u5370\u5ea6\u5c3c\u897f\u4e9e\u590f\u65e5\u6642\u9593", "EIST"}}, - {"Asia/Kabul", new String[] {"\u963f\u5bcc\u6c57\u6642\u9593", "AFT", - "\u963f\u5bcc\u6c57\u590f\u4ee4\u6642\u9593", "AFST"}}, -@@ -537,7 +535,8 @@ - {"Asia/Kashgar", CTT}, - {"Asia/Kathmandu", NPT}, - {"Asia/Katmandu", NPT}, -- {"Asia/Khandyga", YAKT}, -+ {"Asia/Khandyga", new String[] {"\u6F22\u5730\u52A0 (Khandyga) \u6642\u9593", "YAKT", -+ "\u6F22\u5730\u52A0 (Khandyga) \u590F\u4EE4\u6642\u9593", "YAKST"}}, - {"Asia/Kolkata", IST}, - {"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u6642\u9593", "KRAT", - "\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u590f\u4ee4\u6642\u9593", "KRAST"}}, -@@ -587,7 +586,8 @@ - {"Asia/Ulaanbaatar", ULAT}, - {"Asia/Ulan_Bator", ULAT}, - {"Asia/Urumqi", CTT}, -- {"Asia/Ust-Nera", VLAT}, -+ {"Asia/Ust-Nera", new String[] {"\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u6642\u9593", "VLAT", -+ "\u70CF\u65AF\u5167\u62C9 (Ust-Nera) \u590F\u4EE4\u6642\u9593", "VLAST"}}, - {"Asia/Vientiane", ICT}, - {"Asia/Vladivostok", VLAT}, - {"Asia/Yakutsk", YAKT}, -@@ -617,8 +617,8 @@ - {"Australia/Canberra", EST_NSW}, - {"Australia/Currie", EST_NSW}, - {"Australia/Darwin", DARWIN}, -- {"Australia/Eucla", new String[] {"\u4e2d\u897f\u90e8\u6a19\u6e96\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "CWST", -- "\u4e2d\u897f\u90e8\u65e5\u5149\u7bc0\u7d04\u6642\u9593 (\u6fb3\u5927\u5229\u4e9e)", "CWST"}}, -+ {"Australia/Eucla", new String[] {"\u4E2D\u897F\u90E8\u6A19\u6E96\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "CWST", -+ "\u4E2D\u897F\u90E8\u590F\u4EE4\u6642\u9593 (\u6FB3\u5927\u5229\u4E9E)", "CWST"}}, - {"Australia/Hobart", TASMANIA}, - {"Australia/LHI", LORD_HOWE}, - {"Australia/Lindeman", BRISBANE},