Skip to content

Commit b97131b

Browse files
3d-gussner3d-gussner
authored
Merge pull request #4691 from 3d-gussner/MK3_3.14.0_Pre_release
Pre-release update bump up verion and build number
2 parents 9da23d8 + 2a4c012 commit b97131b

15 files changed

+129
-129
lines changed

‎Firmware/Configuration.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ extern const char _sPrinterMmuName[] PROGMEM;
2121
#define FW_MAJOR 3
2222
#define FW_MINOR 14
2323
#define FW_REVISION 0
24-
#define FW_COMMITNR 7945
25-
#define FW_FLAVOR BETA //uncomment if DEV, ALPHA, BETA or RC
26-
#define FW_FLAVERSION 1 //uncomment if FW_FLAVOR is defined and versioning is needed. Limited to max 8.
24+
#define FW_COMMITNR 8066
25+
//#define FW_FLAVOR BETA //uncomment if DEV, ALPHA, BETA or RC
26+
//#define FW_FLAVERSION 1 //uncomment if FW_FLAVOR is defined and versioning is needed. Limited to max 8.
2727
#endif
2828

2929
#ifndef FW_FLAVOR

‎lang/po/Firmware.pot

+9-9
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,7 @@ msgid "Heating"
839839
msgstr ""
840840

841841
#. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
842-
#: ../../Firmware/Marlin_main.cpp:9647 ../../Firmware/messages.cpp:211
842+
#: ../../Firmware/Marlin_main.cpp:9648 ../../Firmware/messages.cpp:211
843843
msgid "Heating disabled by safety timer."
844844
msgstr ""
845845

@@ -1216,7 +1216,7 @@ msgid "Mesh bed leveling failed. Please run Z calibration."
12161216
msgstr ""
12171217

12181218
#. MSG_MODE c=6
1219-
#: ../../Firmware/Marlin_main.cpp:8495 ../../Firmware/messages.cpp:117
1219+
#: ../../Firmware/Marlin_main.cpp:8496 ../../Firmware/messages.cpp:117
12201220
#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:4132
12211221
#: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4144
12221222
#: ../../Firmware/ultralcd.cpp:4152 ../../Firmware/ultralcd.cpp:4155
@@ -1325,7 +1325,7 @@ msgid "None"
13251325
msgstr ""
13261326

13271327
#. MSG_NORMAL c=7
1328-
#: ../../Firmware/Marlin_main.cpp:8497 ../../Firmware/messages.cpp:121
1328+
#: ../../Firmware/Marlin_main.cpp:8498 ../../Firmware/messages.cpp:121
13291329
#: ../../Firmware/ultralcd.cpp:4096 ../../Firmware/ultralcd.cpp:4132
13301330
#: ../../Firmware/ultralcd.cpp:4511
13311331
msgid "Normal"
@@ -1433,7 +1433,7 @@ msgid "Once"
14331433
msgstr ""
14341434

14351435
#. MSG_PAUSED_THERMAL_ERROR c=20
1436-
#: ../../Firmware/Marlin_main.cpp:9861 ../../Firmware/messages.cpp:186
1436+
#: ../../Firmware/Marlin_main.cpp:9862 ../../Firmware/messages.cpp:186
14371437
msgid "PAUSED THERMAL ERROR"
14381438
msgstr ""
14391439

@@ -1569,7 +1569,7 @@ msgid "Please place steel sheet on heatbed."
15691569
msgstr ""
15701570

15711571
#. MSG_PRESS_TO_UNLOAD c=20 r=4
1572-
#: ../../Firmware/Marlin_main.cpp:11215 ../../Firmware/Marlin_main.cpp:11245
1572+
#: ../../Firmware/Marlin_main.cpp:11216 ../../Firmware/Marlin_main.cpp:11246
15731573
#: ../../Firmware/messages.cpp:84
15741574
msgid "Please press the knob to unload filament"
15751575
msgstr ""
@@ -1606,7 +1606,7 @@ msgid "Please upgrade."
16061606
msgstr ""
16071607

16081608
#. MSG_PLEASE_WAIT c=20
1609-
#: ../../Firmware/Marlin_main.cpp:3521 ../../Firmware/Marlin_main.cpp:8090
1609+
#: ../../Firmware/Marlin_main.cpp:3521 ../../Firmware/Marlin_main.cpp:8091
16101610
#: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:2179
16111611
#: ../../Firmware/ultralcd.cpp:2190
16121612
msgid "Please wait"
@@ -1671,7 +1671,7 @@ msgid "Press the knob"
16711671
msgstr ""
16721672

16731673
#. MSG_PRESS_TO_PREHEAT c=20 r=4
1674-
#: ../../Firmware/Marlin_main.cpp:11227 ../../Firmware/messages.cpp:212
1674+
#: ../../Firmware/Marlin_main.cpp:11228 ../../Firmware/messages.cpp:212
16751675
msgid "Press the knob to preheat nozzle and continue."
16761676
msgstr ""
16771677

@@ -1846,7 +1846,7 @@ msgid "SELECTOR CANNOT MOVE"
18461846
msgstr ""
18471847

18481848
#. MSG_STOPPED c=20
1849-
#: ../../Firmware/Marlin_main.cpp:9887 ../../Firmware/messages.cpp:125
1849+
#: ../../Firmware/Marlin_main.cpp:9888 ../../Firmware/messages.cpp:125
18501850
msgid "STOPPED."
18511851
msgstr ""
18521852

@@ -2004,7 +2004,7 @@ msgid "Shutdown host"
20042004
msgstr ""
20052005

20062006
#. MSG_SILENT c=7
2007-
#: ../../Firmware/Marlin_main.cpp:8497 ../../Firmware/messages.cpp:120
2007+
#: ../../Firmware/Marlin_main.cpp:8498 ../../Firmware/messages.cpp:120
20082008
#: ../../Firmware/ultralcd.cpp:4155 ../../Firmware/ultralcd.cpp:4194
20092009
msgid "Silent"
20102010
msgstr ""

‎lang/po/Firmware_cs.po

+9-9
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ msgid "Heating"
851851
msgstr "Zahřívání"
852852

853853
#. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
854-
#: ../../Firmware/Marlin_main.cpp:9647 ../../Firmware/messages.cpp:211
854+
#: ../../Firmware/Marlin_main.cpp:9648 ../../Firmware/messages.cpp:211
855855
msgid "Heating disabled by safety timer."
856856
msgstr "Zahřívání přerušeno bezpečnostním časovačem."
857857

@@ -1185,7 +1185,7 @@ msgid "Mesh Bed Leveling"
11851185
msgstr "Mesh Bed Leveling"
11861186

11871187
#. MSG_MODE c=6
1188-
#: ../../Firmware/Marlin_main.cpp:8495 ../../Firmware/messages.cpp:117
1188+
#: ../../Firmware/Marlin_main.cpp:8496 ../../Firmware/messages.cpp:117
11891189
#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:4132
11901190
#: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4144
11911191
#: ../../Firmware/ultralcd.cpp:4152 ../../Firmware/ultralcd.cpp:4155
@@ -1294,7 +1294,7 @@ msgid "None"
12941294
msgstr "Žádné"
12951295

12961296
#. MSG_NORMAL c=7
1297-
#: ../../Firmware/Marlin_main.cpp:8497 ../../Firmware/messages.cpp:121
1297+
#: ../../Firmware/Marlin_main.cpp:8498 ../../Firmware/messages.cpp:121
12981298
#: ../../Firmware/ultralcd.cpp:4096 ../../Firmware/ultralcd.cpp:4132
12991299
#: ../../Firmware/ultralcd.cpp:4511
13001300
msgid "Normal"
@@ -1390,7 +1390,7 @@ msgid "Once"
13901390
msgstr "Jednou"
13911391

13921392
#. MSG_PAUSED_THERMAL_ERROR c=20
1393-
#: ../../Firmware/Marlin_main.cpp:9861 ../../Firmware/messages.cpp:186
1393+
#: ../../Firmware/Marlin_main.cpp:9862 ../../Firmware/messages.cpp:186
13941394
msgid "PAUSED THERMAL ERROR"
13951395
msgstr "STOP: CHYBA TEPLOTY"
13961396

@@ -1533,7 +1533,7 @@ msgid "Please place steel sheet on heatbed."
15331533
msgstr "Umistěte tiskový plát na podložku"
15341534

15351535
#. MSG_PRESS_TO_UNLOAD c=20 r=4
1536-
#: ../../Firmware/Marlin_main.cpp:11215 ../../Firmware/Marlin_main.cpp:11245
1536+
#: ../../Firmware/Marlin_main.cpp:11216 ../../Firmware/Marlin_main.cpp:11246
15371537
#: ../../Firmware/messages.cpp:84
15381538
msgid "Please press the knob to unload filament"
15391539
msgstr "Pro vysunutí filamentu stiskněte tlačítko"
@@ -1570,7 +1570,7 @@ msgid "Please upgrade."
15701570
msgstr "Prosím aktualizujte."
15711571

15721572
#. MSG_PLEASE_WAIT c=20
1573-
#: ../../Firmware/Marlin_main.cpp:3521 ../../Firmware/Marlin_main.cpp:8090
1573+
#: ../../Firmware/Marlin_main.cpp:3521 ../../Firmware/Marlin_main.cpp:8091
15741574
#: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:2179
15751575
#: ../../Firmware/ultralcd.cpp:2190
15761576
msgid "Please wait"
@@ -1630,7 +1630,7 @@ msgid "Press the knob"
16301630
msgstr "Stiskněte tlačítko"
16311631

16321632
#. MSG_PRESS_TO_PREHEAT c=20 r=4
1633-
#: ../../Firmware/Marlin_main.cpp:11227 ../../Firmware/messages.cpp:212
1633+
#: ../../Firmware/Marlin_main.cpp:11228 ../../Firmware/messages.cpp:212
16341634
msgid "Press the knob to preheat nozzle and continue."
16351635
msgstr "Pro nahřátí trysky a pokračování stiskněte tlačítko."
16361636

@@ -1811,7 +1811,7 @@ msgid "SELECTOR CANNOT MOVE"
18111811
msgstr "SELEKTOR SE NEHÝBE"
18121812

18131813
#. MSG_STOPPED c=20
1814-
#: ../../Firmware/Marlin_main.cpp:9887 ../../Firmware/messages.cpp:125
1814+
#: ../../Firmware/Marlin_main.cpp:9888 ../../Firmware/messages.cpp:125
18151815
msgid "STOPPED."
18161816
msgstr "ZASTAVENO."
18171817

@@ -1946,7 +1946,7 @@ msgid "Show end stops"
19461946
msgstr "Stav konc. spín."
19471947

19481948
#. MSG_SILENT c=7
1949-
#: ../../Firmware/Marlin_main.cpp:8497 ../../Firmware/messages.cpp:120
1949+
#: ../../Firmware/Marlin_main.cpp:8498 ../../Firmware/messages.cpp:120
19501950
#: ../../Firmware/ultralcd.cpp:4155 ../../Firmware/ultralcd.cpp:4194
19511951
msgid "Silent"
19521952
msgstr "Tichý"

‎lang/po/Firmware_de.po

+9-9
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,7 @@ msgid "Heating"
857857
msgstr "Aufwärmen"
858858

859859
#. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
860-
#: ../../Firmware/Marlin_main.cpp:9647 ../../Firmware/messages.cpp:211
860+
#: ../../Firmware/Marlin_main.cpp:9648 ../../Firmware/messages.cpp:211
861861
msgid "Heating disabled by safety timer."
862862
msgstr "Heizung durch Sicherheitstimer deaktiviert."
863863

@@ -1200,7 +1200,7 @@ msgid "Mesh Bed Leveling"
12001200
msgstr "MeshBett Ausgleich"
12011201

12021202
#. MSG_MODE c=6
1203-
#: ../../Firmware/Marlin_main.cpp:8495 ../../Firmware/messages.cpp:117
1203+
#: ../../Firmware/Marlin_main.cpp:8496 ../../Firmware/messages.cpp:117
12041204
#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:4132
12051205
#: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4144
12061206
#: ../../Firmware/ultralcd.cpp:4152 ../../Firmware/ultralcd.cpp:4155
@@ -1309,7 +1309,7 @@ msgid "None"
13091309
msgstr "Ohne"
13101310

13111311
#. MSG_NORMAL c=7
1312-
#: ../../Firmware/Marlin_main.cpp:8497 ../../Firmware/messages.cpp:121
1312+
#: ../../Firmware/Marlin_main.cpp:8498 ../../Firmware/messages.cpp:121
13131313
#: ../../Firmware/ultralcd.cpp:4096 ../../Firmware/ultralcd.cpp:4132
13141314
#: ../../Firmware/ultralcd.cpp:4511
13151315
msgid "Normal"
@@ -1406,7 +1406,7 @@ msgid "Once"
14061406
msgstr "Einmal"
14071407

14081408
#. MSG_PAUSED_THERMAL_ERROR c=20
1409-
#: ../../Firmware/Marlin_main.cpp:9861 ../../Firmware/messages.cpp:186
1409+
#: ../../Firmware/Marlin_main.cpp:9862 ../../Firmware/messages.cpp:186
14101410
msgid "PAUSED THERMAL ERROR"
14111411
msgstr "PAUSE THERM. FEHLER"
14121412

@@ -1553,7 +1553,7 @@ msgid "Please place steel sheet on heatbed."
15531553
msgstr "Legen Sie das Stahlblech auf das Heizbett."
15541554

15551555
#. MSG_PRESS_TO_UNLOAD c=20 r=4
1556-
#: ../../Firmware/Marlin_main.cpp:11215 ../../Firmware/Marlin_main.cpp:11245
1556+
#: ../../Firmware/Marlin_main.cpp:11216 ../../Firmware/Marlin_main.cpp:11246
15571557
#: ../../Firmware/messages.cpp:84
15581558
msgid "Please press the knob to unload filament"
15591559
msgstr "Drücken Sie den Knopf um das Filament zu entladen."
@@ -1590,7 +1590,7 @@ msgid "Please upgrade."
15901590
msgstr "Bitte aktualisieren."
15911591

15921592
#. MSG_PLEASE_WAIT c=20
1593-
#: ../../Firmware/Marlin_main.cpp:3521 ../../Firmware/Marlin_main.cpp:8090
1593+
#: ../../Firmware/Marlin_main.cpp:3521 ../../Firmware/Marlin_main.cpp:8091
15941594
#: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:2179
15951595
#: ../../Firmware/ultralcd.cpp:2190
15961596
msgid "Please wait"
@@ -1650,7 +1650,7 @@ msgid "Press the knob"
16501650
msgstr "Knopf drücken zum"
16511651

16521652
#. MSG_PRESS_TO_PREHEAT c=20 r=4
1653-
#: ../../Firmware/Marlin_main.cpp:11227 ../../Firmware/messages.cpp:212
1653+
#: ../../Firmware/Marlin_main.cpp:11228 ../../Firmware/messages.cpp:212
16541654
msgid "Press the knob to preheat nozzle and continue."
16551655
msgstr "Drücken Sie den Knopf um die Düse vorzuheizen und fortzufahren."
16561656

@@ -1831,7 +1831,7 @@ msgid "SELECTOR CANNOT MOVE"
18311831
msgstr "SELEKTOR SITZT FEST"
18321832

18331833
#. MSG_STOPPED c=20
1834-
#: ../../Firmware/Marlin_main.cpp:9887 ../../Firmware/messages.cpp:125
1834+
#: ../../Firmware/Marlin_main.cpp:9888 ../../Firmware/messages.cpp:125
18351835
msgid "STOPPED."
18361836
msgstr "GESTOPPT."
18371837

@@ -1968,7 +1968,7 @@ msgid "Show end stops"
19681968
msgstr "Endschalter Status"
19691969

19701970
#. MSG_SILENT c=7
1971-
#: ../../Firmware/Marlin_main.cpp:8497 ../../Firmware/messages.cpp:120
1971+
#: ../../Firmware/Marlin_main.cpp:8498 ../../Firmware/messages.cpp:120
19721972
#: ../../Firmware/ultralcd.cpp:4155 ../../Firmware/ultralcd.cpp:4194
19731973
msgid "Silent"
19741974
msgstr "Leise"

‎lang/po/Firmware_es.po

+9-9
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ msgid "Heating"
861861
msgstr "Calentando..."
862862

863863
#. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
864-
#: ../../Firmware/Marlin_main.cpp:9647 ../../Firmware/messages.cpp:211
864+
#: ../../Firmware/Marlin_main.cpp:9648 ../../Firmware/messages.cpp:211
865865
msgid "Heating disabled by safety timer."
866866
msgstr "Calentadores desactivados por el temporizador de seguridad."
867867

@@ -1197,7 +1197,7 @@ msgid "Mesh Bed Leveling"
11971197
msgstr "Nivela. Malla Base"
11981198

11991199
#. MSG_MODE c=6
1200-
#: ../../Firmware/Marlin_main.cpp:8495 ../../Firmware/messages.cpp:117
1200+
#: ../../Firmware/Marlin_main.cpp:8496 ../../Firmware/messages.cpp:117
12011201
#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:4132
12021202
#: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4144
12031203
#: ../../Firmware/ultralcd.cpp:4152 ../../Firmware/ultralcd.cpp:4155
@@ -1306,7 +1306,7 @@ msgid "None"
13061306
msgstr "Ninguno"
13071307

13081308
#. MSG_NORMAL c=7
1309-
#: ../../Firmware/Marlin_main.cpp:8497 ../../Firmware/messages.cpp:121
1309+
#: ../../Firmware/Marlin_main.cpp:8498 ../../Firmware/messages.cpp:121
13101310
#: ../../Firmware/ultralcd.cpp:4096 ../../Firmware/ultralcd.cpp:4132
13111311
#: ../../Firmware/ultralcd.cpp:4511
13121312
msgid "Normal"
@@ -1406,7 +1406,7 @@ msgid "Once"
14061406
msgstr "Una vez"
14071407

14081408
#. MSG_PAUSED_THERMAL_ERROR c=20
1409-
#: ../../Firmware/Marlin_main.cpp:9861 ../../Firmware/messages.cpp:186
1409+
#: ../../Firmware/Marlin_main.cpp:9862 ../../Firmware/messages.cpp:186
14101410
msgid "PAUSED THERMAL ERROR"
14111411
msgstr "PAUSA ERROR TÉRMICO"
14121412

@@ -1551,7 +1551,7 @@ msgid "Please place steel sheet on heatbed."
15511551
msgstr "Coloca la lam. de acero en la base."
15521552

15531553
#. MSG_PRESS_TO_UNLOAD c=20 r=4
1554-
#: ../../Firmware/Marlin_main.cpp:11215 ../../Firmware/Marlin_main.cpp:11245
1554+
#: ../../Firmware/Marlin_main.cpp:11216 ../../Firmware/Marlin_main.cpp:11246
15551555
#: ../../Firmware/messages.cpp:84
15561556
msgid "Please press the knob to unload filament"
15571557
msgstr "Pulsa el dial para descargar el filamento"
@@ -1588,7 +1588,7 @@ msgid "Please upgrade."
15881588
msgstr "Actualiza por favor."
15891589

15901590
#. MSG_PLEASE_WAIT c=20
1591-
#: ../../Firmware/Marlin_main.cpp:3521 ../../Firmware/Marlin_main.cpp:8090
1591+
#: ../../Firmware/Marlin_main.cpp:3521 ../../Firmware/Marlin_main.cpp:8091
15921592
#: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:2179
15931593
#: ../../Firmware/ultralcd.cpp:2190
15941594
msgid "Please wait"
@@ -1648,7 +1648,7 @@ msgid "Press the knob"
16481648
msgstr "Pulsa el dial"
16491649

16501650
#. MSG_PRESS_TO_PREHEAT c=20 r=4
1651-
#: ../../Firmware/Marlin_main.cpp:11227 ../../Firmware/messages.cpp:212
1651+
#: ../../Firmware/Marlin_main.cpp:11228 ../../Firmware/messages.cpp:212
16521652
msgid "Press the knob to preheat nozzle and continue."
16531653
msgstr "Pulsa el dial para precalentar la boquilla y continue."
16541654

@@ -1829,7 +1829,7 @@ msgid "SELECTOR CANNOT MOVE"
18291829
msgstr "SELECT. SIN MOVERSE"
18301830

18311831
#. MSG_STOPPED c=20
1832-
#: ../../Firmware/Marlin_main.cpp:9887 ../../Firmware/messages.cpp:125
1832+
#: ../../Firmware/Marlin_main.cpp:9888 ../../Firmware/messages.cpp:125
18331833
msgid "STOPPED."
18341834
msgstr "PARADA"
18351835

@@ -1970,7 +1970,7 @@ msgid "Show end stops"
19701970
msgstr "Mostrar endstops"
19711971

19721972
#. MSG_SILENT c=7
1973-
#: ../../Firmware/Marlin_main.cpp:8497 ../../Firmware/messages.cpp:120
1973+
#: ../../Firmware/Marlin_main.cpp:8498 ../../Firmware/messages.cpp:120
19741974
#: ../../Firmware/ultralcd.cpp:4155 ../../Firmware/ultralcd.cpp:4194
19751975
msgid "Silent"
19761976
msgstr "Acallar"

0 commit comments

Comments
 (0)