Merge pull request #5410 from thinkyhead/rc_polish_update

Update Polish language, reduce filament change messages
This commit is contained in:
Scott Lahteine 2016-12-07 03:15:53 -06:00 committed by GitHub
commit 35ad9626f1
20 changed files with 176 additions and 186 deletions

View File

@ -210,30 +210,30 @@
#define MSG_DRIVE_STRENGTH "Drive Strength"
#define MSG_DAC_PERCENT "Driver %"
#define MSG_DAC_EEPROM_WRITE "DAC EEPROM Write"
#define MSG_FILAMENT_CHANGE_HEADER "CHANGE FILAMENT"
#define MSG_FILAMENT_CHANGE_OPTION_HEADER "CHANGE OPTIONS:"
#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "Extrude more"
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Resume print"
#if LCD_HEIGHT >= 4
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Wait for start"
#define MSG_FILAMENT_CHANGE_INIT_2 "of the filament"
#define MSG_FILAMENT_CHANGE_INIT_3 "change"
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Wait for"
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "filament unload"
#define MSG_FILAMENT_CHANGE_UNLOAD_3 ""
#define MSG_FILAMENT_CHANGE_INSERT_1 "Insert filament"
#define MSG_FILAMENT_CHANGE_INSERT_2 "and press button"
#define MSG_FILAMENT_CHANGE_INSERT_3 "to continue..."
#define MSG_FILAMENT_CHANGE_LOAD_1 "Wait for"
#define MSG_FILAMENT_CHANGE_LOAD_2 "filament load"
#define MSG_FILAMENT_CHANGE_LOAD_3 ""
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Wait for"
#define MSG_FILAMENT_CHANGE_EXTRUDE_2 "filament extrude"
#define MSG_FILAMENT_CHANGE_EXTRUDE_3 ""
#define MSG_FILAMENT_CHANGE_RESUME_1 "Wait for print"
#define MSG_FILAMENT_CHANGE_RESUME_2 "to resume"
#define MSG_FILAMENT_CHANGE_RESUME_3 ""
#else // LCD_HEIGHT < 4
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Please wait..."
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Ejecting..."
#define MSG_FILAMENT_CHANGE_INSERT_1 "Insert and Click"

View File

@ -214,7 +214,9 @@
#define MSG_FILAMENT_CHANGE_OPTION_HEADER "CO DAL?"
#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "Jeste vytlacit"
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Obnovit tisk"
#if LCD_HEIGHT >= 4
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Cekejte prosim"
#define MSG_FILAMENT_CHANGE_INIT_2 "na zahajeni"
#define MSG_FILAMENT_CHANGE_INIT_3 "vymeny filamentu"
@ -234,6 +236,7 @@
#define MSG_FILAMENT_CHANGE_RESUME_2 "na pokracovani"
#define MSG_FILAMENT_CHANGE_RESUME_3 "tisku"
#else // LCD_HEIGHT < 4
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Cekejte..."
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Vysouvani..."
#define MSG_FILAMENT_CHANGE_INSERT_1 "Vlozte, kliknete"

View File

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

View File

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

View File

@ -198,25 +198,23 @@
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Resume print"
#if LCD_HEIGHT >= 4
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Wait for start"
#define MSG_FILAMENT_CHANGE_INIT_2 "of the filament"
#define MSG_FILAMENT_CHANGE_INIT_3 "change"
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Wait for"
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "filament unload"
#define MSG_FILAMENT_CHANGE_UNLOAD_3 ""
#define MSG_FILAMENT_CHANGE_INSERT_1 "Insert filament"
#define MSG_FILAMENT_CHANGE_INSERT_2 "and press button"
#define MSG_FILAMENT_CHANGE_INSERT_3 "to continue..."
#define MSG_FILAMENT_CHANGE_LOAD_1 "Wait for"
#define MSG_FILAMENT_CHANGE_LOAD_2 "filament load"
#define MSG_FILAMENT_CHANGE_LOAD_3 ""
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Wait for"
#define MSG_FILAMENT_CHANGE_EXTRUDE_2 "filament extrude"
#define MSG_FILAMENT_CHANGE_EXTRUDE_3 ""
#define MSG_FILAMENT_CHANGE_RESUME_1 "Wait for print"
#define MSG_FILAMENT_CHANGE_RESUME_2 "to resume"
#define MSG_FILAMENT_CHANGE_RESUME_3 ""
#else // LCD_HEIGHT < 4
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Please wait..."
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Ejecting..."
#define MSG_FILAMENT_CHANGE_INSERT_1 "Insert and Click"

View File

@ -559,61 +559,38 @@
#ifndef MSG_FILAMENT_CHANGE_OPTION_RESUME
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Resume print"
#endif
//
// Filament Change screens show up to 3 lines on a 4-line display
// ...or up to 2 lines on a 3-line display
//
#if LCD_HEIGHT >= 4
#ifndef MSG_FILAMENT_CHANGE_INIT_1
#define MSG_FILAMENT_CHANGE_INIT_1 "Wait for start"
#endif
#ifndef MSG_FILAMENT_CHANGE_INIT_2
#define MSG_FILAMENT_CHANGE_INIT_2 "of the filament"
#endif
#ifndef MSG_FILAMENT_CHANGE_INIT_3
#define MSG_FILAMENT_CHANGE_INIT_3 "change"
#endif
#ifndef MSG_FILAMENT_CHANGE_UNLOAD_1
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Wait for"
#endif
#ifndef MSG_FILAMENT_CHANGE_UNLOAD_2
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "filament unload"
#endif
#ifndef MSG_FILAMENT_CHANGE_UNLOAD_3
#define MSG_FILAMENT_CHANGE_UNLOAD_3 ""
#endif
#ifndef MSG_FILAMENT_CHANGE_INSERT_1
#define MSG_FILAMENT_CHANGE_INSERT_1 "Insert filament"
#endif
#ifndef MSG_FILAMENT_CHANGE_INSERT_2
#define MSG_FILAMENT_CHANGE_INSERT_2 "and press button"
#endif
#ifndef MSG_FILAMENT_CHANGE_INSERT_3
#define MSG_FILAMENT_CHANGE_INSERT_3 "to continue..."
#endif
#ifndef MSG_FILAMENT_CHANGE_LOAD_1
#define MSG_FILAMENT_CHANGE_LOAD_1 "Wait for"
#endif
#ifndef MSG_FILAMENT_CHANGE_LOAD_2
#define MSG_FILAMENT_CHANGE_LOAD_2 "filament load"
#endif
#ifndef MSG_FILAMENT_CHANGE_LOAD_3
#define MSG_FILAMENT_CHANGE_LOAD_3 ""
#endif
#ifndef MSG_FILAMENT_CHANGE_EXTRUDE_1
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Wait for"
#endif
#ifndef MSG_FILAMENT_CHANGE_EXTRUDE_2
#define MSG_FILAMENT_CHANGE_EXTRUDE_2 "filament extrude"
#endif
#ifndef MSG_FILAMENT_CHANGE_EXTRUDE_3
#define MSG_FILAMENT_CHANGE_EXTRUDE_3 ""
#endif
#ifndef MSG_FILAMENT_CHANGE_RESUME_1
#define MSG_FILAMENT_CHANGE_RESUME_1 "Wait for print"
#endif
#ifndef MSG_FILAMENT_CHANGE_RESUME_2
#define MSG_FILAMENT_CHANGE_RESUME_2 "to resume"
#endif
#ifndef MSG_FILAMENT_CHANGE_RESUME_3
#define MSG_FILAMENT_CHANGE_RESUME_3 ""
#endif
#else // LCD_HEIGHT < 4
#ifndef MSG_FILAMENT_CHANGE_INIT_1
#define MSG_FILAMENT_CHANGE_INIT_1 "Please wait..."

View File

@ -187,27 +187,35 @@
#define MSG_INFO_MIN_TEMP "Temperatura minima"
#define MSG_INFO_MAX_TEMP "Temperatura maxima"
#define MSG_INFO_PSU "Fuente de poder"
#define MSG_FILAMENT_CHANGE_HEADER "Cambiar Filamento"
#define MSG_FILAMENT_CHANGE_OPTION_HEADER "Opciones de cambio:"
#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "Extruir mas"
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Resumir imp."
#define MSG_FILAMENT_CHANGE_INIT_1 "Esperando iniciar"
#define MSG_FILAMENT_CHANGE_INIT_2 "del filamento"
#define MSG_FILAMENT_CHANGE_INIT_3 "cambiar"
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Esperado por"
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "filamento expulsado"
#define MSG_FILAMENT_CHANGE_UNLOAD_3 ""
#define MSG_FILAMENT_CHANGE_INSERT_1 "Inserte filamento"
#define MSG_FILAMENT_CHANGE_INSERT_2 "y presione el boton"
#define MSG_FILAMENT_CHANGE_INSERT_3 "para continuar..."
#if LCD_HEIGHT >= 4
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_2 "del filamento"
#define MSG_FILAMENT_CHANGE_INIT_3 "cambiar"
#define MSG_FILAMENT_CHANGE_INSERT_3 "para continuar..."
#else // LCD_HEIGHT < 4
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_2 "del fil. cambiar"
#define MSG_FILAMENT_CHANGE_INSERT_1 "Inserte filamento"
#endif // LCD_HEIGHT < 4
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Esperado por"
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "filamento expulsado"
#define MSG_FILAMENT_CHANGE_LOAD_1 "Esperado por"
#define MSG_FILAMENT_CHANGE_LOAD_2 "Cargar filamento"
#define MSG_FILAMENT_CHANGE_LOAD_3 ""
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Esperado por"
#define MSG_FILAMENT_CHANGE_EXTRUDE_2 "Extruir filamento"
#define MSG_FILAMENT_CHANGE_EXTRUDE_3 ""
#define MSG_FILAMENT_CHANGE_RESUME_1 "Esperando imp."
#define MSG_FILAMENT_CHANGE_RESUME_2 "para resumir"
#define MSG_FILAMENT_CHANGE_RESUME_3 ""
#endif // LANGUAGE_ES_H

View File

@ -208,31 +208,30 @@
#define MSG_DRIVE_STRENGTH "Puiss. moteur "
#define MSG_DAC_PERCENT "Driver %"
#define MSG_DAC_EEPROM_WRITE "DAC EEPROM sauv."
#define MSG_FILAMENT_CHANGE_HEADER "CHANGER FILAMENT"
#define MSG_FILAMENT_CHANGE_OPTION_HEADER "CHANGER OPTIONS:"
#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "+ extrusion"
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Reprendre impr."
#if LCD_HEIGHT >= 4
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Attente Demarrage"
#define MSG_FILAMENT_CHANGE_INIT_2 "du filament"
#define MSG_FILAMENT_CHANGE_INIT_3 "changer"
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "attente de"
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "decharger filament"
#define MSG_FILAMENT_CHANGE_UNLOAD_3 ""
#define MSG_FILAMENT_CHANGE_INSERT_1 "inserer filament"
#define MSG_FILAMENT_CHANGE_INSERT_2 "et app. bouton"
#define MSG_FILAMENT_CHANGE_INSERT_3 "pour continuer..."
#define MSG_FILAMENT_CHANGE_LOAD_1 "attente de"
#define MSG_FILAMENT_CHANGE_LOAD_2 "charger filament"
#define MSG_FILAMENT_CHANGE_LOAD_3 ""
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "attente de"
#define MSG_FILAMENT_CHANGE_EXTRUDE_2 "extrusion fil."
#define MSG_FILAMENT_CHANGE_EXTRUDE_3 ""
#define MSG_FILAMENT_CHANGE_RESUME_1 "attente impression"
#define MSG_FILAMENT_CHANGE_RESUME_2 "pour reprendre"
#define MSG_FILAMENT_CHANGE_RESUME_3 ""
#else // LCD_HEIGHT < 4
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Patientez..."
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Ejection..."
#define MSG_FILAMENT_CHANGE_INSERT_1 "Inserer et click"

View File

@ -206,11 +206,14 @@
#define MSG_DRIVE_STRENGTH "Potencia motor"
#define MSG_DAC_PERCENT "Motor %"
#define MSG_DAC_EEPROM_WRITE "Garda DAC EEPROM"
#define MSG_FILAMENT_CHANGE_HEADER "TROCO FILAMENTO"
#define MSG_FILAMENT_CHANGE_OPTION_HEADER "OPCIONS TROCO:"
#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "Extruir mais"
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Segue traballo"
#if LCD_HEIGHT >= 4
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Agarde para"
#define MSG_FILAMENT_CHANGE_INIT_2 "iniciar troco"
#define MSG_FILAMENT_CHANGE_INIT_3 "de filamento"
@ -230,6 +233,7 @@
#define MSG_FILAMENT_CHANGE_RESUME_2 "seguir co"
#define MSG_FILAMENT_CHANGE_RESUME_3 "traballo"
#else // LCD_HEIGHT < 4
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Agarde..."
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Descargando..."
#define MSG_FILAMENT_CHANGE_INSERT_1 "Introduza e click"

View File

@ -207,12 +207,14 @@
#define MSG_DRIVE_STRENGTH "Drive Strength"
#define MSG_DAC_PERCENT "Driver %"
#define MSG_DAC_EEPROM_WRITE "DAC EEPROM Write"
#define MSG_FILAMENT_CHANGE_HEADER "CHANGE FILAMENT"
#define MSG_FILAMENT_CHANGE_OPTION_HEADER "CHANGE OPTIONS:"
#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "Extrudiraj više"
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Nastavi print"
#if LCD_HEIGHT >= 4
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Čekaj početak"
#define MSG_FILAMENT_CHANGE_INIT_2 "filamenta"
#define MSG_FILAMENT_CHANGE_INIT_3 "promijeni"
@ -228,6 +230,7 @@
#define MSG_FILAMENT_CHANGE_RESUME_1 "Wait for print"
#define MSG_FILAMENT_CHANGE_RESUME_2 "to resume"
#else // LCD_HEIGHT < 4
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Pričekaj..."
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Ejecting..."
#define MSG_FILAMENT_CHANGE_INSERT_1 "Insert and Click"

View File

@ -222,11 +222,14 @@
#define MSG_DRIVE_STRENGTH "Potenza Drive"
#define MSG_DAC_PERCENT "Driver %"
#define MSG_DAC_EEPROM_WRITE "Scrivi DAC EEPROM"
#define MSG_FILAMENT_CHANGE_HEADER "CAMBIA FILAMENTO"
#define MSG_FILAMENT_CHANGE_OPTION_HEADER "CAMBIA OPZIONI:"
#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "Estrusione"
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Riprendi stampa"
#if LCD_HEIGHT >= 4
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Attendere avvio"
#define MSG_FILAMENT_CHANGE_INIT_2 "del cambio"
#define MSG_FILAMENT_CHANGE_INIT_3 "di filamento"
@ -246,6 +249,7 @@
#define MSG_FILAMENT_CHANGE_RESUME_2 "la ripresa"
#define MSG_FILAMENT_CHANGE_RESUME_3 "della stampa"
#else // LCD_HEIGHT < 4
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Attendere..."
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Espulsione..."
#define MSG_FILAMENT_CHANGE_INSERT_1 "Inserisci e premi"

View File

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

View File

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

View File

@ -157,15 +157,15 @@
#define MSG_HEATING_FAILED_LCD "Rozgrz. nieudane"
#define MSG_ERR_REDUNDANT_TEMP "Blad temperatury"
#define MSG_THERMAL_RUNAWAY "Zanik temp."
#define MSG_ERR_MAXTEMP "Err: max. temp."
#define MSG_ERR_MINTEMP "Err: min. temp."
#define MSG_ERR_MAXTEMP_BED "Err: max. temp. loza"
#define MSG_ERR_MINTEMP_BED "Err: min. temp. loza"
#define MSG_ERR_MAXTEMP "Err max temp"
#define MSG_ERR_MINTEMP "Err min temp"
#define MSG_ERR_MAXTEMP_BED "Err max temp stolu"
#define MSG_ERR_MINTEMP_BED "Err min temp stolu"
#define MSG_ERR_Z_HOMING "G28 Z Forbidden"
#define MSG_HALTED "PRINTER HALTED"
#define MSG_PLEASE_RESET "Please reset"
#define MSG_HALTED "Drukarka zatrzym."
#define MSG_PLEASE_RESET "Prosze zresetowac"
#define MSG_SHORT_DAY "d" // One character only
#define MSG_SHORT_HOUR "h" // One character only
#define MSG_SHORT_HOUR "g" // One character only
#define MSG_SHORT_MINUTE "m" // One character only
#define MSG_HEATING "Rozgrzewanie..."
#define MSG_HEATING_COMPLETE "Rozgrzano"
@ -177,68 +177,67 @@
#define MSG_DELTA_CALIBRATE_Z "Kalibruj Z"
#define MSG_DELTA_CALIBRATE_CENTER "Kalibruj środek"
#define MSG_INFO_MENU "About Printer"
#define MSG_INFO_PRINTER_MENU "Printer Info"
#define MSG_INFO_STATS_MENU "Printer Stats"
#define MSG_INFO_MENU "O drukarce"
#define MSG_INFO_PRINTER_MENU "Info drukarki"
#define MSG_INFO_STATS_MENU "Statystyki"
#define MSG_INFO_BOARD_MENU "Board Info"
#define MSG_INFO_THERMISTOR_MENU "Thermistors"
#define MSG_INFO_EXTRUDERS "Extruders"
#define MSG_INFO_BAUDRATE "Baud"
#define MSG_INFO_PROTOCOL "Protocol"
#define MSG_LIGHTS_ON "Case light on"
#define MSG_LIGHTS_OFF "Case light off"
#define MSG_INFO_THERMISTOR_MENU "Thermistory"
#define MSG_INFO_EXTRUDERS "Ekstrudery"
#define MSG_INFO_BAUDRATE "Prędkosc USB"
#define MSG_INFO_PROTOCOL "Protokol"
#define MSG_LIGHTS_ON "Oswietlenie wl."
#define MSG_LIGHTS_OFF "Oswietlenie wyl."
#if LCD_WIDTH >= 20
#define MSG_INFO_PRINT_COUNT "Print Count"
#define MSG_INFO_COMPLETED_PRINTS "Completed"
#define MSG_INFO_PRINT_TIME "Total print time"
#define MSG_INFO_PRINT_LONGEST "Longest job time"
#define MSG_INFO_PRINT_FILAMENT "Extruded total"
#define MSG_INFO_PRINT_COUNT "Wydrukowano"
#define MSG_INFO_COMPLETED_PRINTS "Ukończono"
#define MSG_INFO_PRINT_TIME "Czas druku"
#define MSG_INFO_PRINT_LONGEST "Najdl. druk"
#define MSG_INFO_PRINT_FILAMENT "Uzyty fil."
#else
#define MSG_INFO_PRINT_COUNT "Prints"
#define MSG_INFO_COMPLETED_PRINTS "Completed"
#define MSG_INFO_PRINT_TIME "Total"
#define MSG_INFO_PRINT_LONGEST "Longest"
#define MSG_INFO_PRINT_FILAMENT "Extruded"
#define MSG_INFO_PRINT_COUNT "Wydrukowano"
#define MSG_INFO_COMPLETED_PRINTS "Ukonczono"
#define MSG_INFO_PRINT_TIME "Razem"
#define MSG_INFO_PRINT_LONGEST "Najdl. druk"
#define MSG_INFO_PRINT_FILAMENT "Uzyty fil."
#endif
#define MSG_INFO_MIN_TEMP "Min Temp"
#define MSG_INFO_MAX_TEMP "Max Temp"
#define MSG_INFO_PSU "Power Supply"
#define MSG_INFO_PSU "Zasilacz"
#define MSG_DRIVE_STRENGTH "Siła silnika"
#define MSG_DAC_PERCENT "Siła %"
#define MSG_DAC_EEPROM_WRITE "Zapisz DAC EEPROM"
#define MSG_FILAMENT_CHANGE_HEADER "ZMIEN FILAMENT"
#define MSG_FILAMENT_CHANGE_OPTION_HEADER "ZMIEN OPCJE:"
#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "Ekstruduj wiecej"
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Wznow drukowanie"
#define MSG_DRIVE_STRENGTH "Drive Strength"
#define MSG_DAC_PERCENT "Driver %"
#define MSG_DAC_EEPROM_WRITE "DAC EEPROM Write"
#define MSG_FILAMENT_CHANGE_HEADER "CHANGE FILAMENT"
#define MSG_FILAMENT_CHANGE_OPTION_HEADER "CHANGE OPTIONS:"
#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "Extrude more"
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Resume print"
#if LCD_HEIGHT >= 4
#define MSG_FILAMENT_CHANGE_INIT_1 "Wait for start"
#define MSG_FILAMENT_CHANGE_INIT_2 "of the filament"
#define MSG_FILAMENT_CHANGE_INIT_3 "change"
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Wait for"
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "filament unload"
#define MSG_FILAMENT_CHANGE_UNLOAD_3 ""
#define MSG_FILAMENT_CHANGE_INSERT_1 "Insert filament"
#define MSG_FILAMENT_CHANGE_INSERT_2 "and press button"
#define MSG_FILAMENT_CHANGE_INSERT_3 "to continue..."
#define MSG_FILAMENT_CHANGE_LOAD_1 "Wait for"
#define MSG_FILAMENT_CHANGE_LOAD_2 "filament load"
#define MSG_FILAMENT_CHANGE_LOAD_3 ""
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Wait for"
#define MSG_FILAMENT_CHANGE_EXTRUDE_2 "filament extrude"
#define MSG_FILAMENT_CHANGE_EXTRUDE_3 ""
#define MSG_FILAMENT_CHANGE_RESUME_1 "Wait for print"
#define MSG_FILAMENT_CHANGE_RESUME_2 "to resume"
#define MSG_FILAMENT_CHANGE_RESUME_3 ""
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Czekam na "
#define MSG_FILAMENT_CHANGE_INIT_2 "zmiane filamentu"
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Czekam na"
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "wyjecie filamentu"
#define MSG_FILAMENT_CHANGE_INSERT_1 "Wloz filament"
#define MSG_FILAMENT_CHANGE_INSERT_2 "i nacisnij przycisk"
#define MSG_FILAMENT_CHANGE_INSERT_3 "aby kontynuowac..."
#define MSG_FILAMENT_CHANGE_LOAD_1 "Czekam na"
#define MSG_FILAMENT_CHANGE_LOAD_2 "wlozenie filamentu"
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Czekam na"
#define MSG_FILAMENT_CHANGE_EXTRUDE_2 "ekstruzje filamentu"
#define MSG_FILAMENT_CHANGE_RESUME_1 "Czekam na"
#define MSG_FILAMENT_CHANGE_RESUME_2 "wznowienie druku"
#else // LCD_HEIGHT < 4
#define MSG_FILAMENT_CHANGE_INIT_1 "Please wait..."
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Ejecting..."
#define MSG_FILAMENT_CHANGE_INSERT_1 "Insert and Click"
#define MSG_FILAMENT_CHANGE_LOAD_1 "Loading..."
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Extruding..."
#define MSG_FILAMENT_CHANGE_RESUME_1 "Resuming..."
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Prosze czekac..."
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Wysuwanie..."
#define MSG_FILAMENT_CHANGE_INSERT_1 "Wloz i nacisnij prz."
#define MSG_FILAMENT_CHANGE_LOAD_1 "Ladowanie..."
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Ekstruzja..."
#define MSG_FILAMENT_CHANGE_RESUME_1 "Wznowienie..."
#endif // LCD_HEIGHT < 4
#endif // LANGUAGE_PL_H

View File

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

View File

@ -214,26 +214,25 @@
#define MSG_FILAMENT_CHANGE_OPTION_HEADER "Seçenekler:" //Seçenekler:
#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "Daha Akıt" //Daha Akıt
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Baskıyı sürdür" //Baskıyı sürdür
#if LCD_HEIGHT >= 4
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Başlama bekleniyor" //Başlama bekleniyor
#define MSG_FILAMENT_CHANGE_INIT_2 "filamanın" //filamanın
#define MSG_FILAMENT_CHANGE_INIT_3 "değişimi" //değişimi
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Bekleniyor" //Bekleniyor
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "filamanın çıkması" //filamanın çıkması
#define MSG_FILAMENT_CHANGE_UNLOAD_3 "" //
#define MSG_FILAMENT_CHANGE_INSERT_1 "Filamanı yükle" //Filamanı yükle
#define MSG_FILAMENT_CHANGE_INSERT_2 "ve devam için" //ve devam için
#define MSG_FILAMENT_CHANGE_INSERT_3 "tuşa bas..." //tuşa bas...
#define MSG_FILAMENT_CHANGE_LOAD_1 "Bekleniyor" //Bekleniyor
#define MSG_FILAMENT_CHANGE_LOAD_2 "filamanın yüklenmesi" //filamanın yüklenmesi
#define MSG_FILAMENT_CHANGE_LOAD_3 "" //
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Bekleniyor" //Bekleniyor
#define MSG_FILAMENT_CHANGE_EXTRUDE_2 "filaman akması" //filaman akması
#define MSG_FILAMENT_CHANGE_EXTRUDE_3 "" //
#define MSG_FILAMENT_CHANGE_RESUME_1 "Baskının sürdürülmesini" //Baskının sürdürülmesini
#define MSG_FILAMENT_CHANGE_RESUME_2 "bekle" //bekle
#define MSG_FILAMENT_CHANGE_RESUME_3 "" //
#else // LCD_HEIGHT < 4
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Lütfen bekleyiniz..." //Lütfen bekleyiniz...
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Çıkartılıyor..." //Çıkartılıyor...
#define MSG_FILAMENT_CHANGE_INSERT_1 "Yükle ve bas" //Yükle ve bas

View File

@ -197,24 +197,24 @@
#define MSG_DRIVE_STRENGTH "Сила мотору"
#define MSG_DAC_PERCENT "% мотору"
#define MSG_DAC_EEPROM_WRITE "Запис ЦАП на ПЗП"
#define MSG_FILAMENT_CHANGE_HEADER "ЗАМІНА ВОЛОКНА"
#define MSG_FILAMENT_CHANGE_OPTION_HEADER "НАЛАШТ. ЗАМІНИ:"
#define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "Екструдувати"
#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Відновити друк"
#if LCD_HEIGHT >= 4
// Up to 3 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Зачекайте на"
#define MSG_FILAMENT_CHANGE_INIT_2 "початок заміни"
#define MSG_FILAMENT_CHANGE_INIT_3 "волокна"
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Зачекайте на"
#define MSG_FILAMENT_CHANGE_UNLOAD_2 "вивід волокна"
#define MSG_FILAMENT_CHANGE_UNLOAD_3 ""
#define MSG_FILAMENT_CHANGE_INSERT_1 "Вставте волокно"
#define MSG_FILAMENT_CHANGE_INSERT_2 "та натисніть для"
#define MSG_FILAMENT_CHANGE_INSERT_3 "продовження..."
#define MSG_FILAMENT_CHANGE_LOAD_1 "Зачекайте на"
#define MSG_FILAMENT_CHANGE_LOAD_2 "ввід волокна"
#define MSG_FILAMENT_CHANGE_LOAD_3 ""
#define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Зачекайте на"
#define MSG_FILAMENT_CHANGE_EXTRUDE_2 "екструзію"
#define MSG_FILAMENT_CHANGE_EXTRUDE_3 "волокна"
@ -222,6 +222,7 @@
#define MSG_FILAMENT_CHANGE_RESUME_2 "відновлення"
#define MSG_FILAMENT_CHANGE_RESUME_3 "друку"
#else // LCD_HEIGHT < 4
// Up to 2 lines allowed
#define MSG_FILAMENT_CHANGE_INIT_1 "Зачекайте..."
#define MSG_FILAMENT_CHANGE_UNLOAD_1 "Вивід..."
#define MSG_FILAMENT_CHANGE_INSERT_1 "Вставте і нат."

View File

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

View File

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

View File

@ -8,31 +8,33 @@
#
# If no language codes are specified then all languages will be checked
#
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"
[ -d "Marlin" ] && cd "Marlin"
LANG="$@"
FILES=$(ls language_*.h | grep -v language_en.h | sed -E 's/language_([^\.]+)\.h/\1/')
FILES=$(ls language_*.h | grep -v -E "(_en|_test)\.h" | sed -E 's/language_([^\.]+)\.h/\1/')
declare -A STRING_MAP
# Get files matching the given arguments
TEST_LANGS=$FILES
if [[ -n $@ ]]; then
TEST_LANGS=""
for K in "$@"; do
for F in $FILES; do
[[ "$F" != "${F%$K*}" ]] && TEST_LANGS="$TEST_LANGS $F"
done
done
fi
echo -n "Building list of missing strings..."
for i in $(awk '/#define/{print $2}' language_en.h); do
for i in $(awk '/#ifndef/{print $2}' language_en.h); do
[[ $i == "LANGUAGE_EN_H" ]] && continue
LANG_LIST=""
for j in $FILES; do
[[ $j == "test" ]] && continue
[[ -n $LANG && ! "${j}" =~ $LANG ]] && continue
t=$(grep -c "define ${i} " language_${j}.h)
if [[ $t -eq 0 ]]; then
for k in ${IGNORE_DEFINES}; do
[[ $k == $i ]] && continue 2
done
LANG_LIST="$LANG_LIST $j"
fi
for j in $TEST_LANGS; do
[[ $(grep -c " ${i} " language_${j}.h) -eq 0 ]] && LANG_LIST="$LANG_LIST $j"
done
[[ -z $LANG_LIST ]] && continue
STRING_MAP["$i"]="$LANG_LIST"
STRING_MAP[$i]=$LANG_LIST
done
echo