--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties	Wed Apr 18 13:37:39 2018 -0400
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties	Wed Apr 18 16:02:53 2018 -0400
@@ -39,13 +39,18 @@
 # name              a name, typically a Java identifier
 # number            an integer
 # option name       the name of a command line option
-# source version    a source version number, such as 1.5, 1.6, 1.7
+# path              a path
+# profile           a profile name
+# source            a source version number, such as 1.5, 1.6, 1.7, taken from a com.sun.tools.javac.code.Source
+# source version    a source version number, such as 1.5, 1.6, 1.7, taken from a javax.lang.model.SourceVersion
 # string            a general string
 # symbol            the name of a declared type
 # symbol kind       the kind of a symbol (i.e. method, variable)
 # kind name         an informative description of the kind of a declaration; see compiler.misc.kindname.*
+# target            a target version number, such as 1.5, 1.6, 1.7, taken from a com.sun.tools.javac.jvm.Target
 # token             the name of a non-terminal in source code; see compiler.misc.token.*
 # type              a Java type; e.g. int, X, X<T>
+# url               a URL
 # object            a Java object (unspecified)
 # unused            the value is not used in this message
 #
@@ -1779,7 +1784,7 @@
 compiler.warn.option.obsolete.source=\
     source value {0} is obsolete and will be removed in a future release
 
-# 0: string
+# 0: target
 compiler.warn.option.obsolete.target=\
     target value {0} is obsolete and will be removed in a future release
 
@@ -1787,12 +1792,12 @@
 compiler.err.option.removed.source=\
     Source option {0} is no longer supported. Use {1} or later.
 
-# 0: string, 1: string
+# 0: target, 1: target
 compiler.err.option.removed.target=\
     Target option {0} is no longer supported. Use {1} or later.
 
 
-# 0: string, 1: string
+# 0: target, 1: target
 compiler.warn.option.parameters.unsupported=\
     -parameters is not supported for target value {0}. Use {1} or later.
 
@@ -3257,3 +3262,123 @@
 # 0: string, 1: string
 compiler.err.illegal.argument.for.option=\
     illegal argument for {0}: {1}
+
+
+############################################
+# messages previouly at javac.properties
+
+compiler.err.empty.A.argument=\
+    -A requires an argument; use ''-Akey'' or ''-Akey=value''
+
+# 0: string
+compiler.err.invalid.A.key=\
+    key in annotation processor option ''{0}'' is not a dot-separated sequence of identifiers
+
+# 0: string
+compiler.err.invalid.flag=\
+    invalid flag: {0}
+
+compiler.err.profile.bootclasspath.conflict=\
+    profile and bootclasspath options cannot be used together
+
+# 0: string
+compiler.err.invalid.profile=\
+    invalid profile: {0}
+
+# 0: string
+compiler.err.invalid.target=\
+    invalid target release: {0}
+
+# 0: option name, 1: target
+compiler.err.option.not.allowed.with.target=\
+    option {0} not allowed with target {1}
+
+# 0: string
+compiler.err.option.too.many=\
+    option {0} can only be specified once
+
+compiler.err.no.source.files=\
+    no source files
+
+compiler.err.no.source.files.classes=\
+    no source files or class names
+
+# 0: string
+compiler.err.req.arg=\
+    {0} requires an argument
+
+# 0: string
+compiler.err.invalid.source=\
+    invalid source release: {0}
+
+# 0: string, 1: string
+compiler.err.error.writing.file=\
+    error writing {0}; {1}
+
+compiler.err.sourcepath.modulesourcepath.conflict=\
+    cannot specify both --source-path and --module-source-path
+
+# 0: string, 1: target
+compiler.warn.source.target.conflict=\
+    source release {0} requires target release {1}
+
+# 0: string, 1: target
+compiler.warn.target.default.source.conflict=\
+    target release {0} conflicts with default source release {1}
+
+# 0: profile, 1: target
+compiler.warn.profile.target.conflict=\
+    profile {0} is not valid for target release {1}
+
+# 0: string
+compiler.err.file.not.directory=\
+    not a directory: {0}
+
+# 0: object
+compiler.err.file.not.file=\
+    not a file: {0}
+
+compiler.err.two.class.loaders.1=\
+    javac is split between multiple class loaders: check your configuration
+
+# 0: url, 1: url
+compiler.err.two.class.loaders.2=\
+    javac is split between multiple class loaders:\n\
+    one class comes from file: {0}\n\
+    while javac comes from {1}
+
+# 0: string, 1: string
+compiler.err.bad.value.for.option=\
+    bad value for {0} option: ''{1}''
+
+# 0: string
+compiler.err.no.value.for.option=\
+    no value for {0} option
+
+# 0: string
+compiler.err.repeated.value.for.patch.module=\
+    --patch-module specified more than once for {0}
+
+# 0: string
+compiler.err.unmatched.quote=\
+    unmatched quote in environment variable {0}
+
+# 0: option name
+compiler.err.release.bootclasspath.conflict=\
+    option {0} cannot be used together with --release
+
+# 0: string
+compiler.err.unsupported.release.version=\
+    release version {0} not supported
+
+# 0: string
+compiler.err.file.not.found=\
+    file not found: {0}
+
+# 0: string, 1: source
+compiler.err.preview.not.latest=\
+    invalid source release {0} with --enable-preview\n\
+    (preview language features are only supported for release {1})
+
+compiler.err.preview.without.source.or.release=\
+    --enable-preview must be used with either -source or --release