diff --git a/app/client/public/locales/ja/translation.json b/app/client/public/locales/ja/translation.json
new file mode 100644
index 0000000..cba0ee1
--- /dev/null
+++ b/app/client/public/locales/ja/translation.json
@@ -0,0 +1,45 @@
+{
+  "Waiting for user to click ALLOW button on screen sharing device...": "画面共有デバイスでユーザーが「許可」をクリックするのを待っています...",
+  "Waiting for user to select source to share from screen sharing device...": "画面共有デバイスから共有するソースをユーザーが選択するのを待っています...",
+  "My Device Info": "このデバイスの情報",
+  "Device Type": "デバイスの種類",
+  "Your Device IP should match with Device IP in alert popup appeared on your computer, where Deskreen is running": "Deskreenが動作しているパソコンに表示されるアラートポップアップの\"デバイスIP\"と、このデバイスのデバイスIPが一致する必要があります。",
+  "Device IP": "デバイスのIP",
+  "Device Browser": "デバイスのブラウザ",
+  "Device OS": "デバイスのOS",
+  "These details should match with the ones that you see in alert popup on computer screen, where Deskreen is running": "これらの内容は、画面共有デバイスのアラートポップアップに表示される内容と一致している必要があります。",
+  "Deskreen Screen Viewer": "Deskreen Screen Viewer",
+  "Connected!": "接続されました！",
+  "Error occurred": "エラーが発生しました",
+  "Deskreen Error Dialog": "Deskreen エラーダイアログ",
+  "Something went wrong": "何らかの問題が発生しました",
+  "You may close this browser window then try to connect again": "このブラウザを閉じてから、再度接続を試みてください",
+  "An unknown error occurred": "不明なエラーが発生しました",
+  "You were not allowed to connect": "接続が許可されていません",
+  "You were disconnected": "接続が切断されました",
+  "WebRTC error occurred": "WebRTCエラーが発生しました",
+  "If you like Deskreen consider contributing financially Deskreen is open-source Your donations keep us motivated to make Deskreen even better": "Deskreenを気に入っていただけたなら、資金面での貢献をご検討ください。Deskreenはオープンソースです。あなたの寄付により、私たちはDeskreenをより良いものにするためのモチベーションを保つことができます。",
+  "Donate": "寄付",
+  "Video stream is paused": "ビデオストリームを一時停止しています",
+  "Video stream is playing": "ビデオストリームを再生中です",
+  "Pause": "一時停止",
+  "Play": "再生",
+  "Video Settings": "ビデオ設定",
+  "Flip": "反転",
+  "Video quality has been changed to": "ビデオの画質を変更しました。画質：",
+  "Click to Open Video Settings": "クリックしてビデオ設定を開きます",
+  "Click to Enter Full Screen Mode": "クリックするとフルスクリーンモードになります",
+  "Default video player has been turned OFF": "デフォルトのビデオプレーヤーがOFFになっています",
+  "Default video player has been turned ON": "デフォルトのビデオプレーヤーがONになっています",
+  "ON": "ON",
+  "OFF": "OFF",
+  "Default Video Player": "デフォルトのビデオプレーヤー",
+  "Click to visit our website": "クリックするとウェブサイトが開きます",
+  "Video is flipped horizontally": "映像が水平方向に反転しています",
+  "TRANSLATIONS BELOW ARE NOT ADDED TO UI YET, BUT YOUR TRANSLATIONS ARE WELCOME! THE FEATURES WILL BE ADDED SOON SO YOUR TRANSLATIONS ARE NEEDED": "",
+  "Click to see connection info": "クリックすると接続情報が表示されます",
+  "Pair ID": "ペアID",
+  "Unpair": "ペア解除",
+  "Session ID": "セッションID",
+  "Click to boost video stream if it is lagging": "クリックすると、ビデオストリームが遅延している場合、ブーストされます"
+}
diff --git a/app/client/src/config/i18n.ts b/app/client/src/config/i18n.ts
index 9049ba2..c0d01a8 100644
--- a/app/client/src/config/i18n.ts
+++ b/app/client/src/config/i18n.ts
@@ -22,7 +22,7 @@ i18n
     saveMissingTo: 'all',
     fallbackLng: 'en', // TODO: to generate missing keys use false as value here, will be useful when custom nodejs server is created to store missing values
     debug: false, // change to true to see debug message logs in browser console
-    whitelist: ['en', 'es', 'ru', 'ua', 'zh_CN', 'zh_TW', 'da', 'de', 'fi', 'ko', 'it'],
+    whitelist: ['en', 'es', 'ru', 'ua', 'zh_CN', 'zh_TW', 'da', 'de', 'fi', 'ko', 'it', 'ja'],
     backend: {
       // path where resources get loaded from
       loadPath: '/locales/{{lng}}/{{ns}}.json',
diff --git a/app/configs/app.lang.config.ts b/app/configs/app.lang.config.ts
index d5e1006..b6918ec 100644
--- a/app/configs/app.lang.config.ts
+++ b/app/configs/app.lang.config.ts
@@ -15,6 +15,7 @@ export default {
     'fi',
     'ko',
     'it',
+    'ja',
   ],
   langISOKeyToLangFullNameMap: {
     en: 'English',
@@ -28,5 +29,6 @@ export default {
     ko: '한국어',
     zh_CN: '简体中文',
     zh_TW: '繁體中文',
+    ja: '日本語',
   },
 };
diff --git a/app/configs/i18next.config.client.ts b/app/configs/i18next.config.client.ts
index 370fd1e..2049e0f 100644
--- a/app/configs/i18next.config.client.ts
+++ b/app/configs/i18next.config.client.ts
@@ -19,6 +19,7 @@ import translationDA from '../locales/da/translation.json';
 import translationDE from '../locales/de/translation.json';
 import translationFI from '../locales/fi/translation.json';
 import translationIT from '../locales/it/translation.json';
+import translationJA from '../locales/ja/translation.json';
 import { IpcEvents } from '../main/IpcEvents.enum';
 import { ElectronStoreKeys } from '../enums/ElectronStoreKeys.enum';
 import store from '../deskreen-electron-store';
@@ -66,6 +67,7 @@ export const getShuffledArrayOfHello = (): string[] => {
   res.push(translationDE.Hello);
   res.push(translationFI.Hello);
   res.push(translationIT.Hello);
+  res.push(translationJA.Hello);
 
   shuffleArray(res);
 
diff --git a/app/locales/da/translation.json b/app/locales/da/translation.json
index c17cf1c..10b4027 100644
--- a/app/locales/da/translation.json
+++ b/app/locales/da/translation.json
@@ -13,6 +13,7 @@
   "fi": "Suomi",
   "ko": "한국어",
   "it": "Italiano",
+  "ja": "日本語",
   "Donate": "Donér",
   "If you like Deskreen consider contributing financially Deskreen is open-source Your donations keep us motivated to make Deskreen even better": "Hvis du er vild med Deskreen, så overvej at bidrage til Deskreen financielt. Deskreen er open-source. Dine donationer hjælper os med at forblive motiverede for at gøre Deskreen endnu bedre.",
   "Click to visit our website": "Klik her for at besøge vores hjemmeside",
diff --git a/app/locales/de/translation.json b/app/locales/de/translation.json
index e449815..9665d31 100644
--- a/app/locales/de/translation.json
+++ b/app/locales/de/translation.json
@@ -13,6 +13,7 @@
   "fi": "Suomi",
   "ko": "한국어",
   "it": "Italiano",
+  "ja": "日本語",
   "Donate": "Spenden",
   "If you like Deskreen consider contributing financially Deskreen is open-source Your donations keep us motivated to make Deskreen even better": "Wenn dir Deskreen gefällt, denke über eine Spende nach. Deskreen ist Open-Source. Spenden motivieren uns, Deskreen noch besser zu machen.",
   "Click to visit our website": "Klicken um unsere Website zu besuchen",
diff --git a/app/locales/en/translation.json b/app/locales/en/translation.json
index f97fe0a..f0619b9 100644
--- a/app/locales/en/translation.json
+++ b/app/locales/en/translation.json
@@ -13,6 +13,7 @@
   "fi": "Suomi",
   "ko": "한국어",
   "it": "Italiano",
+  "ja": "日本語",
   "Donate": "Donate",
   "If you like Deskreen consider contributing financially Deskreen is open-source Your donations keep us motivated to make Deskreen even better": "If you like Deskreen, consider contributing financially. Deskreen is open-source. Your donations keep us motivated to make Deskreen even better.",
   "Click to visit our website": "Click to visit our website",
diff --git a/app/locales/es/translation.json b/app/locales/es/translation.json
index 54ed150..2b92b7c 100644
--- a/app/locales/es/translation.json
+++ b/app/locales/es/translation.json
@@ -13,6 +13,7 @@
   "fi": "Suomi",
   "ko": "한국어",
   "it": "Italiano",
+  "ja": "日本語",
   "Donate": "Donar",
   "If you like Deskreen consider contributing financially Deskreen is open-source Your donations keep us motivated to make Deskreen even better": "Si te gusta Deskreen, considera la posibilidad de contribuir económicamente. Deskreen es de código abierto. Tus donaciones nos mantienen motivados para hacer que Deskreen sea aún mejor.",
   "Click to visit our website": "Clic para visitar nuestro sitio web",
diff --git a/app/locales/fi/translation.json b/app/locales/fi/translation.json
index 020028e..340da5c 100644
--- a/app/locales/fi/translation.json
+++ b/app/locales/fi/translation.json
@@ -13,6 +13,7 @@
   "fi": "Suomi",
   "ko": "한국어",
   "it": "Italiano",
+  "ja": "日本語",
   "Donate": "Lahjoittaa",
   "If you like Deskreen consider contributing financially Deskreen is open-source Your donations keep us motivated to make Deskreen even better": "Jos pidät Deskreen, harkitse taloudellista osallistumista. Deskreen on avoimen lähdekoodin lähde. Lahjoituksesi motivoivat meitä tekemään Deskreen entistä paremman.",
   "Click to visit our website": "Napsauta vieraillaksesi verkkosivuillamme",
diff --git a/app/locales/it/translation.json b/app/locales/it/translation.json
index dedcd53..495b66f 100644
--- a/app/locales/it/translation.json
+++ b/app/locales/it/translation.json
@@ -13,6 +13,7 @@
   "fi": "Suomi",
   "ko": "한국어",
   "it": "Italiano",
+  "ja": "日本語",
   "Donate": "Dona",
   "If you like Deskreen consider contributing financially Deskreen is open-source Your donations keep us motivated to make Deskreen even better": "Se ti piace Deskreen, considera di contribuire finanziariamente. Deskreen è open-source. Le tue donazioni ci motivano a rendere Deskreen ancora migliore.",
   "Click to visit our website": "Clicca per visitare il nostro sito",
diff --git a/app/locales/ja/translation.json b/app/locales/ja/translation.json
new file mode 100644
index 0000000..ae95295
--- /dev/null
+++ b/app/locales/ja/translation.json
@@ -0,0 +1,151 @@
+{
+  "Hello": "こんにちは",
+  "Continue": "続ける",
+  "Language": "言語",
+  "ru": "Русский",
+  "en": "English",
+  "es": "Español",
+  "ua": "Українська",
+  "zh_CN": "简体中文",
+  "zh_TW": "繁體中文",
+  "da": "Dansk",
+  "de": "Deutsch",
+  "fi": "Suomi",
+  "ko": "한국어",
+  "it": "Italiano",
+  "ja": "日本語",
+  "Donate": "寄付",
+  "If you like Deskreen consider contributing financially Deskreen is open-source Your donations keep us motivated to make Deskreen even better": "Deskreenを気に入っていただけたなら、資金面での貢献をご検討ください。 Deskreenはオープンソースです。あなたの寄付により、Deskreenをより良くするためのモチベーションが保つことができます。",
+  "Click to visit our website": "クリックするとウェブサイトが開きます。",
+  "Connected Devices": "接続されたデバイス",
+  "Tutorial": "チュートリアル",
+  "Settings": "設定",
+  "Connect": "接続",
+  "Select": "選択",
+  "Confirm": "確認",
+  "Scan the QR code": "QRコードをスキャン",
+  "Make sure your computer and screen viewing device are connected to same Wi-Fi": "パソコンと画面表示デバイスが同じWi-Fiに接続されていることを確認してください。",
+  "Or type the following address in browser address bar on any device": "または、各端末のブラウザのアドレスバーに以下のアドレスを入力してください。",
+  "Someone is trying to connect, do you allow?": "誰かが接続しようとしています。許可しますか？",
+  "Click to make bigger": "クリックで拡大",
+  "Click to copy": "クリックでコピー",
+  "Partner Device Info": "接続するデバイスの情報",
+  "Device Type": "デバイスの種類",
+  "Device IP": "デバイスのIP",
+  "Device Browser": "デバイスのブラウザ",
+  "Device OS": "デバイスのOS",
+  "Session ID": "セッションID",
+  "Allow": "許可",
+  "Deny": "拒否",
+  "Device is successfully disconnected by you You can connect a new device": "デバイスが正常に切断されました。新しいデバイスを接続することができます。",
+  "Deskreen Update is Available!": "Deskreenのアップデートが利用可能です！",
+  "Your current version is": "現在お使いのバージョン：",
+  "Click to download new updated version": "クリックすると新しいアップデートされたバージョンをダウンロードできます。",
+  "Connected": "接続されています",
+  "Click to see more": "クリックして詳細を見る",
+  "This should match with Device IP displayed on the screen of device that is trying to connect": "この値は、接続しようとしているデバイスの画面に表示されているデバイスのIPと一致する必要があります。",
+  "If IP addresses dont match click Disconnect button": "IPアドレスが一致しない場合は、「切断」ボタンをクリックして、コンピュータの画面への不正アクセスを防止してください。",
+  "Disconnect": "切断する",
+  "Choose Entire Screen or App window you want to share": "共有したい画面全体またはアプリのウィンドウを選択する",
+  "OR": "OR",
+  "Entire Screen": "画面全体",
+  "Application Window": "アプリケーションウィンドウ",
+  "Check if all is OK and click Confirm": "すべて問題ないことを確認し、「確認」をクリックします。",
+  "Confirm Button Text": "確認",
+  "No, I need to choose other": "いいえ、その他を共有します",
+  "Done!": "完了!",
+  "Now you can see your screen on other device": "これで、接続されたデバイスで自分の画面を見ることができます。",
+  "You can manage connected devices by clicking Connected Devices button in top panel": "トップパネルの「接続されたデバイス」をクリックして接続されたデバイスを管理することができます。",
+  "Connect New Device": "新しいデバイスを接続",
+  "Select Entire Screen to Share": "共有する画面を選択",
+  "Select App Window to Share": "共有するアプリのウィンドウを選択",
+  "Refresh": "リフレッシュ",
+  "Disconnect all devices": "すべてのデバイスを切断する",
+  "Are you sure you want to disconnect all connected viewing devices?": "接続されているすべてのデバイスを切断してよろしいですか？",
+  "This step can not be undone": "このステップは元に戻すことができません",
+  "You will have to connect all devices manually again": "再度、すべてのデバイスを手動で接続する必要があります",
+  "No, Cancel": "キャンセル",
+  "Yes, Disconnect All": "すべて切断する",
+  "A new version of Deskreen is available! Click to download new version": "Deskreenの新バージョンがリリースされました。クリックして新バージョンがダウンロードできます。",
+  "Security": "セキュリティ",
+  "General": "一般",
+  "About": "詳細",
+  "Website": "ウェブサイト",
+  "About Deskreen": "Deskreenについて",
+  "Security Settings": "セキュリティの設定",
+  "Color Theme": "カラーテーマ",
+  "Automatic Updates": "自動更新",
+  "General Settings": "一般的な設定",
+  "Disabled": "使用不可",
+  "Version": "バージョン",
+  "Copyright": "コピーライト",
+  "Edit": "編集",
+  "Hide Deskreen": "Deskreenを隠す",
+  "Hide Others": "その他を隠す",
+  "Show All": "すべて表示",
+  "Quit": "閉じる",
+  "Undo": "取り消す",
+  "Redo": "やり直す",
+  "Cut": "カット",
+  "Copy": "コピー",
+  "Paste": "ペースト",
+  "Select All": "すべて表示",
+  "View": "表示",
+  "Reload": "再読込",
+  "Toggle Full Screen": "全画面表示",
+  "Toggle Developer Tools": "デベロッパーツールの切り替え",
+  "Window": "ウィンドウ",
+  "Minimize": "最小化",
+  "Close": "閉じる",
+  "Bring All to Front": "すべてを前面に出す",
+  "Help": "ヘルプ",
+  "Learn More": "さらに詳しく",
+  "Documentation": "文書",
+  "Community Discussions": "コミュニティーディスカッション",
+  "Search Issues": "検索条件",
+  "TRANSLATIONS BELOW ARE NOT ADDED TO UI YET, BUT YOUR TRANSLATIONS ARE WELCOME! THE FEATURES WILL BE ADDED SOON SO YOUR TRANSLATIONS ARE NEEDED": "",
+  "Available Trusted Devices": "利用可能な信頼できるデバイス",
+  "Make this device trusted": "このデバイスを信頼する",
+  "Click to select other screen source to share": "クリックして共有する他の画面ソースを選択",
+  "Click to edit Device Alias": "クリックしてデバイスエイリアスを編集",
+  "Trusted Device ID": "信頼できるデバイスのID",
+  "Trusted": "信頼されています",
+  "Make Trusted": "信頼する",
+  "Forget This Device": "このデバイスを忘れる",
+  "Device Alias": "デバイスエイリアス",
+  "Auto share last Entire Screen source when device is available": "デバイスが利用可能な場合、最後の画面ソースを自動共有する",
+  "All devices are successfully disconnected": "すべてのデバイスは正常に切断されました",
+  "Device was disconnected": "デバイスは切断されました",
+  "Networking": "ネットワーク構築",
+  "Deskreen Application Port": "Deskreenアプリケーションポート",
+  "Port is already used by other App": "他のアプリで既に使用されているポート",
+  "Click to change Deskreen Application Port": "クリックすると、Deskreenアプリケーションポートが変更されます。",
+  "Type a number from 3000 to 64000 to use as a Deskreen Application Port": "Deskreenアプリケーションポートとして使用する3000から64000までの番号を入力します。",
+  "Type another number in range from 3000 to 64000": "3000から64000の範囲で別の数値を入力します。",
+  "Select Network Interface": "ネットワークインターフェースの選択",
+  "I know IP of my computer and I want to type it manually": "自分のコンピュータのIPが分かっているので、それを手動で入力したい。",
+  "Type Your Computer IP": "コンピューターのIPを入力",
+  "Click to type IP manually": "クリックしてIPを手動で入力",
+  "Banned IPs": "禁止されたIP",
+  "Ban New IP": "新しくIPを禁止する",
+  "Type the IP you want to ban": "禁止したいIPを入力する",
+  "Unban this IP": "このIPの使用禁止を解除",
+  "Unban all IPs": "すべてのIPの使用禁止を解除",
+  "Reset Deskreen settings to default": "Deskreenの設定をデフォルトに戻す",
+  "Ask user to enter password when connecting": "接続時にパスワードの入力を要求する",
+  "Change Password": "パスワードを変更",
+  "Type a New Password": "新しいパスワードを入力",
+  "Cancel": "キャンセル",
+  "Device Status": "デバイスの状態",
+  "Sharing Screen": "共有中の画面",
+  "Available, no screen sharing": "利用可能 画面共有不可",
+  "Not Available": "利用不可",
+  "Autostart Deskreen App on login": "ログイン時にDeskreenアプリを自動起動する",
+  "Open Deskreen App window on login": "ログイン時にDeskreen Appのウィンドウを開く",
+  "Use system tray": "システムトレイを使用する",
+  "Deskreen System Tray": "Deskreen システムトレイ",
+  "Open App Window": "アプリのウィンドウを開く",
+  "Minimize To Tray": "トレイに最小化する",
+  "Show Connected Devices": "接続されたデバイスを見る",
+  "Quit Deskreen": "Deskreenを閉じる"
+}
diff --git a/app/locales/ko/translation.json b/app/locales/ko/translation.json
index e72df5f..f598437 100644
--- a/app/locales/ko/translation.json
+++ b/app/locales/ko/translation.json
@@ -13,6 +13,7 @@
   "fi": "Suomi",
   "ko": "한국어",
   "it": "Italiano",
+  "ja": "日本語",
   "Donate": "기부하기",
   "If you like Deskreen consider contributing financially Deskreen is open-source Your donations keep us motivated to make Deskreen even better": "오픈소스 프로젝트에 재정적으로 기여하는 것은 더 좋은 프로그램 개발 동기를 부여합니다.",
   "Click to visit our website": "클릭하면 웹 사이트를 방문합니다",
diff --git a/app/locales/ru/translation.json b/app/locales/ru/translation.json
index cfc06b0..8a0e1a0 100644
--- a/app/locales/ru/translation.json
+++ b/app/locales/ru/translation.json
@@ -13,6 +13,7 @@
   "fi": "Suomi",
   "ko": "한국어",
   "it": "Italiano",
+  "ja": "日本語",
   "Donate": "Пожертвовать",
   "If you like Deskreen consider contributing financially Deskreen is open-source Your donations keep us motivated to make Deskreen even better": "Если вам нравится Deskreen, подумайте о том, чтобы внести финансовый вклад. Deskreen - это оупенсорсный проэкт. Ваши пожертвования позволяют нам делать Deskreen еще лучше.",
   "Click to visit our website": "Нажмите, чтобы посетить наш сайт",
diff --git a/app/locales/ua/translation.json b/app/locales/ua/translation.json
index a7a3628..16b3d23 100644
--- a/app/locales/ua/translation.json
+++ b/app/locales/ua/translation.json
@@ -13,6 +13,7 @@
   "fi": "Suomi",
   "ko": "한국어",
   "it": "Italiano",
+  "ja": "日本語",
   "Donate": "Пожертвувати",
   "If you like Deskreen consider contributing financially Deskreen is open-source Your donations keep us motivated to make Deskreen even better": "Якщо вам подобається Deskreen, подумайте про те, щоб внести фінансовий внесок. Deskreen - це оупенсорсний проект. Ваші пожертвування дозволяють нам робити Deskreen ще краще.",
   "Click to visit our website": "Натисніть, щоб відвідати наш сайт",
diff --git a/app/locales/zh_CN/translation.json b/app/locales/zh_CN/translation.json
index 3b374ec..3f627a5 100644
--- a/app/locales/zh_CN/translation.json
+++ b/app/locales/zh_CN/translation.json
@@ -13,6 +13,7 @@
   "fi": "Suomi",
   "ko": "한국어",
   "it": "Italiano",
+  "ja": "日本語",
   "Donate": "捐赠",
   "If you like Deskreen consider contributing financially Deskreen is open-source Your donations keep us motivated to make Deskreen even better": "如果你喜欢 Deskreen，可以考虑出钱。Deskreen 是开源的。您的捐赠使我们有动力让 Deskreen 变得更好。",
   "Click to visit our website": "点击访问我们的网站",
diff --git a/app/locales/zh_TW/translation.json b/app/locales/zh_TW/translation.json
index 36d7333..b6767c1 100644
--- a/app/locales/zh_TW/translation.json
+++ b/app/locales/zh_TW/translation.json
@@ -13,6 +13,7 @@
   "fi": "Suomi",
   "ko": "한국어",
   "it": "Italiano",
+  "ja": "日本語",
   "Donate": "捐贈",
   "If you like Deskreen consider contributing financially Deskreen is open-source Your donations keep us motivated to make Deskreen even better": "如果你喜歡 Deskreen，可以考慮出錢。Deskreen 是開源的。您的捐贈使我們有動力讓 Deskreen 變得更好。",
   "Click to visit our website": "點選訪問我們的網站",