From 8cffa60cc5188c06f75514736cfbc216cd490fce Mon Sep 17 00:00:00 2001 From: Bo Herrmannsen Date: Thu, 10 Nov 2016 20:53:42 +0100 Subject: [PATCH 1/2] Update to Danish language 10/11-2016 --- Marlin/language_da.h | 75 ++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 34 deletions(-) diff --git a/Marlin/language_da.h b/Marlin/language_da.h index 8c770920d3..7f95ac85d4 100644 --- a/Marlin/language_da.h +++ b/Marlin/language_da.h @@ -31,6 +31,8 @@ #define LANGUAGE_DA_H #define MAPPER_C2C3 +// Define SIMULATE_ROMFONT to see what is seen on the character based display defined in Configuration.h +//#define SIMULATE_ROMFONT #define DISPLAY_CHARSET_ISO10646_1 #define WELCOME_MSG MACHINE_NAME " er klar" @@ -113,7 +115,7 @@ #define MSG_TEMPERATURE "Temperatur" #define MSG_MOTION "Bevægelse" #define MSG_VOLUMETRIC "Filament" -#define MSG_VOLUMETRIC_ENABLED "E in mm3" +#define MSG_VOLUMETRIC_ENABLED "E i mm3" #define MSG_FILAMENT_DIAM "Fil. Dia." #define MSG_CONTRAST "LCD kontrast" #define MSG_STORE_EPROM "Gem i EEPROM" @@ -140,13 +142,15 @@ #define MSG_CONTROL_RETRACTF "Tilbagetræk V" #define MSG_CONTROL_RETRACT_ZLIFT "Hop mm" #define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm" -#define MSG_CONTROL_RETRACT_RECOVER_SWAP "S UnRet+mm" +#define MSG_CONTROL_RETRACT_RECOVER_SWAP "Skift UnRet+mm" #define MSG_CONTROL_RETRACT_RECOVERF "UnRet V" #define MSG_AUTORETRACT "AutoRetr." #define MSG_FILAMENTCHANGE "Skift filament" #define MSG_INIT_SDCARD "Init. SD card" #define MSG_CNG_SDCARD "Skift SD kort" #define MSG_ZPROBE_OUT "Probe udenfor plade" +#define MSG_BLTOUCH_SELFTEST "BLTouch Selv-Test" +#define MSG_BLTOUCH_RESET "Reset BLTouch" #define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST #define MSG_FIRST "først" #define MSG_ZPROBE_ZOFFSET "Z Offset" @@ -157,15 +161,16 @@ #define MSG_HEATING_FAILED_LCD "Opvarmning fejlet" #define MSG_ERR_REDUNDANT_TEMP "Fejl: reserve temp" #define MSG_THERMAL_RUNAWAY "Temp løber løbsk" -#define MSG_ERR_MAXTEMP "Fejl: MAKSTEMP" -#define MSG_ERR_MINTEMP "Fejl: MINTEMP" -#define MSG_ERR_MAXTEMP_BED "Fejl: MAKSTEMP PLADE" -#define MSG_ERR_MINTEMP_BED "Fejl: MINTEMP PLADE" -#define MSG_HALTED "PRINTER HALTED" -#define MSG_PLEASE_RESET "Reset venligst" -#define MSG_SHORT_DAY "d" // One character only -#define MSG_SHORT_HOUR "h" // One character only -#define MSG_SHORT_MINUTE "m" // One character only +#define MSG_ERR_MAXTEMP "Fejl: Maks temp" +#define MSG_ERR_MINTEMP "Fejl: Min temp" +#define MSG_ERR_MAXTEMP_BED "Fejl: Maks Plade temp" +#define MSG_ERR_MINTEMP_BED "Fejl: Min Plade temp" +#define MSG_ERR_Z_HOMING "G28 Z Forbudt" +#define MSG_HALTED "PRINTER STOPPET" +#define MSG_PLEASE_RESET "Reset Venligst" +#define MSG_SHORT_DAY "d" // Kun et bogstav +#define MSG_SHORT_HOUR "h" // Kun et bogstav +#define MSG_SHORT_MINUTE "m" // Kun et bogstav #define MSG_HEATING "Opvarmer..." #define MSG_HEATING_COMPLETE "Opvarmet" #define MSG_BED_HEATING "Opvarmer plade" @@ -178,19 +183,19 @@ #define MSG_INFO_MENU "Om Printer" #define MSG_INFO_PRINTER_MENU "Printer Info" -#define MSG_INFO_STATS_MENU "Printer Stat." -#define MSG_INFO_BOARD_MENU "Board Info" +#define MSG_INFO_STATS_MENU "Printer Stats" +#define MSG_INFO_BOARD_MENU "Kort Info" #define MSG_INFO_THERMISTOR_MENU "Thermistors" -#define MSG_INFO_EXTRUDERS "Extrudere" +#define MSG_INFO_EXTRUDERS "Extruders" #define MSG_INFO_BAUDRATE "Baud" #define MSG_INFO_PROTOCOL "Protocol" #if LCD_WIDTH > 19 - #define MSG_INFO_PRINT_COUNT "Antal Print" + #define MSG_INFO_PRINT_COUNT "Ant. Prints" #define MSG_INFO_COMPLETED_PRINTS "Færdige" #define MSG_INFO_PRINT_TIME "Total print tid" - #define MSG_INFO_PRINT_LONGEST "Længste print tid" - #define MSG_INFO_PRINT_FILAMENT "Total extruderet" + #define MSG_INFO_PRINT_LONGEST "Længste print" + #define MSG_INFO_PRINT_FILAMENT "Total Extruderet" #else #define MSG_INFO_PRINT_COUNT "Prints" #define MSG_INFO_COMPLETED_PRINTS "Færdige" @@ -201,36 +206,38 @@ #define MSG_INFO_MIN_TEMP "Min Temp" #define MSG_INFO_MAX_TEMP "Max Temp" -#define MSG_INFO_PSU "Strømforsyning" +#define MSG_INFO_PSU "Strømfors." +#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 "SKIFTE MULIGHEDER:" +#define MSG_FILAMENT_CHANGE_OPTION_HEADER "Skift muligheder:" #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "Extruder mere" -#define MSG_FILAMENT_CHANGE_OPTION_RESUME "forsæt print" +#define MSG_FILAMENT_CHANGE_OPTION_RESUME "Forsæt print" #if LCD_HEIGHT >= 4 - #define MSG_FILAMENT_CHANGE_INIT_1 "Vent på" - #define MSG_FILAMENT_CHANGE_INIT_2 "skift af " - #define MSG_FILAMENT_CHANGE_INIT_3 "filament" + #define MSG_FILAMENT_CHANGE_INIT_1 "Vent på start" + #define MSG_FILAMENT_CHANGE_INIT_2 "af filament" + #define MSG_FILAMENT_CHANGE_INIT_3 "skift" #define MSG_FILAMENT_CHANGE_UNLOAD_1 "Vent på" - #define MSG_FILAMENT_CHANGE_UNLOAD_2 "filament tømning" - #define MSG_FILAMENT_CHANGE_INSERT_1 "indsæt filament" - #define MSG_FILAMENT_CHANGE_INSERT_2 "og tryk for" - #define MSG_FILAMENT_CHANGE_INSERT_3 "at fortsætte..." + #define MSG_FILAMENT_CHANGE_UNLOAD_2 "filament udskyd." + #define MSG_FILAMENT_CHANGE_INSERT_1 "Indsæt filament" + #define MSG_FILAMENT_CHANGE_INSERT_2 "og tryk på knap" + #define MSG_FILAMENT_CHANGE_INSERT_3 "for at fortsætte..." #define MSG_FILAMENT_CHANGE_LOAD_1 "Vent på" - #define MSG_FILAMENT_CHANGE_LOAD_2 "filament fødning" + #define MSG_FILAMENT_CHANGE_LOAD_2 "filament indtag" #define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Vent på" - #define MSG_FILAMENT_CHANGE_EXTRUDE_2 "filament extrudere" - #define MSG_FILAMENT_CHANGE_RESUME_1 "Vent på at" - #define MSG_FILAMENT_CHANGE_RESUME_2 "print forsætter" + #define MSG_FILAMENT_CHANGE_EXTRUDE_2 "filament extrudering" + #define MSG_FILAMENT_CHANGE_RESUME_1 "Vent på at print" + #define MSG_FILAMENT_CHANGE_RESUME_2 "fortsætter" #else // LCD_HEIGHT < 4 #define MSG_FILAMENT_CHANGE_INIT_1 "Vent venligst..." - #define MSG_FILAMENT_CHANGE_UNLOAD_1 "Tømmer..." + #define MSG_FILAMENT_CHANGE_UNLOAD_1 "Udskyder..." #define MSG_FILAMENT_CHANGE_INSERT_1 "Indsæt og klik" - #define MSG_FILAMENT_CHANGE_LOAD_1 "Føder..." + #define MSG_FILAMENT_CHANGE_LOAD_1 "Indtager..." #define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Extrudere..." #define MSG_FILAMENT_CHANGE_RESUME_1 "Fortsætter..." #endif // LCD_HEIGHT < 4 #endif // LANGUAGE_DA_H - From 6eb6f12c64e16d2aca4f5e83927057cef5f61de5 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 17 Nov 2016 22:17:14 -0600 Subject: [PATCH 2/2] Patch up some language formatting --- Marlin/language_cz.h | 2 +- Marlin/language_da.h | 2 +- Marlin/language_de.h | 2 +- Marlin/language_el.h | 2 +- Marlin/language_en.h | 2 +- Marlin/language_fr.h | 3 +- Marlin/language_gl.h | 70 +++++++++++++++++----------------- Marlin/language_it.h | 2 +- Marlin/language_kana.h | 26 ++++++------- Marlin/language_tr.h | 2 +- Marlin/ultralcd_impl_HD44780.h | 4 +- 11 files changed, 58 insertions(+), 59 deletions(-) diff --git a/Marlin/language_cz.h b/Marlin/language_cz.h index 401f11b8a8..9a45a2408c 100644 --- a/Marlin/language_cz.h +++ b/Marlin/language_cz.h @@ -188,7 +188,7 @@ #define MSG_INFO_EXTRUDERS "Extrudery" #define MSG_INFO_BAUDRATE "Rychlost" #define MSG_INFO_PROTOCOL "Protokol" -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #define MSG_INFO_PRINT_COUNT "Pocet tisku" #define MSG_INFO_COMPLETED_PRINTS "Dokonceno" #define MSG_INFO_PRINT_TIME "Celkovy cas" diff --git a/Marlin/language_da.h b/Marlin/language_da.h index 7f95ac85d4..09aaa8227f 100644 --- a/Marlin/language_da.h +++ b/Marlin/language_da.h @@ -190,7 +190,7 @@ #define MSG_INFO_BAUDRATE "Baud" #define MSG_INFO_PROTOCOL "Protocol" -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #define MSG_INFO_PRINT_COUNT "Ant. Prints" #define MSG_INFO_COMPLETED_PRINTS "Færdige" #define MSG_INFO_PRINT_TIME "Total print tid" diff --git a/Marlin/language_de.h b/Marlin/language_de.h index 0b64e67396..9c8aa69128 100644 --- a/Marlin/language_de.h +++ b/Marlin/language_de.h @@ -185,7 +185,7 @@ #define MSG_INFO_BAUDRATE "Baud" #define MSG_INFO_PROTOCOL "Protokol" -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #define MSG_INFO_PRINT_COUNT "Gesamte Drucke" #define MSG_INFO_COMPLETED_PRINTS "Beendete Drucke" #define MSG_INFO_PRINT_TIME "Gesamte Druckzeit" diff --git a/Marlin/language_el.h b/Marlin/language_el.h index 03b45c3e2c..21cee03104 100644 --- a/Marlin/language_el.h +++ b/Marlin/language_el.h @@ -180,7 +180,7 @@ #define MSG_INFO_BAUDRATE "Baud" #define MSG_INFO_PROTOCOL "Protocol" -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #define MSG_INFO_PRINT_COUNT "Print Count" #define MSG_INFO_COMPLETED_PRINTS "Completed " #define MSG_INFO_PRINT_TIME "Total Time " diff --git a/Marlin/language_en.h b/Marlin/language_en.h index 648cee6c9a..d0439f5a01 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -488,7 +488,7 @@ #define MSG_INFO_PROTOCOL "Protocol" #endif -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #ifndef MSG_INFO_PRINT_COUNT #define MSG_INFO_PRINT_COUNT "Print Count" #endif diff --git a/Marlin/language_fr.h b/Marlin/language_fr.h index b680f8f3cf..c567b6804e 100644 --- a/Marlin/language_fr.h +++ b/Marlin/language_fr.h @@ -188,8 +188,7 @@ #define MSG_INFO_BAUDRATE "Baud" #define MSG_INFO_PROTOCOL "Protocole" - -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #define MSG_INFO_PRINT_COUNT "Nbre impressions" #define MSG_INFO_COMPLETED_PRINTS "Terminees" #define MSG_INFO_PRINT_TIME "Tps impr. total" diff --git a/Marlin/language_gl.h b/Marlin/language_gl.h index 19b028b6d6..11016ddc0c 100644 --- a/Marlin/language_gl.h +++ b/Marlin/language_gl.h @@ -182,18 +182,18 @@ #define MSG_INFO_EXTRUDERS "Extrusores" #define MSG_INFO_BAUDRATE "Baudios" #define MSG_INFO_PROTOCOL "Protocolo" -#if LCD_WIDTH > 19 - #define MSG_INFO_PRINT_COUNT "Total traballos" - #define MSG_INFO_COMPLETED_PRINTS "Total completos" - #define MSG_INFO_PRINT_TIME "Tempo impresion" - #define MSG_INFO_PRINT_LONGEST "Traballo +longo" - #define MSG_INFO_PRINT_FILAMENT "Total extruido" +#if LCD_WIDTH >= 20 + #define MSG_INFO_PRINT_COUNT "Total traballos" + #define MSG_INFO_COMPLETED_PRINTS "Total completos" + #define MSG_INFO_PRINT_TIME "Tempo impresion" + #define MSG_INFO_PRINT_LONGEST "Traballo +longo" + #define MSG_INFO_PRINT_FILAMENT "Total extruido" #else - #define MSG_INFO_PRINT_COUNT "Traballos" - #define MSG_INFO_COMPLETED_PRINTS "Completos" - #define MSG_INFO_PRINT_TIME "Tempo" - #define MSG_INFO_PRINT_LONGEST "O +longo" - #define MSG_INFO_PRINT_FILAMENT "Extruido" + #define MSG_INFO_PRINT_COUNT "Traballos" + #define MSG_INFO_COMPLETED_PRINTS "Completos" + #define MSG_INFO_PRINT_TIME "Tempo" + #define MSG_INFO_PRINT_LONGEST "O +longo" + #define MSG_INFO_PRINT_FILAMENT "Extruido" #endif #define MSG_INFO_MIN_TEMP "Min Temp" #define MSG_INFO_MAX_TEMP "Max Temp" @@ -203,31 +203,31 @@ #define MSG_FILAMENT_CHANGE_OPTION_EXTRUDE "Extruir mais" #define MSG_FILAMENT_CHANGE_OPTION_RESUME "Segue traballo" #if LCD_HEIGHT >= 4 - #define MSG_FILAMENT_CHANGE_INIT_1 "Agarde para" - #define MSG_FILAMENT_CHANGE_INIT_2 "iniciar troco" - #define MSG_FILAMENT_CHANGE_INIT_3 "de filamento" - #define MSG_FILAMENT_CHANGE_UNLOAD_1 "Agarde pola" - #define MSG_FILAMENT_CHANGE_UNLOAD_2 "descarga do" - #define MSG_FILAMENT_CHANGE_UNLOAD_3 "filamento" - #define MSG_FILAMENT_CHANGE_INSERT_1 "Introduza o" - #define MSG_FILAMENT_CHANGE_INSERT_2 "filamento e" - #define MSG_FILAMENT_CHANGE_INSERT_3 "faga click" - #define MSG_FILAMENT_CHANGE_LOAD_1 "Agarde pola" - #define MSG_FILAMENT_CHANGE_LOAD_2 "carga do" - #define MSG_FILAMENT_CHANGE_LOAD_3 "filamento" - #define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Agarde pola" - #define MSG_FILAMENT_CHANGE_EXTRUDE_2 "extrusion do" - #define MSG_FILAMENT_CHANGE_EXTRUDE_3 "filamento" - #define MSG_FILAMENT_CHANGE_RESUME_1 "Agarde para" - #define MSG_FILAMENT_CHANGE_RESUME_2 "seguir co" - #define MSG_FILAMENT_CHANGE_RESUME_3 "traballo" + #define MSG_FILAMENT_CHANGE_INIT_1 "Agarde para" + #define MSG_FILAMENT_CHANGE_INIT_2 "iniciar troco" + #define MSG_FILAMENT_CHANGE_INIT_3 "de filamento" + #define MSG_FILAMENT_CHANGE_UNLOAD_1 "Agarde pola" + #define MSG_FILAMENT_CHANGE_UNLOAD_2 "descarga do" + #define MSG_FILAMENT_CHANGE_UNLOAD_3 "filamento" + #define MSG_FILAMENT_CHANGE_INSERT_1 "Introduza o" + #define MSG_FILAMENT_CHANGE_INSERT_2 "filamento e" + #define MSG_FILAMENT_CHANGE_INSERT_3 "faga click" + #define MSG_FILAMENT_CHANGE_LOAD_1 "Agarde pola" + #define MSG_FILAMENT_CHANGE_LOAD_2 "carga do" + #define MSG_FILAMENT_CHANGE_LOAD_3 "filamento" + #define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Agarde pola" + #define MSG_FILAMENT_CHANGE_EXTRUDE_2 "extrusion do" + #define MSG_FILAMENT_CHANGE_EXTRUDE_3 "filamento" + #define MSG_FILAMENT_CHANGE_RESUME_1 "Agarde para" + #define MSG_FILAMENT_CHANGE_RESUME_2 "seguir co" + #define MSG_FILAMENT_CHANGE_RESUME_3 "traballo" #else // LCD_HEIGHT < 4 - #define MSG_FILAMENT_CHANGE_INIT_1 "Agarde..." - #define MSG_FILAMENT_CHANGE_UNLOAD_1 "Descargando..." - #define MSG_FILAMENT_CHANGE_INSERT_1 "Introduza e click" - #define MSG_FILAMENT_CHANGE_LOAD_1 "Cargando..." - #define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Extruindo..." - #define MSG_FILAMENT_CHANGE_RESUME_1 "Seguindo..." + #define MSG_FILAMENT_CHANGE_INIT_1 "Agarde..." + #define MSG_FILAMENT_CHANGE_UNLOAD_1 "Descargando..." + #define MSG_FILAMENT_CHANGE_INSERT_1 "Introduza e click" + #define MSG_FILAMENT_CHANGE_LOAD_1 "Cargando..." + #define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Extruindo..." + #define MSG_FILAMENT_CHANGE_RESUME_1 "Seguindo..." #endif // LCD_HEIGHT < 4 #endif // LANGUAGE_GL_H diff --git a/Marlin/language_it.h b/Marlin/language_it.h index 75df0efde0..edde963da0 100644 --- a/Marlin/language_it.h +++ b/Marlin/language_it.h @@ -190,7 +190,7 @@ #define MSG_INFO_EXTRUDERS "Estrusori" #define MSG_INFO_BAUDRATE "Baud" #define MSG_INFO_PROTOCOL "Protocollo" -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #define MSG_INFO_PRINT_COUNT "Contat. stampa" #define MSG_INFO_COMPLETED_PRINTS "Completati" #define MSG_INFO_PRINT_TIME "Tempo totale" diff --git a/Marlin/language_kana.h b/Marlin/language_kana.h index e8cc1ee53c..6a40fb9b68 100644 --- a/Marlin/language_kana.h +++ b/Marlin/language_kana.h @@ -89,7 +89,7 @@ #define MSG_MIN LCD_STR_THERMOMETER " \xbb\xb2\xc3\xb2" // " ｻｲﾃｲ" (" Min") #define MSG_MAX LCD_STR_THERMOMETER " \xbb\xb2\xba\xb3" // " ｻｲｺｳ" (" Max") #define MSG_FACTOR LCD_STR_THERMOMETER " \xcc\xa7\xb8\xc0\xb0" // " ﾌｧｸﾀｰ" (" Fact") -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #define MSG_AUTOTEMP "\xbc\xde\xc4\xde\xb3\xb5\xdd\xc4\xde\xbe\xb2\xb7\xde\xae" // "ｼﾞﾄﾞｳｵﾝﾄﾞｾｲｷﾞｮ" ("Autotemp") #else #define MSG_AUTOTEMP "\xbc\xde\xc4\xde\xb3\xb5\xdd\xc4\xde" // "ｼﾞﾄﾞｳｵﾝﾄﾞ" ("Autotemp") @@ -101,7 +101,7 @@ #define MSG_PID_D "PID-D" #define MSG_PID_C "PID-C" #define MSG_SELECT "\xbe\xdd\xc0\xb8" // "ｾﾝﾀｸ" ("Select") -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #define MSG_ACC "\xb6\xbf\xb8\xc4\xde mm/s2" // "ｶｿｸﾄﾞ mm/s2" ("Accel") #define MSG_VX_JERK "X\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s" // "Xｼﾞｸ ﾔｸﾄﾞ mm/s" ("Vx-jerk") #define MSG_VY_JERK "Y\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s" // "Yｼﾞｸ ﾔｸﾄﾞ mm/s" ("Vy-jerk") @@ -132,7 +132,7 @@ #define MSG_MOTION "\xb3\xba\xde\xb7\xbe\xaf\xc3\xb2" // "ｳｺﾞｷｾｯﾃｲ" ("Motion") #define MSG_VOLUMETRIC "\xcc\xa8\xd7\xd2\xdd\xc4" // "ﾌｨﾗﾒﾝﾄ" ("Filament") #define MSG_VOLUMETRIC_ENABLED "E in mm3" -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #define MSG_FILAMENT_DIAM "\xcc\xa8\xd7\xd2\xdd\xc4\xc1\xae\xaf\xb9\xb2" // "ﾌｨﾗﾒﾝﾄﾁｮｯｹｲ" ("Fil. Dia.") #else #define MSG_FILAMENT_DIAM "\xcc\xa8\xd7\xd2\xdd\xc4\xb9\xb2" // "ﾌｨﾗﾒﾝﾄｹｲ" ("Fil. Dia.") @@ -157,7 +157,7 @@ #define MSG_NO_MOVE "\xb3\xba\xde\xb7\xcf\xbe\xdd" // "ｳｺﾞｷﾏｾﾝ" ("No move.") #define MSG_KILLED "\xcb\xbc\xde\xae\xb3\xc3\xb2\xbc" // "ﾋｼﾞｮｳﾃｲｼ" ("KILLED. ") #define MSG_STOPPED "\xc3\xb2\xbc\xbc\xcf\xbc\xc0" // "ﾃｲｼｼﾏｼﾀ" ("STOPPED. ") -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #define MSG_CONTROL_RETRACT "\xcb\xb7\xba\xd0\xd8\xae\xb3 mm" // "ﾋｷｺﾐﾘｮｳ mm" ("Retract mm") #define MSG_CONTROL_RETRACT_SWAP "\xcb\xb7\xba\xd0\xd8\xae\xb3S mm" // "ﾋｷｺﾐﾘｮｳS mm" ("Swap Re.mm") #define MSG_CONTROL_RETRACTF "\xcb\xb7\xba\xd0\xbf\xb8\xc4\xde mm/s" // "ﾋｷｺﾐｿｸﾄﾞ mm/s" ("Retract V") @@ -179,14 +179,14 @@ #define MSG_INIT_SDCARD "SD\xb6\xb0\xc4\xde\xbb\xb2\xd6\xd0\xba\xd0" // "SDｶｰﾄﾞｻｲﾖﾐｺﾐ" ("Init. SD card") #define MSG_CNG_SDCARD "SD\xb6\xb0\xc4\xde\xba\xb3\xb6\xdd" // "SDｶｰﾄﾞｺｳｶﾝ" ("Change SD card") #define MSG_ZPROBE_OUT "Z\xcc\xdf\xdb\xb0\xcc\xde\x20\xcd\xde\xaf\xc4\xde\xb6\xde\xb2" // "Zﾌﾟﾛｰﾌﾞ ﾍﾞｯﾄﾞｶﾞｲ" ("Z probe out. bed") -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #define MSG_BLTOUCH_SELFTEST "BLTouch \xbc\xde\xba\xbc\xdd\xc0\xde\xdd" // "BLTouch ｼﾞｺｼﾝﾀﾞﾝ" ("BLTouch Self-Test") #else #define MSG_BLTOUCH_SELFTEST "BLTouch \xbe\xd9\xcc\xc3\xbd\xc4" // "BLTouch ｾﾙﾌﾃｽﾄ" ("BLTouch Self-Test") #endif #define MSG_BLTOUCH_RESET "BLTouch \xd8\xbe\xaf\xc4" // "BLTouch ﾘｾｯﾄ" ("Reset BLTouch") #define MSG_HOME "\xbb\xb7\xc6" // "ｻｷﾆ" ("Home") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #define MSG_FIRST "\xa6\xcc\xaf\xb7\xbb\xbe\xc3\xb8\xc0\xde\xbb\xb2" // "ｦﾌｯｷｻｾﾃｸﾀﾞｻｲ" ("first") #else #define MSG_FIRST "\xa6\xcc\xaf\xb7\xbb\xbe\xd6" // "ｦﾌｯｷｻｾﾖ" ("first") @@ -195,13 +195,13 @@ #define MSG_BABYSTEP_X "X\xbc\xde\xb8\x20\xcb\xde\xc4\xde\xb3" // "Xｼﾞｸ ﾋﾞﾄﾞｳ" ("Babystep X") #define MSG_BABYSTEP_Y "Y\xbc\xde\xb8\x20\xcb\xde\xc4\xde\xb3" // "Yｼﾞｸ ﾋﾞﾄﾞｳ" ("Babystep Y") #define MSG_BABYSTEP_Z "Z\xbc\xde\xb8\x20\xcb\xde\xc4\xde\xb3" // "Zｼﾞｸ ﾋﾞﾄﾞｳ" ("Babystep Z") -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #define MSG_ENDSTOP_ABORT "\xb2\xc4\xde\xb3\xb9\xde\xdd\xb6\xb2\xb9\xdd\xc1\xb7\xc9\xb3" // "ｲﾄﾞｳｹﾞﾝｶｲｹﾝﾁｷﾉｳ" ("Endstop abort") #else #define MSG_ENDSTOP_ABORT "\xb2\xc4\xde\xb3\xb9\xde\xdd\xb6\xb2\xb9\xdd\xc1" // "ｲﾄﾞｳｹﾞﾝｶｲｹﾝﾁ" ("Endstop abort") #endif #define MSG_HEATING_FAILED_LCD "\xb6\xc8\xc2\xbc\xaf\xca\xdf\xb2" // "ｶﾈﾂｼｯﾊﾟｲ" ("Heating failed") -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #define MSG_ERR_REDUNDANT_TEMP "\xb4\xd7\xb0:\xbc\xde\xae\xb3\xc1\xae\xb3\xbb\xb0\xd0\xbd\xc0\xb0\xb7\xc9\xb3" // "ｴﾗｰ:ｼﾞｮｳﾁｮｳｻｰﾐｽﾀｰｷﾉｳ" ("Err: REDUNDANT TEMP") #else #define MSG_ERR_REDUNDANT_TEMP "\xb4\xd7\xb0:\xbc\xde\xae\xb3\xc1\xae\xb3\xbb\xb0\xd0\xbd\xc0" // "ｴﾗｰ:ｼﾞｮｳﾁｮｳｻｰﾐｽﾀ" ("Err: REDUNDANT TEMP") @@ -209,7 +209,7 @@ #define MSG_THERMAL_RUNAWAY "\xc8\xc2\xce\xde\xb3\xbf\xb3" // "ﾈﾂﾎﾞｳｿｳ" ("THERMAL RUNAWAY") #define MSG_ERR_MAXTEMP "\xb4\xd7\xb0:\xbb\xb2\xba\xb3\xb5\xdd\xc1\xae\xb3\xb6" // "ｴﾗｰ:ｻｲｺｳｵﾝﾁｮｳｶ" ("Err: MAXTEMP") #define MSG_ERR_MINTEMP "\xb4\xd7\xb0:\xbb\xb2\xc3\xb2\xb5\xdd\xd0\xcf\xdd" // "ｴﾗｰ:ｻｲﾃｲｵﾝﾐﾏﾝ" ("Err: MINTEMP") -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #define MSG_ERR_MAXTEMP_BED "\xb4\xd7\xb0:\xcd\xde\xaf\xc4\xde\x20\xbb\xb2\xba\xb3\xb5\xdd\xc1\xae\xb3\xb6" // "ｴﾗｰ:ﾍﾞｯﾄﾞ ｻｲｺｳｵﾝﾁｮｳｶ" ("Err: MAXTEMP BED") #define MSG_ERR_MINTEMP_BED "\xb4\xd7\xb0:\xcd\xde\xaf\xc4\xde\x20\xbb\xb2\xc3\xb2\xb5\xdd\xd0\xcf\xdd" // "ｴﾗｰ:ﾍﾞｯﾄﾞ ｻｲﾃｲｵﾝﾐﾏﾝ" ("Err: MINTEMP BED") #else @@ -243,20 +243,20 @@ #define MSG_INFO_COMPLETED_PRINTS "\xb6\xdd\xd8\xae\xb3\xbd\xb3" // "ｶﾝﾘｮｳｽｳ" ("Completed") #define MSG_INFO_PRINT_TIME "\xcc\xdf\xd8\xdd\xc4\xbc\xde\xb6\xdd\xd9\xb2\xb9\xb2" // "ﾌﾟﾘﾝﾄｼﾞｶﾝﾙｲｹｲ" ("Total print time") #define MSG_INFO_PRINT_LONGEST "\xbb\xb2\xc1\xae\xb3\xcc\xdf\xd8\xdd\xc4\xbc\xde\xb6\xdd" // "ｻｲﾁｮｳﾌﾟﾘﾝﾄｼﾞｶﾝ" ("Longest job time") -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #define MSG_INFO_PRINT_FILAMENT "\xcc\xa8\xd7\xd2\xdd\xc4\xbc\xd6\xb3\xd8\xae\xb3\xd9\xb2\xb9\xb2" // "ﾌｨﾗﾒﾝﾄｼﾖｳﾘｮｳﾙｲｹｲ" ("Extruded total") #else #define MSG_INFO_PRINT_FILAMENT "\xcc\xa8\xd7\xd2\xdd\xc4\xbf\xb3\xbc\xd6\xb3\xd8\xae\xb3" // "ﾌｨﾗﾒﾝﾄｿｳｼﾖｳﾘｮｳ" ("Extruded") #endif #define MSG_INFO_MIN_TEMP "\xbe\xaf\xc3\xb2\xbb\xb2\xc3\xb2\xb5\xdd" // "ｾｯﾃｲｻｲﾃｲｵﾝ" ("Min Temp") #define MSG_INFO_MAX_TEMP "\xbe\xaf\xc3\xb2\xbb\xb2\xba\xb3\xb5\xdd" // "ｾｯﾃｲｻｲｺｳｵﾝ" ("Max Temp") -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #define MSG_INFO_PSU "\xc3\xde\xdd\xb9\xde\xdd\xbc\xad\xcd\xde\xc2" // "ﾃﾞﾝｹﾞﾝｼｭﾍﾞﾂ" ("Power Supply") #else #define MSG_INFO_PSU "\xc3\xde\xdd\xb9\xde\xdd" // "ﾃﾞﾝｹﾞﾝ" ("Power Supply") #endif #define MSG_DRIVE_STRENGTH "\xd3\xb0\xc0\xb0\xb8\xc4\xde\xb3\xd8\xae\xb8" // "ﾓｰﾀｰｸﾄﾞｳﾘｮｸ" ("Drive Strength") -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #define MSG_DAC_PERCENT "DAC\xbc\xad\xc2\xd8\xae\xb8 %" // "DACｼｭﾂﾘｮｸ %" ("Driver %") #else #define MSG_DAC_PERCENT "DAC\xbc\xad\xc2\xd8\xae\xb8" // "DACｼｭﾂﾘｮｸ" ("Driver %") @@ -288,7 +288,7 @@ #else // LCD_HEIGHT < 4 #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 > 19 + #if LCD_WIDTH >= 20 #define MSG_FILAMENT_CHANGE_INSERT_1 "\xbf\xb3\xc6\xad\xb3\xbc\x2c\xb8\xd8\xaf\xb8\xbc\xc3\xb8\xc0\xde\xbb\xb2" // "ｿｳﾆｭｳｼ,ｸﾘｯｸｼﾃｸﾀﾞｻｲ" ("Insert and Click") #else #define MSG_FILAMENT_CHANGE_INSERT_1 "\xbf\xb3\xc6\xad\xb3\xbc\x2c\xb8\xd8\xaf\xb8\xbe\xd6" // "ｿｳﾆｭｳｼ,ｸﾘｯｸｾﾖ" ("Insert and Click") diff --git a/Marlin/language_tr.h b/Marlin/language_tr.h index 440f51e7c1..edef587e61 100644 --- a/Marlin/language_tr.h +++ b/Marlin/language_tr.h @@ -186,7 +186,7 @@ #define MSG_INFO_BAUDRATE "\xddleti\xfeim H\xfdz\xfd" #define MSG_INFO_PROTOCOL "Protokol" -#if LCD_WIDTH > 19 +#if LCD_WIDTH >= 20 #define MSG_INFO_PRINT_COUNT "Bask\xfd Say\xfds\xfd" #define MSG_INFO_COMPLETED_PRINTS "Tamamlanan" #define MSG_INFO_PRINT_TIME "Toplam Bask\xfd S\xfcresi" diff --git a/Marlin/ultralcd_impl_HD44780.h b/Marlin/ultralcd_impl_HD44780.h index b60deec7a1..45f59da39e 100644 --- a/Marlin/ultralcd_impl_HD44780.h +++ b/Marlin/ultralcd_impl_HD44780.h @@ -721,7 +721,7 @@ static void lcd_implementation_status_screen() { lcd.print(itostr3(feedrate_percentage)); lcd.print('%'); - #if LCD_WIDTH > 19 && ENABLED(SDSUPPORT) + #if LCD_WIDTH >= 20 && ENABLED(SDSUPPORT) lcd.setCursor(7, 2); lcd_printPGM(PSTR("SD")); @@ -731,7 +731,7 @@ static void lcd_implementation_status_screen() { lcd_printPGM(PSTR("---")); lcd.print('%'); - #endif // LCD_WIDTH > 19 && SDSUPPORT + #endif // LCD_WIDTH >= 20 && SDSUPPORT lcd.setCursor(LCD_WIDTH - 6, 2); lcd.print(LCD_STR_CLOCK[0]);