--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java	Wed Jul 05 21:31:37 2017 +0200
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java	Mon Apr 04 10:31:20 2016 -0700
@@ -132,7 +132,7 @@
                     } catch (IOException ex) {
                         throw new IllegalStateException(ex);
                     }
-                    result.add("<press tab to see more>");
+                    result.add(repl.messageFormat("jshell.console.see.more"));
                     return cursor; //anchor should not be used.
                 }
 
@@ -337,7 +337,7 @@
                 fixes.add(0, new Fix() {
                     @Override
                     public String displayName() {
-                        return "Do nothing";
+                        return repl.messageFormat("jshell.console.do.nothing");
                     }
 
                     @Override
@@ -353,7 +353,7 @@
                     char2Fix.put((char) ('0' + i), fix);
                     in.println("" + i + ": " + fixes.get(i).displayName());
                 }
-                in.print("Choice: ");
+                in.print(repl.messageFormat("jshell.console.choice"));
                 in.flush();
                 int read;
 
@@ -438,7 +438,7 @@
                 return new FixResult(Collections.singletonList(new Fix() {
                     @Override
                     public String displayName() {
-                        return "Create variable";
+                        return repl.messageFormat("jshell.console.create.variable");
                     }
                     @Override
                     public void perform(ConsoleReader in) throws IOException {
@@ -472,14 +472,14 @@
                 }
                 if (res.isResolvable()) {
                     return new FixResult(Collections.emptyList(),
-                                         "\nThe identifier is resolvable in this context.");
+                            repl.messageFormat("jshell.console.resolvable"));
                 } else {
                     String error = "";
                     if (fixes.isEmpty()) {
-                        error = "\nNo candidate fully qualified names found to import.";
+                        error = repl.messageFormat("jshell.console.no.candidate");
                     }
                     if (!res.isUpToDate()) {
-                        error += "\nResults may be incomplete; try again later for complete results.";
+                        error += repl.messageFormat("jshell.console.incomplete");
                     }
                     return new FixResult(fixes, error);
                 }