Mon, 17 Aug 2015 13:50:54 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Mon Aug 10 14:21:28 2015 -0700 1.2 +++ b/.hgtags Mon Aug 17 13:50:54 2015 -0700 1.3 @@ -464,10 +464,16 @@ 1.4 bc23767d08cf1e2ba8793106882a3ec9b926d9e0 jdk8u65-b07 1.5 cc1eef73fb58c59317a0be13f31ef7a77b46b8e3 jdk8u65-b08 1.6 db639a8f026b01059114cd32d9e44dfad2b55de0 jdk8u65-b09 1.7 +98ad80b71e1fb5c3343c33dffd40e9e92e65f087 jdk8u65-b10 1.8 +98ad80b71e1fb5c3343c33dffd40e9e92e65f087 jdk8u65-b10 1.9 +0000000000000000000000000000000000000000 jdk8u65-b10 1.10 +0000000000000000000000000000000000000000 jdk8u65-b10 1.11 +6b5f81fcbdde7bca924364448e7d98912992ac2f jdk8u65-b10 1.12 3a04901d83880634ecd70c8be992189228ccd746 jdk8u66-b00 1.13 3717d70ac87f5e5579e540cd990b4e958c5990a4 jdk8u66-b01 1.14 15851994f9f81f6de37b63683c8cd9b19ae90ed1 jdk8u66-b02 1.15 8e9e5c715064a55865975ec3626b17e0439613c7 jdk8u66-b07 1.16 6802a364b568ce4f4398c0fc90ee0f675337a3c2 jdk8u66-b08 1.17 81d11adaf5aa0b37ffabf45fbeb8fa19f13de596 jdk8u66-b09 1.18 +12e44aa2069b20ecbff03285dea4681325b9c05f jdk8u66-b10 1.19 cd1b3e5a3126d0808c845d2df518095b10a98059 jdk8u71-b00
2.1 --- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties Mon Aug 10 14:21:28 2015 -0700 2.2 +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties Mon Aug 17 13:50:54 2015 -0700 2.3 @@ -1,5 +1,5 @@ 2.4 # 2.5 -# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. 2.6 +# Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. 2.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.8 # 2.9 # This code is free software; you can redistribute it and/or modify it 2.10 @@ -62,7 +62,7 @@ 2.11 2.12 servertool.list=\n\tlist\n 2.13 servertool.list1=lista todos os servidores registrados 2.14 -servertool.list2=\n\tId do Servidor\tNome de Classe do Servidor\t\tAplica\u00E7\u00E3o do Servidor\n\t---------\t-----------------\t\t------------------\n 2.15 +servertool.list2=\n\tId do Servidor\tNome de Classe do Servidor\t\tAplicativo do Servidor\n\t---------\t-----------------\t\t------------------\n 2.16 servertool.listactive=\n\tlistactive 2.17 servertool.listactive1=lista os servidores atualmente ativos 2.18 servertool.listappnames=\tlistappnames\n