# HG changeset patch
# User asaha
# Date 1434603160 25200
# Node ID 71424b1f1fbfa01253e46582b438761662cbea83
# Parent  2aa9f4c2733567995f2902deabe8a007cfb5ac5b# Parent  d68de92de3bad991546b11d77de6e9c17edf7ec2
Merge

diff -r 2aa9f4c27335 -r 71424b1f1fbf .hgtags
--- a/.hgtags	Wed Jun 10 23:13:05 2015 -0700
+++ b/.hgtags	Wed Jun 17 21:52:40 2015 -0700
@@ -438,3 +438,4 @@
 7ef66778231f234b69515202b2dc2287143ecb49 jdk8u60-b17
 cf83b578af1935db8474d01b8642e4803a534d3a jdk8u60-b18
 eb0caffe34c6bea2ff40966757142b3dcd3a2a4c jdk8u60-b19
+4f3a29adbf4cfa2127e1108d82aaaa0d29f3c583 jdk8u60-b20
diff -r 2aa9f4c27335 -r 71424b1f1fbf src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties	Wed Jun 10 23:13:05 2015 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties	Wed Jun 17 21:52:40 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