Merge pull request #1445 from alvinhochun/alvin/cjk-update

Update Chinese and Japanese translations
2022-11-06 21:20:12 +11:00
parent 544bcac930 6f3a2fb775
commit f11f550e0b
6 changed files with 55 additions and 26 deletions
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -14,7 +14,7 @@ jobs:

    steps:
      - name: Install dependencies (apk)
-        run: apk add --no-cache gcc-riscv-none-elf gcc-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi findutils python3 py3-pip make git musl-dev clang bash clang-extra-tools
+        run: apk add --no-cache gcc-riscv-none-elf gcc-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi findutils python3 py3-pip make git bash

      - name: Install dependencies (python)
        run: python3 -m pip install bdflib
--- a/Translations/translation_JA_JP.json
+++ b/Translations/translation_JA_JP.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": true,
 	"messages": {
-		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
+		"SettingsCalibrationWarning": "次に電源を入れるときは、コテ先と本体が室温と同じになっていることを確認してください",
 		"SettingsResetWarning": "設定をリセットしますか？",
 		"UVLOWarningString": "電圧が低すぎます",
 		"UndervoltageString": "Undervoltage",
@@ -16,7 +16,7 @@
 		"SleepingAdvancedString": "Sleeping...",
 		"SleepingTipAdvancedString": "Tip:",
 		"OffString": "オフ",
-		"DeviceFailedValidationWarning": "Your device is most likely a counterfeit!"
+		"DeviceFailedValidationWarning": "このデバイスはおそらく偽造品です"
 	},
 	"messagesWarn": {
 		"ResetOKMessage": "リセットOK",
@@ -84,7 +84,10 @@
 			"desc": "QC電源使用時に要求する目標電圧"
 		},
 		"PDNegTimeout": {
-			"text2": "PD timeout",
+			"text2": [
+				"PD",
+				"timeout"
+			],
 			"desc": "一部のQC電源との互換性のため、PDネゴシエーションをタイムアウトする時間 <x100ms（ミリ秒）>"
 		},
 		"BoostTemperature": {
@@ -164,8 +167,8 @@
 			"desc": "画面の色を反転する"
 		},
 		"LOGOTime": {
-			"text2": "Boot logo duration",
-			"desc": "Set boot logo duration (s=seconds)"
+			"text2": "起動画面",
+			"desc": "起動画面の表示時間を設定する"
 		},
 		"AdvancedIdle": {
 			"text2": "詳細な待受画面",
@@ -180,7 +183,10 @@
 			"desc": "最大電力を制限する <W=ワット>"
 		},
 		"CalibrateCJC": {
-			"text2": "Calibrate CJC",
+			"text2": [
+				"Calibrate CJC",
+				"at next boot"
+			],
 			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5 C)"
 		},
 		"VoltageCalibration": {
--- a/Translations/translation_YUE_HK.json
+++ b/Translations/translation_YUE_HK.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": true,
 	"messages": {
-		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
+		"SettingsCalibrationWarning": "喺下次開機嗰陣時，請確定焫雞咀同機身都係處於室温！",
 		"SettingsResetWarning": "你係咪確定要將全部設定重設到預設值？",
 		"UVLOWarningString": "電壓過低",
 		"UndervoltageString": "Undervoltage",
@@ -16,7 +16,7 @@
 		"SleepingAdvancedString": "Sleeping...",
 		"SleepingTipAdvancedString": "Tip:",
 		"OffString": "關",
-		"DeviceFailedValidationWarning": "Your device is most likely a counterfeit!"
+		"DeviceFailedValidationWarning": "依支焫雞好有可能係冒牌貨！"
 	},
 	"messagesWarn": {
 		"ResetOKMessage": "已重設！",
@@ -164,8 +164,8 @@
 			"desc": "反轉OLED熒幕嘅黑白色"
 		},
 		"LOGOTime": {
-			"text2": "Boot logo duration",
-			"desc": "Set boot logo duration (s=seconds)"
+			"text2": "開機畫面",
+			"desc": "設定開機畫面顯示時長 <s=秒>"
 		},
 		"AdvancedIdle": {
 			"text2": "詳細閒置畫面",
@@ -180,8 +180,8 @@
 			"desc": "限制焫雞可用嘅最大功率 <W=watt（火）>"
 		},
 		"CalibrateCJC": {
-			"text2": "Calibrate CJC",
-			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5 C)"
+			"text2": "校正CJC",
+			"desc": "喺下次開機時校正焫雞咀熱電偶温度感應嘅冷接點補償（温度差低過攝氏5度嘅話唔使校正）"
 		},
 		"VoltageCalibration": {
 			"text2": "輸入電壓校正？",
--- a/Translations/translation_ZH_CN.json
+++ b/Translations/translation_ZH_CN.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": true,
 	"messages": {
-		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
+		"SettingsCalibrationWarning": "于下次开机时，请确定烙铁头和机身均处于室温！",
 		"SettingsResetWarning": "你是否确定要将全部设定重置为默认值？",
 		"UVLOWarningString": "电压过低",
 		"UndervoltageString": "Undervoltage",
@@ -16,7 +16,7 @@
 		"SleepingAdvancedString": "Zzzz...",
 		"SleepingTipAdvancedString": "--->",
 		"OffString": "关",
-		"DeviceFailedValidationWarning": "Your device is most likely a counterfeit!"
+		"DeviceFailedValidationWarning": "这支电烙铁很有可能是冒牌货！"
 	},
 	"messagesWarn": {
 		"ResetOKMessage": "已重置！",
@@ -164,8 +164,8 @@
 			"desc": "反转OLED黑/白屏幕"
 		},
 		"LOGOTime": {
-			"text2": "Boot logo duration",
-			"desc": "Set boot logo duration (s=seconds)"
+			"text2": "开机画面",
+			"desc": "设定开机画面显示时长 <s=秒>"
 		},
 		"AdvancedIdle": {
 			"text2": "闲置画面详情",
@@ -180,8 +180,8 @@
 			"desc": "限制烙铁可用的最大功率 <W=瓦特>"
 		},
 		"CalibrateCJC": {
-			"text2": "Calibrate CJC",
-			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5 C)"
+			"text2": "校正CJC",
+			"desc": "于下次开机时校正烙铁头热电偶温度感应的冷接点补偿（温度差低于摄氏5度的话则无需校正）"
 		},
 		"VoltageCalibration": {
 			"text2": "输入电压校正？",
--- a/Translations/translation_ZH_TW.json
+++ b/Translations/translation_ZH_TW.json
@@ -7,7 +7,7 @@
 	],
 	"tempUnitFahrenheit": true,
 	"messages": {
-		"SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!",
+		"SettingsCalibrationWarning": "於下次開機時，請確定烙鐵頭和機身均處於室溫！",
 		"SettingsResetWarning": "你是否確定要將全部設定重設到預設值？",
 		"UVLOWarningString": "電壓過低",
 		"UndervoltageString": "Undervoltage",
@@ -16,7 +16,7 @@
 		"SleepingAdvancedString": "Sleeping...",
 		"SleepingTipAdvancedString": "Tip:",
 		"OffString": "關",
-		"DeviceFailedValidationWarning": "Your device is most likely a counterfeit!"
+		"DeviceFailedValidationWarning": "這支電烙鐵很有可能是冒牌貨！"
 	},
 	"messagesWarn": {
 		"ResetOKMessage": "已重設！",
@@ -164,8 +164,8 @@
 			"desc": "反轉OLED螢幕的黑白色彩"
 		},
 		"LOGOTime": {
-			"text2": "Boot logo duration",
-			"desc": "Set boot logo duration (s=seconds)"
+			"text2": "開機畫面",
+			"desc": "設定開機畫面顯示時長 <s=秒>"
 		},
 		"AdvancedIdle": {
 			"text2": "詳細閒置畫面",
@@ -180,8 +180,8 @@
 			"desc": "限制烙鐵可用的最大功率 <W=watt（瓦特）>"
 		},
 		"CalibrateCJC": {
-			"text2": "Calibrate CJC",
-			"desc": "Calibrate tip Cold Junction Compensation at the next boot (not required if Delta T is < 5 C)"
+			"text2": "校正CJC",
+			"desc": "於下次開機時校正烙鐵頭熱電偶溫度感應的冷接點補償（溫度差低於攝氏5度的話則無需校正）"
 		},
 		"VoltageCalibration": {
 			"text2": "輸入電壓校正？",
--- a/source/Makefile
+++ b/source/Makefile
@@ -472,6 +472,30 @@ firmware-%: $(HEXFILE_DIR)/$(model)_%.hex $(HEXFILE_DIR)/$(model)_%.bin $(HEXFIL
 	python3 dfuse-pack.py -b $(DEVICE_DFU_ADDRESS)@0:$< -D $(DEVICE_DFU_VID_PID) $@

 $(HEXFILE_DIR)/$(model)_%.elf : \
+		$(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \
+		$(OUTPUT_DIR)/Core/Gen/Translation.%.o \
+		$(OUTPUT_DIR)/Core/LangSupport/lang_single.o \
+		Makefile $(LDSCRIPT)
+	@test -d $(@D) || mkdir -p $(@D)
+	@echo Linking $@
+	@$(CPP) $(CXXFLAGS) $(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \
+		$(OUTPUT_DIR)/Core/Gen/Translation.$*.o \
+		$(OUTPUT_DIR)/Core/LangSupport/lang_single.o \
+		$(LIBS) $(LINKER_FLAGS) -o$@ -Wl,-Map=$@.map
+
+$(HEXFILE_DIR)/$(model)_string_compressed_%.elf : \
+		$(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \
+		$(OUTPUT_DIR)/Core/Gen/Translation_brieflz.%.o \
+		$(OUTPUT_DIR)/Core/LangSupport/lang_single.o \
+		Makefile $(LDSCRIPT)
+	@test -d $(@D) || mkdir -p $(@D)
+	@echo Linking $@
+	@$(CPP) $(CXXFLAGS) $(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \
+		$(OUTPUT_DIR)/Core/Gen/Translation_brieflz.$*.o \
+		$(OUTPUT_DIR)/Core/LangSupport/lang_single.o \
+		$(LIBS) $(LINKER_FLAGS) -o$@ -Wl,-Map=$@.map
+
+$(HEXFILE_DIR)/$(model)_font_compressed_%.elf : \
 		$(OUT_OBJS_S) $(OUT_OBJS) $(OUT_OBJS_CPP) \
 		$(OUTPUT_DIR)/Core/Gen/Translation_brieflz_font.%.o \
 		$(OUTPUT_DIR)/Core/LangSupport/lang_single.o \
@@ -483,7 +507,6 @@ $(HEXFILE_DIR)/$(model)_%.elf : \
 		$(OUTPUT_DIR)/Core/LangSupport/lang_single.o \
 		$(LIBS) $(LINKER_FLAGS) -o$@ -Wl,-Map=$@.map

-
 $(OUT_OBJS): $(OUTPUT_DIR)/%.o : %.c Makefile
 	@test -d $(@D) || mkdir -p $(@D)
 	@echo Compiling ${<}