File tree Expand file tree Collapse file tree 11 files changed +395
-173
lines changed Expand file tree Collapse file tree 11 files changed +395
-173
lines changed Load Diff Large diffs are not rendered by default.
Original file line number Diff line number Diff line change @@ -943,6 +943,9 @@ namespace Language_en {
943
943
LSTR MSG_SHORT_DAY = _UxGT(" d" ); // One character only
944
944
LSTR MSG_SHORT_HOUR = _UxGT(" h" ); // One character only
945
945
LSTR MSG_SHORT_MINUTE = _UxGT(" m" ); // One character only
946
+
947
+ // These strings can be the same in all languages
948
+ LSTR MSG_MARLIN = _UxGT(" Marlin" );
946
949
LSTR MSG_PID_P = _UxGT(" PID-P" );
947
950
LSTR MSG_PID_P_E = _UxGT(" PID-P *" );
948
951
LSTR MSG_PID_I = _UxGT(" PID-I" );
Original file line number Diff line number Diff line change @@ -443,9 +443,6 @@ namespace Language_fr {
443
443
444
444
LSTR MSG_HALTED = _UxGT(" IMPR. STOPPÉE" );
445
445
LSTR MSG_PLEASE_RESET = _UxGT(" Redémarrer SVP" );
446
- LSTR MSG_SHORT_DAY = _UxGT(" j" ); // One character only
447
- LSTR MSG_SHORT_HOUR = _UxGT(" h" ); // One character only
448
- LSTR MSG_SHORT_MINUTE = _UxGT(" m" ); // One character only
449
446
450
447
LSTR MSG_HEATING = _UxGT(" en chauffe..." );
451
448
LSTR MSG_COOLING = _UxGT(" Refroidissement" );
@@ -631,4 +628,8 @@ namespace Language_fr {
631
628
632
629
LSTR MSG_SD_CARD = _UxGT(" Carte SD" );
633
630
LSTR MSG_USB_DISK = _UxGT(" Clé USB" );
631
+
632
+ LSTR MSG_SHORT_DAY = _UxGT(" j" ); // One character only
633
+ LSTR MSG_SHORT_HOUR = _UxGT(" h" ); // One character only
634
+ LSTR MSG_SHORT_MINUTE = _UxGT(" m" ); // One character only
634
635
}
Original file line number Diff line number Diff line change @@ -490,9 +490,6 @@ namespace Language_hu {
490
490
LSTR MSG_ERR_MINTEMP = _UxGT(" Hiba: MIN höfok" );
491
491
LSTR MSG_HALTED = _UxGT(" A NYOMTATÓ LEÁLLT" );
492
492
LSTR MSG_PLEASE_RESET = _UxGT(" Indítsd újra!" );
493
- LSTR MSG_SHORT_DAY = _UxGT(" n" ); // Csak egy karakter
494
- LSTR MSG_SHORT_HOUR = _UxGT(" ó" ); // Csak egy karakter
495
- LSTR MSG_SHORT_MINUTE = _UxGT(" p" ); // Csak egy karakter
496
493
LSTR MSG_HEATING = _UxGT(" Fütés..." );
497
494
LSTR MSG_COOLING = _UxGT(" Hütés..." );
498
495
LSTR MSG_BED_HEATING = _UxGT(" Ágy fütés..." );
@@ -696,12 +693,8 @@ namespace Language_hu {
696
693
697
694
LSTR MSG_SD_CARD = _UxGT(" SD Kártya" );
698
695
LSTR MSG_USB_DISK = _UxGT(" USB Lemez" );
699
- }
700
696
701
- #if FAN_COUNT == 1
702
- #define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED
703
- #define MSG_EXTRA_FIRST_FAN_SPEED MSG_EXTRA_FAN_SPEED
704
- #else
705
- #define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED_N
706
- #define MSG_EXTRA_FIRST_FAN_SPEED MSG_EXTRA_FAN_SPEED_N
707
- #endif
697
+ LSTR MSG_SHORT_DAY = _UxGT(" n" ); // Csak egy karakter
698
+ LSTR MSG_SHORT_HOUR = _UxGT(" ó" ); // Csak egy karakter
699
+ LSTR MSG_SHORT_MINUTE = _UxGT(" p" ); // Csak egy karakter
700
+ }
Original file line number Diff line number Diff line change @@ -538,11 +538,3 @@ namespace Language_pl {
538
538
LSTR MSG_CALIBRATION_FAILED = _UxGT(" Kalibracja nie powiodła się" );
539
539
540
540
}
541
-
542
- #if FAN_COUNT == 1
543
- #define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED
544
- #define MSG_EXTRA_FIRST_FAN_SPEED MSG_EXTRA_FAN_SPEED
545
- #else
546
- #define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED_N
547
- #define MSG_EXTRA_FIRST_FAN_SPEED MSG_EXTRA_FAN_SPEED_N
548
- #endif
Original file line number Diff line number Diff line change @@ -606,11 +606,3 @@ namespace Language_ro {
606
606
LSTR MSG_REHEAT = _UxGT(" Reincalzire" );
607
607
LSTR MSG_REHEATING = _UxGT(" Reincalzire..." );
608
608
}
609
-
610
- #if FAN_COUNT == 1
611
- #define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED
612
- #define MSG_EXTRA_FIRST_FAN_SPEED MSG_EXTRA_FAN_SPEED
613
- #else
614
- #define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED_N
615
- #define MSG_EXTRA_FIRST_FAN_SPEED MSG_EXTRA_FAN_SPEED_N
616
- #endif
Original file line number Diff line number Diff line change @@ -985,12 +985,10 @@ namespace Language_ru {
985
985
986
986
LSTR MSG_DRIVER_BACKWARD = _UxGT(" драйвер наоборот" );
987
987
988
- }
988
+ LSTR MSG_SD_CARD = _UxGT(" SD Карта" );
989
+ LSTR MSG_USB_DISK = _UxGT(" USB Диск" );
989
990
990
- #if FAN_COUNT == 1
991
- #define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED
992
- #define MSG_EXTRA_FIRST_FAN_SPEED MSG_EXTRA_FAN_SPEED
993
- #else
994
- #define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED_N
995
- #define MSG_EXTRA_FIRST_FAN_SPEED MSG_EXTRA_FAN_SPEED_N
996
- #endif
991
+ LSTR MSG_SHORT_DAY = _UxGT(" д" ); // One character only
992
+ LSTR MSG_SHORT_HOUR = _UxGT(" ч" ); // One character only
993
+ LSTR MSG_SHORT_MINUTE = _UxGT(" м" ); // One character only
994
+ }
Original file line number Diff line number Diff line change @@ -625,9 +625,6 @@ namespace Language_uk {
625
625
LSTR MSG_ERR_MINTEMP = _UxGT(" МІНІМАЛЬНА Т" ) LCD_STR_DEGREE;
626
626
LSTR MSG_HALTED = _UxGT(" ПРИНТЕР ЗУПИНЕНО" );
627
627
LSTR MSG_PLEASE_RESET = _UxGT(" Перезавантажте" );
628
- LSTR MSG_SHORT_DAY = _UxGT(" д" ); // One character only
629
- LSTR MSG_SHORT_HOUR = _UxGT(" г" ); // One character only
630
- LSTR MSG_SHORT_MINUTE = _UxGT(" х" ); // One character only
631
628
LSTR MSG_HEATING = _UxGT(" Нагрівання..." );
632
629
LSTR MSG_COOLING = _UxGT(" Охолодження..." );
633
630
LSTR MSG_BED_HEATING = _UxGT(" Нагрів столу..." );
@@ -913,12 +910,8 @@ namespace Language_uk {
913
910
914
911
LSTR MSG_SD_CARD = _UxGT(" SD Картка" );
915
912
LSTR MSG_USB_DISK = _UxGT(" USB Диск" );
916
- }
917
913
918
- #if FAN_COUNT == 1
919
- #define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED
920
- #define MSG_EXTRA_FIRST_FAN_SPEED MSG_EXTRA_FAN_SPEED
921
- #else
922
- #define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED_N
923
- #define MSG_EXTRA_FIRST_FAN_SPEED MSG_EXTRA_FAN_SPEED_N
924
- #endif
914
+ LSTR MSG_SHORT_DAY = _UxGT(" д" ); // One character only
915
+ LSTR MSG_SHORT_HOUR = _UxGT(" г" ); // One character only
916
+ LSTR MSG_SHORT_MINUTE = _UxGT(" х" ); // One character only
917
+ }
Original file line number Diff line number Diff line change @@ -341,9 +341,6 @@ namespace Language_vi {
341
341
LSTR MSG_ERR_MINTEMP = _UxGT(" Điều sai: nhiệt độ tối thiểu" ); // Err: MINTEMP
342
342
LSTR MSG_HALTED = _UxGT(" MÁY IN ĐÃ DỪNG LẠI" ); // PRINTER HALTED
343
343
LSTR MSG_PLEASE_RESET = _UxGT(" Xin bặt lại" ); // Please reset
344
- LSTR MSG_SHORT_DAY = _UxGT(" n" ); // d - ngày - One character only
345
- LSTR MSG_SHORT_HOUR = _UxGT(" g" ); // h - giờ - One character only
346
- LSTR MSG_SHORT_MINUTE = _UxGT(" p" ); // m - phút - One character only
347
344
LSTR MSG_HEATING = _UxGT(" Đang sưởi nóng..." ); // heating
348
345
LSTR MSG_COOLING = _UxGT(" Đang làm nguội..." ); // cooling
349
346
LSTR MSG_BED_HEATING = _UxGT(" Đang sưởi nong bàn..." ); // bed heating
@@ -437,4 +434,8 @@ namespace Language_vi {
437
434
LSTR MSG_TMC_HOMING_THRS = _UxGT(" Vô cảm biến" ); // Sensorless homing
438
435
LSTR MSG_TMC_STEPPING_MODE = _UxGT(" Chế độ từng bước" ); // Stepping mode
439
436
LSTR MSG_TMC_STEALTH_ENABLED = _UxGT(" CắtTàngHình được kích hoạt" ); // StealthChop enabled
437
+
438
+ LSTR MSG_SHORT_DAY = _UxGT(" n" ); // d - ngày - One character only
439
+ LSTR MSG_SHORT_HOUR = _UxGT(" g" ); // h - giờ - One character only
440
+ LSTR MSG_SHORT_MINUTE = _UxGT(" p" ); // m - phút - One character only
440
441
}
Original file line number Diff line number Diff line change @@ -438,9 +438,6 @@ namespace Language_zh_CN {
438
438
LSTR MSG_ERR_MINTEMP = _UxGT(" 错误:最低温度" ); // "Err: MINTEMP"
439
439
LSTR MSG_HALTED = _UxGT(" 打印停机" ); // "PRINTER HALTED"
440
440
LSTR MSG_PLEASE_RESET = _UxGT(" 请重置" ); // "Please reset"
441
- LSTR MSG_SHORT_DAY = _UxGT(" 天" ); // "d" // One character only
442
- LSTR MSG_SHORT_HOUR = _UxGT(" 时" ); // "h" // One character only
443
- LSTR MSG_SHORT_MINUTE = _UxGT(" 分" ); // "m" // One character only
444
441
LSTR MSG_HEATING = _UxGT(" 加热中 ..." ); // "Heating..."
445
442
LSTR MSG_COOLING = _UxGT(" 冷却中 ..." );
446
443
LSTR MSG_BED_HEATING = _UxGT(" 加热热床中 ..." ); // "Bed Heating..."
@@ -608,12 +605,8 @@ namespace Language_zh_CN {
608
605
LSTR MSG_HEATER_TIMEOUT = _UxGT(" 加热器超时" );
609
606
LSTR MSG_REHEAT = _UxGT(" 重新加热" );
610
607
LSTR MSG_REHEATING = _UxGT(" 重新加热中..." );
611
- }
612
608
613
- #if FAN_COUNT == 1
614
- #define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED
615
- #define MSG_EXTRA_FIRST_FAN_SPEED MSG_EXTRA_FAN_SPEED
616
- #else
617
- #define MSG_FIRST_FAN_SPEED MSG_FAN_SPEED_N
618
- #define MSG_EXTRA_FIRST_FAN_SPEED MSG_EXTRA_FAN_SPEED_N
619
- #endif
609
+ LSTR MSG_SHORT_DAY = _UxGT(" 天" ); // "d" // One character only
610
+ LSTR MSG_SHORT_HOUR = _UxGT(" 时" ); // "h" // One character only
611
+ LSTR MSG_SHORT_MINUTE = _UxGT(" 分" ); // "m" // One character only
612
+ }
You can’t perform that action at this time.
0 commit comments