diff --git a/src/share/demo/jfc/Notepad/resources/Notepad.properties b/src/share/demo/jfc/Notepad/resources/Notepad.properties
index fdd5c5a22468817d64b832b8cf4712f7f39c139d..ef61d6fd3c461689b567627e34d9e875f9cadc20 100644
--- a/src/share/demo/jfc/Notepad/resources/Notepad.properties
+++ b/src/share/demo/jfc/Notepad/resources/Notepad.properties
@@ -3,12 +3,15 @@
 
 Title=Notepad
 ElementTreeFrameTitle=Elements
+# The following string should NOT be translated: ViewportBackingStore
 ViewportBackingStore=false
 
 # menubar definition
 #
 # Each of the strings that follow form a key to be 
 # used to the actual menu definition.
+
+# The following string should NOT be translated: menubar
 menubar=file edit debug
 
 # file Menu definition
@@ -20,6 +23,8 @@ menubar=file edit debug
 # new  ->  Notepad.newAction
 # save ->  Notepad.saveAction
 # exit ->  Notepad.exitAction
+
+# The following string should NOT be translated: file
 file=new open save - exit
 fileLabel=File
 openLabel=Open
@@ -36,28 +41,38 @@ exitLabel=Exit
 # cut   -> JTextComponent.cutAction
 # copy  -> JTextComponent.copyAction
 # paste -> JTextComponent.pasteAction
+
+# The following string should NOT be translated: edit
 edit=cut copy paste - undo redo
 editLabel=Edit
 cutLabel=Cut
+# The following string should NOT be translated: cutAction
 cutAction=cut-to-clipboard
 cutImage=resources/cut.gif
 copyLabel=Copy
+# The following string should NOT be translated: copyAction
 copyAction=copy-to-clipboard
 copyImage=resources/copy.gif
 pasteLabel=Paste
+# The following string should NOT be translated: pasteAction
 pasteAction=paste-from-clipboard
 pasteImage=resources/paste.gif
 undoLabel=Undo
+# The following string should NOT be translated: undoAction
 undoAction=Undo
 redoLabel=Redo
+# The following string should NOT be translated: redoAction
 redoAction=Redo
 
 #
 # debug Menu definition
 #
+
+# The following string should NOT be translated: debug
 debug=dump showElementTree
 debugLabel=Debug
 dumpLabel=Dump model to System.err
+# The following string should NOT be translated: dumpAction
 dumpAction=dump-model
 showElementTreeLabel=Show Elements
 
@@ -67,6 +82,8 @@ showElementTreeLabel=Show Elements
 # used as the basis of the tool definition.  Actions
 # are of course sharable, and in this case are shared
 # with the menu items.
+
+# The following string should NOT be translated: toolbar
 toolbar=new open save - cut copy paste
 newTooltip=Create a new file
 openTooltip=Open a file
diff --git a/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties b/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties
index 8a40242b9ec8550bc2cf2ce2ae1619d8e02a17a7..777e1cf72f97c631ce60e89b3a6b4060a0f251a0 100644
--- a/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties
+++ b/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties
@@ -9,7 +9,7 @@ ViewportBackingStore=false
 #
 # Each of the strings that follow form a key to be 
 # used to the actual menu definition.
-menubar=\u30D5\u30A1\u30A4\u30EB \u7DE8\u96C6 \u30C7\u30D0\u30C3\u30B0
+menubar=file edit debug
 
 # file Menu definition
 #
@@ -20,7 +20,7 @@ menubar=\u30D5\u30A1\u30A4\u30EB \u7DE8\u96C6 \u30C7\u30D0\u30C3\u30B0
 # new  ->  Notepad.newAction
 # save ->  Notepad.saveAction
 # exit ->  Notepad.exitAction
-file=\u65B0\u898F \u958B\u304F \u4FDD\u5B58 - \u7D42\u4E86
+file=new open save - exit
 fileLabel=\u30D5\u30A1\u30A4\u30EB
 openLabel=\u958B\u304F
 openImage=resources/open.gif
@@ -36,7 +36,7 @@ exitLabel=\u7D42\u4E86
 # cut   -> JTextComponent.cutAction
 # copy  -> JTextComponent.copyAction
 # paste -> JTextComponent.pasteAction
-edit=\u5207\u53D6\u308A \u30B3\u30D4\u30FC \u8CBC\u4ED8\u3051 - \u5143\u306B\u623B\u3059 \u518D\u5B9F\u884C
+edit=cut copy paste - undo redo
 editLabel=\u7DE8\u96C6
 cutLabel=\u5207\u53D6\u308A
 cutAction=cut-to-clipboard
@@ -48,14 +48,14 @@ pasteLabel=\u8CBC\u4ED8\u3051
 pasteAction=paste-from-clipboard
 pasteImage=resources/paste.gif
 undoLabel=\u5143\u306B\u623B\u3059
-undoAction=\u5143\u306B\u623B\u3059
+undoAction=Undo
 redoLabel=\u518D\u5B9F\u884C
-redoAction=\u518D\u5B9F\u884C
+redoAction=Redo
 
 #
 # debug Menu definition
 #
-debug=showElementTree\u306E\u30C0\u30F3\u30D7
+debug=dump showElementTree
 debugLabel=\u30C7\u30D0\u30C3\u30B0
 dumpLabel=\u30E2\u30C7\u30EB\u3092System.err\u306B\u30C0\u30F3\u30D7
 dumpAction=dump-model
@@ -67,7 +67,7 @@ showElementTreeLabel=\u8981\u7D20\u306E\u8868\u793A
 # used as the basis of the tool definition.  Actions
 # are of course sharable, and in this case are shared
 # with the menu items.
-toolbar=\u65B0\u898F \u958B\u304F \u4FDD\u5B58 - \u5207\u53D6\u308A \u30B3\u30D4\u30FC \u8CBC\u4ED8\u3051
+toolbar=new open save - cut copy paste
 newTooltip=\u30D5\u30A1\u30A4\u30EB\u3092\u65B0\u898F\u4F5C\u6210\u3059\u308B
 openTooltip=\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F
 saveTooltip=\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58
diff --git a/src/share/demo/jfc/Notepad/resources/Notepad_zh_CN.properties b/src/share/demo/jfc/Notepad/resources/Notepad_zh_CN.properties
index 9706f903dadd5a86d8b8d9d63e91a8b1b345d653..be6ec0692c14804885290bc3902a03ad3b438c6c 100644
--- a/src/share/demo/jfc/Notepad/resources/Notepad_zh_CN.properties
+++ b/src/share/demo/jfc/Notepad/resources/Notepad_zh_CN.properties
@@ -48,9 +48,9 @@ pasteLabel=\u7C98\u8D34
 pasteAction=paste-from-clipboard
 pasteImage=resources/paste.gif
 undoLabel=\u64A4\u6D88
-undoAction=\u64A4\u6D88
+undoAction=Undo
 redoLabel=\u91CD\u505A
-redoAction=\u91CD\u505A
+redoAction=Redo
 
 #
 # debug Menu definition