--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties Wed Jul 05 21:31:37 2017 +0200
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties Mon Apr 04 10:31:20 2016 -0700
@@ -23,9 +23,359 @@
# questions.
#
+jshell.msg.welcome =\
+Welcome to JShell -- Version {0}\n\
+For an introduction type: /help intro\n
+jshell.err.opt.classpath.conflict = Conflicting -classpath option.
+jshell.err.opt.classpath.arg = Argument to -classpath missing.
+jshell.err.opt.startup.conflict = Conflicting -startup or -nostartup option.
+jshell.err.opt.unknown = Unknown option: {0}
+
+jshell.msg.terminated =\
+State engine terminated.\n\
+Restore definitions with: /reload restore
+
+jshell.msg.use.one.of = Use one of: {0}
+jshell.err.def.or.id.not.found = No definition or id found named: {0}
+jshell.msg.see.classes.etc = See /classes, /methods, /vars, or /list
+jshell.err.arg = Invalid ''{0}'' argument: {1}
+jshell.msg.see = See {0} for help.
+
+jshell.err.file.not.accessible = File ''{1}'' for ''{0}'' is not accessible: {2}
+jshell.err.file.not.found = File ''{1}'' for ''{0}'' is not found: {2}
+jshell.err.file.exception = File ''{1}'' for ''{0}'' threw exception: {2}
+jshell.err.file.filename = ''{0}'' requires a filename argument.
+
+jshell.err.startup.unexpected.exception = Unexpected exception reading start-up: {0}
+jshell.err.unexpected.exception = Unexpected exception: {0}
+
+jshell.err.no.such.command.or.snippet.id = No such command or snippet id: {0}
+jshell.err.command.ambiguous = Command: ''{0}'' is ambiguous: {1}
+jshell.err.set.editor.arg = The ''/set editor'' command requires a path argument
+jshell.msg.set.editor.set = Editor set to: {0}
+
+jshell.msg.try.list.without.args = Try ''/list'' without arguments.
+jshell.msg.no.active = There are no active definitions.
+
+jshell.msg.resetting = Resetting...
+jshell.msg.resetting.state = Resetting state.
+
+jshell.err.reload.no.previous = No previous history to restore
+jshell.err.reload.restarting.previous.state = Restarting and restoring from previous state.
+jshell.err.reload.restarting.state = Restarting and restoring state.
+
+jshell.msg.vars.not.active = (not-active)
+
+jshell.err.out.of.range = Out of range
+
+jshell.msg.error = Error:
+jshell.msg.warning = Warning:
+
+jshell.err.set.arg = The ''/set'' command requires a sub-command and arguments. See: ''/help /set''
+jshell.err.set.ambiguous = Ambiguous sub-command argument to ''/set'': {0}
+
+jshell.err.classpath.arg = The /classpath command requires a path argument.
+jshell.msg.classpath = Path ''{0}'' added to classpath
+
+jshell.err.help.arg = No commands or subjects start with the provided argument: {0}
+jshell.msg.help.begin =\
+Type a Java language expression, statement, or declaration.\n\
+Or type one of the following commands:\n
+jshell.msg.help.subject =\n\
+For more information type ''/help'' followed by the name of command or a subject.\n\
+For example ''/help /list'' or ''/help intro''. Subjects:\n
+
+jshell.err.drop.arg =\
+In the /drop argument, please specify an import, variable, method, or class to drop.\n\
+Specify by id or name. Use /list to see ids. Use /reset to reset all state.
+jshell.msg.drop.not.active = The argument did not specify an active import, variable, method, or class to drop.
+jshell.err.drop.ambiguous = The argument references more than one import, variable, method, or class.
+jshell.err.failed = Failed.
+jshell.msg.native.method = Native Method
+jshell.msg.unknown.source = Unknown Source
+jshell.msg.goodbye = Goodbye
+
+jshell.msg.help.for.help = Type /help for help.
+
+jshell.err.feedback.expected.new.feedback.mode = Expected new feedback mode -- {0}
+jshell.err.feedback.expected.mode.name = Expected a new feedback mode name. ''{0}'' is a known feedback mode -- {1}
+jshell.err.feedback.command.quiet = Specify either ''command'' or ''quiet'' -- {0}
+jshell.err.feedback.expected.field = Expected field name missing -- {0}
+jshell.err.feedback.expected.mode = Expected a feedback mode -- {0}
+jshell.err.feedback.does.not.match.mode = Does not match any current feedback mode: {0} -- {1}
+jshell.err.feedback.ambiguous.mode = Matches more then one current feedback mode: {0} -- {1}
+jshell.err.feedback.expected.format = Expected format missing -- {0}
+jshell.err.feedback.must.be.quoted = Format ''{0}'' must be quoted -- {1}
+jshell.err.feedback.not.a.valid.selector = Not a valid selector ''{0}'' in ''{1}'' -- {2}
+jshell.err.feedback.multiple.sections = Selector kind in multiple sections of selector list ''{0}'' in ''{1}'' -- {2}
+jshell.err.feedback.different.selector.kinds = Different selector kinds in same sections of selector list ''{0}'' in ''{1}'' -- {2}
+
+jshell.msg.feedback.new.mode = Created new feedback mode: {0}
+jshell.msg.feedback.mode = Feedback mode: {0}
+jshell.msg.feedback.mode.following = The feedback mode should be one of the following:
+
+jshell.console.see.more = <press tab to see more>
+jshell.console.do.nothing = Do nothing
+jshell.console.choice = Choice: \
+
+jshell.console.create.variable = Create variable
+jshell.console.resolvable = \nThe identifier is resolvable in this context.
+jshell.console.no.candidate = \nNo candidate fully qualified names found to import.
+jshell.console.incomplete = \nResults may be incomplete; try again later for complete results.
+
+
+help.usage = \
+Usage: jshell <options> <load files>\n\
+where possible options include:\n\t\
+ -classpath <path> Specify where to find user class files\n\t\
+ -cp <path> Specify where to find user class files\n\t\
+ -startup <file> One run replacement for the start-up definitions\n\t\
+ -nostartup Do not run the start-up definitions\n\t\
+ -help Print a synopsis of standard options\n\t\
+ -version Version information\n
+
+help.list.summary = list the source you have typed
+help.list.args = [all|start|<name or id>]
+help.list =\
+Show the source of snippets, prefaced with the snippet id.\n\
+\n\
+/list\n\t\
+ List the currently active snippets of code that you typed or read with /open\n\n\
+/list start\n\t\
+ List the automatically evaluated start-up snippets\n\n\
+/list all\n\t\
+ List all snippets including failed, overwritten, dropped, and start-up\n\n\
+/list <name>\n\t\
+ List snippets with the specified name (preference for active snippets)\n\n\
+/list <id>\n\t\
+ List the snippet with the specified snippet id
+
+help.edit.summary = edit a source entry referenced by name or id
+help.edit.args = <name or id>
+help.edit =\
+Edit a snippet or snippets of source in an external editor.\n\
+The editor to use is set with /set editor.\n\
+If no editor has been set, a simple editor will be launched.\n\
+\n\
+/edit <name>\n\t\
+ Edit the snippet or snippets with the specified name (preference for active snippets)\n\n\
+/edit <id>\n\t\
+ Edit the snippet with the specified snippet id\n\n\
+/edit\n\t\
+ Edit the currently active snippets of code that you typed or read with /open
+
+help.drop.summary = delete a source entry referenced by name or id
+help.drop.args = <name or id>
+help.drop =\
+Drop a snippet -- making it inactive.\n\
+\n\
+/drop <name>\n\t\
+ Drop the snippet with the specified name\n\n\
+/drop <id>\n\t\
+ Drop the snippet with the specified snippet id
+
+help.save.summary = Save snippet source to a file.
+help.save.args = [all|history|start] <file>
+help.save =\
+Save the specified snippets and/or commands to the specified file.\n\
+\n\
+/save <file>\n\t\
+ Save the source of current active snippets to the file.\n\n\
+/save all <file>\n\t\
+ Save the source of all snippets to the file.\n\t\
+ Includes source including overwritten, failed, and start-up code.\n\n\
+/save history <file>\n\t\
+ Save the sequential history of all commands and snippets entered since jshell was launched.\n\n\
+/save start <file>\n\t\
+ Save the default start-up definitions to the file.
+
+help.open.summary = open a file as source input
+help.open.args = <file>
+help.open =\
+Open a file and read its contents as snippets and commands.\n\
+\n\
+/open <file>\n\t\
+ Read the specified file as jshell input.
+
+help.vars.summary = list the declared variables and their values
+help.vars.args =
+help.vars =\
+List the type, name, and value of the current active jshell variables.
+
+help.methods.summary = list the declared methods and their signatures
+help.methods.args =
+help.methods =\
+List the name, parameter types, and return type of the current active jshell methods.
+
+help.classes.summary = list the declared classes
+help.classes.args =
+help.classes =\
+List the current active jshell classes, interfaces, and enums.
+
+help.imports.summary = list the imported items
+help.imports.args =
+help.imports =\
+List the current active jshell imports.
+
+help.exit.summary = exit jshell
+help.exit.args =
+help.exit =\
+Leave the jshell tool. No work is saved.\n\
+Save any work before using this command
+
+help.reset.summary = reset jshell
+help.reset.args =
+help.reset =\
+Reset the jshell tool code and execution state:\n\t\
+ * All entered code is lost.\n\t\
+ * Start-up code is re-executed.\n\t\
+ * The execution state is restarted.\n\t\
+ * The classpath is cleared.\n\
+Tool settings are maintained, as set with: /set ...\n\
+Save any work before using this command
+
+help.reload.summary = reset and replay relevant history -- current or previous (restore)
+help.reload.args = [restore] [quiet]
+help.reload =\
+Reset the jshell tool code and execution state then replay each\n\
+jshell valid command and valid snippet in the order they were entered.\n\
+\n\
+/reload\n\t\
+ Reset and replay the valid history since jshell was entered, or\n\t\
+ a /reset, or /reload command was executed -- whichever is most\n\t\
+ recent.\n\n\
+/reload restore\n\t\
+ Reset and replay the valid history between the previous and most\n\t\
+ recent time that jshell was entered, or a /reset, or /reload\n\t\
+ command was executed. This can thus be used to restore a previous\n\t\
+ jshell tool sesson.\n\n\
+/reload [restore] quiet\n\t\
+ With the 'quiet' argument the replay is not shown. Errors will display.
+
+help.classpath.summary = add a path to the classpath
+help.classpath.args = <path>
+help.classpath =\
+Append a additional path to the classpath.
+
+help.history.summary = history of what you have typed
+help.history.args =
+help.history =\
+Display the history of snippet and command input since this jshell was launched.
+
+help.debug.summary = toggle debugging of the jshell
+help.debug.args = [0][r][g][f][c][d][e]
+help.debug =\
+Display debugging information for the jshell implementation.\n\
+0: Debugging off\n\
+r: Tool level debugging on\n\
+g: General debugging on\n\
+f: File manager debugging on\n\
+c: Completion analysis debugging on\n\
+d: Dependency debugging on\n\
+e: Event debugging on
+
+help.help.summary = get information about jshell
+help.help.args = [<command>|<subject>]
+help.help =\
+Display information about jshell.\n\
+/help\n\t\
+ List the jshell commands and help subjects.\n\n\
+/help <command>\n\t\
+ Display information about the specified comand. The slash must be included.\n\t\
+ Only the first few letters of the command are needed -- if more than one\n\t\
+ each will be displayed. Example: /help /li\n\n\
+/help <subject>\n\t\
+ Display information about the specified help subject. Example: /help intro
+
+help.set.summary = set jshell configuration information
+help.set.args = editor|start|feedback|newmode|prompt|format ...
+help.set =\
+Set jshell configuration information, including:\n\
+the external editor to use, the start-up definitions to use, a new feedback mode,\n\
+the command prompt, the feedback mode to use, or the format of output.\n\
+\n\
+/set editor <command> <optional-arg>...\n\t\
+ Specify the command to launch for the /edit command.\n\t\
+ The <command> is an operating system dependent string.\n\n\
+/set start <file>\n\t\
+ The contents of the specified <file> become the default start-up snippets and commands.\n\n\
+/set feedback <mode>\n\t\
+ Set the feedback mode describing displayed feedback for entered snippets and commands.\n\n\
+/set newmode <new-mode> [command|quiet [<old-mode>]]\n\t\
+ Create a user-defined feedback mode, optionally copying from an existing mode.\n\n\
+/set prompt <mode> "<prompt>" "<continuation-prompt>"\n\t\
+ Set the displayed prompts for a given feedback mode.\n\n\
+/set format <mode> <field> "<format>" <selector>...\n\t\
+ Configure a feedback mode by setting the format of a field when the selector matchs.\n\n\
+To get more information about one of these forms, use /help with the form specified.\n\
+For example: /help /set format
+
+help.quest.summary = get information about jshell
+help.quest.args = [<command>|<subject>]
+help.quest =\
+Display information about jshell (abbreviation for /help).\n\
+/?\n\t\
+ Display list of commands and help subjects.\n\
+/? <command>\n\t\
+ Display information about the specified comand. The slash must be included.\n\t\
+ Only the first few letters of the command are needed -- if more than one\n\t\
+ match, each will be displayed. Example: /? /li\n\
+/? <subject>\n\t\
+ Display information about the specified help subject. Example: /? intro
+
+help.bang.summary = re-run last snippet
+help.bang.args =
+help.bang =\
+Reevaluate the most recently entered snippet.
+
+help.id.summary = re-run snippet by id
+help.id.args =
+help.id =\
+Reevaluate the snippet specified by the id.
+
+help.previous.summary = re-run n-th previous snippet
+help.previous.args =
+help.previous =\
+Reevaluate the n-th most recently entered snippet.
+
+help.intro.summary = an introduction to the jshell tool
+help.intro =\
+The jshell tool allows you to execute Java code, getting immediate results.\n\
+You can enter a Java definition (variable, method, class, etc), like: int x = 8\n\
+or a Java expression, like: x + x\n\
+or a Java statement or import.\n\
+These little chunks of Java code are called 'snippets'.\n\
+\n\
+There are also jshell commands that allow you to understand and\n\
+control what you are doing, like: /list\n\
+\n\
+For a list of commands: /help
+
+help.shortcuts.summary = a description of shortcuts
+help.shortcuts =\
+Supported shortcuts include:\n\
+\n\
+<tab>\n\t\t\
+ After entering the first few letters of a Java identifier,\n\t\t\
+ a jshell command, or, in some cases, a jshell command argument,\n\t\t\
+ press the <tab> key to complete the input.\n\t\t\
+ If there is more than one completion, show possible completions.\n\n\
+Shift-<tab>\n\t\t\
+ After the name and open parenthesis of a method or constructor invocation,\n\t\t\
+ hold the <shift> key and press the <tab> to see a synopsis of all\n\t\t\
+ matching methods/constructors.\n\n\
+<fix-shortcut> v\n\t\t\
+ After a complete expression, press "<fix-shortcut> v" to introduce a new variable\n\t\t\
+ whose type is based on the type of the expression.\n\t\t\
+ The "<fix-shortcut>" is either Alt-F1 or Alt-Enter, depending on the platform.\n\n\
+<fix-shortcut> i\n\t\t\
+ After an unresolvable identifier, press "<fix-shortcut> i" and jshell will propose\n\t\t\
+ possible fully qualified names based on the content of the specified classpath.\n\t\t\
+ The "<fix-shortcut>" is either Alt-F1 or Alt-Enter, depending on the platform.
+
help.set.format = \
Set the format for reporting a snippet event.\n\
-\n\
+\n\t\
/set format <mode> <field> "<format>" <selector>...\n\
\n\
Where <mode> is the name of a previously defined feedback mode -- see '/help /set newmode'.\n\
@@ -56,14 +406,42 @@
The structure of selector is a hyphen separated list of selector kind lists.\n\
A selector kind list is a comma separated list of values of one selector kind.\n\
A selector matches if each selector kind list matches; A selector kind list\n\
-matches if one of the values matches.\n
-help.set.format.case = The case selector kind describes the kind of snippet. The values are:\n
-help.set.format.action = The action selector kind describes what happened to the snippet. The values are:\n
-help.set.format.when = The when-did-it-occur selector kind describes if this is a direct or indirect action. The values are:\n
-help.set.format.resolve = The resolution-state selector kind describes the state of resolution/definition of the snippet. The values are:\n
-help.set.format.unresolved = The unresolved-count selector kind describes the number of unresolved references. The values are:\n
-help.set.format.errors = The errors-count selector kind describes the number of errors. The values are:\n
-help.set.format.end = \n\
+matches if one of the values matches.\n\n\
+The case selector kind describes the kind of snippet. The values are:\n\t\
+ import -- import declaration\n\t\
+ class -- class declaration\n\t\
+ interface -- interface declaration\n\t\
+ enum -- enum declaration\n\t\
+ annotation -- annotation interface declaration\n\t\
+ method -- method declaration -- note: {type}==parameter-types\n\t\
+ vardecl -- variable declaration without init\n\t\
+ varinit -- variable declaration with init\n\t\
+ expression -- expression -- note: {name}==scratch-variable-name\n\t\
+ varvalue -- variable value expression\n\t\
+ assignment -- assign variable\n\t\
+ statement -- statement\n\
+The action selector kind describes what happened to the snippet. The values are:\n\t\
+ added -- snippet has been added\n\t\
+ modified -- an existing snippet has been modified\n\t\
+ replaced -- an existing snippet has been replaced with a new snippet\n\t\
+ overwrote -- an existing snippet has been overwritten\n\t\
+ dropped -- snippet has been dropped\n\t\
+ used -- snippet was used when it cannot be\n\
+The when-did-it-occur selector kind describes if this is a direct or indirect action. The values are:\n\t\
+ primary -- the entered snippet\n\t\
+ update -- an update to a dependent snippet\n\
+The resolution-state selector kind describes the state of resolution/definition of the snippet. The values are:\n\t\
+ ok -- resolved correctly\n\t\
+ defined -- defined despite recoverably unresolved references\n\t\
+ notdefined -- not defined because of recoverably unresolved references\n\
+The unresolved-count selector kind describes the number of unresolved references. The values are:\n\t\
+ unresolved0 -- no names are unresolved\n\t\
+ unresolved1 -- one name is unresolved\n\t\
+ unresolved2 -- two or more names are unresolved\n\
+The errors-count selector kind describes the number of errors. The values are:\n\t\
+ error0 -- no errors\n\t\
+ error1 -- one error\n\t\
+ error2 -- two or more errors\n\n\
Examples:\n\t\
/set format myformat action 'Created' added-primary\n\t\
/set format myformat action 'Update replaced' replaced-update\n\t\
@@ -73,7 +451,7 @@
help.set.feedback = \
Set the feedback mode describing displayed feedback for entered snippets and commands.\n\
-\n\
+\n\t\
/set feedback <mode>\n\
\n\
Where <mode> is the name of a previously defined feedback mode.\n\
@@ -83,7 +461,7 @@
help.set.newmode = \
Create a user-defined feedback mode, optionally copying from an existing mode.\n\
-\n\
+\n\t\
/set newmode <new-mode> [command|quiet [<old-mode>]]\n\
\n\
Where <new-mode> is the name of a mode you wish to create.\n\
@@ -96,15 +474,32 @@
help.set.prompt = \
Set the prompts. Both the normal prompt and the continuation-prompt must be set.\n\
-\n\
-/set prompt <mode> \"<prompt>\" \"<continuation-propmt>\"\n\
+\n\t\
+/set prompt <mode> \"<prompt>\" \"<continuation-prompt>\"\n\
\n\
Where <mode> is the name of a previously defined feedback mode.\n\
-Where <prompt> and <continuation-propmt> are quoted strings printed as input prompts;\n\
+Where <prompt> and <continuation-prompt> are quoted strings printed as input prompts;\n\
Both may optionally contain '%s' which will be substituted with the next snippet id --\n\
note that what is entered may not be assigned that id, for example it may be an error or command.\n\
The continuation-prompt is used on the second and subsequent lines of a multi-line snippet.\n
+help.set.editor =\
+Specify the command to launch for the /edit command.\n\
+\n\t\
+/set editor <command> <optional-arg>...\n\
+\n\
+The <command> is an operating system dependent string.\n\
+The <command> may include space-separated arguments (such as flags) -- <optional-arg>....\n\
+When /edit is used, the temporary file to edit will be appended as the last argument.
+
+help.set.start =\
+Set the start-up configuration -- a sequence of snippets and commands read at start-up.\n\
+\n\t\
+/set start <file>\n\
+\n\
+The contents of the specified <file> become the default start-up snippets and commands --\n\
+which are run when the jshell tool is started or reset.
+
startup.feedback = \
/set newmode normal command \n\
/set prompt normal '\\n-> ' '>> ' \n\