--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties	Thu May 26 10:46:21 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties	Thu May 26 12:38:21 2016 -0700
@@ -29,7 +29,7 @@
 jshell.err.opt.classpath.conflict = Conflicting -classpath option.
 jshell.err.opt.classpath.arg = Argument to -classpath missing.
 jshell.err.opt.feedback.arg = Argument to -feedback missing. Mode required.
-jshell.err.opt.startup.conflict = Conflicting -startup or -nostartup option.
+jshell.err.opt.startup.one = Only one -startup or -nostartup option may be used.
 jshell.err.opt.unknown = Unknown option: {0}
 
 jshell.msg.terminated =\