diff --git a/EDMarketConnector.wxs b/EDMarketConnector.wxs
index 6f491a91..9391a289 100644
--- a/EDMarketConnector.wxs
+++ b/EDMarketConnector.wxs
@@ -17,8 +17,8 @@
 				 Description="$(var.PRODUCTLONGNAME) installer"
 				 InstallerVersion="300" Compressed="yes"
 				 Platform="x86"
-				 Languages="1033,1029,1031,1034,1036,1040,1043,1045,1049,1058,1060,1062,0" />
-				 <!--        en   cs,  de   es   fr   it   nl   pl   ru   uk   sl   lv  neutral -->
+				 Languages="1033,1029,1031,1034,1036,1040,1041,1043,1045,1049,1058,1060,1062,0" />
+				 <!--        en   cs,  de   es   fr   it   ja   nl   pl   ru   uk   sl   lv  neutral -->
 				 <!-- https://msdn.microsoft.com/en-gb/goglobal/bb964664.aspx -->
 
 		<!-- Always reinstall since patching is problematic -->
@@ -104,6 +104,9 @@
 					<Component Guid="*">
 						<File KeyPath="yes" Source="SourceDir\it.strings" />
 					</Component>
+					<Component Guid="*">
+						<File KeyPath="yes" Source="SourceDir\ja.strings" />
+					</Component>
 					<Component Guid="{A18814B6-B491-42AB-A433-2AD66A823AD7}">
 						<File KeyPath="yes" Source="SourceDir\library.zip" />
 					</Component>
@@ -400,6 +403,7 @@
 			<ComponentRef Id="es.strings" />
 			<ComponentRef Id="fr.strings" />
 			<ComponentRef Id="it.strings" />
+			<ComponentRef Id="ja.strings" />
 			<ComponentRef Id="library.zip" />
 			<ComponentRef Id="lv.strings" />
 			<ComponentRef Id="modules.p" />
diff --git a/L10n/ja.strings b/L10n/ja.strings
new file mode 100644
index 00000000..d6846d25
--- /dev/null
+++ b/L10n/ja.strings
@@ -0,0 +1,483 @@
+/* Language name */
+"!Language" = "日本語";
+
+/* Appearance setting prompt. [prefs.py] */
+"Language" = "言語";
+
+/* Use same text as E:D Launcher's verification dialog. [prefs.py] */
+"A verification code has now been sent to the{CR}email address associated with your Elite account." = "あなたのElite: Dangerousアカウントに登録された{CR}メールアドレス宛に確認用の暗証コードが送られました。";
+
+/* App menu entry on OSX. [EDMarketConnector.py] */
+"About {APP}" = "{APP} について";
+
+/* Federation rank. [stats.py] */
+"Admiral" = "Admiral";
+
+/* Explorer rank. [stats.py] */
+"Aimless" = "Aimless";
+
+/* Appearance setting. [EDMarketConnector.py] */
+"Always on top" = "常に最前面に表示する";
+
+/* CQC rank. [stats.py] */
+"Amateur" = "Amateur";
+
+/* EDSM setting. [prefs.py] */
+"API Key" = "API Key";
+
+/* Tab heading in settings. [prefs.py] */
+"Appearance" = "表示";
+
+/* Output setting. [prefs.py] */
+"Automatically make a log entry on entering a system" = "別の星系に移動したら自動的にフライトログを記録する";
+
+/* [prefs.py] */
+"Automatically open uncharted systems’ EDSM pages" = "EDSMに座標が登録されていない星系のページを自動的に開く";
+
+/* Cmdr stats. [stats.py] */
+"Balance" = "Balance";
+
+/* Empire rank. [stats.py] */
+"Baron" = "Baron";
+
+/* Trade rank. [stats.py] */
+"Broker" = "Broker";
+
+/* Folder selection button on Windows. [prefs.py] */
+"Browse..." = "参照...";
+
+/* Federation rank. [stats.py] */
+"Cadet" = "Cadet";
+
+/* CQC rank. [stats.py] */
+"Champion" = "Champion";
+
+/* Folder selection button on OSX. [prefs.py] */
+"Change..." = "変更...";
+
+/* Menu item. [EDMarketConnector.py] */
+"Check for Updates..." = "更新の確認...";
+
+/* Federation rank. [stats.py] */
+"Chief Petty Officer" = "Chief Petty Officer";
+
+/* Main window. [EDMarketConnector.py] */
+"Cmdr" = "コマンダー";
+
+/* Privacy setting. [prefs.py] */
+"Cmdr name" = "コマンダー名";
+
+/* Ranking. [stats.py] */
+"Combat" = "Combat";
+
+/* EDSM setting. [prefs.py] */
+"Commmander Name" = "Commmander Name";
+
+/* Combat rank. [stats.py] */
+"Competent" = "Competent";
+
+/* Output settings. [prefs.py] */
+"Connected to {EDPROXY} at {ADDR}" = "{ADDR} の {EDPROXY} に接続しました";
+
+/* Update button in main window. [EDMarketConnector.py] */
+"cooldown {SS}s" = "次回更新まであと {SS}秒";
+
+/* As in Copy and Paste. [EDMarketConnector.py] */
+"Copy" = "コピー";
+
+/* Empire rank. [stats.py] */
+"Count" = "Count";
+
+/* Ranking. [stats.py] */
+"CQC" = "CQC";
+
+/* Section heading in settings. [prefs.py] */
+"Credentials" = "認証情報";
+
+/* Combat rank. [stats.py] */
+"Dangerous" = "Dangerous";
+
+/* Appearance theme setting. [prefs.py] */
+"Dark" = "ダーク";
+
+/* Combat rank. [stats.py] */
+"Deadly" = "Deadly";
+
+/* Trade rank. [stats.py] */
+"Dealer" = "Dealer";
+
+/* Appearance theme and language setting. [l10n.py] */
+"Default" = "デフォルト";
+
+/* Empire rank. [stats.py] */
+"Duke" = "Duke";
+
+/* Empire rank. [stats.py] */
+"Earl" = "Earl";
+
+/* Menu title. [EDMarketConnector.py] */
+"Edit" = "編集";
+
+/* Top rank. [stats.py] */
+"Elite" = "Elite";
+
+/* Section heading in settings. [prefs.py] */
+"Elite Dangerous Star Map credentials" = "Elite Dangerous Star Mapの認証情報";
+
+/* Ranking. [stats.py] */
+"Empire" = "Empire";
+
+/* Federation rank. [stats.py] */
+"Ensign" = "Ensign";
+
+/* Trade rank. [stats.py] */
+"Entrepreneur" = "Entrepreneur";
+
+/* [EDMarketConnector.py] */
+"Error: Can't connect to EDDN" = "エラー: EDDNに接続できません";
+
+/* [edsm.py] */
+"Error: Can't connect to EDSM" = "エラー: EDSMに接続できません";
+
+/* [EDMarketConnector.py] */
+"Error: Can't get market data!" = "エラー: 市場データを取得できません！";
+
+/* [EDMarketConnector.py] */
+"Error: Connection to EDDN timed out" = "エラー: EDDNへの接続がタイムアウトしました";
+
+/* [edsm.py] */
+"Error: EDSM {MSG}" = "エラー: EDSM {MSG}";
+
+/* [companion.py] */
+"Error: Invalid Credentials" = "エラー: 認証情報に誤りがあります";
+
+/* [companion.py] */
+"Error: Server is down" = "エラー: サーバがダウンしています";
+
+/* [companion.py] */
+"Error: Verification failed" = "エラー: 認証に失敗しました";
+
+/* Item in the File menu on Windows. [EDMarketConnector.py] */
+"Exit" = "終了";
+
+/* Combat rank. [stats.py] */
+"Expert" = "Expert";
+
+/* Ranking. [stats.py] */
+"Explorer" = "Explorer";
+
+/* Ranking. [stats.py] */
+"Federation" = "Federation";
+
+/* [EDMarketConnector.py] */
+"Fetching data..." = "データを取得中...";
+
+/* Menu title on Windows. [EDMarketConnector.py] */
+"File" = "ファイル";
+
+/* Section heading in settings. [prefs.py] */
+"File location" = "ファイルの出力先";
+
+/* [prefs.py] */
+"Flight log in CSV format file" = "フライトログをCSV形式で記録する";
+
+/* CQC rank. [stats.py] */
+"Gladiator" = "Gladiator";
+
+/* Combat rank. [stats.py] */
+"Harmless" = "Harmless";
+
+/* CQC rank. [stats.py] */
+"Helpless" = "Helpless";
+
+/* CQC rank. [stats.py] */
+"Hero" = "Hero";
+
+/* Dark theme color setting. [prefs.py] */
+"Highlighted text" = "強調表示";
+
+/* Tab heading in settings on Windows. [prefs.py] */
+"Hotkey" = "ホットキー";
+
+/* [prefs.py] */
+"How do you want to be identified in the saved data" = "保存するデータにどのような形式で名前を記録しますか";
+
+/* Tab heading in settings. [prefs.py] */
+"Identity" = "個人情報";
+
+/* Tab heading in settings on OSX. [prefs.py] */
+"Keyboard shortcut" = "ショートカット";
+
+/* Empire rank. [stats.py] */
+"King" = "King";
+
+/* Empire rank. [stats.py] */
+"Knight" = "Knight";
+
+/* [EDMarketConnector.py] */
+"Last updated at {HH}:{MM}:{SS}" = "最終更新時間 {HH}:{MM}:{SS}";
+
+/* Federation rank. [stats.py] */
+"Lieutenant" = "Lieutenant";
+
+/* Federation rank. [stats.py] */
+"Lieutenant Commander" = "Lieutenant Commander";
+
+/* Cmdr stats. [stats.py] */
+"Loan" = "Loan";
+
+/* [EDMarketConnector.py] */
+"Logging in..." = "ログイン中...";
+
+/* Empire rank. [stats.py] */
+"Lord" = "Lord";
+
+/* [prefs.py] */
+"Market data in CSV format file" = "市場データをCSV形式で記録する";
+
+/* [prefs.py] */
+"Market data in Slopey's BPC format file" = "市場データをSlopey's BPC形式で記録する";
+
+/* [prefs.py] */
+"Market data in Trade Dangerous format file" = "市場データをTrade Dangerous形式で記録する";
+
+/* Empire rank. [stats.py] */
+"Marquis" = "Marquis";
+
+/* Combat rank. [stats.py] */
+"Master" = "Master";
+
+/* Trade rank. [stats.py] */
+"Merchant" = "Merchant";
+
+/* Federation rank. [stats.py] */
+"Midshipman" = "Midshipman";
+
+/* Explorer rank. [stats.py] */
+"Mostly Aimless" = "Mostly Aimless";
+
+/* Combat rank. [stats.py] */
+"Mostly Harmless" = "Mostly Harmless";
+
+/* CQC rank. [stats.py] */
+"Mostly Helpless" = "Mostly Helpless";
+
+/* Trade rank. [stats.py] */
+"Mostly Penniless" = "Mostly Penniless";
+
+/* No hotkey/shortcut currently defined. [prefs.py] */
+"None" = "設定なし";
+
+/* Dark theme color setting. [prefs.py] */
+"Normal text" = "通常表示";
+
+/* Combat rank. [stats.py] */
+"Novice" = "Novice";
+
+/* [prefs.py] */
+"OK" = "了解";
+
+/* Hotkey/Shortcut setting. [prefs.py] */
+"Only when Elite: Dangerous is the active app" = "Elite: Dangerousがアクティブの時だけ有効";
+
+/* Shortcut settings button on OSX. [prefs.py] */
+"Open System Preferences" = "システム環境設定を開く";
+
+/* Tab heading in settings. [prefs.py] */
+"Output" = "出力";
+
+/* Empire rank. [stats.py] */
+"Outsider" = "Outsider";
+
+/* Use same text as E:D Launcher's login dialog. [prefs.py] */
+"Password" = "パスワード";
+
+/* Explorer rank. [stats.py] */
+"Pathfinder" = "Pathfinder";
+
+/* Trade rank. [stats.py] */
+"Peddler" = "Peddler";
+
+/* Trade rank. [stats.py] */
+"Penniless" = "Penniless";
+
+/* Federation rank. [stats.py] */
+"Petty Officer" = "Petty Officer";
+
+/* Explorer rank. [stats.py] */
+"Pioneer" = "Pioneer";
+
+/* Hotkey/Shortcut setting. [prefs.py] */
+"Play sound" = "音を鳴らす";
+
+/* [prefs.py] */
+"Please choose what data to save" = "保存するデータの種類を選択して下さい";
+
+/* Use same text as E:D Launcher's verification dialog. [prefs.py] */
+"Please enter the code into the box below." = "以下の欄に暗証コードを入力してください";
+
+/* Use same text as E:D Launcher's login dialog. [prefs.py] */
+"Please log in with your Elite: Dangerous account details" = "Elite: Dangerousのアカウント情報を入力して下さい";
+
+/* Federation rank. [stats.py] */
+"Post Captain" = "Post Captain";
+
+/* Federation rank. [stats.py] */
+"Post Commander" = "Post Commander";
+
+/* Ranking. [stats.py] */
+"Powerplay" = "Powerplay";
+
+/* [prefs.py] */
+"Preferences" = "環境設定";
+
+/* Empire rank. [stats.py] */
+"Prince" = "Prince";
+
+/* Section heading in settings. [prefs.py] */
+"Privacy" = "プライバシー";
+
+/* CQC rank. [stats.py] */
+"Professional" = "Professional";
+
+/* Privacy setting. [prefs.py] */
+"Pseudo-anonymized ID" = "擬似的な匿名ID";
+
+/* Explorer rank. [stats.py] */
+"Ranger" = "Ranger";
+
+/* Power rank. [stats.py] */
+"Rating 1" = "Rating 1";
+
+/* Power rank. [stats.py] */
+"Rating 2" = "Rating 2";
+
+/* Power rank. [stats.py] */
+"Rating 3" = "Rating 3";
+
+/* Power rank. [stats.py] */
+"Rating 4" = "Rating 4";
+
+/* Power rank. [stats.py] */
+"Rating 5" = "Rating 5";
+
+/* Status bar message on launch. [EDMarketConnector.py] */
+"Re-start Elite: Dangerous for automatic log entries" = "自動的にログを記録するにはElite: Dangerousを再起動してください";
+
+/* Output settings prompt. [prefs.py] */
+"Re-start Elite: Dangerous to use this feature" = "この機能を利用するにはElite: Dangerousを再起動してください";
+
+/* Shortcut settings prompt on OSX. [prefs.py] */
+"Re-start {APP} to use shortcuts" = "ショートカットを利用するには {APP} を再起動してください";
+
+/* Federation rank. [stats.py] */
+"Rear Admiral" = "Rear Admiral";
+
+/* Federation rank. [stats.py] */
+"Recruit" = "Recruit";
+
+/* Explorer rank. [stats.py] */
+"Scout" = "Scout";
+
+/* CQC rank. [stats.py] */
+"Semi Professional" = "Semi Professional";
+
+/* [prefs.py] */
+"Send flight log to Elite Dangerous Star Map" = "Elite Dangerous Star Mapにフライトログを送信する";
+
+/* [prefs.py] */
+"Send station data to the Elite Dangerous Data Network" = "Elite Dangerous Data Networkにステーションデータを送信する";
+
+/* [EDMarketConnector.py] */
+"Sending data to EDDN..." = "EDDNにデータ送信中...";
+
+/* [EDMarketConnector.py] */
+"Sending data to EDSM..." = "EDSMにデータ送信中...";
+
+/* Empire rank. [stats.py] */
+"Serf" = "Serf";
+
+/* Item in the File menu on Windows. [EDMarketConnector.py] */
+"Settings" = "設定";
+
+/* Status dialog subtitle. [stats.py] */
+"Ship" = "船";
+
+/* [prefs.py] */
+"Ship loadout in Coriolis format file" = "船の装備をCoriolis形式で保存する";
+
+/* [prefs.py] */
+"Ship loadout in E:D Shipyard format file" = "船の装備をE:D Shipyard形式で保存する";
+
+/* Status dialog title. [stats.py] */
+"Ships" = "所有船";
+
+/* Empire rank. [stats.py] */
+"Squire" = "Squire";
+
+/* Main window. [EDMarketConnector.py] */
+"Station" = "ステーション";
+
+/* [EDMarketConnector.py] */
+"Station doesn't have a market!" = "このステーションには市場がありません！";
+
+/* [EDMarketConnector.py] */
+"Station doesn't have anything!" = "このステーションには何も商品がありません！";
+
+/* Menu item. [EDMarketConnector.py] */
+"Status" = "現在の状態";
+
+/* Explorer rank. [stats.py] */
+"Surveyor" = "Surveyor";
+
+/* Main window. [EDMarketConnector.py] */
+"System" = "星系";
+
+/* Appearance setting. [prefs.py] */
+"Theme" = "テーマ";
+
+/* Ranking. [stats.py] */
+"Trade" = "Trade";
+
+/* Explorer rank. [stats.py] */
+"Trailblazer" = "Trailblazer";
+
+/* Trade rank. [stats.py] */
+"Tycoon" = "Tycoon";
+
+/* Update button in main window. [EDMarketConnector.py] */
+"Update" = "更新";
+
+/* Use same text as E:D Launcher's login dialog. [prefs.py] */
+"Username (Email)" = "ユーザ名(メールアドレス)";
+
+/* Federation rank. [stats.py] */
+"Vice Admiral" = "Vice Admiral";
+
+/* Menu title on OSX. [EDMarketConnector.py] */
+"View" = "表示";
+
+/* Empire rank. [stats.py] */
+"Viscount" = "Viscount";
+
+/* Federation rank. [stats.py] */
+"Warrant Officer" = "Warrant Officer";
+
+/* Shouldn't happen. [EDMarketConnector.py] */
+"What are you flying?!" = "どの船で飛行していますか？！";
+
+/* Shouldn't happen. [EDMarketConnector.py] */
+"Where are you?!" = "どこにいますか？！";
+
+/* Shouldn't happen. [EDMarketConnector.py] */
+"Who are you?!" = "どなたですか？！";
+
+/* Menu title on OSX. [EDMarketConnector.py] */
+"Window" = "ウィンドウ";
+
+/* [EDMarketConnector.py] */
+"You're not docked at a station!" = "ステーションにドッキングしていません！";
+
+/* Shortcut settings prompt on OSX. [prefs.py] */
+"{APP} needs permission to use shortcuts" = "{APP} がショートカットを利用するには許可が必要です";
+
diff --git a/README.md b/README.md
index 05e565b4..4d5e18a1 100644
--- a/README.md
+++ b/README.md
@@ -238,6 +238,7 @@ Acknowledgements
 * Thanks to Cmdr CoolBreeze for the Dutch translation.
 * Thanks to [Cmdr Anthor](http://ed-td.space/) for the French translation.
 * Thanks to [Cmdr Koreldan](http://ed-map.eu/) for the Italian translation.
+* Thanks to Cmdr magni1200s for the Japanese translation.
 * Thanks to Cmdr bubis7 for the Latvian translation.
 * Thanks to Cmdr Amarok 73 for the Polish translation.
 * Thanks to Armando Ota for the Slovenian translation.