ich777/IronOS
1
0
Fork 0
mirror of https://github.com/Ralim/IronOS.git synced 2025-07-23 20:30:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #914 from alvinhochun/text-handling

Browse Source 
Refactoring of text handling (on using large font when starting with \n)
This commit is contained in:
Ben V. Brown
2021-04-05 19:05:29 +10:00
committed by GitHub
parent bf6b00632b 87c0cc162c
commit e463cf2fd2
37 changed files with 745 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
Translations/TranslationEditor.html
View File

@@ -3,7 +3,7 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>TS100 Translation Editor</title> <title>IronOS Translation Editor</title>
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script> <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
<script src="translations_commons.js"></script> <script src="translations_commons.js"></script>
@@ -191,11 +191,67 @@
delim = " and "; delim = " and ";
} }
return str; return str;
},
getWholeScreenMessageMaxLen: function(valMap, id, prop) {
var v = prop ? valMap[id][prop] : valMap[id];
var maxLen;
if (this.isSmall(v)) {
maxLen = defMap[id].maxLen2 || 16;
} else {
maxLen = defMap[id].maxLen || 8;
}
return maxLen;
},
validateWholeScreenMessage: function(valMap, id, prop) {
var v = prop ? valMap[id][prop] : valMap[id];
var maxLen = this.getWholeScreenMessageMaxLen(valMap, id, prop);
if (this.isSmall(v)) {
if (v[0].length === 0) {
return "invalid";
} else if (Math.max(v[0].length, v[1].length) > maxLen) {
return "invalid";
}
} else {
if (v.length > maxLen) {
return "invalid";
}
}
},
constraintWholeScreenMessage: function(valMap, id, prop) {
return "len <= " + this.getWholeScreenMessageMaxLen(valMap, id, prop);
},
isSmall: function(v) {
return v instanceof Array;
},
convertToLarge: function(valMap, id, prop) {
var v = prop ? valMap[id][prop] : valMap[id];
var message = v[0] + (v[1] !== "" ? " " + v[1] : "");
if (prop) {
valMap[id][prop] = message;
} else {
valMap[id] = message;
}
},
convertToSmall: function(valMap, id, prop) {
var v = prop ? valMap[id][prop] : valMap[id];
var message = [ v, "" ];
if (prop) {
valMap[id][prop] = message;
} else {
valMap[id] = message;
}
} }
} }
}); });
app.def = def; app.def = def;
copyArrayToMap(app.def.messages, defMap); copyArrayToMap(app.def.messages, defMap);
copyArrayToMap(app.def.messagesWarn, defMap);
copyArrayToMap(app.def.characters, defMap); copyArrayToMap(app.def.characters, defMap);
copyArrayToMap(app.def.menuGroups, defMap); copyArrayToMap(app.def.menuGroups, defMap);
copyArrayToMap(app.def.menuOptions, defMap); copyArrayToMap(app.def.menuOptions, defMap);
@@ -208,7 +264,7 @@
<body> <body>
<div id="app"> <div id="app">
<h1>TS100 Translation Editor<span v-if="meta.currentLoaded"> - {{ current.languageLocalName }} [{{current.languageCode}}]</span></h1> <h1>IronOS Translation Editor<span v-if="meta.currentLoaded"> - {{ current.languageLocalName }} [{{current.languageCode}}]</span></h1>
<table class="header data"> <table class="header data">
<tr> <tr>
<td class="label">Referent Language</td> <td class="label">Referent Language</td>
@@ -273,6 +329,27 @@
</tr> </tr>
</table> </table>
<h2>Warning Messages</h2>
<table class="data">
<tr v-for="message in def.messagesWarn" v-bind:class="validateWholeScreenMessage(current.messagesWarn, message.id)">
<td class="label"><div class="stringId">{{message.id}}</div></td>
<td class="value">
<div class="constraint">{{constraintWholeScreenMessage(current.messagesWarn, message.id)}}</div>
<div class="ref">{{referent.messagesWarn[message.id]}}</div>
<div class="note" v-if="message.note">{{message.note}}</div>
<div class="tran" v-if="isSmall(current.messagesWarn[message.id])">
<input :id="'in_'+message.id+'_0'" type="text" v-model="current.messagesWarn[message.id][0]" v-bind:class="{unchanged : current.messagesWarn[message.id][0] == referent.messagesWarn[message.id][0] && current.messagesWarn[message.id][1] == referent.messagesWarn[message.id][1], empty : current.messagesWarn[message.id][0] == '' && current.messagesWarn[message.id][1] == ''}">
<input :id="'in_'+message.id+'_1'" type="text" v-model="current.messagesWarn[message.id][1]" v-bind:class="{unchanged : current.messagesWarn[message.id][0] == referent.messagesWarn[message.id][0] && current.messagesWarn[message.id][1] == referent.messagesWarn[message.id][1], empty : current.messagesWarn[message.id][0] == '' && current.messagesWarn[message.id][1] == ''}">
<button type="button" @click="convertToLarge(current.messagesWarn, message.id)">Convert to large text</button>
</div>
<div class="tran" v-else>
<input :id="'in_'+message.id" type="text" v-model="current.messagesWarn[message.id]" v-bind:class="{unchanged : current.messagesWarn[message.id] == referent.messagesWarn[message.id], empty : current.messagesWarn[message.id]==''}">
<button type="button" @click="convertToSmall(current.messagesWarn, message.id)">Convert to small text</button>
</div>
</td>
</tr>
</table>
<h2>Characters</h2> <h2>Characters</h2>
<table class="data"> <table class="data">
<tr v-for="char in def.characters" v-bind:class="validateInput(current.characters, char.id)"> <tr v-for="char in def.characters" v-bind:class="validateInput(current.characters, char.id)">
@@ -287,13 +364,21 @@
<h2>Menu Groups</h2> <h2>Menu Groups</h2>
<table class="data"> <table class="data">
<tr v-for="menu in def.menuGroups" v-bind:class="validateInput(current.menuGroups, menu.id, 2)"> <tr v-for="menu in def.menuGroups" v-bind:class="validateWholeScreenMessage(current.menuGroups, menu.id, 'text2')">
<td class="label"><div class="stringId">{{menu.id}}</div></td> <td class="label"><div class="stringId">{{menu.id}}</div></td>
<td class="value"> <td class="value">
<div class="label">Menu Name</div> <div class="label">Menu Name</div>
<div class="constraint">{{constraintString(menu)}}</div> <div class="constraint">{{constraintWholeScreenMessage(current.menuGroups, menu.id, 'text2')}}</div>
<div class="ref">{{referent.menuGroups[menu.id].text2}}</div> <div class="ref">{{referent.menuGroups[menu.id].text2}}</div>
<div class="tran" v-bind:class="{unchanged : current.menuGroups[menu.id].text2[0] == referent.menuGroups[menu.id].text2[0] && current.menuGroups[menu.id].text2[1] == referent.menuGroups[menu.id].text2[1], empty : current.menuGroups[menu.id].text2[0] == '' || current.menuGroups[menu.id].text2[1] == ''}"><input type="text" v-model="current.menuGroups[menu.id].text2[0]"><input type="text" v-model="current.menuGroups[menu.id].text2[1]"></div> <div class="tran" v-if="isSmall(current.menuGroups[menu.id].text2)">
<input type="text" v-model="current.menuGroups[menu.id].text2[0]" v-bind:class="{unchanged : current.menuGroups[menu.id].text2[0] == referent.menuGroups[menu.id].text2[0] && current.menuGroups[menu.id].text2[1] == referent.menuGroups[menu.id].text2[1], empty : current.menuGroups[menu.id].text2[0] == '' && current.menuGroups[menu.id].text2[1] == ''}">
<input type="text" v-model="current.menuGroups[menu.id].text2[1]" v-bind:class="{unchanged : current.menuGroups[menu.id].text2[0] == referent.menuGroups[menu.id].text2[0] && current.menuGroups[menu.id].text2[1] == referent.menuGroups[menu.id].text2[1], empty : current.menuGroups[menu.id].text2[0] == '' && current.menuGroups[menu.id].text2[1] == ''}">
<button type="button" @click="convertToLarge(current.menuGroups, menu.id, 'text2')">Convert to large text</button>
</div>
<div class="tran" v-else>
<input type="text" v-model="current.menuGroups[menu.id].text2" v-bind:class="{unchanged : current.menuGroups[menu.id].text2 == referent.menuGroups[menu.id].text2, empty : current.menuGroups[menu.id].text2==''}">
<button type="button" @click="convertToSmall(current.menuGroups, menu.id, 'text2')">Convert to small text</button>
</div>
<div class="label">Description</div> <div class="label">Description</div>
<div class="ref">{{referent.menuGroups[menu.id].desc}}</div> <div class="ref">{{referent.menuGroups[menu.id].desc}}</div>
<div class="tran"><input type="text" v-model="current.menuGroups[menu.id].desc" v-bind:class="{unchanged : current.menuGroups[menu.id].desc == referent.menuGroups[menu.id].desc, empty : current.menuGroups[menu.id].desc == ''}"></div> <div class="tran"><input type="text" v-model="current.menuGroups[menu.id].desc" v-bind:class="{unchanged : current.menuGroups[menu.id].desc == referent.menuGroups[menu.id].desc, empty : current.menuGroups[menu.id].desc == ''}"></div>
@@ -303,14 +388,22 @@
<h2>Menu Options</h2> <h2>Menu Options</h2>
<table class="data"> <table class="data">
<tr v-for="menu in def.menuOptions" v-bind:class="validateInput(current.menuOptions, menu.id, 2)"> <tr v-for="menu in def.menuOptions" v-bind:class="validateWholeScreenMessage(current.menuOptions, menu.id, 'text2')">
<td class="label"><div class="stringId">{{menu.id}}</div></td> <td class="label"><div class="stringId">{{menu.id}}</div></td>
<td class="value"> <td class="value">
<div v-bind:class="{hidden : false}"> <div v-bind:class="{hidden : false}">
<div class="label">Menu Name (Double-Line)</div> <div class="label">Menu Name</div>
<div class="constraint">{{constraintString(menu)}}</div> <div class="constraint">{{constraintWholeScreenMessage(current.menuOptions, menu.id, 'text2')}}</div>
<div class="ref">{{referent.menuOptions[menu.id].text2}}</div> <div class="ref">{{referent.menuOptions[menu.id].text2}}</div>
<div class="tran" v-bind:class="{unchanged : current.menuOptions[menu.id].text2[0] == referent.menuOptions[menu.id].text2[0] && current.menuOptions[menu.id].text2[1] == referent.menuOptions[menu.id].text2[1], empty : current.menuOptions[menu.id].text2[0] == '' || current.menuOptions[menu.id].text2[1] == ''}"><input type="text" v-model="current.menuOptions[menu.id].text2[0]"><input type="text" v-model="current.menuOptions[menu.id].text2[1]"></div> <div class="tran" v-if="isSmall(current.menuOptions[menu.id].text2)">
<input type="text" v-model="current.menuOptions[menu.id].text2[0]" v-bind:class="{unchanged : current.menuOptions[menu.id].text2[0] == referent.menuOptions[menu.id].text2[0] && current.menuOptions[menu.id].text2[1] == referent.menuOptions[menu.id].text2[1], empty : current.menuOptions[menu.id].text2[0] == '' && current.menuOptions[menu.id].text2[1] == ''}">
<input type="text" v-model="current.menuOptions[menu.id].text2[1]" v-bind:class="{unchanged : current.menuOptions[menu.id].text2[0] == referent.menuOptions[menu.id].text2[0] && current.menuOptions[menu.id].text2[1] == referent.menuOptions[menu.id].text2[1], empty : current.menuOptions[menu.id].text2[0] == '' && current.menuOptions[menu.id].text2[1] == ''}">
<button type="button" @click="convertToLarge(current.menuOptions, menu.id, 'text2')">Convert to large text</button>
</div>
<div class="tran" v-else>
<input type="text" v-model="current.menuOptions[menu.id].text2" v-bind:class="{unchanged : current.menuOptions[menu.id].text2 == referent.menuOptions[menu.id].text2, empty : current.menuOptions[menu.id].text2==''}">
<button type="button" @click="convertToSmall(current.menuOptions, menu.id, 'text2')">Convert to small text</button>
</div>
</div> </div>
<div class="label">Description</div> <div class="label">Description</div>
<div class="ref">{{referent.menuOptions[menu.id].desc}}</div> <div class="ref">{{referent.menuOptions[menu.id].desc}}</div>
@@ -326,4 +419,4 @@
</div> </div>
</div> </div>
</body> </body>
</html> </html>

61
Translations/make_translation.py
View File

@@ -127,6 +127,15 @@ def get_letter_counts(defs: dict, lang: dict) -> List[str]:
else: else:
text_list.append(obj[eid]) text_list.append(obj[eid])
obj = lang["messagesWarn"]
for mod in defs["messagesWarn"]:
eid = mod["id"]
if isinstance(obj[eid], list):
text_list.append(obj[eid][0])
text_list.append(obj[eid][1])
else:
text_list.append(obj[eid])
obj = lang["characters"] obj = lang["characters"]
for mod in defs["characters"]: for mod in defs["characters"]:
@@ -136,14 +145,20 @@ def get_letter_counts(defs: dict, lang: dict) -> List[str]:
obj = lang["menuOptions"] obj = lang["menuOptions"]
for mod in defs["menuOptions"]: for mod in defs["menuOptions"]:
eid = mod["id"] eid = mod["id"]
text_list.append(obj[eid]["text2"][0]) if isinstance(obj[eid]["text2"], list):
text_list.append(obj[eid]["text2"][1]) text_list.append(obj[eid]["text2"][0])
text_list.append(obj[eid]["text2"][1])
else:
text_list.append(obj[eid]["text2"])
obj = lang["menuGroups"] obj = lang["menuGroups"]
for mod in defs["menuGroups"]: for mod in defs["menuGroups"]:
eid = mod["id"] eid = mod["id"]
text_list.append(obj[eid]["text2"][0]) if isinstance(obj[eid]["text2"], list):
text_list.append(obj[eid]["text2"][1]) text_list.append(obj[eid]["text2"][0])
text_list.append(obj[eid]["text2"][1])
else:
text_list.append(obj[eid]["text2"])
obj = lang["menuGroups"] obj = lang["menuGroups"]
for mod in defs["menuGroups"]: for mod in defs["menuGroups"]:
@@ -403,6 +418,23 @@ def write_language(lang: dict, defs: dict, f: TextIO) -> None:
f.write("\n") f.write("\n")
obj = lang["messagesWarn"]
for mod in defs["messagesWarn"]:
eid = mod["id"]
if isinstance(obj[eid], list):
if not obj[eid][1]:
source_text = obj[eid][0]
else:
source_text = obj[eid][0] + "\n" + obj[eid][1]
else:
source_text = "\n" + obj[eid]
translated_text = convert_string(symbol_conversion_table, source_text)
source_text = source_text.replace("\n", "_")
f.write(f'const char* {eid} = "{translated_text}";//{source_text} \n')
f.write("\n")
# ----- Writing Characters # ----- Writing Characters
obj = lang["characters"] obj = lang["characters"]
@@ -427,16 +459,23 @@ def write_language(lang: dict, defs: dict, f: TextIO) -> None:
# ----- Writing SettingsDescriptions # ----- Writing SettingsDescriptions
obj = lang["menuOptions"] obj = lang["menuOptions"]
f.write("const char* SettingsShortNames[][2] = {\n") f.write("const char* SettingsShortNames[] = {\n")
max_len = 25 max_len = 25
index = 0 index = 0
for mod in defs["menuOptions"]: for mod in defs["menuOptions"]:
eid = mod["id"] eid = mod["id"]
if isinstance(obj[eid]["text2"], list):
if not obj[eid]["text2"][1]:
source_text = obj[eid]["text2"][0]
else:
source_text = obj[eid]["text2"][0] + "\n" + obj[eid]["text2"][1]
else:
source_text = "\n" + obj[eid]["text2"]
if "feature" in mod: if "feature" in mod:
f.write(f"#ifdef {mod['feature']}\n") f.write(f"#ifdef {mod['feature']}\n")
f.write(f" /* [{index:02d}] {eid.ljust(max_len)[:max_len]} */ ") f.write(f" /* [{index:02d}] {eid.ljust(max_len)[:max_len]} */ ")
f.write(f'{{ "{convert_string(symbol_conversion_table, (obj[eid]["text2"][0]))}", "{convert_string(symbol_conversion_table, (obj[eid]["text2"][1]))}" }},//{obj[eid]["text2"]} \n') f.write(f'{{ "{convert_string(symbol_conversion_table, source_text)}" }},//{obj[eid]["text2"]} \n')
if "feature" in mod: if "feature" in mod:
f.write("#endif\n") f.write("#endif\n")
@@ -451,9 +490,15 @@ def write_language(lang: dict, defs: dict, f: TextIO) -> None:
max_len = 25 max_len = 25
for mod in defs["menuGroups"]: for mod in defs["menuGroups"]:
eid = mod["id"] eid = mod["id"]
if isinstance(obj[eid]["text2"], list):
if not obj[eid]["text2"][1]:
source_text = obj[eid]["text2"][0]
else:
source_text = obj[eid]["text2"][0] + "\n" + obj[eid]["text2"][1]
else:
source_text = "\n" + obj[eid]["text2"]
f.write(f" /* {eid.ljust(max_len)[:max_len]} */ ") f.write(f" /* {eid.ljust(max_len)[:max_len]} */ ")
txt = f'{obj[eid]["text2"][0]}\\n{obj[eid]["text2"][1]}' f.write(f'"{convert_string(symbol_conversion_table, source_text)}",//{obj[eid]["text2"]} \n')
f.write(f'"{convert_string(symbol_conversion_table, txt)}",//{obj[eid]["text2"]} \n')
f.write("};\n\n") f.write("};\n\n")

26
Translations/translation_BG.json
View File

@@ -21,11 +21,25 @@
"TipDisconnectedString": "ПРЕКЪСНАТ ВРЪХ", "TipDisconnectedString": "ПРЕКЪСНАТ ВРЪХ",
"SolderingAdvancedPowerPrompt": "Захранване: ", "SolderingAdvancedPowerPrompt": "Захранване: ",
"OffString": "Изкл.", "OffString": "Изкл.",
"ResetOKMessage": "Нулиране завършено", "YourGainMessage": "Усилване:"
"YourGainMessage": "Усилване:", },
"SettingsResetMessage": "Настройките бяха\nнулирани!", "messagesWarn": {
"NoAccelerometerMessage": "No accelerometer\ndetected!", "ResetOKMessage": [
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "Нулиране",
"завършено"
],
"SettingsResetMessage": [
"Настройките бяха",
"нулирани!"
],
"NoAccelerometerMessage": [
"No accelerometer",
"detected!"
],
"NoPowerDeliveryMessage": [
"No USB-PD IC",
"detected!"
],
"LockingKeysString": " LOCKED", "LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED", "UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!" "WarningKeysLockedString": "!LOCKED!"
@@ -37,7 +51,7 @@
"SettingFastChar": "F", "SettingFastChar": "F",
"SettingSlowChar": "S", "SettingSlowChar": "S",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"O", "SettingOffChar": "O",
"SettingStartSolderingChar": "T", "SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S", "SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O", "SettingStartSleepOffChar": "O",

21
Translations/translation_CS.json
View File

@@ -21,11 +21,22 @@
"TipDisconnectedString": "HROT NEPŘIPOJEN", "TipDisconnectedString": "HROT NEPŘIPOJEN",
"SolderingAdvancedPowerPrompt": "Ohřev: ", "SolderingAdvancedPowerPrompt": "Ohřev: ",
"OffString": "Vyp", "OffString": "Vyp",
"YourGainMessage": "Zisk:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Zisk:", "SettingsResetMessage": [
"SettingsResetMessage": "Tov. nas. obnov.", "Tov. nas. obnov.",
"NoAccelerometerMessage": "No accelerometer\ndetected!", ""
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", ],
"NoAccelerometerMessage": [
"No accelerometer",
"detected!"
],
"NoPowerDeliveryMessage": [
"No USB-PD IC",
"detected!"
],
"LockingKeysString": " LOCKED", "LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED", "UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!" "WarningKeysLockedString": "!LOCKED!"
@@ -37,7 +48,7 @@
"SettingFastChar": "R", "SettingFastChar": "R",
"SettingSlowChar": "P", "SettingSlowChar": "P",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"O", "SettingOffChar": "O",
"SettingStartSolderingChar": "T", "SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S", "SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O", "SettingStartSleepOffChar": "O",

21
Translations/translation_DA.json
View File

@@ -21,11 +21,22 @@
"TipDisconnectedString": "TIP DISCONNECTED", "TipDisconnectedString": "TIP DISCONNECTED",
"SolderingAdvancedPowerPrompt": "Power: ", "SolderingAdvancedPowerPrompt": "Power: ",
"OffString": "Off", "OffString": "Off",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:", "SettingsResetMessage": [
"SettingsResetMessage": "Settings were\nreset!", "Settings were",
"NoAccelerometerMessage": "No accelerometer\ndetected!", "reset!"
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", ],
"NoAccelerometerMessage": [
"No accelerometer",
"detected!"
],
"NoPowerDeliveryMessage": [
"No USB-PD IC",
"detected!"
],
"LockingKeysString": " LOCKED", "LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED", "UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!" "WarningKeysLockedString": "!LOCKED!"
@@ -37,7 +48,7 @@
"SettingFastChar": "F", "SettingFastChar": "F",
"SettingSlowChar": "S", "SettingSlowChar": "S",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"O", "SettingOffChar": "O",
"SettingStartSolderingChar": "L", "SettingStartSolderingChar": "L",
"SettingStartSleepChar": "D", "SettingStartSleepChar": "D",
"SettingStartSleepOffChar": "O", "SettingStartSleepOffChar": "O",

19
Translations/translation_DE.json
View File

@@ -22,11 +22,22 @@
"TipDisconnectedString": "Spitze fehlt", "TipDisconnectedString": "Spitze fehlt",
"SolderingAdvancedPowerPrompt": "Leistung: ", "SolderingAdvancedPowerPrompt": "Leistung: ",
"OffString": "Aus", "OffString": "Aus",
"NoAccelerometerMessage": "Kein Bewegungssensor\nerkannt!", "YourGainMessage": "Dein Faktor:"
"NoPowerDeliveryMessage": "Kein USB-PD IC\nerkannt!", },
"messagesWarn": {
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Dein Faktor:", "SettingsResetMessage": [
"SettingsResetMessage": "Einstellungen\nzurückgesetzt!", "Einstellungen",
"zurückgesetzt!"
],
"NoAccelerometerMessage": [
"Kein Bewegungssensor",
"erkannt!"
],
"NoPowerDeliveryMessage": [
"Kein USB-PD IC",
"erkannt!"
],
"LockingKeysString": "GESPERRT", "LockingKeysString": "GESPERRT",
"UnlockingKeysString": "ENTSPERRT", "UnlockingKeysString": "ENTSPERRT",
"WarningKeysLockedString": "!GESPERRT!" "WarningKeysLockedString": "!GESPERRT!"

21
Translations/translation_EN.json
View File

@@ -22,11 +22,22 @@
"TipDisconnectedString": "NO TIP", "TipDisconnectedString": "NO TIP",
"SolderingAdvancedPowerPrompt": "Power: ", "SolderingAdvancedPowerPrompt": "Power: ",
"OffString": "Off", "OffString": "Off",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:", "SettingsResetMessage": [
"SettingsResetMessage": "Settings were\nreset!", "Settings were",
"NoAccelerometerMessage": "No accelerometer\ndetected!", "reset!"
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", ],
"NoAccelerometerMessage": [
"No accelerometer",
"detected!"
],
"NoPowerDeliveryMessage": [
"No USB-PD IC",
"detected!"
],
"LockingKeysString": "LOCKED", "LockingKeysString": "LOCKED",
"UnlockingKeysString": "UNLOCKED", "UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!" "WarningKeysLockedString": "!LOCKED!"
@@ -38,7 +49,7 @@
"SettingFastChar": "F", "SettingFastChar": "F",
"SettingSlowChar": "S", "SettingSlowChar": "S",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"O", "SettingOffChar": "O",
"SettingStartSolderingChar": "S", "SettingStartSolderingChar": "S",
"SettingStartSleepChar": "Z", "SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "R", "SettingStartSleepOffChar": "R",

22
Translations/translation_ES.json
View File

@@ -21,11 +21,23 @@
"TipDisconnectedString": "NO HAY PUNTA", "TipDisconnectedString": "NO HAY PUNTA",
"SolderingAdvancedPowerPrompt": "Potencia: ", "SolderingAdvancedPowerPrompt": "Potencia: ",
"OffString": " No", "OffString": " No",
"ResetOKMessage": "Hecho. ",
"YourGainMessage": "Gananc.:", "YourGainMessage": "Gananc.:",
"SettingsResetMessage": "Ajustes borrados", "SettingsResetMessage": "Ajustes borrados"
"NoAccelerometerMessage": "No accelerometer\ndetected!", },
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "messagesWarn": {
"ResetOKMessage": "Hecho.",
"SettingsResetMessage": [
"Settings were",
"reset!"
],
"NoAccelerometerMessage": [
"No accelerometer",
"detected!"
],
"NoPowerDeliveryMessage": [
"No USB-PD IC",
"detected!"
],
"LockingKeysString": " LOCKED", "LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED", "UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!" "WarningKeysLockedString": "!LOCKED!"
@@ -37,7 +49,7 @@
"SettingFastChar": "R", "SettingFastChar": "R",
"SettingSlowChar": "L", "SettingSlowChar": "L",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"O", "SettingOffChar": "O",
"SettingStartSolderingChar": "S", "SettingStartSolderingChar": "S",
"SettingStartSleepChar": "R", "SettingStartSleepChar": "R",
"SettingStartSleepOffChar": "F", "SettingStartSleepOffChar": "F",

21
Translations/translation_FI.json
View File

@@ -21,11 +21,22 @@
"TipDisconnectedString": "KÄRKI ON IRTI", "TipDisconnectedString": "KÄRKI ON IRTI",
"SolderingAdvancedPowerPrompt": "Teho: ", "SolderingAdvancedPowerPrompt": "Teho: ",
"OffString": "OFF", "OffString": "OFF",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:", "SettingsResetMessage": [
"SettingsResetMessage": "Settings were\nreset!", "Settings were",
"NoAccelerometerMessage": "No accelerometer\ndetected!", "reset!"
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", ],
"NoAccelerometerMessage": [
"No accelerometer",
"detected!"
],
"NoPowerDeliveryMessage": [
"No USB-PD IC",
"detected!"
],
"LockingKeysString": " LOCKED", "LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED", "UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!" "WarningKeysLockedString": "!LOCKED!"
@@ -37,7 +48,7 @@
"SettingFastChar": "N", "SettingFastChar": "N",
"SettingSlowChar": "H", "SettingSlowChar": "H",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"O", "SettingOffChar": "O",
"SettingStartSolderingChar": "T", "SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S", "SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O", "SettingStartSleepOffChar": "O",

21
Translations/translation_FR.json
View File

@@ -21,11 +21,22 @@
"TipDisconnectedString": "PANNE DÉBRANCHÉE", "TipDisconnectedString": "PANNE DÉBRANCHÉE",
"SolderingAdvancedPowerPrompt": "Puissance : ", "SolderingAdvancedPowerPrompt": "Puissance : ",
"OffString": "Off", "OffString": "Off",
"YourGainMessage": "Gain : "
},
"messagesWarn": {
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Gain : ", "SettingsResetMessage": [
"SettingsResetMessage": "Réglage réinit. !", "Réglage",
"NoAccelerometerMessage": "Accéléromètre\nnon détecté !", "réinit. !"
"NoPowerDeliveryMessage": "Pas d'USB-PD\ndétecté !", ],
"NoAccelerometerMessage": [
"Accéléromètre",
"non détecté !"
],
"NoPowerDeliveryMessage": [
"Pas d'USB-PD",
"détecté !"
],
"LockingKeysString": "VERROUIL", "LockingKeysString": "VERROUIL",
"UnlockingKeysString": "DEVERROU", "UnlockingKeysString": "DEVERROU",
"WarningKeysLockedString": "! VERR. !" "WarningKeysLockedString": "! VERR. !"
@@ -37,7 +48,7 @@
"SettingFastChar": "R", "SettingFastChar": "R",
"SettingSlowChar": "L", "SettingSlowChar": "L",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"D", "SettingOffChar": "D",
"SettingStartSolderingChar": "A", "SettingStartSolderingChar": "A",
"SettingStartSleepChar": "V", "SettingStartSleepChar": "V",
"SettingStartSleepOffChar": "O", "SettingStartSleepOffChar": "O",

21
Translations/translation_HR.json
View File

@@ -21,11 +21,22 @@
"TipDisconnectedString": "VRH NIJE SPOJEN!", "TipDisconnectedString": "VRH NIJE SPOJEN!",
"SolderingAdvancedPowerPrompt": "Snaga: ", "SolderingAdvancedPowerPrompt": "Snaga: ",
"OffString": "Off", "OffString": "Off",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:", "SettingsResetMessage": [
"SettingsResetMessage": "Settings were\nreset!", "Settings were",
"NoAccelerometerMessage": "No accelerometer\ndetected!", "reset!"
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", ],
"NoAccelerometerMessage": [
"No accelerometer",
"detected!"
],
"NoPowerDeliveryMessage": [
"No USB-PD IC",
"detected!"
],
"LockingKeysString": " LOCKED", "LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED", "UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!" "WarningKeysLockedString": "!LOCKED!"
@@ -37,7 +48,7 @@
"SettingFastChar": "B", "SettingFastChar": "B",
"SettingSlowChar": "S", "SettingSlowChar": "S",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"O", "SettingOffChar": "O",
"SettingStartSolderingChar": "T", "SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S", "SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O", "SettingStartSleepOffChar": "O",

26
Translations/translation_HU.json
View File

@@ -21,11 +21,25 @@
"TipDisconnectedString": "PÁKA LEVÉVE", "TipDisconnectedString": "PÁKA LEVÉVE",
"SolderingAdvancedPowerPrompt": "Telj: ", "SolderingAdvancedPowerPrompt": "Telj: ",
"OffString": "Ki", "OffString": "Ki",
"ResetOKMessage": "Törlés OK", "YourGainMessage": "Erősítés:"
"YourGainMessage": "Erősítés:", },
"SettingsResetMessage": "Beállítások\ntörölve!", "messagesWarn": {
"NoAccelerometerMessage": "Nincs gyorsulásmérő!", "ResetOKMessage": [
"NoPowerDeliveryMessage": "Nincs USB-PD IC!", "Törlés OK",
""
],
"SettingsResetMessage": [
"Beállítások",
"törölve!"
],
"NoAccelerometerMessage": [
"Nincs",
"gyorsulásmérő!"
],
"NoPowerDeliveryMessage": [
"Nincs USB-PD IC!",
""
],
"LockingKeysString": "LEZÁRVA", "LockingKeysString": "LEZÁRVA",
"UnlockingKeysString": "FELOLDVA", "UnlockingKeysString": "FELOLDVA",
"WarningKeysLockedString": "!LEZÁRVA!" "WarningKeysLockedString": "!LEZÁRVA!"
@@ -37,7 +51,7 @@
"SettingFastChar": "G", "SettingFastChar": "G",
"SettingSlowChar": "L", "SettingSlowChar": "L",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"0", "SettingOffChar": "0",
"SettingStartSolderingChar": "F", "SettingStartSolderingChar": "F",
"SettingStartSleepChar": "Z", "SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "S", "SettingStartSleepOffChar": "S",

21
Translations/translation_IT.json
View File

@@ -21,11 +21,22 @@
"TipDisconnectedString": "PUNTA ASSENTE", "TipDisconnectedString": "PUNTA ASSENTE",
"SolderingAdvancedPowerPrompt": "Potenz:", "SolderingAdvancedPowerPrompt": "Potenz:",
"OffString": "OFF", "OffString": "OFF",
"YourGainMessage": "Guad.: "
},
"messagesWarn": {
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Guad.: ", "SettingsResetMessage": [
"SettingsResetMessage": "Reset effettuato", "Reset effettuato",
"NoAccelerometerMessage": "Accelerometro\nnon rilevato", ""
"NoPowerDeliveryMessage": "USB-PD non\ndisponibile", ],
"NoAccelerometerMessage": [
"Accelerometro",
"non rilevato"
],
"NoPowerDeliveryMessage": [
"USB-PD non",
"disponibile"
],
"LockingKeysString": "Blocc.", "LockingKeysString": "Blocc.",
"UnlockingKeysString": "Sblocc.", "UnlockingKeysString": "Sblocc.",
"WarningKeysLockedString": "BLOCCATO" "WarningKeysLockedString": "BLOCCATO"
@@ -37,7 +48,7 @@
"SettingFastChar": "V", "SettingFastChar": "V",
"SettingSlowChar": "L", "SettingSlowChar": "L",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"O", "SettingOffChar": "O",
"SettingStartSolderingChar": "S", "SettingStartSolderingChar": "S",
"SettingStartSleepChar": "R", "SettingStartSleepChar": "R",
"SettingStartSleepOffChar": "A", "SettingStartSleepOffChar": "A",

26
Translations/translation_LT.json
View File

@@ -21,11 +21,25 @@
"TipDisconnectedString": "NĖRA ANTGALIO", "TipDisconnectedString": "NĖRA ANTGALIO",
"SolderingAdvancedPowerPrompt": "Galia: ", "SolderingAdvancedPowerPrompt": "Galia: ",
"OffString": "Išj", "OffString": "Išj",
"ResetOKMessage": "Atstatytas OK", "YourGainMessage": "Greitis:"
"YourGainMessage": "Greitis:", },
"SettingsResetMessage": "Nust. atstatyti!", "messagesWarn": {
"NoAccelerometerMessage": "Nerastas\nakselerometras!", "ResetOKMessage": [
"NoPowerDeliveryMessage": "Nerastas\nUSB-PD IC !", "Atstatytas OK",
""
],
"SettingsResetMessage": [
"Nust. atstatyti!",
""
],
"NoAccelerometerMessage": [
"Nerastas",
"akselerometras!"
],
"NoPowerDeliveryMessage": [
"Nerastas",
"USB-PD IC !"
],
"LockingKeysString": " UŽRAKIN", "LockingKeysString": " UŽRAKIN",
"UnlockingKeysString": "ATRAKIN", "UnlockingKeysString": "ATRAKIN",
"WarningKeysLockedString": "!UŽRAK!" "WarningKeysLockedString": "!UŽRAK!"
@@ -37,7 +51,7 @@
"SettingFastChar": "G", "SettingFastChar": "G",
"SettingSlowChar": "L", "SettingSlowChar": "L",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"I", "SettingOffChar": "I",
"SettingStartSolderingChar": "T", "SettingStartSolderingChar": "T",
"SettingStartSleepChar": "M", "SettingStartSleepChar": "M",
"SettingStartSleepOffChar": "K", "SettingStartSleepOffChar": "K",

36
Translations/translation_NL.json
View File

@@ -21,14 +21,34 @@
"TipDisconnectedString": "PUNT LOSGEKOPPELT", "TipDisconnectedString": "PUNT LOSGEKOPPELT",
"SolderingAdvancedPowerPrompt": "Vermogen: ", "SolderingAdvancedPowerPrompt": "Vermogen: ",
"OffString": "Uit", "OffString": "Uit",
"YourGainMessage": "Niveau:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Niveau:", "SettingsResetMessage": [
"SettingsResetMessage": "Instellingen zijn\ngereset!", "Instellingen",
"NoAccelerometerMessage": "No accelerometer\ndetected!", "zijn gereset!"
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", ],
"LockingKeysString": " GEBLOKKEERD", "NoAccelerometerMessage": [
"UnlockingKeysString": "GEDEBLOKKEERD", "No accelerometer",
"WarningKeysLockedString": "!GEBLOKKEERD!" "detected!"
],
"NoPowerDeliveryMessage": [
"No USB-PD IC",
"detected!"
],
"LockingKeysString": [
" GEBLOKKEERD",
""
],
"UnlockingKeysString": [
"GEDEBLOKKEERD",
""
],
"WarningKeysLockedString": [
"!GEBLOKKEERD!",
""
]
}, },
"characters": { "characters": {
"SettingRightChar": "R", "SettingRightChar": "R",
@@ -37,7 +57,7 @@
"SettingFastChar": "F", "SettingFastChar": "F",
"SettingSlowChar": "S", "SettingSlowChar": "S",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"O", "SettingOffChar": "O",
"SettingStartSolderingChar": "T", "SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S", "SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O", "SettingStartSleepOffChar": "O",

21
Translations/translation_NL_BE.json
View File

@@ -21,11 +21,22 @@
"TipDisconnectedString": "Punt ONTKOPPELD", "TipDisconnectedString": "Punt ONTKOPPELD",
"SolderingAdvancedPowerPrompt": "Vermogen: ", "SolderingAdvancedPowerPrompt": "Vermogen: ",
"OffString": "Uit", "OffString": "Uit",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:", "SettingsResetMessage": [
"SettingsResetMessage": "Settings were\nreset!", "Settings were",
"NoAccelerometerMessage": "No accelerometer\ndetected!", "reset!"
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", ],
"NoAccelerometerMessage": [
"No accelerometer",
"detected!"
],
"NoPowerDeliveryMessage": [
"No USB-PD IC",
"detected!"
],
"LockingKeysString": " LOCKED", "LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED", "UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!" "WarningKeysLockedString": "!LOCKED!"
@@ -37,7 +48,7 @@
"SettingFastChar": "S", "SettingFastChar": "S",
"SettingSlowChar": "T", "SettingSlowChar": "T",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"O", "SettingOffChar": "O",
"SettingStartSolderingChar": "T", "SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S", "SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O", "SettingStartSleepOffChar": "O",

23
Translations/translation_NO.json
View File

@@ -21,11 +21,22 @@
"TipDisconnectedString": "SPISS FRAKOBLET", "TipDisconnectedString": "SPISS FRAKOBLET",
"SolderingAdvancedPowerPrompt": "Effekt: ", "SolderingAdvancedPowerPrompt": "Effekt: ",
"OffString": "Av", "OffString": "Av",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:", "SettingsResetMessage": [
"SettingsResetMessage": "Settings were\nreset!", "Settings were",
"NoAccelerometerMessage": "No accelerometer\ndetected!", "reset!"
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", ],
"NoAccelerometerMessage": [
"No accelerometer",
"detected!"
],
"NoPowerDeliveryMessage": [
"No USB-PD IC",
"detected!"
],
"LockingKeysString": " LOCKED", "LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED", "UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!" "WarningKeysLockedString": "!LOCKED!"
@@ -37,7 +48,7 @@
"SettingFastChar": "H", "SettingFastChar": "H",
"SettingSlowChar": "L", "SettingSlowChar": "L",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"O", "SettingOffChar": "O",
"SettingStartSolderingChar": "L", "SettingStartSolderingChar": "L",
"SettingStartSleepChar": "D", "SettingStartSleepChar": "D",
"SettingStartSleepOffChar": "O", "SettingStartSleepOffChar": "O",
@@ -105,7 +116,7 @@
}, },
"SleepTimeout": { "SleepTimeout": {
"text2": [ "text2": [
"", "DTid",
"" ""
], ],
"desc": "Tid før dvale <Minutter/Sekunder" "desc": "Tid før dvale <Minutter/Sekunder"

21
Translations/translation_PL.json
View File

@@ -22,11 +22,22 @@
"TipDisconnectedString": "GROT ODŁĄCZONY", "TipDisconnectedString": "GROT ODŁĄCZONY",
"SolderingAdvancedPowerPrompt": "Moc: ", "SolderingAdvancedPowerPrompt": "Moc: ",
"OffString": "Wył", "OffString": "Wył",
"YourGainMessage": "Us.zysk:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Us.zysk:", "SettingsResetMessage": [
"SettingsResetMessage": "Ust. zresetowane", "Ust. zresetowane",
"NoAccelerometerMessage": "No accelerometer\ndetected!", ""
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", ],
"NoAccelerometerMessage": [
"No accelerometer",
"detected!"
],
"NoPowerDeliveryMessage": [
"No USB-PD IC",
"detected!"
],
"LockingKeysString": " ZABLOK.", "LockingKeysString": " ZABLOK.",
"UnlockingKeysString": "ODBLOK.", "UnlockingKeysString": "ODBLOK.",
"WarningKeysLockedString": "!ZABLOK!" "WarningKeysLockedString": "!ZABLOK!"
@@ -38,7 +49,7 @@
"SettingFastChar": "S", "SettingFastChar": "S",
"SettingSlowChar": "W", "SettingSlowChar": "W",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"O", "SettingOffChar": "O",
"SettingStartSolderingChar": "T", "SettingStartSolderingChar": "T",
"SettingStartSleepChar": "Z", "SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "O", "SettingStartSleepOffChar": "O",

21
Translations/translation_PT.json
View File

@@ -21,11 +21,22 @@
"TipDisconnectedString": "SEM PONTA", "TipDisconnectedString": "SEM PONTA",
"SolderingAdvancedPowerPrompt": "Power: ", "SolderingAdvancedPowerPrompt": "Power: ",
"OffString": "Off", "OffString": "Off",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:", "SettingsResetMessage": [
"SettingsResetMessage": "Settings were\nreset!", "Settings were",
"NoAccelerometerMessage": "No accelerometer\ndetected!", "reset!"
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", ],
"NoAccelerometerMessage": [
"No accelerometer",
"detected!"
],
"NoPowerDeliveryMessage": [
"No USB-PD IC",
"detected!"
],
"LockingKeysString": " LOCKED", "LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED", "UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!" "WarningKeysLockedString": "!LOCKED!"
@@ -37,7 +48,7 @@
"SettingFastChar": "R", "SettingFastChar": "R",
"SettingSlowChar": "L", "SettingSlowChar": "L",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"O", "SettingOffChar": "O",
"SettingStartSolderingChar": "T", "SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S", "SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O", "SettingStartSleepOffChar": "O",

21
Translations/translation_RU.json
View File

@@ -21,11 +21,22 @@
"TipDisconnectedString": "ЖАЛО ОТСОЕДИНЕНО", "TipDisconnectedString": "ЖАЛО ОТСОЕДИНЕНО",
"SolderingAdvancedPowerPrompt": "Питание: ", "SolderingAdvancedPowerPrompt": "Питание: ",
"OffString": "Выкл.", "OffString": "Выкл.",
"YourGainMessage": "Прирост:"
},
"messagesWarn": {
"ResetOKMessage": "Сброс OK", "ResetOKMessage": "Сброс OK",
"YourGainMessage": "Прирост:", "SettingsResetMessage": [
"SettingsResetMessage": "Настройки\nсброшены!", "Настройки",
"NoAccelerometerMessage": "Не определен\nакселерометр!", "сброшены!"
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", ],
"NoAccelerometerMessage": [
"Не определен",
"акселерометр!"
],
"NoPowerDeliveryMessage": [
"No USB-PD IC",
"detected!"
],
"LockingKeysString": " LOCKED", "LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED", "UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!" "WarningKeysLockedString": "!LOCKED!"
@@ -37,7 +48,7 @@
"SettingFastChar": "Б", "SettingFastChar": "Б",
"SettingSlowChar": "М", "SettingSlowChar": "М",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"O", "SettingOffChar": "O",
"SettingStartSolderingChar": "П", "SettingStartSolderingChar": "П",
"SettingStartSleepChar": "О", "SettingStartSleepChar": "О",
"SettingStartSleepOffChar": "К", "SettingStartSleepOffChar": "К",

21
Translations/translation_SK.json
View File

@@ -21,11 +21,22 @@
"TipDisconnectedString": "HROT ODPOJENÝ", "TipDisconnectedString": "HROT ODPOJENÝ",
"SolderingAdvancedPowerPrompt": "Výkon: ", "SolderingAdvancedPowerPrompt": "Výkon: ",
"OffString": "Vyp", "OffString": "Vyp",
"YourGainMessage": "Zisk:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Zisk:", "SettingsResetMessage": [
"SettingsResetMessage": "Tov. nas. obnov.", "Tov. nas. obnov.",
"NoAccelerometerMessage": "Bez pohyb. senz.", ""
"NoPowerDeliveryMessage": "Chýba čip USB-PD", ],
"NoAccelerometerMessage": [
"Bez pohyb. senz.",
""
],
"NoPowerDeliveryMessage": [
"Chýba čip USB-PD",
""
],
"LockingKeysString": " ZABLOK.", "LockingKeysString": " ZABLOK.",
"UnlockingKeysString": "ODBLOK.", "UnlockingKeysString": "ODBLOK.",
"WarningKeysLockedString": "!ZABLOK!" "WarningKeysLockedString": "!ZABLOK!"
@@ -37,7 +48,7 @@
"SettingFastChar": "R", "SettingFastChar": "R",
"SettingSlowChar": "P", "SettingSlowChar": "P",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"Z", "SettingOffChar": "Z",
"SettingStartSolderingChar": "S", "SettingStartSolderingChar": "S",
"SettingStartSleepChar": "K", "SettingStartSleepChar": "K",
"SettingStartSleepOffChar": "O", "SettingStartSleepOffChar": "O",

21
Translations/translation_SL.json
View File

@@ -21,11 +21,22 @@
"TipDisconnectedString": "NI KONICE", "TipDisconnectedString": "NI KONICE",
"SolderingAdvancedPowerPrompt": "Moč: ", "SolderingAdvancedPowerPrompt": "Moč: ",
"OffString": "Off", "OffString": "Off",
"YourGainMessage": "Ojačenje"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Ojačenje", "SettingsResetMessage": [
"SettingsResetMessage": "Nastavitve OK!", "Nastavitve OK!",
"NoAccelerometerMessage": "Ni pospeševalnik", ""
"NoPowerDeliveryMessage": "Ni USB-PD čipa!", ],
"NoAccelerometerMessage": [
"Ni pospeševalnik",
""
],
"NoPowerDeliveryMessage": [
"Ni USB-PD čipa!",
""
],
"LockingKeysString": "ZAKLENJ.", "LockingKeysString": "ZAKLENJ.",
"UnlockingKeysString": "ODKLENJ.", "UnlockingKeysString": "ODKLENJ.",
"WarningKeysLockedString": "ZAKLENJ." "WarningKeysLockedString": "ZAKLENJ."
@@ -37,7 +48,7 @@
"SettingFastChar": "H", "SettingFastChar": "H",
"SettingSlowChar": "P", "SettingSlowChar": "P",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"U", "SettingOffChar": "U",
"SettingStartSolderingChar": "S", "SettingStartSolderingChar": "S",
"SettingStartSleepChar": "Z", "SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "V", "SettingStartSleepOffChar": "V",

21
Translations/translation_SR_CYRL.json
View File

@@ -21,11 +21,22 @@
"TipDisconnectedString": "ВРХ НИЈЕ СПОЈЕН", "TipDisconnectedString": "ВРХ НИЈЕ СПОЈЕН",
"SolderingAdvancedPowerPrompt": "Снага: ", "SolderingAdvancedPowerPrompt": "Снага: ",
"OffString": "Иск", "OffString": "Иск",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:", "SettingsResetMessage": [
"SettingsResetMessage": "Settings were\nreset!", "Settings were",
"NoAccelerometerMessage": "No accelerometer\ndetected!", "reset!"
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", ],
"NoAccelerometerMessage": [
"No accelerometer",
"detected!"
],
"NoPowerDeliveryMessage": [
"No USB-PD IC",
"detected!"
],
"LockingKeysString": " LOCKED", "LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED", "UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!" "WarningKeysLockedString": "!LOCKED!"
@@ -37,7 +48,7 @@
"SettingFastChar": "Б", "SettingFastChar": "Б",
"SettingSlowChar": "С", "SettingSlowChar": "С",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"O", "SettingOffChar": "O",
"SettingStartSolderingChar": "T", "SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S", "SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O", "SettingStartSleepOffChar": "O",

21
Translations/translation_SR_LATN.json
View File

@@ -21,11 +21,22 @@
"TipDisconnectedString": "VRH NIJE SPOJEN", "TipDisconnectedString": "VRH NIJE SPOJEN",
"SolderingAdvancedPowerPrompt": "Snaga: ", "SolderingAdvancedPowerPrompt": "Snaga: ",
"OffString": "Isk", "OffString": "Isk",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:", "SettingsResetMessage": [
"SettingsResetMessage": "Settings were\nreset!", "Settings were",
"NoAccelerometerMessage": "No accelerometer\ndetected!", "reset!"
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", ],
"NoAccelerometerMessage": [
"No accelerometer",
"detected!"
],
"NoPowerDeliveryMessage": [
"No USB-PD IC",
"detected!"
],
"LockingKeysString": " LOCKED", "LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED", "UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!" "WarningKeysLockedString": "!LOCKED!"
@@ -37,7 +48,7 @@
"SettingFastChar": "B", "SettingFastChar": "B",
"SettingSlowChar": "S", "SettingSlowChar": "S",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"O", "SettingOffChar": "O",
"SettingStartSolderingChar": "T", "SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S", "SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O", "SettingStartSleepOffChar": "O",

21
Translations/translation_SV.json
View File

@@ -21,11 +21,22 @@
"TipDisconnectedString": "SPETS URTAGEN", "TipDisconnectedString": "SPETS URTAGEN",
"SolderingAdvancedPowerPrompt": "Ström: ", "SolderingAdvancedPowerPrompt": "Ström: ",
"OffString": "Av", "OffString": "Av",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:", "SettingsResetMessage": [
"SettingsResetMessage": "Settings were\nreset!", "Settings were",
"NoAccelerometerMessage": "No accelerometer\ndetected!", "reset!"
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", ],
"NoAccelerometerMessage": [
"No accelerometer",
"detected!"
],
"NoPowerDeliveryMessage": [
"No USB-PD IC",
"detected!"
],
"LockingKeysString": " LOCKED", "LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED", "UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!" "WarningKeysLockedString": "!LOCKED!"
@@ -37,7 +48,7 @@
"SettingFastChar": "S", "SettingFastChar": "S",
"SettingSlowChar": "L", "SettingSlowChar": "L",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"O", "SettingOffChar": "O",
"SettingStartSolderingChar": "T", "SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S", "SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O", "SettingStartSleepOffChar": "O",

29
Translations/translation_TR.json
View File

@@ -21,11 +21,28 @@
"TipDisconnectedString": "UÇ ÇIKARILDI", "TipDisconnectedString": "UÇ ÇIKARILDI",
"SolderingAdvancedPowerPrompt": "Güç: ", "SolderingAdvancedPowerPrompt": "Güç: ",
"OffString": "Kapalı", "OffString": "Kapalı",
"ResetOKMessage": "Sıfırlama Tamam", "YourGainMessage": "Kazancınız:"
"YourGainMessage": "Kazancınız:", },
"SettingsResetMessage": "Ayarlar Sıfırlandı", "messagesWarn": {
"NoAccelerometerMessage": "No accelerometer\ndetected!", "ResetOKMessage": [
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!" "Sıfırlama Tamam",
""
],
"SettingsResetMessage": [
"Ayarlar",
"Sıfırlandı"
],
"NoAccelerometerMessage": [
"No accelerometer",
"detected!"
],
"NoPowerDeliveryMessage": [
"No USB-PD IC",
"detected!"
],
"LockingKeysString": "LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "R", "SettingRightChar": "R",
@@ -34,7 +51,7 @@
"SettingFastChar": "F", "SettingFastChar": "F",
"SettingSlowChar": "S", "SettingSlowChar": "S",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"O", "SettingOffChar": "O",
"SettingStartSolderingChar": "T", "SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S", "SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O", "SettingStartSleepOffChar": "O",

21
Translations/translation_UK.json
View File

@@ -21,11 +21,22 @@
"TipDisconnectedString": "Жало вимкнено!", "TipDisconnectedString": "Жало вимкнено!",
"SolderingAdvancedPowerPrompt": "Живлення: ", "SolderingAdvancedPowerPrompt": "Живлення: ",
"OffString": "Вимк", "OffString": "Вимк",
"YourGainMessage": "Приріст:"
},
"messagesWarn": {
"ResetOKMessage": "Скид. OK", "ResetOKMessage": "Скид. OK",
"YourGainMessage": "Приріст:", "SettingsResetMessage": [
"SettingsResetMessage": "Налаштування\nскинуті!", "Налаштування",
"NoAccelerometerMessage": "Акселерометр\nне виявлено!", "скинуті!"
"NoPowerDeliveryMessage": "USB-PD IC\nне виявлено!", ],
"NoAccelerometerMessage": [
"Акселерометр",
"не виявлено!"
],
"NoPowerDeliveryMessage": [
"USB-PD IC",
"не виявлено!"
],
"LockingKeysString": " ЗАБЛОК.", "LockingKeysString": " ЗАБЛОК.",
"UnlockingKeysString": "РОЗБЛОК.", "UnlockingKeysString": "РОЗБЛОК.",
"WarningKeysLockedString": "!ЗАБЛОК!" "WarningKeysLockedString": "!ЗАБЛОК!"
@@ -37,7 +48,7 @@
"SettingFastChar": "Ш", "SettingFastChar": "Ш",
"SettingSlowChar": "П", "SettingSlowChar": "П",
"SettingMediumChar": "M", "SettingMediumChar": "M",
"SettingOffChar":"B", "SettingOffChar": "B",
"SettingStartSolderingChar": "П", "SettingStartSolderingChar": "П",
"SettingStartSleepChar": "О", "SettingStartSleepChar": "О",
"SettingStartSleepOffChar": "К", "SettingStartSleepOffChar": "К",

188
Translations/translation_YUE_HK.json
View File

@@ -22,11 +22,19 @@
"TipDisconnectedString": "NO TIP", "TipDisconnectedString": "NO TIP",
"SolderingAdvancedPowerPrompt": "Power: ", "SolderingAdvancedPowerPrompt": "Power: ",
"OffString": "關", "OffString": "關",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "已重設！", "ResetOKMessage": "已重設！",
"YourGainMessage": "Your gain:", "SettingsResetMessage": "設定已被重設！",
"SettingsResetMessage": "\n設定已被重設！", "NoAccelerometerMessage": [
"NoAccelerometerMessage": "No accelerometer\ndetected!", "No accelerometer",
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "detected!"
],
"NoPowerDeliveryMessage": [
"No USB-PD IC",
"detected!"
],
"LockingKeysString": "已鎖定", "LockingKeysString": "已鎖定",
"UnlockingKeysString": "已解除鎖定", "UnlockingKeysString": "已解除鎖定",
"WarningKeysLockedString": "!撳掣鎖定!" "WarningKeysLockedString": "!撳掣鎖定!"
@@ -38,7 +46,7 @@
"SettingFastChar": "快", "SettingFastChar": "快",
"SettingSlowChar": "慢", "SettingSlowChar": "慢",
"SettingMediumChar": "中", "SettingMediumChar": "中",
"SettingOffChar":"關", "SettingOffChar": "關",
"SettingStartSolderingChar": "焊", "SettingStartSolderingChar": "焊",
"SettingStartSleepChar": "待", "SettingStartSleepChar": "待",
"SettingStartSleepOffChar": "室", "SettingStartSleepOffChar": "室",
@@ -54,243 +62,141 @@
}, },
"menuGroups": { "menuGroups": {
"PowerMenu": { "PowerMenu": {
"text2": [ "text2": "電源設定",
"",
"電源設定"
],
"desc": "電源設定" "desc": "電源設定"
}, },
"SolderingMenu": { "SolderingMenu": {
"text2": [ "text2": "焊接設定",
"",
"焊接設定"
],
"desc": "焊接設定" "desc": "焊接設定"
}, },
"PowerSavingMenu": { "PowerSavingMenu": {
"text2": [ "text2": "待機設定",
"",
"待機設定"
],
"desc": "自動待機慳電設定" "desc": "自動待機慳電設定"
}, },
"UIMenu": { "UIMenu": {
"text2": [ "text2": "使用者介面",
"",
"使用者介面"
],
"desc": "使用者介面設定" "desc": "使用者介面設定"
}, },
"AdvancedMenu": { "AdvancedMenu": {
"text2": [ "text2": "進階設定",
"",
"進階設定"
],
"desc": "進階設定" "desc": "進階設定"
} }
}, },
"menuOptions": { "menuOptions": {
"DCInCutoff": { "DCInCutoff": {
"text2": [ "text2": "電源",
"",
"電源"
],
"desc": "輸入電源；設定自動停機電壓 <DC 10V> <S 鋰電池，以每粒3.3V計算；依個設定會停用功率限制>" "desc": "輸入電源；設定自動停機電壓 <DC 10V> <S 鋰電池，以每粒3.3V計算；依個設定會停用功率限制>"
}, },
"SleepTemperature": { "SleepTemperature": {
"text2": [ "text2": "待機温度",
"",
"待機温度"
],
"desc": "喺待機模式時嘅辣雞咀温度" "desc": "喺待機模式時嘅辣雞咀温度"
}, },
"SleepTimeout": { "SleepTimeout": {
"text2": [ "text2": "待機延時",
"",
"待機延時"
],
"desc": "自動進入待機模式前嘅閒置等候時間 <S=秒 | M=分鐘>" "desc": "自動進入待機模式前嘅閒置等候時間 <S=秒 | M=分鐘>"
}, },
"ShutdownTimeout": { "ShutdownTimeout": {
"text2": [ "text2": "自動熄機",
"",
"自動熄機"
],
"desc": "自動熄機前嘅閒置等候時間 <M=分鐘>" "desc": "自動熄機前嘅閒置等候時間 <M=分鐘>"
}, },
"MotionSensitivity": { "MotionSensitivity": {
"text2": [ "text2": "動作敏感度",
"",
"動作敏感度"
],
"desc": "0=停用 | 1=最低敏感度 | ... | 9=最高敏感度" "desc": "0=停用 | 1=最低敏感度 | ... | 9=最高敏感度"
}, },
"TemperatureUnit": { "TemperatureUnit": {
"text2": [ "text2": "温度單位",
"",
"温度單位"
],
"desc": "C=攝氏 | F=華氏" "desc": "C=攝氏 | F=華氏"
}, },
"AdvancedIdle": { "AdvancedIdle": {
"text2": [ "text2": "詳細閒置畫面",
"",
"詳細閒置畫面"
],
"desc": "喺閒置畫面以英文細字顯示詳細嘅資料" "desc": "喺閒置畫面以英文細字顯示詳細嘅資料"
}, },
"DisplayRotation": { "DisplayRotation": {
"text2": [ "text2": "畫面方向",
"",
"畫面方向"
],
"desc": "A=自動 | L=使用左手 | R=使用右手" "desc": "A=自動 | L=使用左手 | R=使用右手"
}, },
"BoostTemperature": { "BoostTemperature": {
"text2": [ "text2": "增熱温度",
"",
"增熱温度"
],
"desc": "喺增熱模式時使用嘅温度" "desc": "喺增熱模式時使用嘅温度"
}, },
"AutoStart": { "AutoStart": {
"text2": [ "text2": "自動啓用",
"",
"自動啓用"
],
"desc": "開機時自動啓用 <無=停用 | 焊=焊接模式 | 待=待機模式 | 室=室温待機>" "desc": "開機時自動啓用 <無=停用 | 焊=焊接模式 | 待=待機模式 | 室=室温待機>"
}, },
"CooldownBlink": { "CooldownBlink": {
"text2": [ "text2": "降温時閃爍",
"",
"降温時閃爍"
],
"desc": "停止加熱之後，當辣雞咀仲係熱嗰陣閃爍畫面" "desc": "停止加熱之後，當辣雞咀仲係熱嗰陣閃爍畫面"
}, },
"TemperatureCalibration": { "TemperatureCalibration": {
"text2": [ "text2": "温度校正？",
"",
"温度校正？"
],
"desc": "開始校正辣雞咀温度位移" "desc": "開始校正辣雞咀温度位移"
}, },
"SettingsReset": { "SettingsReset": {
"text2": [ "text2": "全部重設？",
"",
"全部重設？"
],
"desc": "將所有設定重設到預設值" "desc": "將所有設定重設到預設值"
}, },
"VoltageCalibration": { "VoltageCalibration": {
"text2": [ "text2": "輸入電壓校正？",
"",
"輸入電壓校正？"
],
"desc": "開始校正VIN輸入電壓 <長撳以退出>" "desc": "開始校正VIN輸入電壓 <長撳以退出>"
}, },
"AdvancedSoldering": { "AdvancedSoldering": {
"text2": [ "text2": "詳細焊接畫面",
"",
"詳細焊接畫面"
],
"desc": "喺焊接模式畫面以英文細字顯示詳細嘅資料" "desc": "喺焊接模式畫面以英文細字顯示詳細嘅資料"
}, },
"ScrollingSpeed": { "ScrollingSpeed": {
"text2": [ "text2": "捲動速度",
"",
"捲動速度"
],
"desc": "解說文字嘅捲動速度" "desc": "解說文字嘅捲動速度"
}, },
"QCMaxVoltage": { "QCMaxVoltage": {
"text2": [ "text2": "QC電壓",
"",
"QC電壓"
],
"desc": "使用QC電源時請求嘅最高目標電壓" "desc": "使用QC電源時請求嘅最高目標電壓"
}, },
"PowerLimit": { "PowerLimit": {
"text2": [ "text2": "功率限制",
"",
"功率限制"
],
"desc": "限制辣雞可用嘅最大功率 <W=watt（火）>" "desc": "限制辣雞可用嘅最大功率 <W=watt（火）>"
}, },
"ReverseButtonTempChange": { "ReverseButtonTempChange": {
"text2": [ "text2": "反轉加減掣",
"",
"反轉加減掣"
],
"desc": "反轉調校温度時加減掣嘅方向" "desc": "反轉調校温度時加減掣嘅方向"
}, },
"TempChangeShortStep": { "TempChangeShortStep": {
"text2": [ "text2": "温度調整 短",
"",
"温度調整 短"
],
"desc": "調校温度時短撳一下嘅温度變幅" "desc": "調校温度時短撳一下嘅温度變幅"
}, },
"TempChangeLongStep": { "TempChangeLongStep": {
"text2": [ "text2": "温度調整 長",
"",
"温度調整 長"
],
"desc": "調校温度時長撳嘅温度變幅" "desc": "調校温度時長撳嘅温度變幅"
}, },
"PowerPulsePower": { "PowerPulsePower": {
"text2": [ "text2": "電源脈衝",
"",
"電源脈衝"
],
"desc": "為保持電源喚醒而通電所用嘅功率 <watt（火）>" "desc": "為保持電源喚醒而通電所用嘅功率 <watt（火）>"
}, },
"HallEffSensitivity": { "HallEffSensitivity": {
"text2": [ "text2": "磁場敏感度",
"",
"磁場敏感度"
],
"desc": "磁場感應器用嚟啓動待機模式嘅敏感度 <關=停用 | 低=最低敏感度 | 中=中等敏感度 | 高=最高敏感度>" "desc": "磁場感應器用嚟啓動待機模式嘅敏感度 <關=停用 | 低=最低敏感度 | 中=中等敏感度 | 高=最高敏感度>"
}, },
"LockingMode": { "LockingMode": {
"text2": [ "text2": "撳掣鎖定",
"",
"撳掣鎖定"
],
"desc": "喺焊接模式時，同時長撳兩粒掣啓用撳掣鎖定 <無=停用 | 增=鎖定增熱模式 | 全=鎖定全部>" "desc": "喺焊接模式時，同時長撳兩粒掣啓用撳掣鎖定 <無=停用 | 增=鎖定增熱模式 | 全=鎖定全部>"
}, },
"MinVolCell": { "MinVolCell": {
"text2": [ "text2": "最低電壓",
"",
"最低電壓"
],
"desc": "每粒電池嘅最低可用電壓 <伏特> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>" "desc": "每粒電池嘅最低可用電壓 <伏特> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
}, },
"AnimLoop": { "AnimLoop": {
"text2": [ "text2": "動畫循環",
"",
"動畫循環"
],
"desc": "循環顯示功能表圖示動畫" "desc": "循環顯示功能表圖示動畫"
}, },
"AnimSpeed": { "AnimSpeed": {
"text2": [ "text2": "動畫速度",
"",
"動畫速度"
],
"desc": "功能表圖示動畫嘅速度 <關=不顯示動畫 | 慢=慢速 | 中=中速 | 快=快速>" "desc": "功能表圖示動畫嘅速度 <關=不顯示動畫 | 慢=慢速 | 中=中速 | 快=快速>"
}, },
"PowerPulseWait": { "PowerPulseWait": {
"text2": [ "text2": "電源脈衝間隔",
"",
"電源脈衝間隔"
],
"desc": "為保持電源喚醒，每次通電之間嘅間隔時間 <x2.5s（秒）>" "desc": "為保持電源喚醒，每次通電之間嘅間隔時間 <x2.5s（秒）>"
}, },
"PowerPulseDuration": { "PowerPulseDuration": {
"text2": [ "text2": "電源脈衝時長",
"",
"電源脈衝時長"
],
"desc": "為保持電源喚醒，每次通電脈衝嘅時間長度 <x250ms（亳秒）>" "desc": "為保持電源喚醒，每次通電脈衝嘅時間長度 <x250ms（亳秒）>"
} }
} }

188
Translations/translation_ZH_TW.json
View File

@@ -22,11 +22,19 @@
"TipDisconnectedString": "NO TIP", "TipDisconnectedString": "NO TIP",
"SolderingAdvancedPowerPrompt": "Power: ", "SolderingAdvancedPowerPrompt": "Power: ",
"OffString": "關", "OffString": "關",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "已重設！", "ResetOKMessage": "已重設！",
"YourGainMessage": "Your gain:", "SettingsResetMessage": "設定已被重設！",
"SettingsResetMessage": "\n設定已被重設！", "NoAccelerometerMessage": [
"NoAccelerometerMessage": "No accelerometer\ndetected!", "No accelerometer",
"NoPowerDeliveryMessage": "No USB-PD IC\ndetected!", "detected!"
],
"NoPowerDeliveryMessage": [
"No USB-PD IC",
"detected!"
],
"LockingKeysString": "已鎖定", "LockingKeysString": "已鎖定",
"UnlockingKeysString": "已解除鎖定", "UnlockingKeysString": "已解除鎖定",
"WarningKeysLockedString": "!按鍵鎖定!" "WarningKeysLockedString": "!按鍵鎖定!"
@@ -38,7 +46,7 @@
"SettingFastChar": "快", "SettingFastChar": "快",
"SettingSlowChar": "慢", "SettingSlowChar": "慢",
"SettingMediumChar": "中", "SettingMediumChar": "中",
"SettingOffChar":"關", "SettingOffChar": "關",
"SettingStartSolderingChar": "焊", "SettingStartSolderingChar": "焊",
"SettingStartSleepChar": "待", "SettingStartSleepChar": "待",
"SettingStartSleepOffChar": "室", "SettingStartSleepOffChar": "室",
@@ -54,243 +62,141 @@
}, },
"menuGroups": { "menuGroups": {
"PowerMenu": { "PowerMenu": {
"text2": [ "text2": "電源設定",
"",
"電源設定"
],
"desc": "電源設定" "desc": "電源設定"
}, },
"SolderingMenu": { "SolderingMenu": {
"text2": [ "text2": "焊接設定",
"",
"焊接設定"
],
"desc": "焊接設定" "desc": "焊接設定"
}, },
"PowerSavingMenu": { "PowerSavingMenu": {
"text2": [ "text2": "待機設定",
"",
"待機設定"
],
"desc": "自動待機省電設定" "desc": "自動待機省電設定"
}, },
"UIMenu": { "UIMenu": {
"text2": [ "text2": "使用者介面",
"",
"使用者介面"
],
"desc": "使用者介面設定" "desc": "使用者介面設定"
}, },
"AdvancedMenu": { "AdvancedMenu": {
"text2": [ "text2": "進階設定",
"",
"進階設定"
],
"desc": "進階設定" "desc": "進階設定"
} }
}, },
"menuOptions": { "menuOptions": {
"DCInCutoff": { "DCInCutoff": {
"text2": [ "text2": "電源",
"",
"電源"
],
"desc": "輸入電源；設定自動停機電壓 <DC 10V> <S 鋰電池，以每顆3.3V計算；此設定會停用功率限制>" "desc": "輸入電源；設定自動停機電壓 <DC 10V> <S 鋰電池，以每顆3.3V計算；此設定會停用功率限制>"
}, },
"SleepTemperature": { "SleepTemperature": {
"text2": [ "text2": "待機溫度",
"",
"待機溫度"
],
"desc": "於待機模式時的鉻鐵頭溫度" "desc": "於待機模式時的鉻鐵頭溫度"
}, },
"SleepTimeout": { "SleepTimeout": {
"text2": [ "text2": "待機延時",
"",
"待機延時"
],
"desc": "自動進入待機模式前的閒置等候時間 <S=秒 | M=分鐘>" "desc": "自動進入待機模式前的閒置等候時間 <S=秒 | M=分鐘>"
}, },
"ShutdownTimeout": { "ShutdownTimeout": {
"text2": [ "text2": "自動關機",
"",
"自動關機"
],
"desc": "自動關機前的閒置等候時間 <M=分鐘>" "desc": "自動關機前的閒置等候時間 <M=分鐘>"
}, },
"MotionSensitivity": { "MotionSensitivity": {
"text2": [ "text2": "動作敏感度",
"",
"動作敏感度"
],
"desc": "0=停用 | 1=最低敏感度 | ... | 9=最高敏感度" "desc": "0=停用 | 1=最低敏感度 | ... | 9=最高敏感度"
}, },
"TemperatureUnit": { "TemperatureUnit": {
"text2": [ "text2": "溫標",
"",
"溫標"
],
"desc": "C=攝氏 | F=華氏" "desc": "C=攝氏 | F=華氏"
}, },
"AdvancedIdle": { "AdvancedIdle": {
"text2": [ "text2": "詳細閒置畫面",
"",
"詳細閒置畫面"
],
"desc": "於閒置畫面以英文小字型顯示詳細資料" "desc": "於閒置畫面以英文小字型顯示詳細資料"
}, },
"DisplayRotation": { "DisplayRotation": {
"text2": [ "text2": "畫面方向",
"",
"畫面方向"
],
"desc": "A=自動 | L=使用左手 | R=使用右手" "desc": "A=自動 | L=使用左手 | R=使用右手"
}, },
"BoostTemperature": { "BoostTemperature": {
"text2": [ "text2": "增熱溫度",
"",
"增熱溫度"
],
"desc": "於增熱模式時使用的溫度" "desc": "於增熱模式時使用的溫度"
}, },
"AutoStart": { "AutoStart": {
"text2": [ "text2": "自動啟用",
"",
"自動啟用"
],
"desc": "開機時自動啟用 <無=停用 | 焊=焊接模式 | 待=待機模式 | 室=室溫待機>" "desc": "開機時自動啟用 <無=停用 | 焊=焊接模式 | 待=待機模式 | 室=室溫待機>"
}, },
"CooldownBlink": { "CooldownBlink": {
"text2": [ "text2": "降溫時閃爍",
"",
"降溫時閃爍"
],
"desc": "停止加熱之後，當鉻鐵頭仍處於高溫時閃爍畫面" "desc": "停止加熱之後，當鉻鐵頭仍處於高溫時閃爍畫面"
}, },
"TemperatureCalibration": { "TemperatureCalibration": {
"text2": [ "text2": "溫度校正？",
"",
"溫度校正？"
],
"desc": "開始校正鉻鐵頭溫度位移" "desc": "開始校正鉻鐵頭溫度位移"
}, },
"SettingsReset": { "SettingsReset": {
"text2": [ "text2": "全部重設？",
"",
"全部重設？"
],
"desc": "將所有設定重設到預設值" "desc": "將所有設定重設到預設值"
}, },
"VoltageCalibration": { "VoltageCalibration": {
"text2": [ "text2": "輸入電壓校正？",
"",
"輸入電壓校正？"
],
"desc": "開始校正VIN輸入電壓 <長按以退出>" "desc": "開始校正VIN輸入電壓 <長按以退出>"
}, },
"AdvancedSoldering": { "AdvancedSoldering": {
"text2": [ "text2": "詳細焊接畫面",
"",
"詳細焊接畫面"
],
"desc": "於焊接模式畫面以英文小字型顯示詳細資料" "desc": "於焊接模式畫面以英文小字型顯示詳細資料"
}, },
"ScrollingSpeed": { "ScrollingSpeed": {
"text2": [ "text2": "捲動速度",
"",
"捲動速度"
],
"desc": "解說文字的捲動速度" "desc": "解說文字的捲動速度"
}, },
"QCMaxVoltage": { "QCMaxVoltage": {
"text2": [ "text2": "QC電壓",
"",
"QC電壓"
],
"desc": "使用QC電源時請求的最高目標電壓" "desc": "使用QC電源時請求的最高目標電壓"
}, },
"PowerLimit": { "PowerLimit": {
"text2": [ "text2": "功率限制",
"",
"功率限制"
],
"desc": "限制鉻鐵可用的最大功率 <W=watt（瓦特）>" "desc": "限制鉻鐵可用的最大功率 <W=watt（瓦特）>"
}, },
"ReverseButtonTempChange": { "ReverseButtonTempChange": {
"text2": [ "text2": "調換加減鍵",
"",
"調換加減鍵"
],
"desc": "調校溫度時調換加減鍵的方向" "desc": "調校溫度時調換加減鍵的方向"
}, },
"TempChangeShortStep": { "TempChangeShortStep": {
"text2": [ "text2": "溫度調整 短",
"",
"溫度調整 短"
],
"desc": "調校溫度時短按一下的溫度變幅" "desc": "調校溫度時短按一下的溫度變幅"
}, },
"TempChangeLongStep": { "TempChangeLongStep": {
"text2": [ "text2": "溫度調整 長",
"",
"溫度調整 長"
],
"desc": "調校溫度時長按按鍵的溫度變幅" "desc": "調校溫度時長按按鍵的溫度變幅"
}, },
"PowerPulsePower": { "PowerPulsePower": {
"text2": [ "text2": "電源脈衝",
"",
"電源脈衝"
],
"desc": "為保持電源喚醒而通電所用的功率 <watt（瓦特）>" "desc": "為保持電源喚醒而通電所用的功率 <watt（瓦特）>"
}, },
"HallEffSensitivity": { "HallEffSensitivity": {
"text2": [ "text2": "磁場敏感度",
"",
"磁場敏感度"
],
"desc": "磁場感應器用作啟動待機模式的敏感度 <關=停用 | 低=最低敏感度 | 中=中等敏感度 | 高=最高敏感度>" "desc": "磁場感應器用作啟動待機模式的敏感度 <關=停用 | 低=最低敏感度 | 中=中等敏感度 | 高=最高敏感度>"
}, },
"LockingMode": { "LockingMode": {
"text2": [ "text2": "按鍵鎖定",
"",
"按鍵鎖定"
],
"desc": "於焊接模式時，同時長按兩個按鍵啟用按鍵鎖定 <無=停用 | 增=鎖定增熱模式 | 全=鎖定全部>" "desc": "於焊接模式時，同時長按兩個按鍵啟用按鍵鎖定 <無=停用 | 增=鎖定增熱模式 | 全=鎖定全部>"
}, },
"MinVolCell": { "MinVolCell": {
"text2": [ "text2": "最低電壓",
"",
"最低電壓"
],
"desc": "每顆電池的最低可用電壓 <伏特> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>" "desc": "每顆電池的最低可用電壓 <伏特> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
}, },
"AnimLoop": { "AnimLoop": {
"text2": [ "text2": "動畫循環",
"",
"動畫循環"
],
"desc": "循環顯示功能表圖示動畫" "desc": "循環顯示功能表圖示動畫"
}, },
"AnimSpeed": { "AnimSpeed": {
"text2": [ "text2": "動畫速度",
"",
"動畫速度"
],
"desc": "功能表圖示動畫的速度 <關=不顯示動畫 | 慢=慢速 | 中=中速 | 快=快速>" "desc": "功能表圖示動畫的速度 <關=不顯示動畫 | 慢=慢速 | 中=中速 | 快=快速>"
}, },
"PowerPulseWait": { "PowerPulseWait": {
"text2": [ "text2": "電源脈衝間隔",
"",
"電源脈衝間隔"
],
"desc": "為保持電源喚醒，每次通電之間的間隔時間 <x2.5s（秒）>" "desc": "為保持電源喚醒，每次通電之間的間隔時間 <x2.5s（秒）>"
}, },
"PowerPulseDuration": { "PowerPulseDuration": {
"text2": [ "text2": "電源脈衝時長",
"",
"電源脈衝時長"
],
"desc": "為保持電源喚醒，每次通電脈衝的時間長度 <x250ms（亳秒）>" "desc": "為保持電源喚醒，每次通電脈衝的時間長度 <x250ms（亳秒）>"
} }
} }

48
Translations/translations_def.js
View File

@@ -81,44 +81,33 @@ var def =
"id": "OffString", "id": "OffString",
"maxLen": 3 "maxLen": 3
}, },
{
"id": "ResetOKMessage",
"maxLen": 8
},
{ {
"id": "YourGainMessage", "id": "YourGainMessage",
"maxLen": 8, "maxLen": 8,
"default": "Your Gain" "default": "Your Gain"
}
],
"messagesWarn": [
{
"id": "ResetOKMessage"
}, },
{ {
"id": "SettingsResetMessage", "id": "SettingsResetMessage"
"maxLen": 16,
"default": "Settings were\nreset!"
}, },
{ {
"id": "NoAccelerometerMessage", "id": "NoAccelerometerMessage"
"maxLen": 16,
"default": "No accelerometer\ndetected!"
}, },
{ {
"id": "NoPowerDeliveryMessage", "id": "NoPowerDeliveryMessage"
"maxLen": 16,
"default": "No USB-PD IC\ndetected!"
}, },
{ {
"id": "LockingKeysString", "id": "LockingKeysString"
"maxLen": 8,
"default": "LOCKING"
}, },
{ {
"id": "UnlockingKeysString", "id": "UnlockingKeysString"
"maxLen": 8,
"default": "UNLOCK"
}, },
{ {
"id": "WarningKeysLockedString", "id": "WarningKeysLockedString"
"maxLen": 8,
"default": "LOCKED!"
} }
], ],
"characters": [ "characters": [
@@ -206,23 +195,28 @@ var def =
"menuGroups": [ "menuGroups": [
{ {
"id": "PowerMenu", "id": "PowerMenu",
"maxLen": 11 "maxLen": 5,
"maxLen2": 11
}, },
{ {
"id": "SolderingMenu", "id": "SolderingMenu",
"maxLen": 11 "maxLen": 5,
"maxLen2": 11
}, },
{ {
"id": "PowerSavingMenu", "id": "PowerSavingMenu",
"maxLen": 11 "maxLen": 5,
"maxLen2": 11
}, },
{ {
"id": "UIMenu", "id": "UIMenu",
"maxLen": 11 "maxLen": 5,
"maxLen2": 11
}, },
{ {
"id": "AdvancedMenu", "id": "AdvancedMenu",
"maxLen": 11 "maxLen": 5,
"maxLen2": 11
} }
], ],
"menuOptions": [ "menuOptions": [

20
source/Core/Drivers/OLED.cpp
View File

@@ -267,6 +267,26 @@ void OLED::print(const char *const str, FontStyle fontStyle) {
} }
} }
/**
* Prints a static string message designed to use the whole screen, starting
* from the top-left corner.
*
* If the message starts with a newline (`\\x01`), the string starting from
* after the newline is printed in the large font. Otherwise, the message
* is printed in the small font.
*
* @param string The string message to be printed
*/
void OLED::printWholeScreen(const char *string) {
setCursor(0, 0);
if (string[0] == '\x01') {
// Empty first line means that this uses large font (for CJK).
OLED::print(string + 1, FontStyle::LARGE);
} else {
OLED::print(string, FontStyle::SMALL);
}
}
inline void stripLeaderZeros(char *buffer, uint8_t places) { inline void stripLeaderZeros(char *buffer, uint8_t places) {
// Removing the leading zero's by swapping them to SymbolSpace // Removing the leading zero's by swapping them to SymbolSpace
// Stop 1 short so that we dont blank entire number if its zero // Stop 1 short so that we dont blank entire number if its zero

1
source/Core/Drivers/OLED.hpp
View File

@@ -55,6 +55,7 @@ public:
static bool getRotation() { return inLeftHandedMode; } static bool getRotation() { return inLeftHandedMode; }
static int16_t getCursorX() { return cursor_x; } static int16_t getCursorX() { return cursor_x; }
static void print(const char *string, FontStyle fontStyle); // Draw a string to the current location, with selected font static void print(const char *string, FontStyle fontStyle); // Draw a string to the current location, with selected font
static void printWholeScreen(const char *string);
// Set the cursor location by pixels // Set the cursor location by pixels
static void setCursor(int16_t x, int16_t y) { static void setCursor(int16_t x, int16_t y) {
cursor_x = x; cursor_x = x;

9
source/Core/Inc/Translation.h
View File

@@ -12,9 +12,9 @@ extern const uint8_t USER_FONT_12[];
extern const uint8_t USER_FONT_6x8[]; extern const uint8_t USER_FONT_6x8[];
extern const bool HasFahrenheit; extern const bool HasFahrenheit;
extern const char *SettingsShortNames[33][2]; extern const char *SettingsShortNames[];
extern const char *SettingsDescriptions[33]; extern const char *SettingsDescriptions[];
extern const char *SettingsMenuEntries[5]; extern const char *SettingsMenuEntries[];
extern const char *SettingsCalibrationDone; extern const char *SettingsCalibrationDone;
extern const char *SettingsCalibrationWarning; extern const char *SettingsCalibrationWarning;
@@ -35,8 +35,9 @@ extern const char *IdleSetString;
extern const char *TipDisconnectedString; extern const char *TipDisconnectedString;
extern const char *SolderingAdvancedPowerPrompt; extern const char *SolderingAdvancedPowerPrompt;
extern const char *OffString; extern const char *OffString;
extern const char *ResetOKMessage;
extern const char *YourGainMessage; extern const char *YourGainMessage;
extern const char *ResetOKMessage;
extern const char *SettingsResetMessage; extern const char *SettingsResetMessage;
extern const char *NoAccelerometerMessage; extern const char *NoAccelerometerMessage;
extern const char *NoPowerDeliveryMessage; extern const char *NoPowerDeliveryMessage;

1
source/Core/Inc/gui.hpp
View File

@@ -29,6 +29,7 @@ typedef struct {
void enterSettingsMenu(); void enterSettingsMenu();
void GUIDelay(); void GUIDelay();
void warnUser(const char *warning, const int timeout);
extern const menuitem rootSettingsMenu[]; extern const menuitem rootSettingsMenu[];
#endif /* GUI_HPP_ */ #endif /* GUI_HPP_ */

39
source/Core/Src/gui.cpp
View File

@@ -237,20 +237,6 @@ const menuitem advancedMenu[] = {
{nullptr, nullptr, nullptr} // end of menu marker. DO NOT REMOVE {nullptr, nullptr, nullptr} // end of menu marker. DO NOT REMOVE
}; };
static void printShortDescriptionDoubleLine(SettingsItemIndex settingsItemIndex) {
uint8_t shortDescIndex = static_cast<uint8_t>(settingsItemIndex);
if (SettingsShortNames[shortDescIndex][0][0] == '\x00') {
// Empty first line means that this uses large font (for CJK).
OLED::setCursor(0, 0);
OLED::print(SettingsShortNames[shortDescIndex][1], FontStyle::LARGE);
} else {
OLED::setCursor(0, 0);
OLED::print(SettingsShortNames[shortDescIndex][0], FontStyle::SMALL);
OLED::setCursor(0, 8);
OLED::print(SettingsShortNames[shortDescIndex][1], FontStyle::SMALL);
}
}
/** /**
* Prints two small lines (or one line for CJK) of short description for * Prints two small lines (or one line for CJK) of short description for
* setting items and prepares cursor after it. * setting items and prepares cursor after it.
@@ -260,7 +246,8 @@ static void printShortDescriptionDoubleLine(SettingsItemIndex settingsItemIndex)
*/ */
static void printShortDescription(SettingsItemIndex settingsItemIndex, uint16_t cursorCharPosition) { static void printShortDescription(SettingsItemIndex settingsItemIndex, uint16_t cursorCharPosition) {
// print short description (default single line, explicit double line) // print short description (default single line, explicit double line)
printShortDescriptionDoubleLine(settingsItemIndex); uint8_t shortDescIndex = static_cast<uint8_t>(settingsItemIndex);
OLED::printWholeScreen(SettingsShortNames[shortDescIndex]);
// prepare cursor for value // prepare cursor for value
// make room for scroll indicator // make room for scroll indicator
@@ -724,13 +711,7 @@ static bool settings_displayCoolingBlinkEnabled(void) {
static bool settings_setResetSettings(void) { static bool settings_setResetSettings(void) {
if (userConfirmation(SettingsResetWarning)) { if (userConfirmation(SettingsResetWarning)) {
resetSettings(); resetSettings();
warnUser(ResetOKMessage, 2 * TICKS_SECOND);
OLED::clearScreen();
OLED::setCursor(0, 0);
OLED::print(ResetOKMessage, FontStyle::LARGE);
OLED::refresh();
waitForButtonPressOrTimeout(2000); // 2 second timeout
} }
return false; return false;
} }
@@ -814,7 +795,7 @@ static bool settings_setCalibrateVIN(void) {
OLED::setCursor(0, 0); OLED::setCursor(0, 0);
OLED::printNumber(systemSettings.voltageDiv, 3, FontStyle::LARGE); OLED::printNumber(systemSettings.voltageDiv, 3, FontStyle::LARGE);
OLED::refresh(); OLED::refresh();
waitForButtonPressOrTimeout(1000); waitForButtonPressOrTimeout(1 * TICKS_SECOND);
return false; return false;
case BUTTON_NONE: case BUTTON_NONE:
default: default:
@@ -1014,18 +995,8 @@ static bool animOpenState = false;
static void displayMenu(size_t index) { static void displayMenu(size_t index) {
// Call into the menu // Call into the menu
const char *textPtr = SettingsMenuEntries[index];
FontStyle font;
if (textPtr[0] == '\x01') { // `\x01` is used as newline.
// Empty first line means that this uses large font (for CJK).
font = FontStyle::LARGE;
textPtr++;
} else {
font = FontStyle::SMALL;
}
OLED::setCursor(0, 0);
// Draw title // Draw title
OLED::print(textPtr, font); OLED::printWholeScreen(SettingsMenuEntries[index]);
// Draw symbol // Draw symbol
// 16 pixel wide image // 16 pixel wide image
// 2 pixel wide scrolling indicator // 2 pixel wide scrolling indicator

23
source/Core/Threads/GUIThread.cpp
View File

@@ -43,10 +43,10 @@ static uint16_t min(uint16_t a, uint16_t b) {
else else
return a; return a;
} }
void warnUser(const char *warning, const FontStyle font, const int timeout) {
void warnUser(const char *warning, const int timeout) {
OLED::clearScreen(); OLED::clearScreen();
OLED::setCursor(0, 0); OLED::printWholeScreen(warning);
OLED::print(warning, font);
OLED::refresh(); OLED::refresh();
waitForButtonPressOrTimeout(timeout); waitForButtonPressOrTimeout(timeout);
} }
@@ -462,7 +462,7 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
case BUTTON_BOTH_LONG: case BUTTON_BOTH_LONG:
// Unlock buttons // Unlock buttons
buttonsLocked = false; buttonsLocked = false;
warnUser(UnlockingKeysString, FontStyle::LARGE, TICKS_SECOND); warnUser(UnlockingKeysString, TICKS_SECOND);
break; break;
case BUTTON_F_LONG: case BUTTON_F_LONG:
// if boost mode is enabled turn it on // if boost mode is enabled turn it on
@@ -476,7 +476,7 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
case BUTTON_F_SHORT: case BUTTON_F_SHORT:
case BUTTON_B_SHORT: case BUTTON_B_SHORT:
// Do nothing and display a lock warming // Do nothing and display a lock warming
warnUser(WarningKeysLockedString, FontStyle::LARGE, TICKS_SECOND / 2); warnUser(WarningKeysLockedString, TICKS_SECOND / 2);
break; break;
default: default:
break; break;
@@ -511,7 +511,7 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
if (systemSettings.lockingMode != 0) { if (systemSettings.lockingMode != 0) {
// Lock buttons // Lock buttons
buttonsLocked = true; buttonsLocked = true;
warnUser(LockingKeysString, FontStyle::LARGE, TICKS_SECOND); warnUser(LockingKeysString, TICKS_SECOND);
} }
break; break;
default: default:
@@ -713,12 +713,7 @@ void showDebugMenu(void) {
void showWarnings() { void showWarnings() {
// Display alert if settings were reset // Display alert if settings were reset
if (settingsWereReset) { if (settingsWereReset) {
if (SettingsResetMessage[0] == '\x01') { // `\x01` is used as newline. warnUser(SettingsResetMessage, 10 * TICKS_SECOND);
// Empty first line means that this uses large font (for CJK).
warnUser(SettingsResetMessage + 1, FontStyle::LARGE, 10 * TICKS_SECOND);
} else {
warnUser(SettingsResetMessage, FontStyle::SMALL, 10 * TICKS_SECOND);
}
} }
#ifndef NO_WARN_MISSING #ifndef NO_WARN_MISSING
// We also want to alert if accel or pd is not detected / not responding // We also want to alert if accel or pd is not detected / not responding
@@ -732,7 +727,7 @@ void showWarnings() {
if (systemSettings.accelMissingWarningCounter < 2) { if (systemSettings.accelMissingWarningCounter < 2) {
systemSettings.accelMissingWarningCounter++; systemSettings.accelMissingWarningCounter++;
saveSettings(); saveSettings();
warnUser(NoAccelerometerMessage, FontStyle::SMALL, 10 * TICKS_SECOND); warnUser(NoAccelerometerMessage, 10 * TICKS_SECOND);
} }
} }
#ifdef POW_PD #ifdef POW_PD
@@ -741,7 +736,7 @@ void showWarnings() {
if (systemSettings.pdMissingWarningCounter < 2) { if (systemSettings.pdMissingWarningCounter < 2) {
systemSettings.pdMissingWarningCounter++; systemSettings.pdMissingWarningCounter++;
saveSettings(); saveSettings();
warnUser(NoPowerDeliveryMessage, FontStyle::SMALL, 10 * TICKS_SECOND); warnUser(NoPowerDeliveryMessage, 10 * TICKS_SECOND);
} }
} }
#endif #endif

2
source/Makefile
View File

@@ -316,7 +316,7 @@ $(OUT_OBJS_S): $(OUTPUT_DIR)/%.o: %.S Makefile
@echo 'Building file: $<' @echo 'Building file: $<'
@$(AS) -c $(AFLAGS) $< -o $@ @$(AS) -c $(AFLAGS) $< -o $@
Core/Gen/Translation.%.cpp: ../Translations/translation_%.json Makefile ../Translations/make_translation.py ../Translations/translations_commons.js ../Translations/font_tables.py ../Translations/wqy-bitmapsong/wenquanyi_9pt.bdf Core/Gen/Translation.%.cpp: ../Translations/translation_%.json Makefile ../Translations/make_translation.py ../Translations/translations_def.js ../Translations/font_tables.py ../Translations/wqy-bitmapsong/wenquanyi_9pt.bdf
@test -d $(@D) || mkdir -p $(@D) @test -d $(@D) || mkdir -p $(@D)
@echo 'Generating translations for language $*' @echo 'Generating translations for language $*'
@python3 ../Translations/make_translation.py -o $(PWD)/$@ $* @python3 ../Translations/make_translation.py -o $(PWD)/$@ $*