Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Off=>icon #1678

Merged
merged 93 commits into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
3426945
replace Off by Icon
discip Jan 23, 2023
b49c767
Merge branch 'dev' into Off=>Icon
discip Jan 24, 2023
379302e
Update translation_TR.json
discip Jan 24, 2023
1737441
Merge branch 'Ralim:dev' into Off=>Icon
discip Jan 24, 2023
187f1c4
Update translation_ES.json
discip Jan 28, 2023
b1ca14c
Update translation_JA_JP.json
discip Jan 28, 2023
fb8e708
Update translation_ES.json
discip Jan 28, 2023
43f5cae
Merge branch 'Ralim:dev' into dev
discip Jan 30, 2023
3c62520
Merge branch 'main' into Off=>Icon
discip Jan 30, 2023
675a2a1
Update Font.h
discip Jan 30, 2023
e022035
Merge branch 'Ralim:dev' into Off=>Icon
discip Feb 3, 2023
615e7ac
Merge branch 'Ralim:dev' into Off=>Icon
discip Feb 4, 2023
f70a84a
Merge branch 'Ralim:dev' into Off=>Icon
discip Feb 6, 2023
41787d5
Merge branch 'Ralim:dev' into Off=>Icon
discip Feb 7, 2023
bba8b90
Merge branch 'Ralim:dev' into Off=>Icon
discip Feb 15, 2023
7697a84
Merge branch 'Ralim:dev' into Off=>Icon
discip Feb 16, 2023
b0e4fc8
Merge branch 'dev' into Off=>Icon
discip Feb 22, 2023
6c3177b
Merge branch 'dev' into Off=>Icon
discip Feb 23, 2023
ce7d04a
Merge branch 'Ralim:dev' into Off=>Icon
discip Feb 24, 2023
71982f2
Merge branch 'Ralim:dev' into Off=>Icon
discip Mar 6, 2023
1ebd17c
Merge branch 'Ralim:dev' into Off=>Icon
discip Mar 11, 2023
5f9d5b0
Merge branch 'Ralim:dev' into Off=>Icon
discip Mar 13, 2023
60b427e
Merge branch 'dev' into Off=>Icon
discip Mar 14, 2023
32d9317
Merge branch 'dev' into Off=>Icon
discip Mar 15, 2023
2868ff6
Update translation_EN.json
discip Mar 15, 2023
36c3c90
Update translation_EN.json
discip Mar 15, 2023
b57887f
Merge branch 'Ralim:dev' into Off=>Icon
discip Mar 17, 2023
0991099
Merge branch 'Ralim:dev' into Off=>Icon
discip Mar 20, 2023
91b51b5
Merge branch 'Ralim:dev' into Off=>Icon
discip Mar 24, 2023
b2f8a6a
Merge branch 'dev' into Off=>Icon
discip Mar 26, 2023
3070d4e
Merge branch 'Ralim:dev' into Off=>Icon
discip Mar 26, 2023
0a70138
Merge branch 'Ralim:dev' into Off=>Icon
discip Mar 29, 2023
3c1b4c4
Merge branch 'Ralim:dev' into Off=>Icon
discip Apr 1, 2023
af642e4
Merge branch 'Ralim:dev' into Off=>Icon
discip Apr 6, 2023
66f8110
Merge branch 'dev' into Off=>Icon
discip Apr 10, 2023
478f6b5
Merge branch 'Ralim:dev' into Off=>Icon
discip Apr 18, 2023
069a079
Merge branch 'Ralim:dev' into Off=>Icon
discip Apr 24, 2023
1f8f913
update_Off=>Icon
discip Apr 26, 2023
e3209d5
Merge branch 'dev' into Off=>Icon
discip Apr 26, 2023
9be525b
Merge branch 'Ralim:dev' into Off=>Icon
discip Apr 26, 2023
ec285d5
Update settingsGUI.cpp
discip Apr 26, 2023
4665c07
Merge branch 'Ralim:dev' into Off=>Icon
discip Apr 28, 2023
157dbd0
Merge branch 'dev' into Off=>Icon
discip May 8, 2023
3ba97d3
Merge branch 'Ralim:dev' into Off=>Icon
discip May 16, 2023
e629bcf
Merge branch 'dev' into Off=>Icon
discip May 17, 2023
14791bc
Merge branch 'dev' into Off=>Icon
discip May 18, 2023
942fb96
replaced power icon with unavailable icon
discip May 18, 2023
e3b1e82
resized unavailable icon
discip May 18, 2023
17ae492
changed unavailable icon once more (better readability)
discip May 18, 2023
eda3a9d
replaced cross with slash
discip May 18, 2023
bd06071
replaced the outer ring by an circle
discip May 22, 2023
a6aca21
Merge branch 'dev' into Off=>Icon
discip May 28, 2023
3c4db9b
Merge branch 'dev' into Off=>Icon
discip Jun 3, 2023
9862857
Merge branch 'Ralim:dev' into Off=>Icon
discip Jun 5, 2023
af591d1
Merge branch 'Ralim:dev' into Off=>Icon
discip Jun 16, 2023
b338831
Merge branch 'dev' into Off=>Icon
discip Jun 17, 2023
7a608df
Merge branch 'dev' into Off=>Icon
discip Jun 20, 2023
edb8f56
Merge branch 'Ralim:dev' into Off=>Icon
discip Jun 29, 2023
612a64e
Merge branch 'dev' into Off=>Icon
discip Jun 30, 2023
546cb56
Merge branch 'dev' into Off=>Icon
discip Jul 2, 2023
1f27cbc
Merge branch 'Ralim:dev' into Off=>Icon
discip Jul 5, 2023
9af81e8
Merge branch 'Ralim:dev' into Off=>Icon
discip Jul 6, 2023
c023e54
Merge branch 'dev' into Off=>Icon
discip Jul 17, 2023
231b5fa
Update settingsGUI.cpp
discip Jul 17, 2023
7793c04
Merge branch 'Ralim:dev' into Off=>Icon
discip Jul 18, 2023
04eafa6
Merge branch 'dev' into Off=>Icon
discip Jul 20, 2023
a16cfa6
Merge branch 'dev' into Off=>Icon
discip Jul 21, 2023
3cb506b
Merge branch 'dev' into Off=>Icon
discip Jul 23, 2023
942a4e5
Merge branch 'dev' into Off=>Icon
discip Jul 24, 2023
e7174f2
Merge branch 'dev' into Off=>Icon
discip Jul 28, 2023
4e88089
Merge branch 'dev' into Off=>Icon
discip Aug 1, 2023
679bf0c
Merge branch 'Ralim:dev' into Off=>Icon
discip Aug 3, 2023
5e7b798
Merge branch 'Ralim:dev' into Off=>Icon
discip Aug 4, 2023
79495dd
Merge branch 'dev' into Off=>Icon
discip Aug 5, 2023
eb44dd0
Merge branch 'Ralim:dev' into Off=>Icon
discip Aug 11, 2023
f2ea835
Merge branch 'dev' into Off=>Icon
discip Aug 11, 2023
a224a96
Merge branch 'dev' into Off=>Icon
discip Aug 11, 2023
b33b256
Merge branch 'dev' into Off=>Icon
discip Aug 14, 2023
05de651
Merge branch 'dev' into Off=>Icon
discip Aug 21, 2023
313ca2a
Merge branch 'Ralim:dev' into Off=>Icon
discip Sep 5, 2023
7efb301
Merge branch 'dev' into Off=>Icon
discip Sep 5, 2023
4132c01
Merge branch 'Ralim:dev' into Off=>Icon
discip Oct 4, 2023
dfe6e48
Merge branch 'Ralim:dev' into Off=>Icon
discip Oct 20, 2023
7c2582a
Merge branch 'Ralim:dev' into Off=>Icon
discip Nov 18, 2023
3f97407
Merge branch 'dev' into Off=>Icon
discip Nov 23, 2023
4dd6ebe
Merge branch 'Ralim:dev' into Off=>Icon
discip Nov 29, 2023
8be2fbe
Merge branch 'Ralim:dev' into Off=>Icon
discip Dec 10, 2023
917c4d0
Merge branch 'Ralim:dev' into Off=>Icon
discip Dec 17, 2023
ec633d6
Merge branch 'Ralim:dev' into Off=>Icon
discip Dec 22, 2023
ccaffbf
Merge branch 'Ralim:dev' into Off=>Icon
discip Dec 27, 2023
9ffef5c
Merge branch 'Ralim:dev' into Off=>Icon
discip Dec 28, 2023
624dca5
Merge branch 'dev' into Off=>Icon
discip Jan 8, 2024
f26e723
Merge branch 'dev' into Off=>Icon
discip Jan 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 66 additions & 10 deletions Translations/translation_BE.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,11 @@
"SleepingTipAdvancedString": {
"message": "Джала: \n"
},
"OffString": {
"message": "Выкл."
"ProfilePreheatString": {
"message": "Preheat\n"
},
"ProfileCooldownString": {
"message": "Cooldown\n"
},
"ProfilePreheatString": {
"message": "Разагрэць\n"
Expand All @@ -80,15 +83,12 @@
"SettingRightChar": "П",
"SettingLeftChar": "Л",
"SettingAutoChar": "А",
"SettingOffChar": "O",
"SettingSlowChar": "М",
"SettingMediumChar": "С",
"SettingFastChar": "Х",
"SettingStartNoneChar": "В",
"SettingStartSolderingChar": "П",
"SettingStartSleepChar": "Ч",
"SettingStartSleepOffChar": "К",
"SettingLockDisableChar": "А",
"SettingLockBoostChar": "Т",
"SettingLockFullChar": "П"
},
Expand Down Expand Up @@ -141,7 +141,7 @@
},
"AutoStart": {
"displayText": "Аўта\nстарт",
"description": "Рэжым, у якім запускаецца паяльнік пры падачы сілкавання (В=Выкл. | П=Пайка | Ч=Чаканне | К=Чаканне пры комн. тэмп.)"
"description": "Рэжым, у якім запускаецца паяльнік пры падачы сілкавання (П=Пайка | Ч=Чаканне | К=Чаканне пры комн. тэмп.)"
},
"TempChangeShortStep": {
"displayText": "Крок тэмп.\nкар. нац.",
Expand All @@ -153,7 +153,63 @@
},
"LockingMode": {
"displayText": "Дазволіць\nблок. кнопак",
"description": "Пры рабоце падоўжаны націск дзьвух кнопак блакуе іх (А=Адключана | Т=Толькі турба | П=Поўная блакіроўка)"
"description": "Пры рабоце падоўжаны націск дзьвух кнопак блакуе іх (Т=Толькі турба | П=Поўная блакіроўка)"
},
"ProfilePhases": {
"displayText": "Profile\nPhases",
"description": "Number of phases in profile mode"
},
"ProfilePreheatTemp": {
"displayText": "Preheat\nTemp",
"description": "Preheat to this temperature at the start of profile mode"
},
"ProfilePreheatSpeed": {
"displayText": "Preheat\nSpeed",
"description": "Preheat at this rate (degrees per second)"
},
"ProfilePhase1Temp": {
"displayText": "Phase 1\nTemp",
"description": "Target temperature for the end of this phase"
},
"ProfilePhase1Duration": {
"displayText": "Phase 1\nDuration",
"description": "Target duration of this phase (seconds)"
},
"ProfilePhase2Temp": {
"displayText": "Phase 2\nTemp",
"description": ""
},
"ProfilePhase2Duration": {
"displayText": "Phase 2\nDuration",
"description": ""
},
"ProfilePhase3Temp": {
"displayText": "Phase 3\nTemp",
"description": ""
},
"ProfilePhase3Duration": {
"displayText": "Phase 3\nDuration",
"description": ""
},
"ProfilePhase4Temp": {
"displayText": "Phase 4\nTemp",
"description": ""
},
"ProfilePhase4Duration": {
"displayText": "Phase 4\nDuration",
"description": ""
},
"ProfilePhase5Temp": {
"displayText": "Phase 5\nTemp",
"description": ""
},
"ProfilePhase5Duration": {
"displayText": "Phase 5\nDuration",
"description": ""
},
"ProfileCooldownSpeed": {
"displayText": "Cooldown\nSpeed",
"description": "Cooldown at this rate at the end of profile mode (degrees per second)"
},
"ProfilePhases": {
"displayText": "Profile\nPhases",
Expand Down Expand Up @@ -213,7 +269,7 @@
},
"MotionSensitivity": {
"displayText": "Адчувальнасць\nакселерометра",
"description": "Адчувальнасць акселерометра (0=Выкл. | 1=Мін. | ... | 9=Макс.)"
"description": "Адчувальнасць акселерометра (1=Мін. | ... | 9=Макс.)"
},
"SleepTemperature": {
"displayText": "Тэмп.\nчакання",
Expand All @@ -229,7 +285,7 @@
},
"HallEffSensitivity": {
"displayText": "Эфект Хола\nадчувальнасць",
"description": "Узровень адчувальнасці датчыка хола ў рэжыме сну (0=Выкл. | 1=Мін. | ... | 9=Макс.)"
"description": "Узровень адчувальнасці датчыка хола ў рэжыме сну (1=Мін. | ... | 9=Макс.)"
},
"TemperatureUnit": {
"displayText": "Адзінкі\nтэмпературы",
Expand All @@ -253,7 +309,7 @@
},
"AnimSpeed": {
"displayText": "Хуткасць\nанімацыі",
"description": "Хуткасць анімацыі гузікаў у галоўным меню (Мілісекунды) (А=Адключана | Н=Нізкая | С=Сярэдняя | В=Высокая)"
"description": "Хуткасць анімацыі гузікаў у галоўным меню (Мілісекунды) (Н=Нізкая | С=Сярэдняя | В=Высокая)"
},
"AnimLoop": {
"displayText": "Зацыкленая\nанімацыя",
Expand Down
19 changes: 10 additions & 9 deletions Translations/translation_BG.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,11 @@
"SleepingTipAdvancedString": {
"message": "Човка:\n"
},
"OffString": {
"message": "Изкл."
"ProfilePreheatString": {
"message": "Preheat\n"
},
"ProfileCooldownString": {
"message": "Cooldown\n"
},
"ProfilePreheatString": {
"message": "Загряване\n"
Expand All @@ -80,11 +83,9 @@
"SettingRightChar": "Д",
"SettingLeftChar": "Л",
"SettingAutoChar": "А",
"SettingOffChar": "И",
"SettingSlowChar": "Н",
"SettingMediumChar": "С",
"SettingFastChar": "В",
"SettingStartNoneChar": "И",
"SettingStartSolderingChar": "З",
"SettingStartSleepChar": "С",
"SettingStartSleepOffChar": "П",
Expand Down Expand Up @@ -141,7 +142,7 @@
},
"AutoStart": {
"displayText": "Автоматичен\nработен режим",
"description": "Режим на поялника при включване на захранването (И=Изкл. | З=Запояване | С=Сън | П=Покой на стайна температурата)"
"description": "Режим на поялника при включване на захранването (З=Запояване | С=Сън | П=Покой на стайна температурата)"
},
"TempChangeShortStep": {
"displayText": "Промяна T\nбързо",
Expand All @@ -153,7 +154,7 @@
},
"LockingMode": {
"displayText": "Бутони за\nзаключване",
"description": "Докато запоявате, задръжте двата бутона, за да превключите заключването им (И=Изкл. | Т=Турбо режим | П=Пълно)"
"description": "Докато запоявате, задръжте двата бутона, за да превключите заключването им (Т=Турбо режим | П=Пълно)"
},
"ProfilePhases": {
"displayText": "Брой\nетапи",
Expand Down Expand Up @@ -213,7 +214,7 @@
},
"MotionSensitivity": {
"displayText": "Чувствител.\nна движение",
"description": "Чувствителност на движение на акселерометър (0=Изкл. | 1=Слабо | ... | 9=Силно)"
"description": "Чувствителност на движение на акселерометър (1=Слабо | ... | 9=Силно)"
},
"SleepTemperature": {
"displayText": "Темп.\nсън",
Expand All @@ -229,7 +230,7 @@
},
"HallEffSensitivity": {
"displayText": "Датчик\nна Хол",
"description": "Чувствителност на сензора към магнитно поле (0=Изкл. | 1=Слабо | ... | 9=Силно)"
"description": "Чувствителност на сензора към магнитно поле (1=Слабо | ... | 9=Силно)"
},
"TemperatureUnit": {
"displayText": "Единици за\nтемпературата",
Expand All @@ -253,7 +254,7 @@
},
"AnimSpeed": {
"displayText": "Скорост на\nанимацията",
"description": "Скорост на анимация на иконата в главното меню (И=Изкл. | Н=Ниска | C=Средна | B=Висока)"
"description": "Скорост на анимация на иконата в главното меню (Н=Ниска | C=Средна | B=Висока)"
},
"AnimLoop": {
"displayText": "Анимац.\nцикъл",
Expand Down
76 changes: 66 additions & 10 deletions Translations/translation_CS.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,11 @@
"SleepingTipAdvancedString": {
"message": "Hrot: \n"
},
"OffString": {
"message": "Vyp"
"ProfilePreheatString": {
"message": "Preheat\n"
},
"ProfileCooldownString": {
"message": "Cooldown\n"
},
"ProfilePreheatString": {
"message": "Předehřívání\n"
Expand All @@ -80,15 +83,12 @@
"SettingRightChar": "P",
"SettingLeftChar": "L",
"SettingAutoChar": "A",
"SettingOffChar": "D",
"SettingSlowChar": "P",
"SettingMediumChar": "S",
"SettingFastChar": "R",
"SettingStartNoneChar": "V",
"SettingStartSolderingChar": "P",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "M",
"SettingLockDisableChar": "Z",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "U"
},
Expand Down Expand Up @@ -141,7 +141,7 @@
},
"AutoStart": {
"displayText": "Chování\npři startu",
"description": "V=vypnuto | P=pájecí teplota | S=spánková teplota | M=zahřát hrot po pohybu"
"description": "P=pájecí teplota | S=spánková teplota | M=zahřát hrot po pohybu"
},
"TempChangeShortStep": {
"displayText": "Krok teploty\nkrátký?",
Expand All @@ -153,7 +153,63 @@
},
"LockingMode": {
"displayText": "Povolit zamč.\ntlačítek",
"description": "Při pájení podržte obě tlačítka pro jejich zamčení (Z=zakázáno | B=pouze v režimu boost | U=úplné zamčení)"
"description": "Při pájení podržte obě tlačítka pro jejich zamčení (B=pouze v režimu boost | U=úplné zamčení)"
},
"ProfilePhases": {
"displayText": "Profile\nPhases",
"description": "Number of phases in profile mode"
},
"ProfilePreheatTemp": {
"displayText": "Preheat\nTemp",
"description": "Preheat to this temperature at the start of profile mode"
},
"ProfilePreheatSpeed": {
"displayText": "Preheat\nSpeed",
"description": "Preheat at this rate (degrees per second)"
},
"ProfilePhase1Temp": {
"displayText": "Phase 1\nTemp",
"description": "Target temperature for the end of this phase"
},
"ProfilePhase1Duration": {
"displayText": "Phase 1\nDuration",
"description": "Target duration of this phase (seconds)"
},
"ProfilePhase2Temp": {
"displayText": "Phase 2\nTemp",
"description": ""
},
"ProfilePhase2Duration": {
"displayText": "Phase 2\nDuration",
"description": ""
},
"ProfilePhase3Temp": {
"displayText": "Phase 3\nTemp",
"description": ""
},
"ProfilePhase3Duration": {
"displayText": "Phase 3\nDuration",
"description": ""
},
"ProfilePhase4Temp": {
"displayText": "Phase 4\nTemp",
"description": ""
},
"ProfilePhase4Duration": {
"displayText": "Phase 4\nDuration",
"description": ""
},
"ProfilePhase5Temp": {
"displayText": "Phase 5\nTemp",
"description": ""
},
"ProfilePhase5Duration": {
"displayText": "Phase 5\nDuration",
"description": ""
},
"ProfileCooldownSpeed": {
"displayText": "Cooldown\nSpeed",
"description": "Cooldown at this rate at the end of profile mode (degrees per second)"
},
"ProfilePhases": {
"displayText": "Profilové\nFáze",
Expand Down Expand Up @@ -213,7 +269,7 @@
},
"MotionSensitivity": {
"displayText": "Citlivost\nna pohyb",
"description": "0=vyp | 1=nejméně citlivé | ... | 9=nejvíce citlivé"
"description": "1=nejméně citlivé | ... | 9=nejvíce citlivé"
},
"SleepTemperature": {
"displayText": "Teplota\nve spánku",
Expand All @@ -229,7 +285,7 @@
},
"HallEffSensitivity": {
"displayText": "Citlivost\nHall. čidla",
"description": "Citlivost Hallova čidla pro detekci spánku (0=vypnuto | 1=nejméně citlivé | ... | 9=nejvíce citlivé)"
"description": "Citlivost Hallova čidla pro detekci spánku (1=nejméně citlivé | ... | 9=nejvíce citlivé)"
},
"TemperatureUnit": {
"displayText": "Jednotka\nteploty",
Expand All @@ -253,7 +309,7 @@
},
"AnimSpeed": {
"displayText": "Anim.\nrychlost",
"description": "Tempo animace ikon v menu (O=vypnuto | P=pomalu | S=středně | R=rychle)"
"description": "Tempo animace ikon v menu (P=pomalu | S=středně | R=rychle)"
},
"AnimLoop": {
"displayText": "Anim.\nsmyčka",
Expand Down
Loading