diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi
index bcd5417b..ad9e337a 100644
--- a/etc/NSIS/setup.nsi
+++ b/etc/NSIS/setup.nsi
@@ -261,12 +261,12 @@ UninstPage Custom un.LockedListShow
 !insertmacro MUI_LANGUAGE "Ukrainian"
 !insertmacro MUI_LANGUAGE "Polish"
 !insertmacro MUI_LANGUAGE "Hungarian"
+!insertmacro MUI_LANGUAGE "Japanese"
 
 ; !insertmacro MUI_LANGUAGE "French"
 ; !insertmacro MUI_LANGUAGE "SpanishInternational"
 ; !insertmacro MUI_LANGUAGE "SimpChinese"
 ; !insertmacro MUI_LANGUAGE "TradChinese"
-; !insertmacro MUI_LANGUAGE "Japanese"
 ; !insertmacro MUI_LANGUAGE "Italian"
 ; !insertmacro MUI_LANGUAGE "Dutch"
 ; !insertmacro MUI_LANGUAGE "Greek"
diff --git a/etc/Translation/LameXP_JA.nsh b/etc/Translation/LameXP_JA.nsh
new file mode 100644
index 00000000..b17cc273
--- /dev/null
+++ b/etc/Translation/LameXP_JA.nsh
@@ -0,0 +1,44 @@
+; ///////////////////////////////////////////////////////////////////////////////
+; // LameXP - Audio Encoder Front-End
+; // Copyright (C) 2004-2019 LoRd_MuldeR <MuldeR2@GMX.de>
+; //
+; // This program is free software; you can redistribute it and/or modify
+; // it under the terms of the GNU General Public License as published by
+; // the Free Software Foundation; either version 2 of the License, or
+; // (at your option) any later version.
+; //
+; // This program is distributed in the hope that it will be useful,
+; // but WITHOUT ANY WARRANTY; without even the implied warranty of
+; // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+; // GNU General Public License for more details.
+; //
+; // You should have received a copy of the GNU General Public License along
+; // with this program; if not, write to the Free Software Foundation, Inc.,
+; // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+; //
+; // http://www.gnu.org/licenses/gpl-2.0.txt
+; ///////////////////////////////////////////////////////////////////////////////
+
+LangString LAMEXP_LANG_STATUS_CLEANUP      ${LANG_JAPANESE} "クリーンアップ中。お待ちください..."
+LangString LAMEXP_LANG_STATUS_CLOSING      ${LANG_JAPANESE} "実行中のインスタンスを終了中。お待ちください..."
+LangString LAMEXP_LANG_STATUS_INSTFILES    ${LANG_JAPANESE} "プログラムをインストール中。お待ちください..."
+LangString LAMEXP_LANG_STATUS_VCREDIST     ${LANG_JAPANESE} "ランタイムをインストール中。お待ちください..."
+LangString LAMEXP_LANG_STATUS_MAKEUNINST   ${LANG_JAPANESE} "アンインストーラーを作成中。お待ちください..."
+LangString LAMEXP_LANG_STATUS_SHORTCUTS    ${LANG_JAPANESE} "ショートカットを作成中。お待ちください..."
+LangString LAMEXP_LANG_STATUS_REGISTRY     ${LANG_JAPANESE} "レジストリを更新中。お待ちください..."
+LangString LAMEXP_LANG_STATUS_UNINSTALL    ${LANG_JAPANESE} "プログラムをアンインストール中。お待ちください..."
+LangString LAMEXP_LANG_LOCKEDLIST_HEADER   ${LANG_JAPANESE} "インスタンスを実行します。"
+LangString LAMEXP_LANG_LOCKEDLIST_TEXT     ${LANG_JAPANESE} "起動中の LameXP のインスタンスを確認中。"
+LangString LAMEXP_LANG_LOCKEDLIST_HEADING  ${LANG_JAPANESE} "インストールを続行する前に以下のプログラムを終了してください..."
+LangString LAMEXP_LANG_LOCKEDLIST_NOPROG   ${LANG_JAPANESE} "終了の必要のあるプログラムは起動中ではありません。"
+LangString LAMEXP_LANG_LOCKEDLIST_SEARCH   ${LANG_JAPANESE} "検索中。お待ちください..."
+LangString LAMEXP_LANG_LOCKEDLIST_COLHDR1  ${LANG_JAPANESE} "アプリケーション"
+LangString LAMEXP_LANG_LOCKEDLIST_COLHDR2  ${LANG_JAPANESE} "プロセス"
+LangString LAMEXP_LANG_UNINST_PERSONAL     ${LANG_JAPANESE} "個人設定も削除しますか ?"
+LangString LAMEXP_LANG_LINK_LICENSE        ${LANG_JAPANESE} "License"
+LangString LAMEXP_LANG_LINK_CHANGELOG      ${LANG_JAPANESE} "Version History"
+LangString LAMEXP_LANG_LINK_TRANSLATE      ${LANG_JAPANESE} "Translator's Guide"
+LangString LAMEXP_LANG_LINK_UNINSTALL      ${LANG_JAPANESE} "アンインストール"
+LangString LAMEXP_LANG_LINK_FAQ            ${LANG_JAPANESE} "Frequently Asked Questions"
+LangString LAMEXP_LANG_LINK_MANUAL         ${LANG_JAPANESE} "User Manual"
+LangString LAMEXP_LANG_PRERELEASE_WARNING  ${LANG_JAPANESE} "LameXP のデモ版 (正式公開前) をインストールしようとしています !"
diff --git a/etc/Translation/LameXP_JA.ts b/etc/Translation/LameXP_JA.ts
index 1b368124..83cb3dd2 100644
--- a/etc/Translation/LameXP_JA.ts
+++ b/etc/Translation/LameXP_JA.ts
@@ -3384,7 +3384,7 @@
     <message>
         <location filename="../../src/ShellIntegration.cpp" line="95"/>
         <source>Convert this file with LameXP v%1</source>
-        <translation>このファイルを LameXP %1 で変換</translation>
+        <translation type="unfinished">このファイルを LameXP v%1 で変換</translation>
     </message>
 </context>
 <context>
diff --git a/res/localization/LameXP_JA.qm b/res/localization/LameXP_JA.qm
index 9fe1972c..81dcfbeb 100644
Binary files a/res/localization/LameXP_JA.qm and b/res/localization/LameXP_JA.qm differ