Browse Source

Remove filament-change empty lines from languages

Scott Lahteine 8 years ago
parent
commit
4783a59249

+ 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

+ 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

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

+ 4
- 5
Marlin/language_pl.h View File

@@ -209,30 +209,29 @@
209 209
 #define MSG_DRIVE_STRENGTH                  "Siła silnika"
210 210
 #define MSG_DAC_PERCENT                     "Siła %"
211 211
 #define MSG_DAC_EEPROM_WRITE                "Zapisz DAC EEPROM"
212
+
212 213
 #define MSG_FILAMENT_CHANGE_HEADER          "ZMIEN FILAMENT"
213 214
 #define MSG_FILAMENT_CHANGE_OPTION_HEADER   "ZMIEN OPCJE:"
214 215
 #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE  "Ekstruduj wiecej"
215 216
 #define MSG_FILAMENT_CHANGE_OPTION_RESUME   "Wznow drukowanie"
217
+
216 218
 #if LCD_HEIGHT >= 4
219
+  // Up to 3 lines allowed
217 220
   #define MSG_FILAMENT_CHANGE_INIT_1          "Czekam na "
218 221
   #define MSG_FILAMENT_CHANGE_INIT_2          "zmiane filamentu"
219
-  #define MSG_FILAMENT_CHANGE_INIT_3          ""
220 222
   #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Czekam na"
221 223
   #define MSG_FILAMENT_CHANGE_UNLOAD_2        "wyjecie filamentu"
222
-  #define MSG_FILAMENT_CHANGE_UNLOAD_3        ""
223 224
   #define MSG_FILAMENT_CHANGE_INSERT_1        "Wloz filament"
224 225
   #define MSG_FILAMENT_CHANGE_INSERT_2        "i nacisnij przycisk"
225 226
   #define MSG_FILAMENT_CHANGE_INSERT_3        "aby kontynuowac..."
226 227
   #define MSG_FILAMENT_CHANGE_LOAD_1          "Czekam na"
227 228
   #define MSG_FILAMENT_CHANGE_LOAD_2          "wlozenie filamentu"
228
-  #define MSG_FILAMENT_CHANGE_LOAD_3          ""
229 229
   #define MSG_FILAMENT_CHANGE_EXTRUDE_1       "Czekam na"
230 230
   #define MSG_FILAMENT_CHANGE_EXTRUDE_2       "ekstruzje filamentu"
231
-  #define MSG_FILAMENT_CHANGE_EXTRUDE_3       ""
232 231
   #define MSG_FILAMENT_CHANGE_RESUME_1        "Czekam na"
233 232
   #define MSG_FILAMENT_CHANGE_RESUME_2        "wznowienie druku"
234
-  #define MSG_FILAMENT_CHANGE_RESUME_3        ""
235 233
 #else // LCD_HEIGHT < 4
234
+  // Up to 2 lines allowed
236 235
   #define MSG_FILAMENT_CHANGE_INIT_1          "Prosze czekac..."
237 236
   #define MSG_FILAMENT_CHANGE_UNLOAD_1        "Wysuwanie..."
238 237
   #define MSG_FILAMENT_CHANGE_INSERT_1        "Wloz i nacisnij prz."

+ 3
- 4
Marlin/language_tr.h View File

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

+ 3
- 4
Marlin/language_tr_utf8.h View File

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

Loading…
Cancel
Save