jdk-sandbox: comparison src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n.properties

equal deleted inserted replaced

-:c7ab0761ef88
+:83840e83476a
 jshell.console.create.variable = Create variable
 jshell.console.create.method = Create method
 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.
-jshell.console.erroneous = \nIncomplete or erroneous. A single valid expression or statement must proceed Shift-<tab> m.
+jshell.console.erroneous = \nIncomplete or erroneous. A single valid expression or statement must precede Shift+Tab m.
-jshell.console.exprstmt = \nA single valid expression or statement must proceed Shift-<tab> m.
+jshell.console.exprstmt = \nA single valid expression or statement must precede Shift+Tab m.
-jshell.console.empty = \nEmpty entry. A single valid expression or statement must proceed Shift-<tab> m..
+jshell.console.empty = \nEmpty entry. A single valid expression or statement must precede Shift+Tab m.
 jshell.fix.wrong.shortcut =\
-Unexpected character after Shift-Tab.\n\
+Unexpected character after Shift+Tab.\n\
 Use "i" for auto-import, "v" for variable creation, or "m" for method creation.\n\
 For more information see:\n\
 /help shortcuts
 help.usage = \
 and edit snippets and commands. The current command/snippet can be edited,\n\
 or prior commands/snippets can be retrieved from history, edited, and executed.\n\
 This support is similar to readline/editline with simple emacs-like bindings.\n\
 There are also jshell tool specific key sequences.\n\
 \n\
---- Line and history navigation ---\n\
+Line and history navigation:\n\
-\n\
+\n\t\
-Return\n\t\
+Return\n\t\t\
-Enters the current snippet\n\
+Enters the current snippet\n\t\
-Left-arrow or Ctrl+B\n\t\
+Left-arrow or Ctrl+B\n\t\t\
-Moves backward one character\n\
+Moves backward one character\n\t\
-Right-arrow or Ctrl+F\n\t\
+Right-arrow or Ctrl+F\n\t\t\
-Moves forward one character\n\
+Moves forward one character\n\t\
-Up-arrow or Ctrl+P\n\t\
+Up-arrow or Ctrl+P\n\t\t\
-Moves up one line, backward through history\n\
+Moves up one line, backward through history\n\t\
-Down arrow or Ctrl+N\n\t\
+Down arrow or Ctrl+N\n\t\t\
-Moves down one line, forward through history\n\
+Moves down one line, forward through history\n\t\
-Ctrl+A\n\t\
+Ctrl+A\n\t\t\
-Moves to the beginning of the line\n\
+Moves to the beginning of the line\n\t\
-Ctrl+E\n\t\
+Ctrl+E\n\t\t\
-Moves to the end of the line\n\
+Moves to the end of the line\n\t\
-Meta+B\n\t\
+Meta+B\n\t\t\
-Moves backward one word\n\
+Moves backward one word\n\t\
-Meta+F\n\t\
+Meta+F\n\t\t\
-Moves forward one word\n\
+Moves forward one word\n\t\
-Ctrl+R\n\t\
+Ctrl+R\n\t\t\
 Search backward through history\n\
 \n\
 \n\
---- Line and history basic editing ---\n\
+Line and history basic editing:\n\
-\n\
+\n\t\
-Meta+Return or Ctrl+Return (depending on platform)\n\t\
+Meta+Return or Ctrl+Return (depending on platform)\n\t\t\
-Insert a new line in snippet\n\
+Insert a new line in snippet\n\t\
-Ctrl+_ (underscore may require shift key) or Ctrl+X then Ctrl+U\n\t\
+Ctrl+_ (underscore may require the Shift key) or Ctrl+X then Ctrl+U\n\t\t\
-Undo edit - repeat to undo more edits\n\
+Undo edit - repeat to undo more edits\n\t\
-Delete\n\t\
+Delete\n\t\t\
-Deletes the character at or after the cursor, depending on the operating system\n\
+Deletes the character at or after the cursor, depending on the operating system\n\t\
-Backspace\n\t\
+Backspace\n\t\t\
-Deletes the character before the cursor\n\
+Deletes the character before the cursor\n\t\
-Ctrl+K\n\t\
+Ctrl+K\n\t\t\
-Deletes the text from the cursor to the end of the line\n\
+Deletes the text from the cursor to the end of the line\n\t\
-Meta+D\n\t\
+Meta+D\n\t\t\
-Deletes the text from the cursor to the end of the word\n\
+Deletes the text from the cursor to the end of the word\n\t\
-Ctrl+W\n\t\
+Ctrl+W\n\t\t\
-Deletes the text from the cursor to the previous white space\n\
+Deletes the text from the cursor to the previous white space\n\t\
-Ctrl+Y\n\t\
+Ctrl+Y\n\t\t\
-Pastes the most recently deleted text into the line\n\
+Pastes the most recently deleted text into the line\n\t\
-Meta+Y\n\t\
+Meta+Y\n\t\t\
-After Ctrl+Y, Meta+Y cycles through previously deleted text\n\
+After Ctrl+Y, Meta+Y cycles through previously deleted text\n\t\
-Ctrl+X then Ctrl+K\n\t\
+Ctrl+X then Ctrl+K\n\t\t\
 Delete whole snippet\n\
 \n\
 \n\
---- Shortcuts for jshell tool ---\n\
+Shortcuts for jshell tool:\n\
-\n\
+\n\t\
 For details, see: /help shortcuts\n\
-\n\
+\n\t\
-Tab\n\t\
+Tab\n\t\t\
-Complete Java identifier or jshell command\n\
+Complete Java identifier or jshell command\n\t\
-Shift+Tab then v\n\t\
+Shift+Tab then v\n\t\t\
-Convert expression to variable declaration\n\
+Convert expression to variable declaration\n\t\
-Shift+Tab then m\n\t\
+Shift+Tab then m\n\t\t\
-Convert statement to method declaration\n\
+Convert statement to method declaration\n\t\
-Shift+Tab then i\n\t\
+Shift+Tab then i\n\t\t\
-Add imports for this identifier\n\
+Add imports for this identifier\n\t\
 \n\
 \n\
---- More line and history editing ---\n\
+More line and history editing:\n\
-\n\
+\n\t\
-Ctrl+L\n\t\
+Ctrl+L\n\t\t\
-Clear screen and reprint snippet\n\
+Clear screen and reprint snippet\n\t\
-Ctrl+U\n\t\
+Ctrl+U\n\t\t\
-Kill whole line\n\
+Kill whole line\n\t\
-Ctrl+T\n\t\
+Ctrl+T\n\t\t\
-Transpose characters\n\
+Transpose characters\n\t\
-Ctrl+X then Ctrl+B\n\t\
+Ctrl+X then Ctrl+B\n\t\t\
-Navigate to matching bracket, parenthesis, ...\n\
+Navigate to matching bracket, parenthesis, ...\n\t\
-Ctrl+X then =\n\t\
+Ctrl+X then =\n\t\t\
-Enter show current character position mode\n\
+Enter show current character position mode\n\t\
-Ctrl+X then Ctrl+O\n\t\
+Ctrl+X then Ctrl+O\n\t\t\
-Toggle overwrite characters vs insert characters\n\
+Toggle overwrite characters vs insert characters\n\t\
-Meta+C\n\t\
+Meta+C\n\t\t\
-Capitalize word\n\
+Capitalize word\n\t\
-Meta+U\n\t\
+Meta+U\n\t\t\
-Convert word to uppercase\n\
+Convert word to uppercase\n\t\
-Meta+L\n\t\
+Meta+L\n\t\t\
-Convert word to lowercase\n\
+Convert word to lowercase\n\t\
-Meta+0 through Meta+9 then key\n\t\
+Meta+0 through Meta+9 then key\n\t\t\
 Repeat the specified number of times\n\
 \n\
-Where, for example, "Ctrl+A" means hold down the control key and press A.\n\
+Where, for example, "Ctrl+A" means hold down the Control key and press A.\n\
 Where "Meta" is "Alt" on many keyboards.\n\
 Line editing support is derived from JLine 3.
 help.shortcuts.summary = a description of keystrokes for snippet and command completion,\n\
 information access, and automatic code generation
 help.shortcuts =\
 Supported shortcuts include:\n\
-\n\
+\n\t\
-<tab>\n\t\t\
+Tab\n\t\t\
 After entering the first few letters of a Java identifier,\n\t\t\
-a jshell tool command, or, in some cases, a jshell tool command argument,\n\t\t\
+a jshell tool command, or, in some cases, a jshell tool\n\t\t\
-press the <tab> key to complete the input.\n\t\t\
+command argument, press the Tab key to complete the input.\n\t\t\
-If there is more than one completion, then possible completions will be shown.\n\t\t\
+If there is more than one completion, then possible completions\n\t\t\
-Will show documentation if available and appropriate.\n\n\
+will be shown.\n\t\t\
-Shift-<tab> v\n\t\t\
+Another Tab will show documentation if available and appropriate.\n\n\t\
-After a complete expression, hold down <shift> while pressing <tab>,\n\t\t\
+Shift+Tab then v\n\t\t\
-then release and press "v", the expression will be converted to\n\t\t\
+After a complete expression, hold down the Shift key while\n\t\t\
-a variable declaration whose type is based on the type of the expression.\n\n\
+pressing the Tab key, then release and press the "v" key,\n\t\t\
-Shift-<tab> m\n\t\t\
+the expression will be converted to a variable declaration \n\t\t\
-After a complete expression or statement, hold down <shift> while pressing <tab>,\n\t\t\
+whose type is based on the type of the expression.\n\n\t\
-then release and press "m", the expression or statement will be converted to\n\t\t\
+Shift+Tab then m\n\t\t\
-a method declaration. If an expression, the return type is based on the type\n\t\t\
+After a complete expression or statement, hold down the\n\t\t\
-of the expression.\n\n\
+Shift key while pressing the Tab key, then release and press\n\t\t\
-Shift-<tab> i\n\t\t\
+the "m" key, the expression or statement will be converted\n\t\t\
-After an unresolvable identifier, hold down <shift> while pressing <tab>,\n\t\t\
+to a method declaration. If it is an expression, the method\n\t\t\
-then release and press "i", and the jshell tool will propose possible imports\n\t\t\
+return type will be based on the type of the expression.\n\n\t\
-which will resolve the identifier based on the content of the specified classpath.
+Shift+Tab then i\n\t\t\
+After an unresolvable identifier, hold down the Shift key\n\t\t\
+while pressing the Tab key, then release and press the "i" key,\n\t\t\
+and the jshell tool will propose possible imports which will\n\t\t\
+resolve the identifier based on the content of the specified\n\t\t\
+classpath. Enter the digit corresponding to the desired import,\n\t\t\
+or press the "0" key to add no imports.\n\
+\n\
+For information onother special keys see: /help keys
 help.context.summary = a description of the evaluation context options for /env /reload and /reset
 help.context =\
 These options configure the evaluation context.  They can be specified on the\n\
 command-line when the jshell tool is started or as command options when the jshell tool is\n\
 An ID range is represented as a two IDs separated by a hyphen, e.g.:  3-17\n\
 Startup and error snippets maybe used, e.g.:  s3-s9    or   e1-e4\n\
 Any number of IDs or ID ranges may be used, e.g.:  /3-7 s4 14-16 e2\n\
 See also '/help id'.\n\
 \n\
-Finally, you can search backwards through history by entering ctrl-R followed by the string to search for.
+Finally, you can search backwards through history by entering Ctrl+R followed by the string to search for.
 help.set._retain = \
 The '-retain' option saves a setting so that it is used in future sessions.\n\
 The -retain option can be used on the following forms of /set:\n\n\t\
 /set editor -retain\n\t\

changeset 53058	83840e83476a
parent 52938	5ff7480c9e28