Merge jdk8u65-b10

Mon, 17 Aug 2015 13:10:38 -0700

author
asaha
date
Mon, 17 Aug 2015 13:10:38 -0700
changeset 1091
6b5f81fcbdde
parent 1089
2a879c200dcb
parent 1090
fef9a26ae803
child 1092
2dcd36bfa8a4

Merge

     1.1 --- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties	Mon Aug 17 13:02:13 2015 -0700
     1.2 +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties	Mon Aug 17 13:10:38 2015 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10 @@ -62,7 +62,7 @@
    1.11  
    1.12  servertool.list=\n\tlist\n
    1.13  servertool.list1=lista todos os servidores registrados
    1.14 -servertool.list2=\n\tId do Servidor\tNome de Classe do Servidor\t\tAplica\u00E7\u00E3o do Servidor\n\t---------\t-----------------\t\t------------------\n
    1.15 +servertool.list2=\n\tId do Servidor\tNome de Classe do Servidor\t\tAplicativo do Servidor\n\t---------\t-----------------\t\t------------------\n
    1.16  servertool.listactive=\n\tlistactive
    1.17  servertool.listactive1=lista os servidores atualmente ativos
    1.18  servertool.listappnames=\tlistappnames\n

mercurial