Mercurial > hg > release > icedtea6-1.12
changeset 3030:115e96db9364
S8025255: (tz) Support tzdata2013g
S6925851: Localize JRE into pt_BR
S7035073: Add missing timezones to TimeZoneNames_pt_BR.java
2013-11-08 Andrew John Hughes <gnu.andrew@redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patches.
* NEWS: Updated.
* patches/openjdk/6925851-pt_br.patch: Added.
* patches/openjdk/7017800-tzdata2011b.patch,
* patches/openjdk/7027387-tzdata2011d.patch:
Updated with pt_BR changes.
* patches/openjdk/7035073-missing_pt_br_timezones.patch:
Added.
* patches/openjdk/7090843-tzdata2011j.patch,
* patches/openjdk/7103108-tzdata2011l.patch,
* patches/openjdk/7103405-correct_display_names.patch,
* patches/openjdk/7158483-tzdata2012c.patch,
* patches/openjdk/8009987-tzdata2013b.patch:
Updated with pt_BR changes.
* patches/openjdk/8025255-tzdata2013g.patch:
Added.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Thu, 21 Nov 2013 15:40:13 +0000 |
| parents | dfef77966f7c |
| children | 7e24ac073f74 |
| files | ChangeLog Makefile.am NEWS patches/openjdk/6925851-pt_br.patch patches/openjdk/7017800-tzdata2011b.patch patches/openjdk/7027387-tzdata2011d.patch patches/openjdk/7035073-missing_pt_br_timezones.patch patches/openjdk/7090843-tzdata2011j.patch patches/openjdk/7103108-tzdata2011l.patch patches/openjdk/7103405-correct_display_names.patch patches/openjdk/7158483-tzdata2012c.patch patches/openjdk/8009987-tzdata2013b.patch patches/openjdk/8025255-tzdata2013g.patch |
| diffstat | 13 files changed, 9618 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Nov 20 22:56:43 2013 +0000 +++ b/ChangeLog Thu Nov 21 15:40:13 2013 +0000 @@ -1,3 +1,23 @@ +2013-11-08 Andrew John Hughes <gnu.andrew@redhat.com> + + * Makefile.am: + (ICEDTEA_PATCHES): Add new patches. + * NEWS: Updated. + * patches/openjdk/6925851-pt_br.patch: Added. + * patches/openjdk/7017800-tzdata2011b.patch, + * patches/openjdk/7027387-tzdata2011d.patch: + Updated with pt_BR changes. + * patches/openjdk/7035073-missing_pt_br_timezones.patch: + Added. + * patches/openjdk/7090843-tzdata2011j.patch, + * patches/openjdk/7103108-tzdata2011l.patch, + * patches/openjdk/7103405-correct_display_names.patch, + * patches/openjdk/7158483-tzdata2012c.patch, + * patches/openjdk/8009987-tzdata2013b.patch: + Updated with pt_BR changes. + * patches/openjdk/8025255-tzdata2013g.patch: + Added. + 2013-10-29 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am:
--- a/Makefile.am Wed Nov 20 22:56:43 2013 +0000 +++ b/Makefile.am Thu Nov 21 15:40:13 2013 +0000 @@ -794,11 +794,13 @@ patches/openjdk/8009996-emitter_bean.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 \ @@ -827,7 +829,8 @@ patches/openjdk/7000225-bad_tabs.patch \ patches/openjdk/7038711-fix_no-clobber_usage.patch \ patches/disable-cc-incompatible-sanity-checks.patch \ - patches/rh995488-rhel_tz_fix.patch + patches/rh995488-rhel_tz_fix.patch \ + patches/openjdk/8025255-tzdata2013g.patch if WITH_RHINO ICEDTEA_PATCHES += \
--- a/NEWS Wed Nov 20 22:56:43 2013 +0000 +++ b/NEWS Thu Nov 21 15:40:13 2013 +0000 @@ -101,6 +101,7 @@ - S6868539: javap should use current names for constant pool tags - S6888215: memory leak in jpeg plugin - S6902264: fix indentation of tableswitch and lookupswitch + - S6925851: Localize JRE into pt_BR - S6954275: XML signatures with reference data larger 16KB and cacheRef on fails to validate - S6974017: Upgrade required Solaris Studio compilers to 5.10 (12 update 1 + patches) - S6980281: SWAT: SwingSet2 got core dumped in Solaris-AMD64 using b107 swat build @@ -110,10 +111,11 @@ - S7013519: [parfait] Integer overflows in 2D code - S7018912: [parfait] potential buffer overruns in imageio jpeg - S7022999: Can't build with FORCE_TIERED=0 + - S7035073: Add missing timezones to TimeZoneNames_pt_BR.java - S7038711: Fix CC_VER checks for compiler options, fix use of -Wno-clobber - S7146431: java.security files out-of-sync - S7196533: TimeZone.getDefault() slow due to synchronization bottleneck - -S8000450: Restrict access to com/sun/corba/se/impl package + - S8000450: Restrict access to com/sun/corba/se/impl package - S8002070: Remove the stack search for a resource bundle for Logger to use - S8003992: File and other classes in java.io do not handle embedded nulls properly - S8004188: Rename src/share/lib/security/java.security to java.security-linux @@ -153,6 +155,7 @@ - S8023964: java/io/IOException/LastErrorString.java should be @ignore-d - S8024914: Swapped usage of idx_t and bm_word_t types in bitMap.inline.hpp - S8025128: File.createTempFile fails if prefix is absolute path + - S8025255: (tz) Support tzdata2013g - OJ19: Fix test cases from 8010118 to work with OpenJDK 6 - OJ20: Resolve merge issues with JAXP security fixes - OJ21: Remove @Override annotation added on interface by 2013/10/15 security fixes
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6925851-pt_br.patch Thu Nov 21 15:40:13 2013 +0000 @@ -0,0 +1,3651 @@ +# 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/7017800-tzdata2011b.patch Wed Nov 20 22:56:43 2013 +0000 +++ b/patches/openjdk/7017800-tzdata2011b.patch Thu Nov 21 15:40:13 2013 +0000 @@ -222,6 +222,17 @@ {"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 @@
--- a/patches/openjdk/7027387-tzdata2011d.patch Wed Nov 20 22:56:43 2013 +0000 +++ b/patches/openjdk/7027387-tzdata2011d.patch Thu Nov 21 15:40:13 2013 +0000 @@ -443,6 +443,26 @@ {"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 @@
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7035073-missing_pt_br_timezones.patch Thu Nov 21 15:40:13 2013 +0000 @@ -0,0 +1,1644 @@ +# 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/7090843-tzdata2011j.patch Wed Nov 20 22:56:43 2013 +0000 +++ b/patches/openjdk/7090843-tzdata2011j.patch Thu Nov 21 15:40:13 2013 +0000 @@ -1070,6 +1070,59 @@ {"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 @@
--- a/patches/openjdk/7103108-tzdata2011l.patch Wed Nov 20 22:56:43 2013 +0000 +++ b/patches/openjdk/7103108-tzdata2011l.patch Thu Nov 21 15:40:13 2013 +0000 @@ -1393,6 +1393,73 @@ {"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 @@
--- a/patches/openjdk/7103405-correct_display_names.patch Wed Nov 20 22:56:43 2013 +0000 +++ b/patches/openjdk/7103405-correct_display_names.patch Thu Nov 21 15:40:13 2013 +0000 @@ -83,6 +83,18 @@ 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 @@
--- a/patches/openjdk/7158483-tzdata2012c.patch Wed Nov 20 22:56:43 2013 +0000 +++ b/patches/openjdk/7158483-tzdata2012c.patch Thu Nov 21 15:40:13 2013 +0000 @@ -1299,6 +1299,52 @@ {"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 @@
--- a/patches/openjdk/8009987-tzdata2013b.patch Wed Nov 20 22:56:43 2013 +0000 +++ b/patches/openjdk/8009987-tzdata2013b.patch Thu Nov 21 15:40:13 2013 +0000 @@ -1846,6 +1846,116 @@ {"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 @@
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8025255-tzdata2013g.patch Thu Nov 21 15:40:13 2013 +0000 @@ -0,0 +1,3976 @@ +# 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},