Skip to content

Commit deff8dc

Browse files
3d-gussnerDRracerwavexxD.R.racer
authored
MK3 3 9 0 missing translations (prusa3d#2646)
* Add and update missing translations - updated in Firmware/ files the missing `c=xx` column and `r=yy` rows. - added missing translations to lang/lang_en*.txt Everyone is developing and adding messages to serial and especially to LCD PLEASE add `//// c=xx` or `//// c=xx r=yy` comments. Preparing translations files without that information is a pain in the ... and takes way more time for somebody else to review to code as it would take you. * No need to have `MSG_abcde` again in comments `////` in `messages.c` * German translation * Missed a space * Use the same format as somewhere else * French translation. I am not a native French speaking person, so please excuse my mistakes I may have done. * Spanish translation. I am not a native Spanish speaking person, so please excuse my mistakes I may have done. * CZ translation * Fix typos * Another fix It is Dimmwert and not Dim Wert * Fix issues reported by `lang-check.py` * Add "difficult" messages containing `%` * Updated MSG and German translation * removed a translation as it breaks the language selection * No need to wait until any-key is pressed * No need to wait any-key is pressed * Fixed two LF issues * Updated PO files ready to be send to translators * Add missing italian translations * Improve some existing italian translations * More italian fixes * More italian fixes * Add exceptions in editorconfig for po files to avoid recoding * Fix typo Thanks @DRracer for pointing out * Italian translation by @wavexx * Update po/new/*.po files * Update after merging MK3 branch * Update French translation and some c=xx comments Big thanks to @awenelo @carlin57 for helping with the french translations and their comments. * Update po files after French translation * Fixed most `lang-check.py` reported translation errors for Czech and German. Two Czech have to be reviewed as these are too long. One German is correct as it is shown in c=20 r=2 but is 1 char longer than this to split the message. One German translation seams to be to long but have to review the actual max length * Fix `lang-check.py` Spanish translation errors There have been quite lot TOO long messages, Can't imagine that nobody every complained about that. * Fix `lang-check.py` Italian translations errors * Update not_tran and not_used files after fixing several translations * Some more error fixes and update of `po` files * Polish translation * Czech updated * Fix typo * no need to translate `\x00` if it is the same * Polish: Runouts->Koniec * Polish: Runouts->Konce f ... hopefully the last change * Added MK2.5/s auto power mode to eeprom doxygen * Final updates. - Compiled all versions with multi-languages - Compiled all versions with EN_ONLY - updated all /lang/po/Firmware*.* files * Add crlf attributes for po files As done for editorconfig, this similarly forces git to handle po files consistently in DOS format. * Further improvent of IT translations * Updated translation Added cleanup to PF-build.sh * remove lang/not_tran* and lang/not_used mistakenly added into the PR Co-authored-by: DRracer <drracer@seznam.cz> Co-authored-by: Yuri D'Elia <wavexx@thregr.org> Co-authored-by: D.R.racer <drracer@drracer.eu>
1 parent 9462530 commit deff8dc

31 files changed

+16832
-15634
lines changed

‎.editorconfig

+4
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,7 @@ indent_style = space
1212
indent_size = 4
1313
tab_width = 4
1414
max_line_length = 100
15+
16+
[lang/po/*.po]
17+
end_of_line = crlf
18+
trim_trailing_whitespace = false

‎.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lang/po/*.po text eol=crlf

‎Firmware/Marlin_main.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -869,14 +869,14 @@ static void check_if_fw_is_on_right_printer(){
869869
swi2c_init();
870870
const uint8_t pat9125_detected = swi2c_readByte_A8(PAT9125_I2C_ADDR,0x00,NULL);
871871
if (pat9125_detected){
872-
lcd_show_fullscreen_message_and_wait_P(_i("MK3S firmware detected on MK3 printer"));}
872+
lcd_show_fullscreen_message_and_wait_P(_i("MK3S firmware detected on MK3 printer"));}////c=20 r=3
873873
#endif //IR_SENSOR
874874

875875
#ifdef PAT9125
876876
//will return 1 only if IR can detect filament in bondtech extruder so this may fail even when we have IR sensor
877877
const uint8_t ir_detected = !(PIN_GET(IR_SENSOR_PIN));
878878
if (ir_detected){
879-
lcd_show_fullscreen_message_and_wait_P(_i("MK3 firmware detected on MK3S printer"));}
879+
lcd_show_fullscreen_message_and_wait_P(_i("MK3 firmware detected on MK3S printer"));}////c=20 r=3
880880
#endif //PAT9125
881881
}
882882
#endif //FILAMENT_SENSOR
@@ -1515,7 +1515,7 @@ void setup()
15151515
}
15161516

15171517
if (!previous_settings_retrieved) {
1518-
lcd_show_fullscreen_message_and_wait_P(_i("Old settings found. Default PID, Esteps etc. will be set.")); //if EEPROM version or printer type was changed, inform user that default setting were loaded////MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
1518+
lcd_show_fullscreen_message_and_wait_P(_i("Old settings found. Default PID, Esteps etc. will be set.")); //if EEPROM version or printer type was changed, inform user that default setting were loaded////MSG_DEFAULT_SETTINGS_LOADED c=20 r=5
15191519
Config_StoreSettings();
15201520
}
15211521
if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) {
@@ -9509,7 +9509,7 @@ static uint16_t nFSCheckCount=0;
95099509
oFsensorPCB=ClFsensorPCB::_Rev04;
95109510
eeprom_update_byte((uint8_t*)EEPROM_FSENSOR_PCB,(uint8_t)oFsensorPCB);
95119511
printf_IRSensorAnalogBoardChange(true);
9512-
lcd_setstatuspgm(_i("FS v0.4 or newer"));
9512+
lcd_setstatuspgm(_i("FS v0.4 or newer"));////c=18
95139513
}
95149514
} else {
95159515
nFSCheckCount=0;
@@ -10880,7 +10880,7 @@ void recover_print(uint8_t automatic) {
1088010880
char cmd[30];
1088110881
lcd_update_enable(true);
1088210882
lcd_update(2);
10883-
lcd_setstatuspgm(_i("Recovering print "));////MSG_RECOVERING_PRINT c=20 r=1
10883+
lcd_setstatuspgm(_i("Recovering print "));////MSG_RECOVERING_PRINT c=20
1088410884

1088510885
// Recover position, temperatures and extrude_multipliers
1088610886
bool mbl_was_active = recover_machine_state_after_power_panic();

‎Firmware/cardreader.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ void CardReader::presort() {
735735
// Never sort more than the max allowed
736736
// If you use folders to organize, 20 may be enough
737737
if (fileCnt > SDSORT_LIMIT) {
738-
lcd_show_fullscreen_message_and_wait_P(_i("Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."));////MSG_FILE_CNT c=20 r=4
738+
lcd_show_fullscreen_message_and_wait_P(_i("Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."));////MSG_FILE_CNT c=20 r=6
739739
fileCnt = SDSORT_LIMIT;
740740
}
741741
lcd_clear();

‎Firmware/eeprom.h

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP
8181
| :-- | :-- | :-- | :--: | :--: | :-- | :--: | :--:
8282
| 0x0FFFh 4095 | uchar | EEPROM_SILENT | 00h 0 | ffh 255 | TMC Stealth mode: __off__ / miniRambo Power mode | LCD menu | D3 Ax0fff C1
8383
| ^ | ^ | ^ | 01h 1 | ^ | TMC Stealth mode: __on__ / miniRambo Silent mode | ^ | ^
84+
| ^ | ^ | ^ | 02h 2 | ^ | miniRambo Auto mode | ^ | ^
8485
| 0x0FFEh 4094 | uchar | EEPROM_LANG | 00h 0 | ffh 255 __L__ | English / LANG_ID_PRI | LCD menu | D3 Ax0ffe C1
8586
| ^ | ^ | ^ | 01h 1 | ^ | Other language LANG_ID_SEC | ^ | ^
8687
| 0x0FFCh 4092 | uint16 | EEPROM_BABYSTEP_X | ??? | ff ffh 65535 | Babystep for X axis _unsued_ | ??? | D3 Ax0ffc C2

‎Firmware/messages.c

+22-22
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ const char MSG_BABYSTEP_Z_NOT_SET[] PROGMEM_I1 = ISTR("Distance between tip of t
1414
const char MSG_BED[] PROGMEM_I1 = ISTR("Bed"); ////
1515
const char MSG_BED_DONE[] PROGMEM_I1 = ISTR("Bed done"); ////
1616
const char MSG_BED_HEATING[] PROGMEM_I1 = ISTR("Bed Heating"); ////
17-
const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."); ////c=20 r=4
17+
const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."); ////c=20 r=5
1818
const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ calibration failed. Please consult the manual."); ////c=20 r=8
1919
const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////c=20 r=2
2020
const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); ////
2121
const char MSG_CONFIRM_NOZZLE_CLEAN[] PROGMEM_I1 = ISTR("Please clean the nozzle for calibration. Click when done."); ////c=20 r=8
2222
const char MSG_COOLDOWN[] PROGMEM_I1 = ISTR("Cooldown"); ////
2323
const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r=1
24-
const char MSG_CRASHDETECT[] PROGMEM_I1 = ISTR("Crash det."); ////
24+
const char MSG_CRASHDETECT[] PROGMEM_I1 = ISTR("Crash det."); ////c=13
2525
const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////
2626
const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1
2727
const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17 r=1
@@ -34,10 +34,10 @@ const char MSG_FILAMENT_LOADING_T3[] PROGMEM_I1 = ISTR("Insert filament into ext
3434
const char MSG_FILAMENTCHANGE[] PROGMEM_I1 = ISTR("Change filament"); ////
3535
const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE1[] PROGMEM_I1 = ISTR("Searching bed calibration point"); ////c=60
3636
const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2[] PROGMEM_I1 = ISTR(" of 4"); ////c=14
37-
const char MSG_FINISHING_MOVEMENTS[] PROGMEM_I1 = ISTR("Finishing movements"); ////c=20 r=1
37+
const char MSG_FINISHING_MOVEMENTS[] PROGMEM_I1 = ISTR("Finishing movements"); ////c=20
3838
const char MSG_FOLLOW_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=8
39-
const char MSG_FOLLOW_Z_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=8
40-
const char MSG_FSENSOR_AUTOLOAD[] PROGMEM_I1 = ISTR("F. autoload"); ////c=17 r=1
39+
const char MSG_FOLLOW_Z_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=9
40+
const char MSG_FSENSOR_AUTOLOAD[] PROGMEM_I1 = ISTR("F. autoload"); ////c=13
4141
const char MSG_FSENSOR[] PROGMEM_I1 = ISTR("Fil. sensor"); ////
4242
const char MSG_HEATING[] PROGMEM_I1 = ISTR("Heating"); ////
4343
const char MSG_HEATING_COMPLETE[] PROGMEM_I1 = ISTR("Heating done."); ////c=20
@@ -48,7 +48,7 @@ const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); //// Number 1
4848
const char MSG_LOADING_FILAMENT[] PROGMEM_I1 = ISTR("Loading filament"); ////c=20
4949
const char MSG_EJECT_FILAMENT[] PROGMEM_I1 = ISTR("Eject filament"); //// Number 1 to 5 is added behind text e.g. "Eject filament 1" c=16
5050
const char MSG_CUT_FILAMENT[] PROGMEM_I1 = ISTR("Cut filament"); //// Number 1 to 5 is added behind text e.g. "Cut filament 1" c=16
51-
const char MSG_M117_V2_CALIBRATION[] PROGMEM_I1 = ISTR("M117 First layer cal."); ////c=25 r=1
51+
const char MSG_M117_V2_CALIBRATION[] PROGMEM_I1 = ISTR("M117 First layer cal."); ////c=25
5252
const char MSG_MAIN[] PROGMEM_I1 = ISTR("Main"); ////
5353
const char MSG_BACK[] PROGMEM_I1 = ISTR("Back"); ////
5454
const char MSG_SHEET[] PROGMEM_I1 = ISTR("Sheet"); ////c=10
@@ -57,7 +57,7 @@ const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[] PROGMEM_I1 = ISTR(" of 9");
5757
const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); ////
5858
const char MSG_NO[] PROGMEM_I1 = ISTR("No"); ////
5959
const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); ////
60-
const char MSG_PAPER[] PROGMEM_I1 = ISTR("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); ////c=20 r=8
60+
const char MSG_PAPER[] PROGMEM_I1 = ISTR("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); ////c=20 r=10
6161
const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////c=20 r=4
6262
const char MSG_PLEASE_WAIT[] PROGMEM_I1 = ISTR("Please wait"); ////c=20
6363
const char MSG_PREHEAT_NOZZLE[] PROGMEM_I1 = ISTR("Preheat the nozzle!"); ////c=20
@@ -90,7 +90,7 @@ const char MSG_STEALTH[] PROGMEM_I1 = ISTR("Stealth"); ////
9090
const char MSG_STEEL_SHEET_CHECK[] PROGMEM_I1 = ISTR("Is steel sheet on heatbed?"); ////c=20 r=2
9191
const char MSG_STOP_PRINT[] PROGMEM_I1 = ISTR("Stop print"); ////
9292
const char MSG_STOPPED[] PROGMEM_I1 = ISTR("STOPPED. "); ////
93-
const char MSG_TEMP_CALIBRATION[] PROGMEM_I1 = ISTR("Temp. cal."); ////c=12 r=1
93+
const char MSG_TEMP_CALIBRATION[] PROGMEM_I1 = ISTR("Temp. cal."); ////c=14
9494
const char MSG_TEMP_CALIBRATION_DONE[] PROGMEM_I1 = ISTR("Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."); ////c=20 r=12
9595
const char MSG_UNLOAD_FILAMENT[] PROGMEM_I1 = ISTR("Unload filament"); ////c=17
9696
const char MSG_UNLOADING_FILAMENT[] PROGMEM_I1 = ISTR("Unloading filament"); ////c=20 r=1
@@ -100,13 +100,13 @@ const char MSG_WIZARD_DONE[] PROGMEM_I1 = ISTR("All is done. Happy printing!");
100100
const char MSG_WIZARD_HEATING[] PROGMEM_I1 = ISTR("Preheating nozzle. Please wait."); ////c=20 r=3
101101
const char MSG_WIZARD_QUIT[] PROGMEM_I1 = ISTR("You can always resume the Wizard from Calibration -> Wizard."); ////c=20 r=8
102102
const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); ////
103-
const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=17 r=1
103+
const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=18
104104
const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20
105105
const char MSG_OFF[] PROGMEM_I1 = ISTR("Off"); ////
106106
const char MSG_ON[] PROGMEM_I1 = ISTR("On"); ////
107107
const char MSG_NA[] PROGMEM_I1 = ISTR("N/A"); ////
108108
const char MSG_AUTO_DEPLETE[] PROGMEM_I1 = ISTR("SpoolJoin"); ////
109-
const char MSG_CUTTER[] PROGMEM_I1 = ISTR("Cutter"); ////
109+
const char MSG_CUTTER[] PROGMEM_I1 = ISTR("Cutter"); ////c=9
110110
const char MSG_NONE[] PROGMEM_I1 = ISTR("None"); ////
111111
const char MSG_WARN[] PROGMEM_I1 = ISTR("Warn"); ////
112112
const char MSG_STRICT[] PROGMEM_I1 = ISTR("Strict"); ////
@@ -128,20 +128,20 @@ const char MSG_SOUND_BLIND[] PROGMEM_I1 = ISTR("Assist"); ////
128128
const char MSG_MESH[] PROGMEM_I1 = ISTR("Mesh"); ////
129129
const char MSG_Z_PROBE_NR[] PROGMEM_I1 = ISTR("Z-probe nr."); ////
130130
const char MSG_MAGNETS_COMP[] PROGMEM_I1 = ISTR("Magnets comp."); ////
131-
const char MSG_FS_ACTION[] PROGMEM_I1 = ISTR("FS Action"); ////
132-
const char MSG_FS_CONTINUE[] PROGMEM_I1 = ISTR("Cont."); ////
133-
const char MSG_FS_PAUSE[] PROGMEM_I1 = ISTR("Pause"); ////
134-
const char MSG_BRIGHTNESS[] PROGMEM_I1 = ISTR("Brightness"); ////
135-
const char MSG_BL_HIGH[] PROGMEM_I1 = ISTR("Level Bright"); ////
136-
const char MSG_BL_LOW[] PROGMEM_I1 = ISTR("Level Dimmed"); ////
137-
const char MSG_TIMEOUT[] PROGMEM_I1 = ISTR("Timeout"); ////
138-
const char MSG_BRIGHT[] PROGMEM_I1 = ISTR("Bright"); ////
139-
const char MSG_DIM[] PROGMEM_I1 = ISTR("Dim"); ////
140-
const char MSG_AUTO[] PROGMEM_I1 = ISTR("Auto"); ////
131+
const char MSG_FS_ACTION[] PROGMEM_I1 = ISTR("FS Action"); ////c=10
132+
const char MSG_FS_CONTINUE[] PROGMEM_I1 = ISTR("Cont."); ////c=5
133+
const char MSG_FS_PAUSE[] PROGMEM_I1 = ISTR("Pause"); ////c=5
134+
const char MSG_BRIGHTNESS[] PROGMEM_I1 = ISTR("Brightness"); ////c=18
135+
const char MSG_BL_HIGH[] PROGMEM_I1 = ISTR("Level Bright"); ////c=12
136+
const char MSG_BL_LOW[] PROGMEM_I1 = ISTR("Level Dimmed"); ////c=12
137+
const char MSG_TIMEOUT[] PROGMEM_I1 = ISTR("Timeout"); ////c=12
138+
const char MSG_BRIGHT[] PROGMEM_I1 = ISTR("Bright"); ////c=6
139+
const char MSG_DIM[] PROGMEM_I1 = ISTR("Dim"); ////c=6
140+
const char MSG_AUTO[] PROGMEM_I1 = ISTR("Auto"); ////c=6
141141
#ifdef IR_SENSOR_ANALOG
142142
// Beware - the space at the beginning is necessary since it is reused in LCD menu items which are to be with a space
143-
const char MSG_04_OR_NEWER[] PROGMEM_I1 = ISTR(" 0.4 or newer");
144-
const char MSG_03_OR_OLDER[] PROGMEM_I1 = ISTR(" 0.3 or older");
143+
const char MSG_04_OR_NEWER[] PROGMEM_I1 = ISTR(" 0.4 or newer");////c=18
144+
const char MSG_03_OR_OLDER[] PROGMEM_I1 = ISTR(" 0.3 or older");////c=18
145145
#endif
146146

147147
//not internationalized messages

‎Firmware/mmu.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ void mmu_M600_wait_and_beep() {
830830
KEEPALIVE_STATE(PAUSED_FOR_USER);
831831

832832
int counterBeep = 0;
833-
lcd_display_message_fullscreen_P(_i("Remove old filament and press the knob to start loading new filament."));
833+
lcd_display_message_fullscreen_P(_i("Remove old filament and press the knob to start loading new filament.")); ////MSG_REMOVE_OLD_FILAMENT c=20 r=5
834834
bool bFirst=true;
835835

836836
while (!lcd_clicked()){
@@ -1385,7 +1385,7 @@ void mmu_cut_filament(uint8_t filament_nr)
13851385
{
13861386
LcdUpdateDisabler disableLcdUpdate;
13871387
lcd_clear();
1388-
lcd_set_cursor(0, 1); lcd_puts_P(_i("Cutting filament")); //// c=18 r=1
1388+
lcd_set_cursor(0, 1); lcd_puts_P(_i("Cutting filament")); //// c=18
13891389
lcd_print(" ");
13901390
lcd_print(filament_nr + 1);
13911391
mmu_filament_ramming();

0 commit comments

Comments
 (0)