diff --git a/mRemoteV1/Resources/Language/Language.ja-JP.resx b/mRemoteV1/Resources/Language/Language.ja-JP.resx
index 7f24478c..8e60db57 100644
--- a/mRemoteV1/Resources/Language/Language.ja-JP.resx
+++ b/mRemoteV1/Resources/Language/Language.ja-JP.resx
@@ -158,7 +158,7 @@
     <value>常にパネルのタブを表示</value>
   </data>
   <data name="strAlwaysShowSysTrayIcon" xml:space="preserve">
-    <value>Always show notification area icon</value>
+    <value>常に通知領域アイコンを表示</value>
   </data>
   <data name="strAskUpdatesCommandAskLater" xml:space="preserve">
     <value>もう一度後で聞く</value>
@@ -167,7 +167,7 @@
     <value>Customize the settings now</value>
   </data>
   <data name="strAskUpdatesCommandRecommended" xml:space="preserve">
-    <value>Use the recommended settings</value>
+    <value>推奨設定を使用</value>
   </data>
   <data name="strAskUpdatesContent" xml:space="preserve">
     <value>{0} can automatically check for updates that may provide new features and bug fixes. It is recommended that you allow {0} to check for updates weekly.</value>
@@ -485,7 +485,7 @@ VncSharpNG Control Version {0}</value>
     <value>Are you sure you want to delete the connection, "{0}"?</value>
   </data>
   <data name="strConfirmDeleteNodeFolder" xml:space="preserve">
-    <value>Are you sure you want to delete the empty folder, "{0}"?</value>
+    <value>空のフォルダ「{0}」削除してもよろしいですか？</value>
   </data>
   <data name="strConfirmDeleteNodeFolderNotEmpty" xml:space="preserve">
     <value>Are you sure you want to delete the folder, "{0}"? Any folders or connections that it contains will also be deleted.</value>
@@ -570,7 +570,7 @@ Starting with new connections file.</value>
     <value>Connection to {0} via {1} closed by user {2}.  (Description: "{3}"; User Field: "{4}")</value>
   </data>
   <data name="strConnenctionCloseEvent" xml:space="preserve">
-    <value>Connection Event Closed</value>
+    <value>接続イベントに失敗しました</value>
   </data>
   <data name="strConnenctionCloseEventFailed" xml:space="preserve">
     <value>Connection Event Closed failed!</value>
@@ -919,10 +919,10 @@ See the Microsoft Support article at http://support.microsoft.com/kb/811833 for
     <value>アドレス：</value>
   </data>
   <data name="strLabelArguments" xml:space="preserve">
-    <value>Arguments:</value>
+    <value>パラメータ：</value>
   </data>
   <data name="strLabelChangeLog" xml:space="preserve">
-    <value>Change Log:</value>
+    <value>履歴：</value>
   </data>
   <data name="strLabelClosingConnections" xml:space="preserve">
     <value>切断時：</value>
@@ -1307,7 +1307,8 @@ If you run into such an error, please create a new connection file!</value>
 If you run into such an error, please create a new connection file!</comment>
   </data>
   <data name="strOpenNewTabRight" xml:space="preserve">
-    <value>Open new tab to the right of the currently selected tab</value>
+    <value>選択されているタブの右側に新規タブを作成</value>
+    <comment>Open new tab to the right of the currently selected tab</comment>
   </data>
   <data name="strOpenPorts" xml:space="preserve">
     <value>Open Ports</value>
@@ -1365,7 +1366,7 @@ If you run into such an error, please create a new connection file!</comment>
     <value>同じパスワードを入力してください</value>
   </data>
   <data name="strPasswordStatusTooShort" xml:space="preserve">
-    <value>The password must be at least 3 characters long.</value>
+    <value>パスワードは最低３文字必要です</value>
   </data>
   <data name="strPleaseFillAllFields" xml:space="preserve">
     <value>全て入力してください</value>
@@ -1380,7 +1381,7 @@ If you run into such an error, please create a new connection file!</comment>
     <value>(These properties will only be saved if you select mRemote/mRemoteNG XML as output file format!)</value>
   </data>
   <data name="strPropertyDescriptionAddress" xml:space="preserve">
-    <value>Enter the hostname or ip you want to connect to.</value>
+    <value>ホスト名かIPアドレスを入力してください</value>
   </data>
   <data name="strPropertyDescriptionAll" xml:space="preserve">
     <value>Toggle all inheritance options.</value>
@@ -1449,13 +1450,15 @@ If you run into such an error, please create a new connection file!</comment>
     <value>This is the name that will be displayed in the connections tree.</value>
   </data>
   <data name="strPropertyDescriptionPanel" xml:space="preserve">
-    <value>Sets the panel in which the connection will open.</value>
+    <value>接続をするパネルを指定</value>
+    <comment>Sets the panel in which the connection will open.</comment>
   </data>
   <data name="strPropertyDescriptionPassword" xml:space="preserve">
-    <value>パスワードを入力してください</value>
+    <value>パスワードを入力</value>
   </data>
   <data name="strPropertyDescriptionPort" xml:space="preserve">
-    <value>Enter the port the selected protocol is listening on.</value>
+    <value>プロトコルのポートを入力</value>
+    <comment>Enter the port the selected protocol is listening on.</comment>
   </data>
   <data name="strPropertyDescriptionProtocol" xml:space="preserve">
     <value>Choose the protocol mRemoteNG should use to connect to the host.</value>
@@ -1566,7 +1569,7 @@ If you run into such an error, please create a new connection file!</comment>
     <value>テーマの表示</value>
   </data>
   <data name="strPropertyNameDisplayWallpaper" xml:space="preserve">
-    <value>Display Wallpaper</value>
+    <value>ウォールペーパーを表示</value>
   </data>
   <data name="strPropertyNameDomain" xml:space="preserve">
     <value>ドメイン</value>
@@ -1584,7 +1587,7 @@ If you run into such an error, please create a new connection file!</comment>
     <value>Encryption Strength</value>
   </data>
   <data name="strPropertyNameExternalTool" xml:space="preserve">
-    <value>External Tool</value>
+    <value>外部ツール</value>
   </data>
   <data name="strPropertyNameExternalToolAfter" xml:space="preserve">
     <value>External Tool After</value>
@@ -1832,16 +1835,16 @@ Message:
     <value>Disable Full Window drag</value>
   </data>
   <data name="strRDPDisableMenuAnimations" xml:space="preserve">
-    <value>Disable Menu Animations</value>
+    <value>メニューのアニメーションを無効にする</value>
   </data>
   <data name="strRDPDisableThemes" xml:space="preserve">
-    <value>Disable Themes</value>
+    <value>テーマを無効にする</value>
   </data>
   <data name="strRDPDisableWallpaper" xml:space="preserve">
     <value>Disable Wallpaper</value>
   </data>
   <data name="strRdpDisconnected" xml:space="preserve">
-    <value>RDP disconnected!</value>
+    <value>リモートデスクトップが切断されました</value>
   </data>
   <data name="strRdpDisconnectFailed" xml:space="preserve">
     <value>RDP Disconnect failed, trying to close!</value>
@@ -2022,10 +2025,12 @@ Message:
     <value>Couldn't save settings or dispose SysTray Icon!</value>
   </data>
   <data name="strShowDescriptionTooltips" xml:space="preserve">
-    <value>Show description tooltips in connection tree</value>
+    <value>接続ツリーに接続の説明をツールチップを表示する</value>
+    <comment>Show description tooltips in connection tree</comment>
   </data>
   <data name="strShowFullConsFilePath" xml:space="preserve">
-    <value>Show full connections file path in window title</value>
+    <value>ウィンドウのタイトルに接続設定ファイルへのフルパス名を表示する</value>
+    <comment>Show full connections file path in window title</comment>
   </data>
   <data name="strShowLogonInfoOnTabs" xml:space="preserve">
     <value>Show logon information on tab names</value>