diff --git a/AlgebraicDataflowArchitectureModel/resources/locales/en.properties b/AlgebraicDataflowArchitectureModel/resources/locales/en.properties
index 93ea088..ac26d9b 100644
--- a/AlgebraicDataflowArchitectureModel/resources/locales/en.properties
+++ b/AlgebraicDataflowArchitectureModel/resources/locales/en.properties
@@ -38,6 +38,11 @@
 showNavigation=Show Navigation
 showFlowLayer=Show Flow Layer
 
+# Navigation
+dataFlowModeling=Data-Flow Modeling
+pushpullSelection = PUSH/PULL Selection
+pushpullExtension = PUSH/PULL Extension
+
 # PopUp Actions
 changeCallOrder=Change Call Order
 insertMediator=Introduce Mediator
diff --git a/AlgebraicDataflowArchitectureModel/resources/locales/ja.properties b/AlgebraicDataflowArchitectureModel/resources/locales/ja.properties
index 8cb8f38..bc7288a 100644
--- a/AlgebraicDataflowArchitectureModel/resources/locales/ja.properties
+++ b/AlgebraicDataflowArchitectureModel/resources/locales/ja.properties
@@ -38,6 +38,11 @@
 showNavigation=\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3
 showFlowLayer=\u30D5\u30ED\u30FC\u30EC\u30A4\u30E4\u30FC
 
+# Navigation
+dataFlowModeling=\u30C7\u30FC\u30BF\u30D5\u30ED\u30FC\u30E2\u30C7\u30EA\u30F3\u30B0
+pushpullSelection = PUSH/PULL\u306E\u9078\u629E
+pushpullExtension = PUSH/PULL\u306E\u62E1\u5F35
+
 # PopUp Actions
 changeCallOrder=\u547C\u3073\u51FA\u3057\u9806\u306E\u5909\u66F4
 insertMediator=\u4EF2\u4ECB\u8005\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u5C0E\u5165
diff --git a/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java b/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java
index b96cbe4..780088e 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/ApplicationWindow.java
@@ -34,7 +34,7 @@
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		
 		// If you want to change the language, change here.
-		ApplicationLanguage.getInstance().setLocaleLanguage(ApplicationLanguage.EN);
+		ApplicationLanguage.getInstance().setLocaleLanguage(ApplicationLanguage.JP);
 
 		this.graph = new mxGraph() {
 			public boolean isPort(Object cell) {
diff --git a/AlgebraicDataflowArchitectureModel/src/application/views/NavigationWindow.java b/AlgebraicDataflowArchitectureModel/src/application/views/NavigationWindow.java
index fe71d44..f52bead 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/views/NavigationWindow.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/views/NavigationWindow.java
@@ -9,6 +9,7 @@
 import javax.swing.JDialog;
 import javax.swing.JToggleButton;
 
+import application.ApplicationLanguage;
 import application.ApplicationWindow;
 import application.editor.Editor;
 import application.editor.IStageChangeListener;
@@ -32,9 +33,9 @@
 		this.editor = editor;
 		Container panel = getContentPane();
 		panel.setLayout(new java.awt.GridLayout(3, 1));
-		dataFlowModelingButton = new JToggleButton("Data-Flow Modeling");
-		pushPullSelectionButton = new JToggleButton("PUSH/PULL Selection");
-		controlFlowDelegationButton = new JToggleButton("Control-Flow Delegation");
+		dataFlowModelingButton = new JToggleButton(ApplicationLanguage.getInstance().getOptionByPropName("dataFlowModeling"));
+		pushPullSelectionButton = new JToggleButton(ApplicationLanguage.getInstance().getOptionByPropName("pushpullSelection"));
+		controlFlowDelegationButton = new JToggleButton(ApplicationLanguage.getInstance().getOptionByPropName("pushpullExtension"));
 		dataFlowModelingButton.addActionListener(new DataFlowModelingButtonListener());
 		pushPullSelectionButton.addActionListener(new PushPullSelectionButtonListener());
 		controlFlowDelegationButton.addActionListener(new ControlFlowDelegationButtonListener());