zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4723 from thinkyhead/rc_fix_some_text

Browse source 
Fix Danish encoding and an error message
This commit is contained in:
Scott Lahteine 2016-08-28 10:02:46 -05:00 committed by GitHub
parent 2cb63f0bf7 a2572d2854
commit 73c5c312c9
2 changed files with 44 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/SanityCheck.h
View file

@ -134,7 +134,7 @@
#elif defined(Z_RAISE_PROBE_DEPLOY_STOW) || defined(Z_RAISE_BETWEEN_PROBINGS) #elif defined(Z_RAISE_PROBE_DEPLOY_STOW) || defined(Z_RAISE_BETWEEN_PROBINGS)
#error "Z_RAISE_PROBE_DEPLOY_STOW and Z_RAISE_BETWEEN_PROBINGS are now Z_PROBE_DEPLOY_HEIGHT and Z_PROBE_TRAVEL_HEIGHT Please update your configuration." #error "Z_RAISE_PROBE_DEPLOY_STOW and Z_RAISE_BETWEEN_PROBINGS are now Z_PROBE_DEPLOY_HEIGHT and Z_PROBE_TRAVEL_HEIGHT Please update your configuration."
#elif !defined(MIN_STEPS_PER_SEGMENT) #elif !defined(MIN_STEPS_PER_SEGMENT)
#error "\"dropsegments\" is replaced with MIN_STEPS_PER_SEGMENT (and increases by 1). Please update Configuration_adv.h." #error "dropsegments" is replaced with MIN_STEPS_PER_SEGMENT (and increases by 1). Please update Configuration_adv.h.
#elif defined(PREVENT_DANGEROUS_EXTRUDE) #elif defined(PREVENT_DANGEROUS_EXTRUDE)
#error "PREVENT_DANGEROUS_EXTRUDE is now PREVENT_COLD_EXTRUSION. Please update your configuration." #error "PREVENT_DANGEROUS_EXTRUDE is now PREVENT_COLD_EXTRUSION. Please update your configuration."
#endif #endif

85
Marlin/language_da.h
View file

@ -39,19 +39,19 @@
#define MSG_LCD_ENDSTOPS "Endstops" // Max length 8 characters #define MSG_LCD_ENDSTOPS "Endstops" // Max length 8 characters
#define MSG_MAIN "Menu" #define MSG_MAIN "Menu"
#define MSG_AUTOSTART "Autostart" #define MSG_AUTOSTART "Autostart"
#define MSG_DISABLE_STEPPERS "Slå alle steppere fra" #define MSG_DISABLE_STEPPERS "Slå alle steppere fra"
#define MSG_AUTO_HOME "Auto Home" // G28 #define MSG_AUTO_HOME "Auto Home" // G28
#define MSG_AUTO_HOME_X "Home X" #define MSG_AUTO_HOME_X "Home X"
#define MSG_AUTO_HOME_Y "Home Y" #define MSG_AUTO_HOME_Y "Home Y"
#define MSG_AUTO_HOME_Z "Home Z" #define MSG_AUTO_HOME_Z "Home Z"
#define MSG_LEVEL_BED_HOMING "Homing XYZ" #define MSG_LEVEL_BED_HOMING "Homing XYZ"
#define MSG_LEVEL_BED_WAITING "Klik når du er klar" #define MSG_LEVEL_BED_WAITING "Klik når du er klar"
#define MSG_LEVEL_BED_NEXT_POINT "Næste punkt" #define MSG_LEVEL_BED_NEXT_POINT "Næste punkt"
#define MSG_LEVEL_BED_DONE "Bed level er færdig!" #define MSG_LEVEL_BED_DONE "Bed level er færdig!"
#define MSG_LEVEL_BED_CANCEL "Annuller bed level" #define MSG_LEVEL_BED_CANCEL "Annuller bed level"
#define MSG_SET_HOME_OFFSETS "Sæt forsk. af home" #define MSG_SET_HOME_OFFSETS "Sæt forsk. af home"
#define MSG_HOME_OFFSETS_APPLIED "Forsk. er nu aktiv" #define MSG_HOME_OFFSETS_APPLIED "Forsk. er nu aktiv"
#define MSG_SET_ORIGIN "Sæt origin" #define MSG_SET_ORIGIN "Sæt origin"
#define MSG_PREHEAT_1 "Forvarm PLA" #define MSG_PREHEAT_1 "Forvarm PLA"
#define MSG_PREHEAT_1_N "Forvarm PLA " #define MSG_PREHEAT_1_N "Forvarm PLA "
#define MSG_PREHEAT_1_ALL "Forvarm PLA Alle" #define MSG_PREHEAT_1_ALL "Forvarm PLA Alle"
@ -62,9 +62,9 @@
#define MSG_PREHEAT_2_ALL "Forvarm ABS Alle" #define MSG_PREHEAT_2_ALL "Forvarm ABS Alle"
#define MSG_PREHEAT_2_BEDONLY "Forvarm ABS Bed" #define MSG_PREHEAT_2_BEDONLY "Forvarm ABS Bed"
#define MSG_PREHEAT_2_SETTINGS "Forvarm ABS conf" #define MSG_PREHEAT_2_SETTINGS "Forvarm ABS conf"
#define MSG_COOLDOWN "Afkøl" #define MSG_COOLDOWN "Afkøl"
#define MSG_SWITCH_PS_ON "Slå strøm til" #define MSG_SWITCH_PS_ON "Slå strøm til"
#define MSG_SWITCH_PS_OFF "Slå strøm fra" #define MSG_SWITCH_PS_OFF "Slå strøm fra"
#define MSG_EXTRUDE "Extruder" #define MSG_EXTRUDE "Extruder"
#define MSG_RETRACT "Retract" #define MSG_RETRACT "Retract"
#define MSG_MOVE_AXIS "Flyt akser" #define MSG_MOVE_AXIS "Flyt akser"
@ -81,7 +81,7 @@
#define MSG_NOZZLE "Dyse" #define MSG_NOZZLE "Dyse"
#define MSG_BED "Plade" #define MSG_BED "Plade"
#define MSG_FAN_SPEED "Blæser hastighed" #define MSG_FAN_SPEED "Blæser hastighed"
#define MSG_FLOW "Flow" #define MSG_FLOW "Flow"
#define MSG_CONTROL "Kontrol" #define MSG_CONTROL "Kontrol"
#define MSG_MIN " \002 Min" #define MSG_MIN " \002 Min"
@ -94,7 +94,7 @@
#define MSG_PID_I "PID-I" #define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D" #define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C" #define MSG_PID_C "PID-C"
#define MSG_SELECT "Vælg" #define MSG_SELECT "Vælg"
#define MSG_ACC "Accel" #define MSG_ACC "Accel"
#define MSG_VXY_JERK "Vxy-jerk" #define MSG_VXY_JERK "Vxy-jerk"
#define MSG_VZ_JERK "Vz-jerk" #define MSG_VZ_JERK "Vz-jerk"
@ -110,7 +110,7 @@
#define MSG_ZSTEPS "Zsteps/mm" #define MSG_ZSTEPS "Zsteps/mm"
#define MSG_ESTEPS "Esteps/mm" #define MSG_ESTEPS "Esteps/mm"
#define MSG_TEMPERATURE "Temperatur" #define MSG_TEMPERATURE "Temperatur"
#define MSG_MOTION "Bevægelse" #define MSG_MOTION "Bevægelse"
#define MSG_VOLUMETRIC "Filament" #define MSG_VOLUMETRIC "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm3" #define MSG_VOLUMETRIC_ENABLED "E in mm3"
#define MSG_FILAMENT_DIAM "Fil. Dia." #define MSG_FILAMENT_DIAM "Fil. Dia."
@ -119,24 +119,24 @@
#define MSG_LOAD_EPROM "Hent fra EEPROM" #define MSG_LOAD_EPROM "Hent fra EEPROM"
#define MSG_RESTORE_FAILSAFE "Gendan failsafe" #define MSG_RESTORE_FAILSAFE "Gendan failsafe"
#define MSG_REFRESH "Genopfrisk" #define MSG_REFRESH "Genopfrisk"
#define MSG_WATCH "Info skærm" #define MSG_WATCH "Info skærm"
#define MSG_PREPARE "Forbered" #define MSG_PREPARE "Forbered"
#define MSG_TUNE "Tune" #define MSG_TUNE "Tune"
#define MSG_PAUSE_PRINT "Pause printet" #define MSG_PAUSE_PRINT "Pause printet"
#define MSG_RESUME_PRINT "Forsæt printet" #define MSG_RESUME_PRINT "Forsæt printet"
#define MSG_STOP_PRINT "Stop printet" #define MSG_STOP_PRINT "Stop printet"
#define MSG_CARD_MENU "Print fra SD" #define MSG_CARD_MENU "Print fra SD"
#define MSG_NO_CARD "Intet SD kort" #define MSG_NO_CARD "Intet SD kort"
#define MSG_DWELL "Dvale..." #define MSG_DWELL "Dvale..."
#define MSG_USERWAIT "Venter på bruger..." #define MSG_USERWAIT "Venter på bruger..."
#define MSG_RESUMING "Forsætter printet" #define MSG_RESUMING "Forsætter printet"
#define MSG_PRINT_ABORTED "Print annulleret" #define MSG_PRINT_ABORTED "Print annulleret"
#define MSG_NO_MOVE "Ingen bevægelse." #define MSG_NO_MOVE "Ingen bevægelse."
#define MSG_KILLED "DRÆBT. " #define MSG_KILLED "DRÆBT. "
#define MSG_STOPPED "STOPPET. " #define MSG_STOPPED "STOPPET. "
#define MSG_CONTROL_RETRACT "Tilbagetræk mm" #define MSG_CONTROL_RETRACT "Tilbagetræk mm"
#define MSG_CONTROL_RETRACT_SWAP "Skift Re.mm" #define MSG_CONTROL_RETRACT_SWAP "Skift Re.mm"
#define MSG_CONTROL_RETRACTF "Tilbagetræk V" #define MSG_CONTROL_RETRACTF "Tilbagetræk V"
#define MSG_CONTROL_RETRACT_ZLIFT "Hop mm" #define MSG_CONTROL_RETRACT_ZLIFT "Hop mm"
#define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm" #define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "S UnRet+mm" #define MSG_CONTROL_RETRACT_RECOVER_SWAP "S UnRet+mm"
@ -147,7 +147,7 @@
#define MSG_CNG_SDCARD "Skift SD kort" #define MSG_CNG_SDCARD "Skift SD kort"
#define MSG_ZPROBE_OUT "Probe udenfor plade" #define MSG_ZPROBE_OUT "Probe udenfor plade"
#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST #define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#define MSG_FIRST "først" #define MSG_FIRST "først"
#define MSG_ZPROBE_ZOFFSET "Z Offset" #define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystep X" #define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Y "Babystep Y"
@ -155,7 +155,7 @@
#define MSG_ENDSTOP_ABORT "Endstop abort" #define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_HEATING_FAILED_LCD "Opvarmning fejlet" #define MSG_HEATING_FAILED_LCD "Opvarmning fejlet"
#define MSG_ERR_REDUNDANT_TEMP "Fejl: reserve temp" #define MSG_ERR_REDUNDANT_TEMP "Fejl: reserve temp"
#define MSG_THERMAL_RUNAWAY "Temp løber løbsk" #define MSG_THERMAL_RUNAWAY "Temp løber løbsk"
#define MSG_ERR_MAXTEMP "Fejl: MAKSTEMP" #define MSG_ERR_MAXTEMP "Fejl: MAKSTEMP"
#define MSG_ERR_MINTEMP "Fejl: MINTEMP" #define MSG_ERR_MINTEMP "Fejl: MINTEMP"
#define MSG_ERR_MAXTEMP_BED "Fejl: MAKSTEMP PLADE" #define MSG_ERR_MAXTEMP_BED "Fejl: MAKSTEMP PLADE"
@ -186,49 +186,50 @@
#if LCD_WIDTH > 19 #if LCD_WIDTH > 19
#define MSG_INFO_PRINT_COUNT "Antal Print" #define MSG_INFO_PRINT_COUNT "Antal Print"
#define MSG_INFO_COMPLETED_PRINTS "Færdige" #define MSG_INFO_COMPLETED_PRINTS "Færdige"
#define MSG_INFO_PRINT_TIME "Total print tid" #define MSG_INFO_PRINT_TIME "Total print tid"
#define MSG_INFO_PRINT_LONGEST "Længste print tid" #define MSG_INFO_PRINT_LONGEST "Længste print tid"
#define MSG_INFO_PRINT_FILAMENT "Total extruderet" #define MSG_INFO_PRINT_FILAMENT "Total extruderet"
#else #else
#define MSG_INFO_PRINT_COUNT "Prints" #define MSG_INFO_PRINT_COUNT "Prints"
#define MSG_INFO_COMPLETED_PRINTS "Færdige" #define MSG_INFO_COMPLETED_PRINTS "Færdige"
#define MSG_INFO_PRINT_TIME "Total" #define MSG_INFO_PRINT_TIME "Total"
#define MSG_INFO_PRINT_LONGEST "Længste" #define MSG_INFO_PRINT_LONGEST "Længste"
#define MSG_INFO_PRINT_FILAMENT "Extruderet" #define MSG_INFO_PRINT_FILAMENT "Extruderet"
#endif #endif
#define MSG_INFO_MIN_TEMP "Min Temp" #define MSG_INFO_MIN_TEMP "Min Temp"
#define MSG_INFO_MAX_TEMP "Max Temp" #define MSG_INFO_MAX_TEMP "Max Temp"
#define MSG_INFO_PSU "Strømforsyning" #define MSG_INFO_PSU "Strømforsyning"
#define MSG_FILAMENT_CHANGE_HEADER "SKIFT FILAMENT" #define MSG_FILAMENT_CHANGE_HEADER "SKIFT FILAMENT"
#define MSG_FILAMENT_CHANGE_OPTION_HEADER "SKIFTE MULIGHEDER:" #define MSG_FILAMENT_CHANGE_OPTION_HEADER "SKIFTE MULIGHEDER:"
#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "Extruder mere" #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "Extruder mere"
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "forsæt print" #define MSG_FILAMENT_CHANGE_OPTION_RESUME "forsæt print"
#if LCD_HEIGHT >= 4 #if LCD_HEIGHT >= 4
#define MSG_FILAMENT_CHANGE_INIT_1 "Vent på" #define MSG_FILAMENT_CHANGE_INIT_1 "Vent på"
#define MSG_FILAMENT_CHANGE_INIT_2 "skift af " #define MSG_FILAMENT_CHANGE_INIT_2 "skift af "
#define MSG_FILAMENT_CHANGE_INIT_3 "filament" #define MSG_FILAMENT_CHANGE_INIT_3 "filament"
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Vent på" #define MSG_FILAMENT_CHANGE_UNLOAD_1 "Vent på"
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "filament tømning" #define MSG_FILAMENT_CHANGE_UNLOAD_2 "filament tømning"
#define MSG_FILAMENT_CHANGE_INSERT_1 "indsæt filament" #define MSG_FILAMENT_CHANGE_INSERT_1 "indsæt filament"
#define MSG_FILAMENT_CHANGE_INSERT_2 "og tryk for" #define MSG_FILAMENT_CHANGE_INSERT_2 "og tryk for"
#define MSG_FILAMENT_CHANGE_INSERT_3 "at fortsætte..." #define MSG_FILAMENT_CHANGE_INSERT_3 "at fortsætte..."
#define MSG_FILAMENT_CHANGE_LOAD_1 "Vent på" #define MSG_FILAMENT_CHANGE_LOAD_1 "Vent på"
#define MSG_FILAMENT_CHANGE_LOAD_2 "filament fødning" #define MSG_FILAMENT_CHANGE_LOAD_2 "filament fødning"
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Vent på" #define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Vent på"
#define MSG_FILAMENT_CHANGE_EXTRUDE_2 "filament extrudere" #define MSG_FILAMENT_CHANGE_EXTRUDE_2 "filament extrudere"
#define MSG_FILAMENT_CHANGE_RESUME_1 "Vent på at" #define MSG_FILAMENT_CHANGE_RESUME_1 "Vent på at"
#define MSG_FILAMENT_CHANGE_RESUME_2 "print forsætter" #define MSG_FILAMENT_CHANGE_RESUME_2 "print forsætter"
#else // LCD_HEIGHT < 4 #else // LCD_HEIGHT < 4
#define MSG_FILAMENT_CHANGE_INIT_1 "Vent venligst..." #define MSG_FILAMENT_CHANGE_INIT_1 "Vent venligst..."
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Tømmer..." #define MSG_FILAMENT_CHANGE_UNLOAD_1 "Tømmer..."
#define MSG_FILAMENT_CHANGE_INSERT_1 "Indsæt og klik" #define MSG_FILAMENT_CHANGE_INSERT_1 "Indsæt og klik"
#define MSG_FILAMENT_CHANGE_LOAD_1 "Føder..." #define MSG_FILAMENT_CHANGE_LOAD_1 "Føder..."
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Extrudere..." #define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Extrudere..."
#define MSG_FILAMENT_CHANGE_RESUME_1 "Fortsætter..." #define MSG_FILAMENT_CHANGE_RESUME_1 "Fortsætter..."
#endif // LCD_HEIGHT < 4 #endif // LCD_HEIGHT < 4
#endif // LANGUAGE_DA_H #endif // LANGUAGE_DA_H