From d60244c0da211635d1833d79eb0e714113b086df Mon Sep 17 00:00:00 2001
From: Alvin Wong <alvinhochun@gmail.com>
Date: Tue, 12 Oct 2021 23:53:14 +0800
Subject: [PATCH 1/2] Remove obsolete msgs from translation_JA_JP.json

---
 Translations/translation_JA_JP.json | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Translations/translation_JA_JP.json b/Translations/translation_JA_JP.json
index 7d3000d8..47940763 100755
--- a/Translations/translation_JA_JP.json
+++ b/Translations/translation_JA_JP.json
@@ -4,25 +4,19 @@
   "fonts": ["ascii_basic", "cjk"],
   "tempUnitFahrenheit": true,
   "messages": {
-    "SettingsCalibrationDone": "校正完了",
     "SettingsCalibrationWarning": "続行する前に、コテ先が室温と同じになっていることを確認してください",
     "SettingsResetWarning": "設定をリセットしますか？",
     "UVLOWarningString": "DC電圧が低すぎます",
     "UndervoltageString": "電圧不足",
     "InputVoltageString": "入力電圧 V: ",
-    "WarningTipTempString": "コテ先温度: ",
-    "BadTipString": "コテ先エラー",
     "SleepingSimpleString": "Zzzz",
     "SleepingAdvancedString": "スリープ中...",
-    "WarningSimpleString": "高温注意!",
-    "WarningAdvancedString": "!!! コテ先高温 !!!",
     "SleepingTipAdvancedString": "コテ先:",
     "IdleTipString": "コテ先:",
     "IdleSetString": " 設定:",
     "TipDisconnectedString": "コテ先が接続されていません",
     "SolderingAdvancedPowerPrompt": "電源: ",
-    "OffString": "オフ",
-    "YourGainMessage": "ゲイン:"
+    "OffString": "オフ"
   },
   "messagesWarn": {
     "ResetOKMessage": "リセットOK",

From 5e2d696260046b7f86e690a37c0b12d6dbd409bf Mon Sep 17 00:00:00 2001
From: Alvin Wong <alvinhochun@gmail.com>
Date: Wed, 13 Oct 2021 00:06:44 +0800
Subject: [PATCH 2/2] Revert "Update translation_JA_JP.json"

This reverts commit 20c2b78e389104fb9c8a6c5479c28aa7fe747a68.
---
 Translations/translation_JA_JP.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Translations/translation_JA_JP.json b/Translations/translation_JA_JP.json
index 47940763..3a07ada8 100755
--- a/Translations/translation_JA_JP.json
+++ b/Translations/translation_JA_JP.json
@@ -6,16 +6,16 @@
   "messages": {
     "SettingsCalibrationWarning": "続行する前に、コテ先が室温と同じになっていることを確認してください",
     "SettingsResetWarning": "設定をリセットしますか？",
-    "UVLOWarningString": "DC電圧が低すぎます",
-    "UndervoltageString": "電圧不足",
-    "InputVoltageString": "入力電圧 V: ",
+    "UVLOWarningString": "電圧が低すぎます",
+    "UndervoltageString": "Undervoltage",
+    "InputVoltageString": "Input V: ",
     "SleepingSimpleString": "Zzzz",
-    "SleepingAdvancedString": "スリープ中...",
-    "SleepingTipAdvancedString": "コテ先:",
-    "IdleTipString": "コテ先:",
-    "IdleSetString": " 設定:",
-    "TipDisconnectedString": "コテ先が接続されていません",
-    "SolderingAdvancedPowerPrompt": "電源: ",
+    "SleepingAdvancedString": "Sleeping...",
+    "SleepingTipAdvancedString": "Tip:",
+    "IdleTipString": "Tip:",
+    "IdleSetString": " Set:",
+    "TipDisconnectedString": "NO TIP",
+    "SolderingAdvancedPowerPrompt": "Power: ",
     "OffString": "オフ"
   },
   "messagesWarn": {