Browse Source

Merge pull request #5410 from thinkyhead/rc_polish_update

Update Polish language, reduce filament change messages
Scott Lahteine 8 years ago
parent
commit
35ad9626f1

+ 4
- 4
Marlin/language_bg.h View File

@@ -210,30 +210,30 @@
210 210
 #define MSG_DRIVE_STRENGTH                  "Drive Strength"
211 211
 #define MSG_DAC_PERCENT                     "Driver %"
212 212
 #define MSG_DAC_EEPROM_WRITE                "DAC EEPROM Write"
213
+
213 214
 #define MSG_FILAMENT_CHANGE_HEADER          "CHANGE FILAMENT"
214 215
 #define MSG_FILAMENT_CHANGE_OPTION_HEADER   "CHANGE OPTIONS:"
215 216
 #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "Extrude more"
216 217
 #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Resume print"
218
+
217 219
 #if LCD_HEIGHT >= 4
220
+  // Up to 3 lines allowed
218 221
   #define MSG_FILAMENT_CHANGE_INIT_1          "Wait for start"
219 222
   #define MSG_FILAMENT_CHANGE_INIT_2          "of the filament"
220 223
   #define MSG_FILAMENT_CHANGE_INIT_3          "change"
221 224
   #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Wait for"
222 225
   #define MSG_FILAMENT_CHANGE_UNLOAD_2        "filament unload"
223
-  #define MSG_FILAMENT_CHANGE_UNLOAD_3        ""
224 226
   #define MSG_FILAMENT_CHANGE_INSERT_1        "Insert filament"
225 227
   #define MSG_FILAMENT_CHANGE_INSERT_2        "and press button"
226 228
   #define MSG_FILAMENT_CHANGE_INSERT_3        "to continue..."
227 229
   #define MSG_FILAMENT_CHANGE_LOAD_1          "Wait for"
228 230
   #define MSG_FILAMENT_CHANGE_LOAD_2          "filament load"
229
-  #define MSG_FILAMENT_CHANGE_LOAD_3          ""
230 231
   #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Wait for"
231 232
   #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "filament extrude"
232
-  #define MSG_FILAMENT_CHANGE_EXTRUDE_3       ""
233 233
   #define MSG_FILAMENT_CHANGE_RESUME_1        "Wait for print"
234 234
   #define MSG_FILAMENT_CHANGE_RESUME_2        "to resume"
235
-  #define MSG_FILAMENT_CHANGE_RESUME_3        ""
236 235
 #else // LCD_HEIGHT < 4
236
+  // Up to 2 lines allowed
237 237
   #define MSG_FILAMENT_CHANGE_INIT_1          "Please wait..."
238 238
   #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Ejecting..."
239 239
   #define MSG_FILAMENT_CHANGE_INSERT_1        "Insert and Click"

+ 3
- 0
Marlin/language_cz.h View File

@@ -214,7 +214,9 @@
214 214
 #define MSG_FILAMENT_CHANGE_OPTION_HEADER   "CO DAL?"
215 215
 #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "Jeste vytlacit"
216 216
 #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Obnovit tisk"
217
+
217 218
 #if LCD_HEIGHT >= 4
219
+  // Up to 3 lines allowed
218 220
   #define MSG_FILAMENT_CHANGE_INIT_1          "Cekejte prosim"
219 221
   #define MSG_FILAMENT_CHANGE_INIT_2          "na zahajeni"
220 222
   #define MSG_FILAMENT_CHANGE_INIT_3          "vymeny filamentu"
@@ -234,6 +236,7 @@
234 236
   #define MSG_FILAMENT_CHANGE_RESUME_2        "na pokracovani"
235 237
   #define MSG_FILAMENT_CHANGE_RESUME_3        "tisku"
236 238
 #else // LCD_HEIGHT < 4
239
+  // Up to 2 lines allowed
237 240
   #define MSG_FILAMENT_CHANGE_INIT_1          "Cekejte..."
238 241
   #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Vysouvani..."
239 242
   #define MSG_FILAMENT_CHANGE_INSERT_1        "Vlozte, kliknete"

+ 1
- 0
Marlin/language_da.h View File

@@ -209,6 +209,7 @@
209 209
 #define MSG_DRIVE_STRENGTH                  "Driv Styrke"
210 210
 #define MSG_DAC_PERCENT                     "Driv %"
211 211
 #define MSG_DAC_EEPROM_WRITE                "DAC EEPROM Skriv"
212
+
212 213
 #define MSG_FILAMENT_CHANGE_HEADER          "SKIFT FILAMENT"
213 214
 #define MSG_FILAMENT_CHANGE_OPTION_HEADER   "Skift muligheder:"
214 215
 #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "Extruder mere"

+ 2
- 0
Marlin/language_de.h View File

@@ -216,6 +216,7 @@
216 216
 #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Drucke weiter"
217 217
 
218 218
 #if LCD_HEIGHT >= 4
219
+  // Up to 3 lines allowed
219 220
   #define MSG_FILAMENT_CHANGE_INIT_1          "Warte auf den"
220 221
   #define MSG_FILAMENT_CHANGE_INIT_2          "Start des "
221 222
   #define MSG_FILAMENT_CHANGE_INIT_3          "Filamentwechsels"
@@ -235,6 +236,7 @@
235 236
   #define MSG_FILAMENT_CHANGE_RESUME_2        "Fortsetzung des"
236 237
   #define MSG_FILAMENT_CHANGE_RESUME_3        "Druckes"
237 238
 #else // LCD_HEIGHT < 4
239
+  // Up to 2 lines allowed
238 240
   #define MSG_FILAMENT_CHANGE_INIT_1          "Bitte warten..."
239 241
   #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Auswerfen..."
240 242
   #define MSG_FILAMENT_CHANGE_INSERT_1        "Laden und Klick"

+ 22
- 24
Marlin/language_el.h View File

@@ -198,31 +198,29 @@
198 198
 #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Resume print"
199 199
 
200 200
 #if LCD_HEIGHT >= 4
201
-  #define MSG_FILAMENT_CHANGE_INIT_1        "Wait for start"
202
-  #define MSG_FILAMENT_CHANGE_INIT_2        "of the filament"
203
-  #define MSG_FILAMENT_CHANGE_INIT_3        "change"
204
-  #define MSG_FILAMENT_CHANGE_UNLOAD_1      "Wait for"
205
-  #define MSG_FILAMENT_CHANGE_UNLOAD_2      "filament unload"
206
-  #define MSG_FILAMENT_CHANGE_UNLOAD_3      ""
207
-  #define MSG_FILAMENT_CHANGE_INSERT_1      "Insert filament"
208
-  #define MSG_FILAMENT_CHANGE_INSERT_2      "and press button"
209
-  #define MSG_FILAMENT_CHANGE_INSERT_3      "to continue..."
210
-  #define MSG_FILAMENT_CHANGE_LOAD_1        "Wait for"
211
-  #define MSG_FILAMENT_CHANGE_LOAD_2        "filament load"
212
-  #define MSG_FILAMENT_CHANGE_LOAD_3        ""
213
-  #define MSG_FILAMENT_CHANGE_EXTRUDE_1     "Wait for"
214
-  #define MSG_FILAMENT_CHANGE_EXTRUDE_2     "filament extrude"
215
-  #define MSG_FILAMENT_CHANGE_EXTRUDE_3     ""
216
-  #define MSG_FILAMENT_CHANGE_RESUME_1      "Wait for print"
217
-  #define MSG_FILAMENT_CHANGE_RESUME_2      "to resume"
218
-  #define MSG_FILAMENT_CHANGE_RESUME_3      ""
201
+  // Up to 3 lines allowed
202
+  #define MSG_FILAMENT_CHANGE_INIT_1          "Wait for start"
203
+  #define MSG_FILAMENT_CHANGE_INIT_2          "of the filament"
204
+  #define MSG_FILAMENT_CHANGE_INIT_3          "change"
205
+  #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Wait for"
206
+  #define MSG_FILAMENT_CHANGE_UNLOAD_2        "filament unload"
207
+  #define MSG_FILAMENT_CHANGE_INSERT_1        "Insert filament"
208
+  #define MSG_FILAMENT_CHANGE_INSERT_2        "and press button"
209
+  #define MSG_FILAMENT_CHANGE_INSERT_3        "to continue..."
210
+  #define MSG_FILAMENT_CHANGE_LOAD_1          "Wait for"
211
+  #define MSG_FILAMENT_CHANGE_LOAD_2          "filament load"
212
+  #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Wait for"
213
+  #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "filament extrude"
214
+  #define MSG_FILAMENT_CHANGE_RESUME_1        "Wait for print"
215
+  #define MSG_FILAMENT_CHANGE_RESUME_2        "to resume"
219 216
 #else // LCD_HEIGHT < 4
220
-  #define MSG_FILAMENT_CHANGE_INIT_1        "Please wait..."
221
-  #define MSG_FILAMENT_CHANGE_UNLOAD_1      "Ejecting..."
222
-  #define MSG_FILAMENT_CHANGE_INSERT_1      "Insert and Click"
223
-  #define MSG_FILAMENT_CHANGE_LOAD_1        "Loading..."
224
-  #define MSG_FILAMENT_CHANGE_EXTRUDE_1     "Extruding..."
225
-  #define MSG_FILAMENT_CHANGE_RESUME_1      "Resuming..."
217
+  // Up to 2 lines allowed
218
+  #define MSG_FILAMENT_CHANGE_INIT_1          "Please wait..."
219
+  #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Ejecting..."
220
+  #define MSG_FILAMENT_CHANGE_INSERT_1        "Insert and Click"
221
+  #define MSG_FILAMENT_CHANGE_LOAD_1          "Loading..."
222
+  #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Extruding..."
223
+  #define MSG_FILAMENT_CHANGE_RESUME_1        "Resuming..."
226 224
 #endif
227 225
 
228 226
 #endif // LANGUAGE_EL_H

+ 5
- 28
Marlin/language_en.h View File

@@ -559,61 +559,38 @@
559 559
 #ifndef MSG_FILAMENT_CHANGE_OPTION_RESUME
560 560
   #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Resume print"
561 561
 #endif
562
+
563
+//
564
+// Filament Change screens show up to 3 lines on a 4-line display
565
+//                        ...or up to 2 lines on a 3-line display
566
+//
562 567
 #if LCD_HEIGHT >= 4
563 568
   #ifndef MSG_FILAMENT_CHANGE_INIT_1
564 569
     #define MSG_FILAMENT_CHANGE_INIT_1          "Wait for start"
565
-  #endif
566
-  #ifndef MSG_FILAMENT_CHANGE_INIT_2
567 570
     #define MSG_FILAMENT_CHANGE_INIT_2          "of the filament"
568
-  #endif
569
-  #ifndef MSG_FILAMENT_CHANGE_INIT_3
570 571
     #define MSG_FILAMENT_CHANGE_INIT_3          "change"
571 572
   #endif
572 573
   #ifndef MSG_FILAMENT_CHANGE_UNLOAD_1
573 574
     #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Wait for"
574
-  #endif
575
-  #ifndef MSG_FILAMENT_CHANGE_UNLOAD_2
576 575
     #define MSG_FILAMENT_CHANGE_UNLOAD_2        "filament unload"
577 576
   #endif
578
-  #ifndef MSG_FILAMENT_CHANGE_UNLOAD_3
579
-    #define MSG_FILAMENT_CHANGE_UNLOAD_3        ""
580
-  #endif
581 577
   #ifndef MSG_FILAMENT_CHANGE_INSERT_1
582 578
     #define MSG_FILAMENT_CHANGE_INSERT_1        "Insert filament"
583
-  #endif
584
-  #ifndef MSG_FILAMENT_CHANGE_INSERT_2
585 579
     #define MSG_FILAMENT_CHANGE_INSERT_2        "and press button"
586
-  #endif
587
-  #ifndef MSG_FILAMENT_CHANGE_INSERT_3
588 580
     #define MSG_FILAMENT_CHANGE_INSERT_3        "to continue..."
589 581
   #endif
590 582
   #ifndef MSG_FILAMENT_CHANGE_LOAD_1
591 583
     #define MSG_FILAMENT_CHANGE_LOAD_1          "Wait for"
592
-  #endif
593
-  #ifndef MSG_FILAMENT_CHANGE_LOAD_2
594 584
     #define MSG_FILAMENT_CHANGE_LOAD_2          "filament load"
595 585
   #endif
596
-  #ifndef MSG_FILAMENT_CHANGE_LOAD_3
597
-    #define MSG_FILAMENT_CHANGE_LOAD_3          ""
598
-  #endif
599 586
   #ifndef MSG_FILAMENT_CHANGE_EXTRUDE_1
600 587
     #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Wait for"
601
-  #endif
602
-  #ifndef MSG_FILAMENT_CHANGE_EXTRUDE_2
603 588
     #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "filament extrude"
604 589
   #endif
605
-  #ifndef MSG_FILAMENT_CHANGE_EXTRUDE_3
606
-    #define MSG_FILAMENT_CHANGE_EXTRUDE_3       ""
607
-  #endif
608 590
   #ifndef MSG_FILAMENT_CHANGE_RESUME_1
609 591
     #define MSG_FILAMENT_CHANGE_RESUME_1        "Wait for print"
610
-  #endif
611
-  #ifndef MSG_FILAMENT_CHANGE_RESUME_2
612 592
     #define MSG_FILAMENT_CHANGE_RESUME_2        "to resume"
613 593
   #endif
614
-  #ifndef MSG_FILAMENT_CHANGE_RESUME_3
615
-    #define MSG_FILAMENT_CHANGE_RESUME_3        ""
616
-  #endif
617 594
 #else // LCD_HEIGHT < 4
618 595
   #ifndef MSG_FILAMENT_CHANGE_INIT_1
619 596
     #define MSG_FILAMENT_CHANGE_INIT_1          "Please wait..."

+ 17
- 9
Marlin/language_es.h View File

@@ -187,27 +187,35 @@
187 187
 #define MSG_INFO_MIN_TEMP                   "Temperatura minima"
188 188
 #define MSG_INFO_MAX_TEMP                   "Temperatura maxima"
189 189
 #define MSG_INFO_PSU                        "Fuente de poder"
190
+
190 191
 #define MSG_FILAMENT_CHANGE_HEADER          "Cambiar Filamento"
191 192
 #define MSG_FILAMENT_CHANGE_OPTION_HEADER   "Opciones de cambio:"
192 193
 #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "Extruir mas"
193 194
 #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Resumir imp."
195
+
194 196
 #define MSG_FILAMENT_CHANGE_INIT_1          "Esperando iniciar"
195
-#define MSG_FILAMENT_CHANGE_INIT_2          "del filamento"
196
-#define MSG_FILAMENT_CHANGE_INIT_3          "cambiar"
197
-#define MSG_FILAMENT_CHANGE_UNLOAD_1        "Esperado por"
198
-#define MSG_FILAMENT_CHANGE_UNLOAD_2        "filamento expulsado"
199
-#define MSG_FILAMENT_CHANGE_UNLOAD_3        ""
197
+
200 198
 #define MSG_FILAMENT_CHANGE_INSERT_1        "Inserte filamento"
201 199
 #define MSG_FILAMENT_CHANGE_INSERT_2        "y presione el boton"
202
-#define MSG_FILAMENT_CHANGE_INSERT_3        "para continuar..."
200
+
201
+#if LCD_HEIGHT >= 4
202
+  // Up to 3 lines allowed
203
+  #define MSG_FILAMENT_CHANGE_INIT_2          "del filamento"
204
+  #define MSG_FILAMENT_CHANGE_INIT_3          "cambiar"
205
+  #define MSG_FILAMENT_CHANGE_INSERT_3        "para continuar..."
206
+#else // LCD_HEIGHT < 4
207
+  // Up to 2 lines allowed
208
+  #define MSG_FILAMENT_CHANGE_INIT_2          "del fil. cambiar"
209
+  #define MSG_FILAMENT_CHANGE_INSERT_1        "Inserte filamento"
210
+#endif // LCD_HEIGHT < 4
211
+
212
+#define MSG_FILAMENT_CHANGE_UNLOAD_1        "Esperado por"
213
+#define MSG_FILAMENT_CHANGE_UNLOAD_2        "filamento expulsado"
203 214
 #define MSG_FILAMENT_CHANGE_LOAD_1          "Esperado por"
204 215
 #define MSG_FILAMENT_CHANGE_LOAD_2          "Cargar filamento"
205
-#define MSG_FILAMENT_CHANGE_LOAD_3          ""
206 216
 #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Esperado por"
207 217
 #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "Extruir filamento"
208
-#define MSG_FILAMENT_CHANGE_EXTRUDE_3       ""
209 218
 #define MSG_FILAMENT_CHANGE_RESUME_1        "Esperando imp."
210 219
 #define MSG_FILAMENT_CHANGE_RESUME_2        "para resumir"
211
-#define MSG_FILAMENT_CHANGE_RESUME_3        ""
212 220
 
213 221
 #endif // LANGUAGE_ES_H

+ 23
- 24
Marlin/language_fr.h View File

@@ -208,37 +208,36 @@
208 208
 #define MSG_DRIVE_STRENGTH                  "Puiss. moteur "
209 209
 #define MSG_DAC_PERCENT                     "Driver %"
210 210
 #define MSG_DAC_EEPROM_WRITE                "DAC EEPROM sauv."
211
+
211 212
 #define MSG_FILAMENT_CHANGE_HEADER          "CHANGER FILAMENT"
212 213
 #define MSG_FILAMENT_CHANGE_OPTION_HEADER   "CHANGER OPTIONS:"
213 214
 #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "+ extrusion"
214 215
 #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Reprendre impr."
215 216
 
216 217
 #if LCD_HEIGHT >= 4
217
-    #define MSG_FILAMENT_CHANGE_INIT_1          "Attente Demarrage"
218
-    #define MSG_FILAMENT_CHANGE_INIT_2          "du filament"
219
-    #define MSG_FILAMENT_CHANGE_INIT_3          "changer"
220
-    #define MSG_FILAMENT_CHANGE_UNLOAD_1        "attente de"
221
-    #define MSG_FILAMENT_CHANGE_UNLOAD_2        "decharger filament"
222
-    #define MSG_FILAMENT_CHANGE_UNLOAD_3        ""
223
-    #define MSG_FILAMENT_CHANGE_INSERT_1        "inserer filament"
224
-    #define MSG_FILAMENT_CHANGE_INSERT_2        "et app. bouton"
225
-    #define MSG_FILAMENT_CHANGE_INSERT_3        "pour continuer..."
226
-    #define MSG_FILAMENT_CHANGE_LOAD_1          "attente de"
227
-    #define MSG_FILAMENT_CHANGE_LOAD_2          "charger filament"
228
-    #define MSG_FILAMENT_CHANGE_LOAD_3          ""
229
-    #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "attente de"
230
-    #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "extrusion fil."
231
-    #define MSG_FILAMENT_CHANGE_EXTRUDE_3       ""
232
-    #define MSG_FILAMENT_CHANGE_RESUME_1        "attente impression"
233
-    #define MSG_FILAMENT_CHANGE_RESUME_2        "pour reprendre"
234
-    #define MSG_FILAMENT_CHANGE_RESUME_3        ""
218
+  // Up to 3 lines allowed
219
+  #define MSG_FILAMENT_CHANGE_INIT_1          "Attente Demarrage"
220
+  #define MSG_FILAMENT_CHANGE_INIT_2          "du filament"
221
+  #define MSG_FILAMENT_CHANGE_INIT_3          "changer"
222
+  #define MSG_FILAMENT_CHANGE_UNLOAD_1        "attente de"
223
+  #define MSG_FILAMENT_CHANGE_UNLOAD_2        "decharger filament"
224
+  #define MSG_FILAMENT_CHANGE_INSERT_1        "inserer filament"
225
+  #define MSG_FILAMENT_CHANGE_INSERT_2        "et app. bouton"
226
+  #define MSG_FILAMENT_CHANGE_INSERT_3        "pour continuer..."
227
+  #define MSG_FILAMENT_CHANGE_LOAD_1          "attente de"
228
+  #define MSG_FILAMENT_CHANGE_LOAD_2          "charger filament"
229
+  #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "attente de"
230
+  #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "extrusion fil."
231
+  #define MSG_FILAMENT_CHANGE_RESUME_1        "attente impression"
232
+  #define MSG_FILAMENT_CHANGE_RESUME_2        "pour reprendre"
235 233
 #else // LCD_HEIGHT < 4
236
-    #define MSG_FILAMENT_CHANGE_INIT_1          "Patientez..."
237
-    #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Ejection..."
238
-    #define MSG_FILAMENT_CHANGE_INSERT_1        "Inserer et click"
239
-    #define MSG_FILAMENT_CHANGE_LOAD_1          "Chargement..."
240
-    #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Extrusion..."
241
-    #define MSG_FILAMENT_CHANGE_RESUME_1        "Reprise..."
234
+  // Up to 2 lines allowed
235
+  #define MSG_FILAMENT_CHANGE_INIT_1          "Patientez..."
236
+  #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Ejection..."
237
+  #define MSG_FILAMENT_CHANGE_INSERT_1        "Inserer et click"
238
+  #define MSG_FILAMENT_CHANGE_LOAD_1          "Chargement..."
239
+  #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Extrusion..."
240
+  #define MSG_FILAMENT_CHANGE_RESUME_1        "Reprise..."
242 241
 #endif // LCD_HEIGHT < 4
243 242
 
244 243
 #endif // LANGUAGE_FR_H

+ 4
- 0
Marlin/language_gl.h View File

@@ -206,11 +206,14 @@
206 206
 #define MSG_DRIVE_STRENGTH                  "Potencia motor"
207 207
 #define MSG_DAC_PERCENT                     "Motor %"
208 208
 #define MSG_DAC_EEPROM_WRITE                "Garda DAC EEPROM"
209
+
209 210
 #define MSG_FILAMENT_CHANGE_HEADER          "TROCO FILAMENTO"
210 211
 #define MSG_FILAMENT_CHANGE_OPTION_HEADER   "OPCIONS TROCO:"
211 212
 #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "Extruir mais"
212 213
 #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Segue traballo"
214
+
213 215
 #if LCD_HEIGHT >= 4
216
+  // Up to 3 lines allowed
214 217
   #define MSG_FILAMENT_CHANGE_INIT_1          "Agarde para"
215 218
   #define MSG_FILAMENT_CHANGE_INIT_2          "iniciar troco"
216 219
   #define MSG_FILAMENT_CHANGE_INIT_3          "de filamento"
@@ -230,6 +233,7 @@
230 233
   #define MSG_FILAMENT_CHANGE_RESUME_2        "seguir co"
231 234
   #define MSG_FILAMENT_CHANGE_RESUME_3        "traballo"
232 235
 #else // LCD_HEIGHT < 4
236
+  // Up to 2 lines allowed
233 237
   #define MSG_FILAMENT_CHANGE_INIT_1          "Agarde..."
234 238
   #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Descargando..."
235 239
   #define MSG_FILAMENT_CHANGE_INSERT_1        "Introduza e click"

+ 3
- 0
Marlin/language_hr.h View File

@@ -207,12 +207,14 @@
207 207
 #define MSG_DRIVE_STRENGTH                  "Drive Strength"
208 208
 #define MSG_DAC_PERCENT                     "Driver %"
209 209
 #define MSG_DAC_EEPROM_WRITE                "DAC EEPROM Write"
210
+
210 211
 #define MSG_FILAMENT_CHANGE_HEADER          "CHANGE FILAMENT"
211 212
 #define MSG_FILAMENT_CHANGE_OPTION_HEADER   "CHANGE OPTIONS:"
212 213
 #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "Extrudiraj više"
213 214
 #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Nastavi print"
214 215
 
215 216
 #if LCD_HEIGHT >= 4
217
+  // Up to 3 lines allowed
216 218
   #define MSG_FILAMENT_CHANGE_INIT_1          "Čekaj početak"
217 219
   #define MSG_FILAMENT_CHANGE_INIT_2          "filamenta"
218 220
   #define MSG_FILAMENT_CHANGE_INIT_3          "promijeni"
@@ -228,6 +230,7 @@
228 230
   #define MSG_FILAMENT_CHANGE_RESUME_1        "Wait for print"
229 231
   #define MSG_FILAMENT_CHANGE_RESUME_2        "to resume"
230 232
 #else // LCD_HEIGHT < 4
233
+  // Up to 2 lines allowed
231 234
   #define MSG_FILAMENT_CHANGE_INIT_1          "Pričekaj..."
232 235
   #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Ejecting..."
233 236
   #define MSG_FILAMENT_CHANGE_INSERT_1        "Insert and Click"

+ 4
- 0
Marlin/language_it.h View File

@@ -222,11 +222,14 @@
222 222
 #define MSG_DRIVE_STRENGTH                  "Potenza Drive"
223 223
 #define MSG_DAC_PERCENT                     "Driver %"
224 224
 #define MSG_DAC_EEPROM_WRITE                "Scrivi DAC EEPROM"
225
+
225 226
 #define MSG_FILAMENT_CHANGE_HEADER          "CAMBIA FILAMENTO"
226 227
 #define MSG_FILAMENT_CHANGE_OPTION_HEADER   "CAMBIA OPZIONI:"
227 228
 #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "Estrusione"
228 229
 #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Riprendi stampa"
230
+
229 231
 #if LCD_HEIGHT >= 4
232
+  // Up to 3 lines allowed
230 233
   #define MSG_FILAMENT_CHANGE_INIT_1          "Attendere avvio"
231 234
   #define MSG_FILAMENT_CHANGE_INIT_2          "del cambio"
232 235
   #define MSG_FILAMENT_CHANGE_INIT_3          "di filamento"
@@ -246,6 +249,7 @@
246 249
   #define MSG_FILAMENT_CHANGE_RESUME_2        "la ripresa"
247 250
   #define MSG_FILAMENT_CHANGE_RESUME_3        "della stampa"
248 251
 #else // LCD_HEIGHT < 4
252
+  // Up to 2 lines allowed
249 253
   #define MSG_FILAMENT_CHANGE_INIT_1          "Attendere..."
250 254
   #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Espulsione..."
251 255
   #define MSG_FILAMENT_CHANGE_INSERT_1        "Inserisci e premi"

+ 3
- 6
Marlin/language_kana.h View File

@@ -275,26 +275,23 @@
275 275
 #define MSG_FILAMENT_CHANGE_OPTION_HEADER   "\xc4\xde\xb3\xbb\xa6\xbe\xdd\xc0\xb8\xbc\xc3\xb8\xc0\xde\xbb\xb2" // "ドウサヲセンタクシテクダサイ" ("CHANGE OPTIONS:")
276 276
 #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "\xbb\xd7\xc6\xb5\xbc\xc0\xde\xbd"                                 // "サラニオシダス" ("Extrude more")
277 277
 #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "\xcc\xdf\xd8\xdd\xc4\xbb\xb2\xb6\xb2"                             // "プリントサイカイ" ("Resume print")
278
+
278 279
 #if LCD_HEIGHT >= 4
280
+  // Up to 3 lines allowed
279 281
   #define MSG_FILAMENT_CHANGE_INIT_1        "\xba\xb3\xb6\xdd\xa6\xb6\xb2\xbc\xbc\xcf\xbd"                     // "コウカンヲカイシシマス" ("Wait for start")
280 282
   #define MSG_FILAMENT_CHANGE_INIT_2        "\xbc\xca\xde\xd7\xb8\xb5\xcf\xc1\xb8\xc0\xde\xbb\xb2"             // "シバラクオマチクダサイ" ("of the filament")
281
-  #define MSG_FILAMENT_CHANGE_INIT_3        ""                                                                 // "" ("change")
282 283
   #define MSG_FILAMENT_CHANGE_UNLOAD_1      "\xcc\xa8\xd7\xd2\xdd\xc4\xc7\xb7\xc0\xde\xbc\xc1\xad\xb3"         // "フィラメントヌキダシチュウ" ("Wait for")
283 284
   #define MSG_FILAMENT_CHANGE_UNLOAD_2      "\xbc\xca\xde\xd7\xb8\xb5\xcf\xc1\xb8\xc0\xde\xbb\xb2"             // "シバラクオマチクダサイ" ("filament unload")
284
-  #define MSG_FILAMENT_CHANGE_UNLOAD_3      ""
285 285
   #define MSG_FILAMENT_CHANGE_INSERT_1      "\xcc\xa8\xd7\xd2\xdd\xc4\xa6\xbf\xb3\xc6\xad\xb3\xbc,"            // "フィラメントヲソウニュウシ," ("Insert filament")
286 286
   #define MSG_FILAMENT_CHANGE_INSERT_2      "\xb8\xd8\xaf\xb8\xbd\xd9\xc4\xbf\xde\xaf\xba\xb3\xbc\xcf\xbd"     // "クリックスルトゾッコウシマス" ("and press button")
287
-  #define MSG_FILAMENT_CHANGE_INSERT_3      ""                                                                 // "" ("to continue...")
288 287
   #define MSG_FILAMENT_CHANGE_LOAD_1        "\xcc\xa8\xd7\xd2\xdd\xc4\xbf\xb3\xc3\xdd\xc1\xad\xb3"             // "フィラメントソウテンチュウ" ("Wait for")
289 288
   #define MSG_FILAMENT_CHANGE_LOAD_2        "\xbc\xca\xde\xd7\xb8\xb5\xcf\xc1\xb8\xc0\xde\xbb\xb2"             // "シバラクオマチクダサイ" ("filament load")
290
-  #define MSG_FILAMENT_CHANGE_LOAD_3        ""
291 289
   #define MSG_FILAMENT_CHANGE_EXTRUDE_1     "\xcc\xa8\xd7\xd2\xdd\xc4\xb5\xbc\xc0\xde\xbc\xc1\xad\xb3"         // "フィラメントオシダシチュウ" ("Wait for")
292 290
   #define MSG_FILAMENT_CHANGE_EXTRUDE_2     "\xbc\xca\xde\xd7\xb8\xb5\xcf\xc1\xb8\xc0\xde\xbb\xb2"             // "シバラクオマチクダサイ" ("filament extrude")
293
-  #define MSG_FILAMENT_CHANGE_EXTRUDE_3     ""
294 291
   #define MSG_FILAMENT_CHANGE_RESUME_1      "\xcc\xdf\xd8\xdd\xc4\xa6\xbb\xb2\xb6\xb2\xbc\xcf\xbd"             // "プリントヲサイカイシマス" ("Wait for print")
295 292
   #define MSG_FILAMENT_CHANGE_RESUME_2      "\xbc\xca\xde\xd7\xb8\xb5\xcf\xc1\xb8\xc0\xde\xbb\xb2"             // "シバラクオマチクダサイ" ("to resume")
296
-  #define MSG_FILAMENT_CHANGE_RESUME_3      ""
297 293
 #else // LCD_HEIGHT < 4
294
+  // Up to 2 lines allowed
298 295
   #define MSG_FILAMENT_CHANGE_INIT_1        "\xba\xb3\xb6\xdd\xa6\xb6\xb2\xbc\xbc\xcf\xbd"                     // "コウカンヲカイシシマス" ("Please wait...")
299 296
   #define MSG_FILAMENT_CHANGE_UNLOAD_1      "\xcc\xa8\xd7\xd2\xdd\xc4\xc7\xb7\xc0\xde\xbc\xc1\xad\xb3"         // "フィラメントヌキダシチュウ" ("Ejecting...")
300 297
   #if LCD_WIDTH >= 20

+ 0
- 6
Marlin/language_kana_utf8.h View File

@@ -209,21 +209,15 @@
209 209
 #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "プリントサイカイ"                // "Resume print"
210 210
 #define MSG_FILAMENT_CHANGE_INIT_1          "コウカンヲカイシシマス"            // "Wait for start"
211 211
 #define MSG_FILAMENT_CHANGE_INIT_2          "シバラクオマチクダサイ"            // "of the filament"
212
-#define MSG_FILAMENT_CHANGE_INIT_3          ""                           // "change"
213 212
 #define MSG_FILAMENT_CHANGE_UNLOAD_1        "フィラメントヌキダシチュウ"          // "Wait for"
214 213
 #define MSG_FILAMENT_CHANGE_UNLOAD_2        "シバラクオマチクダサイ"            // "filament unload"
215
-#define MSG_FILAMENT_CHANGE_UNLOAD_3        ""
216 214
 #define MSG_FILAMENT_CHANGE_INSERT_1        "フィラメントヲソウニュウシ,"         // "Insert filament"
217 215
 #define MSG_FILAMENT_CHANGE_INSERT_2        "クリックスルトゾッコウシマス"         // "and press button"
218
-#define MSG_FILAMENT_CHANGE_INSERT_3        ""                           // "to continue..."
219 216
 #define MSG_FILAMENT_CHANGE_LOAD_1          "フィラメントソウテンチュウ"          // "Wait for"
220 217
 #define MSG_FILAMENT_CHANGE_LOAD_2          "シバラクオマチクダサイ"            // "filament load"
221
-#define MSG_FILAMENT_CHANGE_LOAD_3          ""
222 218
 #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "フィラメントオシダシチュウ"          // "Wait for"
223 219
 #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "シバラクオマチクダサイ"            // "filament extrude"
224
-#define MSG_FILAMENT_CHANGE_EXTRUDE_3       ""
225 220
 #define MSG_FILAMENT_CHANGE_RESUME_1        "プリントヲサイカイシマス"           // "Wait for print"
226 221
 #define MSG_FILAMENT_CHANGE_RESUME_2        "シバラクオマチクダサイ"            // "to resume"
227
-#define MSG_FILAMENT_CHANGE_RESUME_3        ""
228 222
 
229 223
 #endif // LANGUAGE_KANA_UTF_H

+ 57
- 58
Marlin/language_pl.h View File

@@ -157,15 +157,15 @@
157 157
 #define MSG_HEATING_FAILED_LCD              "Rozgrz. nieudane"
158 158
 #define MSG_ERR_REDUNDANT_TEMP              "Blad temperatury"
159 159
 #define MSG_THERMAL_RUNAWAY                 "Zanik temp."
160
-#define MSG_ERR_MAXTEMP                     "Err: max. temp."
161
-#define MSG_ERR_MINTEMP                     "Err: min. temp."
162
-#define MSG_ERR_MAXTEMP_BED                 "Err: max. temp. loza"
163
-#define MSG_ERR_MINTEMP_BED                 "Err: min. temp. loza"
160
+#define MSG_ERR_MAXTEMP                     "Err max temp"
161
+#define MSG_ERR_MINTEMP                     "Err min temp"
162
+#define MSG_ERR_MAXTEMP_BED                 "Err max temp stolu"
163
+#define MSG_ERR_MINTEMP_BED                 "Err min temp stolu"
164 164
 #define MSG_ERR_Z_HOMING                    "G28 Z Forbidden"
165
-#define MSG_HALTED                          "PRINTER HALTED"
166
-#define MSG_PLEASE_RESET                    "Please reset"
165
+#define MSG_HALTED                          "Drukarka zatrzym."
166
+#define MSG_PLEASE_RESET                    "Prosze zresetowac"
167 167
 #define MSG_SHORT_DAY                       "d" // One character only
168
-#define MSG_SHORT_HOUR                      "h" // One character only
168
+#define MSG_SHORT_HOUR                      "g" // One character only
169 169
 #define MSG_SHORT_MINUTE                    "m" // One character only
170 170
 #define MSG_HEATING                         "Rozgrzewanie..."
171 171
 #define MSG_HEATING_COMPLETE                "Rozgrzano"
@@ -177,68 +177,67 @@
177 177
 #define MSG_DELTA_CALIBRATE_Z               "Kalibruj Z"
178 178
 #define MSG_DELTA_CALIBRATE_CENTER          "Kalibruj środek"
179 179
 
180
-#define MSG_INFO_MENU                       "About Printer"
181
-#define MSG_INFO_PRINTER_MENU               "Printer Info"
182
-#define MSG_INFO_STATS_MENU                 "Printer Stats"
180
+#define MSG_INFO_MENU                       "O drukarce"
181
+#define MSG_INFO_PRINTER_MENU               "Info drukarki"
182
+#define MSG_INFO_STATS_MENU                 "Statystyki"
183 183
 #define MSG_INFO_BOARD_MENU                 "Board Info"
184
-#define MSG_INFO_THERMISTOR_MENU            "Thermistors"
185
-#define MSG_INFO_EXTRUDERS                  "Extruders"
186
-#define MSG_INFO_BAUDRATE                   "Baud"
187
-#define MSG_INFO_PROTOCOL                   "Protocol"
188
-#define MSG_LIGHTS_ON                       "Case light on"
189
-#define MSG_LIGHTS_OFF                      "Case light off"
184
+#define MSG_INFO_THERMISTOR_MENU            "Thermistory"
185
+#define MSG_INFO_EXTRUDERS                  "Ekstrudery"
186
+#define MSG_INFO_BAUDRATE                   "Prędkosc USB"
187
+#define MSG_INFO_PROTOCOL                   "Protokol"
188
+#define MSG_LIGHTS_ON                       "Oswietlenie wl."
189
+#define MSG_LIGHTS_OFF                      "Oswietlenie wyl."
190 190
 
191 191
 #if LCD_WIDTH >= 20
192
-  #define MSG_INFO_PRINT_COUNT              "Print Count"
193
-  #define MSG_INFO_COMPLETED_PRINTS         "Completed"
194
-  #define MSG_INFO_PRINT_TIME               "Total print time"
195
-  #define MSG_INFO_PRINT_LONGEST            "Longest job time"
196
-  #define MSG_INFO_PRINT_FILAMENT           "Extruded total"
192
+  #define MSG_INFO_PRINT_COUNT              "Wydrukowano"
193
+  #define MSG_INFO_COMPLETED_PRINTS         "Ukończono"
194
+  #define MSG_INFO_PRINT_TIME               "Czas druku"
195
+  #define MSG_INFO_PRINT_LONGEST            "Najdl. druk"
196
+  #define MSG_INFO_PRINT_FILAMENT           "Uzyty fil."
197 197
 #else
198
-  #define MSG_INFO_PRINT_COUNT              "Prints"
199
-  #define MSG_INFO_COMPLETED_PRINTS         "Completed"
200
-  #define MSG_INFO_PRINT_TIME               "Total"
201
-  #define MSG_INFO_PRINT_LONGEST            "Longest"
202
-  #define MSG_INFO_PRINT_FILAMENT           "Extruded"
198
+  #define MSG_INFO_PRINT_COUNT              "Wydrukowano"
199
+  #define MSG_INFO_COMPLETED_PRINTS         "Ukonczono"
200
+  #define MSG_INFO_PRINT_TIME               "Razem"
201
+  #define MSG_INFO_PRINT_LONGEST            "Najdl. druk"
202
+  #define MSG_INFO_PRINT_FILAMENT           "Uzyty fil."
203 203
 #endif
204 204
 
205 205
 #define MSG_INFO_MIN_TEMP                   "Min Temp"
206 206
 #define MSG_INFO_MAX_TEMP                   "Max Temp"
207
-#define MSG_INFO_PSU                        "Power Supply"
207
+#define MSG_INFO_PSU                        "Zasilacz"
208
+
209
+#define MSG_DRIVE_STRENGTH                  "Siła silnika"
210
+#define MSG_DAC_PERCENT                     "Siła %"
211
+#define MSG_DAC_EEPROM_WRITE                "Zapisz DAC EEPROM"
212
+
213
+#define MSG_FILAMENT_CHANGE_HEADER          "ZMIEN FILAMENT"
214
+#define MSG_FILAMENT_CHANGE_OPTION_HEADER   "ZMIEN OPCJE:"
215
+#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "Ekstruduj wiecej"
216
+#define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Wznow drukowanie"
208 217
 
209
-#define MSG_DRIVE_STRENGTH                  "Drive Strength"
210
-#define MSG_DAC_PERCENT                     "Driver %"
211
-#define MSG_DAC_EEPROM_WRITE                "DAC EEPROM Write"
212
-#define MSG_FILAMENT_CHANGE_HEADER          "CHANGE FILAMENT"
213
-#define MSG_FILAMENT_CHANGE_OPTION_HEADER   "CHANGE OPTIONS:"
214
-#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "Extrude more"
215
-#define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Resume print"
216 218
 #if LCD_HEIGHT >= 4
217
-  #define MSG_FILAMENT_CHANGE_INIT_1          "Wait for start"
218
-  #define MSG_FILAMENT_CHANGE_INIT_2          "of the filament"
219
-  #define MSG_FILAMENT_CHANGE_INIT_3          "change"
220
-  #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Wait for"
221
-  #define MSG_FILAMENT_CHANGE_UNLOAD_2        "filament unload"
222
-  #define MSG_FILAMENT_CHANGE_UNLOAD_3        ""
223
-  #define MSG_FILAMENT_CHANGE_INSERT_1        "Insert filament"
224
-  #define MSG_FILAMENT_CHANGE_INSERT_2        "and press button"
225
-  #define MSG_FILAMENT_CHANGE_INSERT_3        "to continue..."
226
-  #define MSG_FILAMENT_CHANGE_LOAD_1          "Wait for"
227
-  #define MSG_FILAMENT_CHANGE_LOAD_2          "filament load"
228
-  #define MSG_FILAMENT_CHANGE_LOAD_3          ""
229
-  #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Wait for"
230
-  #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "filament extrude"
231
-  #define MSG_FILAMENT_CHANGE_EXTRUDE_3       ""
232
-  #define MSG_FILAMENT_CHANGE_RESUME_1        "Wait for print"
233
-  #define MSG_FILAMENT_CHANGE_RESUME_2        "to resume"
234
-  #define MSG_FILAMENT_CHANGE_RESUME_3        ""
219
+  // Up to 3 lines allowed
220
+  #define MSG_FILAMENT_CHANGE_INIT_1          "Czekam na "
221
+  #define MSG_FILAMENT_CHANGE_INIT_2          "zmiane filamentu"
222
+  #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Czekam na"
223
+  #define MSG_FILAMENT_CHANGE_UNLOAD_2        "wyjecie filamentu"
224
+  #define MSG_FILAMENT_CHANGE_INSERT_1        "Wloz filament"
225
+  #define MSG_FILAMENT_CHANGE_INSERT_2        "i nacisnij przycisk"
226
+  #define MSG_FILAMENT_CHANGE_INSERT_3        "aby kontynuowac..."
227
+  #define MSG_FILAMENT_CHANGE_LOAD_1          "Czekam na"
228
+  #define MSG_FILAMENT_CHANGE_LOAD_2          "wlozenie filamentu"
229
+  #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Czekam na"
230
+  #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "ekstruzje filamentu"
231
+  #define MSG_FILAMENT_CHANGE_RESUME_1        "Czekam na"
232
+  #define MSG_FILAMENT_CHANGE_RESUME_2        "wznowienie druku"
235 233
 #else // LCD_HEIGHT < 4
236
-  #define MSG_FILAMENT_CHANGE_INIT_1          "Please wait..."
237
-  #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Ejecting..."
238
-  #define MSG_FILAMENT_CHANGE_INSERT_1        "Insert and Click"
239
-  #define MSG_FILAMENT_CHANGE_LOAD_1          "Loading..."
240
-  #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Extruding..."
241
-  #define MSG_FILAMENT_CHANGE_RESUME_1        "Resuming..."
234
+  // Up to 2 lines allowed
235
+  #define MSG_FILAMENT_CHANGE_INIT_1          "Prosze czekac..."
236
+  #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Wysuwanie..."
237
+  #define MSG_FILAMENT_CHANGE_INSERT_1        "Wloz i nacisnij prz."
238
+  #define MSG_FILAMENT_CHANGE_LOAD_1          "Ladowanie..."
239
+  #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Ekstruzja..."
240
+  #define MSG_FILAMENT_CHANGE_RESUME_1        "Wznowienie..."
242 241
 #endif // LCD_HEIGHT < 4
243 242
 
244 243
 #endif // LANGUAGE_PL_H

+ 3
- 4
Marlin/language_tr.h View File

@@ -214,26 +214,25 @@
214 214
 #define MSG_FILAMENT_CHANGE_OPTION_HEADER   "Se\xe7enekler:"                                             //Seçenekler:
215 215
 #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "Daha Ak\xfdt"                                               //Daha Akıt
216 216
 #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Bask\xfdy\xfd s\xfcrd\xfcr"                                 //Baskıyı sürdür
217
+
217 218
 #if LCD_HEIGHT >= 4
219
+  // Up to 3 lines allowed
218 220
   #define MSG_FILAMENT_CHANGE_INIT_1          "Ba\xfelama bekleniyor"                                    //Başlama bekleniyor
219 221
   #define MSG_FILAMENT_CHANGE_INIT_2          "filaman\xfdn"                                             //filamanın
220 222
   #define MSG_FILAMENT_CHANGE_INIT_3          "de\xf0i\xfeimi"                                           //değişimi
221 223
   #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Bekleniyor"                                               //Bekleniyor
222 224
   #define MSG_FILAMENT_CHANGE_UNLOAD_2        "filaman\xfdn \xe7\xfdkmas\xfd"                            //filamanın çıkması
223
-  #define MSG_FILAMENT_CHANGE_UNLOAD_3        ""                                                         //
224 225
   #define MSG_FILAMENT_CHANGE_INSERT_1        "Filaman\xfd y\xfckle"                                     //Filamanı yükle
225 226
   #define MSG_FILAMENT_CHANGE_INSERT_2        "ve devam i\xe7in"                                         //ve devam için
226 227
   #define MSG_FILAMENT_CHANGE_INSERT_3        "tu\xfea bas..."                                           //tuşa bas...
227 228
   #define MSG_FILAMENT_CHANGE_LOAD_1          "Bekleniyor"                                               //Bekleniyor
228 229
   #define MSG_FILAMENT_CHANGE_LOAD_2          "filaman\xfdn y\xfcklenmesi"                               //filamanın yüklenmesi
229
-  #define MSG_FILAMENT_CHANGE_LOAD_3          ""                                                         //
230 230
   #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Bekleniyor"                                               //Bekleniyor
231 231
   #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "filaman akmas\xfd"                                        //filaman akması
232
-  #define MSG_FILAMENT_CHANGE_EXTRUDE_3       ""                                                         //
233 232
   #define MSG_FILAMENT_CHANGE_RESUME_1        "Bask\xfdn\xfdn s\xfcrd\xfcr\xfclmesini"                   //Baskının sürdürülmesini
234 233
   #define MSG_FILAMENT_CHANGE_RESUME_2        "bekle"                                                    //bekle
235
-  #define MSG_FILAMENT_CHANGE_RESUME_3        ""                                                         //
236 234
 #else // LCD_HEIGHT < 4
235
+  // Up to 2 lines allowed
237 236
   #define MSG_FILAMENT_CHANGE_INIT_1          "L\xfctfen bekleyiniz..."                                  //Lütfen bekleyiniz...
238 237
   #define MSG_FILAMENT_CHANGE_UNLOAD_1        "\xc7\xfdkart\xfdl\xfdyor..."                              //Çıkartılıyor...
239 238
   #define MSG_FILAMENT_CHANGE_INSERT_1        "Y\xfckle ve bas"                                          //Yükle ve bas

+ 3
- 4
Marlin/language_tr_utf8.h View File

@@ -214,26 +214,25 @@
214 214
 #define MSG_FILAMENT_CHANGE_OPTION_HEADER   "Seçenekler:"                                                //Seçenekler:
215 215
 #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "Daha Akıt"                                                  //Daha Akıt
216 216
 #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Baskıyı sürdür"                                             //Baskıyı sürdür
217
+
217 218
 #if LCD_HEIGHT >= 4
219
+  // Up to 3 lines allowed
218 220
   #define MSG_FILAMENT_CHANGE_INIT_1          "Başlama bekleniyor"                                       //Başlama bekleniyor
219 221
   #define MSG_FILAMENT_CHANGE_INIT_2          "filamanın"                                                //filamanın
220 222
   #define MSG_FILAMENT_CHANGE_INIT_3          "değişimi"                                                 //değişimi
221 223
   #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Bekleniyor"                                               //Bekleniyor
222 224
   #define MSG_FILAMENT_CHANGE_UNLOAD_2        "filamanın çıkması"                                        //filamanın çıkması
223
-  #define MSG_FILAMENT_CHANGE_UNLOAD_3        ""                                                         //
224 225
   #define MSG_FILAMENT_CHANGE_INSERT_1        "Filamanı yükle"                                           //Filamanı yükle
225 226
   #define MSG_FILAMENT_CHANGE_INSERT_2        "ve devam için"                                            //ve devam için
226 227
   #define MSG_FILAMENT_CHANGE_INSERT_3        "tuşa bas..."                                              //tuşa bas...
227 228
   #define MSG_FILAMENT_CHANGE_LOAD_1          "Bekleniyor"                                               //Bekleniyor
228 229
   #define MSG_FILAMENT_CHANGE_LOAD_2          "filamanın yüklenmesi"                                     //filamanın yüklenmesi
229
-  #define MSG_FILAMENT_CHANGE_LOAD_3          ""                                                         //
230 230
   #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Bekleniyor"                                               //Bekleniyor
231 231
   #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "filaman akması"                                           //filaman akması
232
-  #define MSG_FILAMENT_CHANGE_EXTRUDE_3       ""                                                         //
233 232
   #define MSG_FILAMENT_CHANGE_RESUME_1        "Baskının sürdürülmesini"                                  //Baskının sürdürülmesini
234 233
   #define MSG_FILAMENT_CHANGE_RESUME_2        "bekle"                                                    //bekle
235
-  #define MSG_FILAMENT_CHANGE_RESUME_3        ""                                                         //
236 234
 #else // LCD_HEIGHT < 4
235
+  // Up to 2 lines allowed
237 236
   #define MSG_FILAMENT_CHANGE_INIT_1          "Lütfen bekleyiniz..."                                     //Lütfen bekleyiniz...
238 237
   #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Çıkartılıyor..."                                          //Çıkartılıyor...
239 238
   #define MSG_FILAMENT_CHANGE_INSERT_1        "Yükle ve bas"                                             //Yükle ve bas

+ 3
- 2
Marlin/language_uk.h View File

@@ -197,24 +197,24 @@
197 197
 #define MSG_DRIVE_STRENGTH                  "Сила мотору"
198 198
 #define MSG_DAC_PERCENT                     "% мотору"
199 199
 #define MSG_DAC_EEPROM_WRITE                "Запис ЦАП на ПЗП"
200
+
200 201
 #define MSG_FILAMENT_CHANGE_HEADER          "ЗАМІНА ВОЛОКНА"
201 202
 #define MSG_FILAMENT_CHANGE_OPTION_HEADER   "НАЛАШТ. ЗАМІНИ:"
202 203
 #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "Екструдувати"
203 204
 #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Відновити друк"
204 205
 
205 206
 #if LCD_HEIGHT >= 4
207
+  // Up to 3 lines allowed
206 208
   #define MSG_FILAMENT_CHANGE_INIT_1          "Зачекайте на"
207 209
   #define MSG_FILAMENT_CHANGE_INIT_2          "початок заміни"
208 210
   #define MSG_FILAMENT_CHANGE_INIT_3          "волокна"
209 211
   #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Зачекайте на"
210 212
   #define MSG_FILAMENT_CHANGE_UNLOAD_2        "вивід волокна"
211
-  #define MSG_FILAMENT_CHANGE_UNLOAD_3        ""
212 213
   #define MSG_FILAMENT_CHANGE_INSERT_1        "Вставте волокно"
213 214
   #define MSG_FILAMENT_CHANGE_INSERT_2        "та натисніть для"
214 215
   #define MSG_FILAMENT_CHANGE_INSERT_3        "продовження..."
215 216
   #define MSG_FILAMENT_CHANGE_LOAD_1          "Зачекайте на"
216 217
   #define MSG_FILAMENT_CHANGE_LOAD_2          "ввід волокна"
217
-  #define MSG_FILAMENT_CHANGE_LOAD_3          ""
218 218
   #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Зачекайте на"
219 219
   #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "екструзію"
220 220
   #define MSG_FILAMENT_CHANGE_EXTRUDE_3       "волокна"
@@ -222,6 +222,7 @@
222 222
   #define MSG_FILAMENT_CHANGE_RESUME_2        "відновлення"
223 223
   #define MSG_FILAMENT_CHANGE_RESUME_3        "друку"
224 224
 #else // LCD_HEIGHT < 4
225
+  // Up to 2 lines allowed
225 226
   #define MSG_FILAMENT_CHANGE_INIT_1          "Зачекайте..."
226 227
   #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Вивід..."
227 228
   #define MSG_FILAMENT_CHANGE_INSERT_1        "Вставте і нат."

+ 1
- 1
Marlin/planner.h View File

@@ -348,7 +348,7 @@ class Planner {
348 348
     static void set_position_mm(const AxisEnum axis, const float &v);
349 349
     static FORCE_INLINE void set_z_position_mm(const float &z) { set_position_mm(Z_AXIS, z); }
350 350
     static FORCE_INLINE void set_e_position_mm(const float &e) {
351
-      set_position_mm(E_AXIS
351
+      set_position_mm((AxisEnum)E_AXIS
352 352
         #if ENABLED(DISTINCT_E_FACTORS)
353 353
           + active_extruder
354 354
         #endif

+ 1
- 1
Marlin/ultralcd.cpp View File

@@ -1874,7 +1874,7 @@ void kill_screen(const char* lcd_msg) {
1874 1874
       if (e == active_extruder)
1875 1875
         _planner_refresh_positioning();
1876 1876
       else
1877
-        planner.steps_to_mm[i] = 1.0 / planner.axis_steps_per_mm[i];
1877
+        planner.steps_to_mm[e] = 1.0 / planner.axis_steps_per_mm[e];
1878 1878
     }
1879 1879
     void _planner_refresh_e0_positioning() { _reset_e_acceleration_rate(0); }
1880 1880
     void _planner_refresh_e1_positioning() { _reset_e_acceleration_rate(1); }

+ 17
- 15
buildroot/share/scripts/findMissingTranslations.sh View File

@@ -8,31 +8,33 @@
8 8
 #
9 9
 # If no language codes are specified then all languages will be checked
10 10
 #
11
-IGNORE_DEFINES="LANGUAGE_EN_H MAPPER_NON SIMULATE_ROMFONT DISPLAY_CHARSET_ISO10646_1 MSG_X MSG_Y MSG_Z MSG_E MSG_H1 MSG_H2 MSG_H3 MSG_H4 MSG_MOVE_E1 MSG_MOVE_E2 MSG_MOVE_E3 MSG_MOVE_E4 MSG_N1 MSG_N2 MSG_N3 MSG_N4 MSG_DIAM_E1 MSG_DIAM_E2 MSG_DIAM_E3 MSG_DIAM_E4 MSG_E1 MSG_E2 MSG_E3 MSG_E4"
12 11
 
13 12
 [ -d "Marlin" ] && cd "Marlin"
14 13
 
15
-LANG="$@"
16
-FILES=$(ls language_*.h | grep -v language_en.h | sed -E 's/language_([^\.]+)\.h/\1/')
14
+FILES=$(ls language_*.h | grep -v -E "(_en|_test)\.h" | sed -E 's/language_([^\.]+)\.h/\1/')
17 15
 declare -A STRING_MAP
18 16
 
17
+# Get files matching the given arguments
18
+TEST_LANGS=$FILES
19
+if [[ -n $@ ]]; then
20
+  TEST_LANGS=""
21
+  for K in "$@"; do
22
+    for F in $FILES; do
23
+      [[ "$F" != "${F%$K*}" ]] && TEST_LANGS="$TEST_LANGS $F"
24
+    done
25
+  done
26
+fi
27
+
19 28
 echo -n "Building list of missing strings..."
20 29
 
21
-for i in $(awk '/#define/{print $2}' language_en.h); do
30
+for i in $(awk '/#ifndef/{print $2}' language_en.h); do
31
+  [[ $i == "LANGUAGE_EN_H" ]] && continue
22 32
   LANG_LIST=""
23
-  for j in $FILES; do
24
-    [[ $j == "test" ]] && continue
25
-    [[ -n $LANG && ! "${j}" =~ $LANG ]] && continue
26
-    t=$(grep -c "define ${i} " language_${j}.h)
27
-    if [[ $t -eq 0 ]]; then
28
-      for k in ${IGNORE_DEFINES}; do
29
-        [[ $k == $i ]] && continue 2
30
-      done
31
-      LANG_LIST="$LANG_LIST $j"
32
-    fi
33
+  for j in $TEST_LANGS; do
34
+    [[ $(grep -c " ${i} " language_${j}.h) -eq 0 ]] && LANG_LIST="$LANG_LIST $j"
33 35
   done
34 36
   [[ -z $LANG_LIST ]] && continue
35
-  STRING_MAP["$i"]="$LANG_LIST"
37
+  STRING_MAP[$i]=$LANG_LIST
36 38
 done
37 39
 
38 40
 echo

Loading…
Cancel
Save