Merge jdk8u60-b20

Fri, 12 Jun 2015 18:44:48 -0700

author
lana
date
Fri, 12 Jun 2015 18:44:48 -0700
changeset 946
4f3a29adbf4c
parent 944
1bb85284d611
parent 945
abea92b048d6
child 947
d68de92de3ba
child 949
4b5fe2cb5d9a

Merge

     1.1 --- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties	Wed Jun 10 18:15:48 2015 -0700
     1.2 +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties	Fri Jun 12 18:44:48 2015 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 2000, 2013, 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 @@ -100,7 +100,7 @@
    1.11  tnameserv.orbinitialport0=ORBInitialPort 0 \u00E4r inte ett giltigt alternativ f\u00F6r NameService
    1.12  tnameserv.hs1=Ursprunglig namngivningskontext:\n{0}
    1.13  tnameserv.hs2=TransientNameServer: st\u00E4ller in port f\u00F6r ursprungliga objektreferenser till: {0}
    1.14 -tnameserv.hs3=Redo.
    1.15 +tnameserv.hs3=Klar.
    1.16  
    1.17  orbd.commfailure=\nKunde inte starta ORBD eftersom ORBinitialport redan anv\u00E4nds
    1.18  orbd.internalexception=\nKunde inte starta ORBD p\u00E5 grund av internt undantag. \nM\u00F6jliga orsaker: \n1. Angivet ORBInitialPort eller ORBActivationPort anv\u00E4ndas redan \n2. Ingen beh\u00F6righet att skriva till orb.db 

mercurial