Browse Source

Fix Danish encoding and an error message

Scott Lahteine 7 years ago
parent
commit
a2572d2854
2 changed files with 44 additions and 43 deletions
  1. 1
    1
      Marlin/SanityCheck.h
  2. 43
    42
      Marlin/language_da.h

+ 1
- 1
Marlin/SanityCheck.h View File

134
 #elif defined(Z_RAISE_PROBE_DEPLOY_STOW) || defined(Z_RAISE_BETWEEN_PROBINGS)
134
 #elif defined(Z_RAISE_PROBE_DEPLOY_STOW) || defined(Z_RAISE_BETWEEN_PROBINGS)
135
   #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."
135
   #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."
136
 #elif !defined(MIN_STEPS_PER_SEGMENT)
136
 #elif !defined(MIN_STEPS_PER_SEGMENT)
137
-  #error "\"dropsegments\" is replaced with MIN_STEPS_PER_SEGMENT (and increases by 1). Please update Configuration_adv.h."
137
+  #error "dropsegments" is replaced with MIN_STEPS_PER_SEGMENT (and increases by 1). Please update Configuration_adv.h.
138
 #elif defined(PREVENT_DANGEROUS_EXTRUDE)
138
 #elif defined(PREVENT_DANGEROUS_EXTRUDE)
139
   #error "PREVENT_DANGEROUS_EXTRUDE is now PREVENT_COLD_EXTRUSION. Please update your configuration."
139
   #error "PREVENT_DANGEROUS_EXTRUDE is now PREVENT_COLD_EXTRUSION. Please update your configuration."
140
 #endif
140
 #endif

+ 43
- 42
Marlin/language_da.h View File

39
 #define MSG_LCD_ENDSTOPS                    "Endstops" // Max length 8 characters
39
 #define MSG_LCD_ENDSTOPS                    "Endstops" // Max length 8 characters
40
 #define MSG_MAIN                            "Menu"
40
 #define MSG_MAIN                            "Menu"
41
 #define MSG_AUTOSTART                       "Autostart"
41
 #define MSG_AUTOSTART                       "Autostart"
42
-#define MSG_DISABLE_STEPPERS                "Slå alle steppere fra"
42
+#define MSG_DISABLE_STEPPERS                "Slå alle steppere fra"
43
 #define MSG_AUTO_HOME                       "Auto Home" // G28
43
 #define MSG_AUTO_HOME                       "Auto Home" // G28
44
 #define MSG_AUTO_HOME_X                     "Home X"
44
 #define MSG_AUTO_HOME_X                     "Home X"
45
 #define MSG_AUTO_HOME_Y                     "Home Y"
45
 #define MSG_AUTO_HOME_Y                     "Home Y"
46
 #define MSG_AUTO_HOME_Z                     "Home Z"
46
 #define MSG_AUTO_HOME_Z                     "Home Z"
47
 #define MSG_LEVEL_BED_HOMING                "Homing XYZ"
47
 #define MSG_LEVEL_BED_HOMING                "Homing XYZ"
48
-#define MSG_LEVEL_BED_WAITING               "Klik når du er klar"
49
-#define MSG_LEVEL_BED_NEXT_POINT            "Næste punkt"
50
-#define MSG_LEVEL_BED_DONE                  "Bed level er færdig!"
48
+#define MSG_LEVEL_BED_WAITING               "Klik når du er klar"
49
+#define MSG_LEVEL_BED_NEXT_POINT            "Næste punkt"
50
+#define MSG_LEVEL_BED_DONE                  "Bed level er færdig!"
51
 #define MSG_LEVEL_BED_CANCEL                "Annuller bed level"
51
 #define MSG_LEVEL_BED_CANCEL                "Annuller bed level"
52
-#define MSG_SET_HOME_OFFSETS                "Sæt forsk. af home"
52
+#define MSG_SET_HOME_OFFSETS                "Sæt forsk. af home"
53
 #define MSG_HOME_OFFSETS_APPLIED            "Forsk. er nu aktiv"
53
 #define MSG_HOME_OFFSETS_APPLIED            "Forsk. er nu aktiv"
54
-#define MSG_SET_ORIGIN                      "Sæt origin"
54
+#define MSG_SET_ORIGIN                      "Sæt origin"
55
 #define MSG_PREHEAT_1                       "Forvarm PLA"
55
 #define MSG_PREHEAT_1                       "Forvarm PLA"
56
 #define MSG_PREHEAT_1_N                     "Forvarm PLA "
56
 #define MSG_PREHEAT_1_N                     "Forvarm PLA "
57
 #define MSG_PREHEAT_1_ALL                   "Forvarm PLA Alle"
57
 #define MSG_PREHEAT_1_ALL                   "Forvarm PLA Alle"
62
 #define MSG_PREHEAT_2_ALL                   "Forvarm ABS Alle"
62
 #define MSG_PREHEAT_2_ALL                   "Forvarm ABS Alle"
63
 #define MSG_PREHEAT_2_BEDONLY               "Forvarm ABS Bed"
63
 #define MSG_PREHEAT_2_BEDONLY               "Forvarm ABS Bed"
64
 #define MSG_PREHEAT_2_SETTINGS              "Forvarm ABS conf"
64
 #define MSG_PREHEAT_2_SETTINGS              "Forvarm ABS conf"
65
-#define MSG_COOLDOWN                        "Afkøl"
66
-#define MSG_SWITCH_PS_ON                    "Slå strøm til"
67
-#define MSG_SWITCH_PS_OFF                   "Slå strøm fra"
65
+#define MSG_COOLDOWN                        "Afkøl"
66
+#define MSG_SWITCH_PS_ON                    "Slå strøm til"
67
+#define MSG_SWITCH_PS_OFF                   "Slå strøm fra"
68
 #define MSG_EXTRUDE                         "Extruder"
68
 #define MSG_EXTRUDE                         "Extruder"
69
 #define MSG_RETRACT                         "Retract"
69
 #define MSG_RETRACT                         "Retract"
70
 #define MSG_MOVE_AXIS                       "Flyt akser"
70
 #define MSG_MOVE_AXIS                       "Flyt akser"
81
 #define MSG_NOZZLE                          "Dyse"
81
 #define MSG_NOZZLE                          "Dyse"
82
 
82
 
83
 #define MSG_BED                             "Plade"
83
 #define MSG_BED                             "Plade"
84
-#define MSG_FAN_SPEED                       "Blæser hastighed"
84
+#define MSG_FAN_SPEED                       "Blæser hastighed"
85
 #define MSG_FLOW                            "Flow"
85
 #define MSG_FLOW                            "Flow"
86
 #define MSG_CONTROL                         "Kontrol"
86
 #define MSG_CONTROL                         "Kontrol"
87
 #define MSG_MIN                             " \002 Min"
87
 #define MSG_MIN                             " \002 Min"
94
 #define MSG_PID_I                           "PID-I"
94
 #define MSG_PID_I                           "PID-I"
95
 #define MSG_PID_D                           "PID-D"
95
 #define MSG_PID_D                           "PID-D"
96
 #define MSG_PID_C                           "PID-C"
96
 #define MSG_PID_C                           "PID-C"
97
-#define MSG_SELECT                          "Vælg"
97
+#define MSG_SELECT                          "Vælg"
98
 #define MSG_ACC                             "Accel"
98
 #define MSG_ACC                             "Accel"
99
 #define MSG_VXY_JERK                        "Vxy-jerk"
99
 #define MSG_VXY_JERK                        "Vxy-jerk"
100
 #define MSG_VZ_JERK                         "Vz-jerk"
100
 #define MSG_VZ_JERK                         "Vz-jerk"
110
 #define MSG_ZSTEPS                          "Zsteps/mm"
110
 #define MSG_ZSTEPS                          "Zsteps/mm"
111
 #define MSG_ESTEPS                          "Esteps/mm"
111
 #define MSG_ESTEPS                          "Esteps/mm"
112
 #define MSG_TEMPERATURE                     "Temperatur"
112
 #define MSG_TEMPERATURE                     "Temperatur"
113
-#define MSG_MOTION                          "Bevægelse"
113
+#define MSG_MOTION                          "Bevægelse"
114
 #define MSG_VOLUMETRIC                      "Filament"
114
 #define MSG_VOLUMETRIC                      "Filament"
115
 #define MSG_VOLUMETRIC_ENABLED              "E in mm3"
115
 #define MSG_VOLUMETRIC_ENABLED              "E in mm3"
116
 #define MSG_FILAMENT_DIAM                   "Fil. Dia."
116
 #define MSG_FILAMENT_DIAM                   "Fil. Dia."
119
 #define MSG_LOAD_EPROM                      "Hent fra EEPROM"
119
 #define MSG_LOAD_EPROM                      "Hent fra EEPROM"
120
 #define MSG_RESTORE_FAILSAFE                "Gendan failsafe"
120
 #define MSG_RESTORE_FAILSAFE                "Gendan failsafe"
121
 #define MSG_REFRESH                         "Genopfrisk"
121
 #define MSG_REFRESH                         "Genopfrisk"
122
-#define MSG_WATCH                           "Info skærm"
122
+#define MSG_WATCH                           "Info skærm"
123
 #define MSG_PREPARE                         "Forbered"
123
 #define MSG_PREPARE                         "Forbered"
124
 #define MSG_TUNE                            "Tune"
124
 #define MSG_TUNE                            "Tune"
125
 #define MSG_PAUSE_PRINT                     "Pause printet"
125
 #define MSG_PAUSE_PRINT                     "Pause printet"
126
-#define MSG_RESUME_PRINT                    "Forsæt printet"
126
+#define MSG_RESUME_PRINT                    "Forsæt printet"
127
 #define MSG_STOP_PRINT                      "Stop printet"
127
 #define MSG_STOP_PRINT                      "Stop printet"
128
 #define MSG_CARD_MENU                       "Print fra SD"
128
 #define MSG_CARD_MENU                       "Print fra SD"
129
 #define MSG_NO_CARD                         "Intet SD kort"
129
 #define MSG_NO_CARD                         "Intet SD kort"
130
 #define MSG_DWELL                           "Dvale..."
130
 #define MSG_DWELL                           "Dvale..."
131
-#define MSG_USERWAIT                        "Venter på bruger..."
132
-#define MSG_RESUMING                        "Forsætter printet"
131
+#define MSG_USERWAIT                        "Venter på bruger..."
132
+#define MSG_RESUMING                        "Forsætter printet"
133
 #define MSG_PRINT_ABORTED                   "Print annulleret"
133
 #define MSG_PRINT_ABORTED                   "Print annulleret"
134
-#define MSG_NO_MOVE                         "Ingen bevægelse."
135
-#define MSG_KILLED                          "DRÆBT. "
134
+#define MSG_NO_MOVE                         "Ingen bevægelse."
135
+#define MSG_KILLED                          "DRÆBT. "
136
 #define MSG_STOPPED                         "STOPPET. "
136
 #define MSG_STOPPED                         "STOPPET. "
137
-#define MSG_CONTROL_RETRACT                 "Tilbagetræk mm"
137
+#define MSG_CONTROL_RETRACT                 "Tilbagetræk mm"
138
 #define MSG_CONTROL_RETRACT_SWAP            "Skift Re.mm"
138
 #define MSG_CONTROL_RETRACT_SWAP            "Skift Re.mm"
139
-#define MSG_CONTROL_RETRACTF                "Tilbagetræk V"
139
+#define MSG_CONTROL_RETRACTF                "Tilbagetræk V"
140
 #define MSG_CONTROL_RETRACT_ZLIFT           "Hop mm"
140
 #define MSG_CONTROL_RETRACT_ZLIFT           "Hop mm"
141
 #define MSG_CONTROL_RETRACT_RECOVER         "UnRet +mm"
141
 #define MSG_CONTROL_RETRACT_RECOVER         "UnRet +mm"
142
 #define MSG_CONTROL_RETRACT_RECOVER_SWAP    "S UnRet+mm"
142
 #define MSG_CONTROL_RETRACT_RECOVER_SWAP    "S UnRet+mm"
147
 #define MSG_CNG_SDCARD                      "Skift SD kort"
147
 #define MSG_CNG_SDCARD                      "Skift SD kort"
148
 #define MSG_ZPROBE_OUT                      "Probe udenfor plade"
148
 #define MSG_ZPROBE_OUT                      "Probe udenfor plade"
149
 #define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
149
 #define MSG_HOME                            "Home"  // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
150
-#define MSG_FIRST                           "først"
150
+#define MSG_FIRST                           "først"
151
 #define MSG_ZPROBE_ZOFFSET                  "Z Offset"
151
 #define MSG_ZPROBE_ZOFFSET                  "Z Offset"
152
 #define MSG_BABYSTEP_X                      "Babystep X"
152
 #define MSG_BABYSTEP_X                      "Babystep X"
153
 #define MSG_BABYSTEP_Y                      "Babystep Y"
153
 #define MSG_BABYSTEP_Y                      "Babystep Y"
155
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
155
 #define MSG_ENDSTOP_ABORT                   "Endstop abort"
156
 #define MSG_HEATING_FAILED_LCD              "Opvarmning fejlet"
156
 #define MSG_HEATING_FAILED_LCD              "Opvarmning fejlet"
157
 #define MSG_ERR_REDUNDANT_TEMP              "Fejl: reserve temp"
157
 #define MSG_ERR_REDUNDANT_TEMP              "Fejl: reserve temp"
158
-#define MSG_THERMAL_RUNAWAY                 "Temp løber løbsk"
158
+#define MSG_THERMAL_RUNAWAY                 "Temp løber løbsk"
159
 #define MSG_ERR_MAXTEMP                     "Fejl: MAKSTEMP"
159
 #define MSG_ERR_MAXTEMP                     "Fejl: MAKSTEMP"
160
 #define MSG_ERR_MINTEMP                     "Fejl: MINTEMP"
160
 #define MSG_ERR_MINTEMP                     "Fejl: MINTEMP"
161
 #define MSG_ERR_MAXTEMP_BED                 "Fejl: MAKSTEMP PLADE"
161
 #define MSG_ERR_MAXTEMP_BED                 "Fejl: MAKSTEMP PLADE"
186
 
186
 
187
 #if LCD_WIDTH > 19
187
 #if LCD_WIDTH > 19
188
   #define MSG_INFO_PRINT_COUNT              "Antal Print"
188
   #define MSG_INFO_PRINT_COUNT              "Antal Print"
189
-  #define MSG_INFO_COMPLETED_PRINTS         "Færdige"
189
+  #define MSG_INFO_COMPLETED_PRINTS         "Færdige"
190
   #define MSG_INFO_PRINT_TIME               "Total print tid"
190
   #define MSG_INFO_PRINT_TIME               "Total print tid"
191
-  #define MSG_INFO_PRINT_LONGEST            "Længste print tid"
191
+  #define MSG_INFO_PRINT_LONGEST            "Længste print tid"
192
   #define MSG_INFO_PRINT_FILAMENT           "Total extruderet"
192
   #define MSG_INFO_PRINT_FILAMENT           "Total extruderet"
193
 #else
193
 #else
194
   #define MSG_INFO_PRINT_COUNT              "Prints"
194
   #define MSG_INFO_PRINT_COUNT              "Prints"
195
-  #define MSG_INFO_COMPLETED_PRINTS         "Færdige"
195
+  #define MSG_INFO_COMPLETED_PRINTS         "Færdige"
196
   #define MSG_INFO_PRINT_TIME               "Total"
196
   #define MSG_INFO_PRINT_TIME               "Total"
197
-  #define MSG_INFO_PRINT_LONGEST            "Længste"
197
+  #define MSG_INFO_PRINT_LONGEST            "Længste"
198
   #define MSG_INFO_PRINT_FILAMENT           "Extruderet"
198
   #define MSG_INFO_PRINT_FILAMENT           "Extruderet"
199
 #endif
199
 #endif
200
 
200
 
201
 #define MSG_INFO_MIN_TEMP                   "Min Temp"
201
 #define MSG_INFO_MIN_TEMP                   "Min Temp"
202
 #define MSG_INFO_MAX_TEMP                   "Max Temp"
202
 #define MSG_INFO_MAX_TEMP                   "Max Temp"
203
-#define MSG_INFO_PSU                        "Strømforsyning"
203
+#define MSG_INFO_PSU                        "Strømforsyning"
204
 
204
 
205
 #define MSG_FILAMENT_CHANGE_HEADER          "SKIFT FILAMENT"
205
 #define MSG_FILAMENT_CHANGE_HEADER          "SKIFT FILAMENT"
206
 #define MSG_FILAMENT_CHANGE_OPTION_HEADER   "SKIFTE MULIGHEDER:"
206
 #define MSG_FILAMENT_CHANGE_OPTION_HEADER   "SKIFTE MULIGHEDER:"
207
 #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "Extruder mere"
207
 #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "Extruder mere"
208
-#define MSG_FILAMENT_CHANGE_OPTION_RESUME   "forsæt print"
208
+#define MSG_FILAMENT_CHANGE_OPTION_RESUME   "forsæt print"
209
 
209
 
210
 #if LCD_HEIGHT >= 4
210
 #if LCD_HEIGHT >= 4
211
-  #define MSG_FILAMENT_CHANGE_INIT_1          "Vent på"
211
+  #define MSG_FILAMENT_CHANGE_INIT_1          "Vent på"
212
   #define MSG_FILAMENT_CHANGE_INIT_2          "skift af "
212
   #define MSG_FILAMENT_CHANGE_INIT_2          "skift af "
213
   #define MSG_FILAMENT_CHANGE_INIT_3          "filament"
213
   #define MSG_FILAMENT_CHANGE_INIT_3          "filament"
214
-  #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Vent på"
215
-  #define MSG_FILAMENT_CHANGE_UNLOAD_2        "filament tømning"
216
-  #define MSG_FILAMENT_CHANGE_INSERT_1        "indsæt filament"
214
+  #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Vent på"
215
+  #define MSG_FILAMENT_CHANGE_UNLOAD_2        "filament tømning"
216
+  #define MSG_FILAMENT_CHANGE_INSERT_1        "indsæt filament"
217
   #define MSG_FILAMENT_CHANGE_INSERT_2        "og tryk for"
217
   #define MSG_FILAMENT_CHANGE_INSERT_2        "og tryk for"
218
-  #define MSG_FILAMENT_CHANGE_INSERT_3        "at fortsætte..."
219
-  #define MSG_FILAMENT_CHANGE_LOAD_1          "Vent på"
220
-  #define MSG_FILAMENT_CHANGE_LOAD_2          "filament fødning"
221
-  #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Vent på"
218
+  #define MSG_FILAMENT_CHANGE_INSERT_3        "at fortsætte..."
219
+  #define MSG_FILAMENT_CHANGE_LOAD_1          "Vent på"
220
+  #define MSG_FILAMENT_CHANGE_LOAD_2          "filament fødning"
221
+  #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Vent på"
222
   #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "filament extrudere"
222
   #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "filament extrudere"
223
-  #define MSG_FILAMENT_CHANGE_RESUME_1        "Vent på at"
224
-  #define MSG_FILAMENT_CHANGE_RESUME_2        "print forsætter"
223
+  #define MSG_FILAMENT_CHANGE_RESUME_1        "Vent på at"
224
+  #define MSG_FILAMENT_CHANGE_RESUME_2        "print forsætter"
225
 #else // LCD_HEIGHT < 4
225
 #else // LCD_HEIGHT < 4
226
   #define MSG_FILAMENT_CHANGE_INIT_1          "Vent venligst..."
226
   #define MSG_FILAMENT_CHANGE_INIT_1          "Vent venligst..."
227
-  #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Tømmer..."
228
-  #define MSG_FILAMENT_CHANGE_INSERT_1        "Indsæt og klik"
229
-  #define MSG_FILAMENT_CHANGE_LOAD_1          "Føder..."
227
+  #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Tømmer..."
228
+  #define MSG_FILAMENT_CHANGE_INSERT_1        "Indsæt og klik"
229
+  #define MSG_FILAMENT_CHANGE_LOAD_1          "Føder..."
230
   #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Extrudere..."
230
   #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Extrudere..."
231
-  #define MSG_FILAMENT_CHANGE_RESUME_1        "Fortsætter..."
231
+  #define MSG_FILAMENT_CHANGE_RESUME_1        "Fortsætter..."
232
 #endif // LCD_HEIGHT < 4
232
 #endif // LCD_HEIGHT < 4
233
 
233
 
234
 #endif // LANGUAGE_DA_H
234
 #endif // LANGUAGE_DA_H
235
+

Loading…
Cancel
Save