Mercurial > hg > openjdk > aarch64-port > corba
changeset 967:4f3a29adbf4c jdk8u60-b20
Merge
| author | lana |
|---|---|
| date | Fri, 12 Jun 2015 18:44:48 -0700 |
| parents | 1bb85284d611 (current diff) abea92b048d6 (diff) |
| children | d68de92de3ba 4b5fe2cb5d9a |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties Wed Jun 10 18:15:48 2015 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties Fri Jun 12 18:44:48 2015 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2015, 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 @@ -100,7 +100,7 @@ tnameserv.orbinitialport0=ORBInitialPort 0 \u00E4r inte ett giltigt alternativ f\u00F6r NameService tnameserv.hs1=Ursprunglig namngivningskontext:\n{0} tnameserv.hs2=TransientNameServer: st\u00E4ller in port f\u00F6r ursprungliga objektreferenser till: {0} -tnameserv.hs3=Redo. +tnameserv.hs3=Klar. orbd.commfailure=\nKunde inte starta ORBD eftersom ORBinitialport redan anv\u00E4nds 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