From 884bc63fbe4d2bfa510b80666d1623e60bd80c9c Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Wed, 15 Jun 2016 15:14:56 +0200 Subject: [PATCH 1/3] Add Croatian language --- Marlin/language_hr.h | 204 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 204 insertions(+) create mode 100644 Marlin/language_hr.h diff --git a/Marlin/language_hr.h b/Marlin/language_hr.h new file mode 100644 index 000000000..edb2dd7cd --- /dev/null +++ b/Marlin/language_hr.h @@ -0,0 +1,204 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * + * Based on Sprinter and grbl. + * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +/** + * Croatian(Hrvatski) + * + * LCD Menu Messages + * See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language + * + */ +#ifndef LANGUAGE_HR_H +#define LANGUAGE_HR_H + +#if DISABLED(MAPPER_NON) && DISABLED(MAPPER_C2C3) && DISABLED(MAPPER_D0D1) && DISABLED(MAPPER_D0D1_MOD) && DISABLED(MAPPER_E382E383) + #define MAPPER_NON // For direct ascii codes +#endif + +//#define SIMULATE_ROMFONT //Comment in to see what is seen on the character based displays +#if DISABLED(SIMULATE_ROMFONT) && DISABLED(DISPLAY_CHARSET_ISO10646_1) && DISABLED(DISPLAY_CHARSET_ISO10646_5) && DISABLED(DISPLAY_CHARSET_ISO10646_KANA) && DISABLED(DISPLAY_CHARSET_ISO10646_CN) + #define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays. +#endif + + +#define WELCOME_MSG MACHINE_NAME " spreman." +#define MSG_SD_INSERTED "SD kartica umetnuta" +#define MSG_SD_REMOVED "SD kartica uklonjena" +#define MSG_LCD_ENDSTOPS "Endstops" // Max length 8 characters +#define MSG_MAIN "Main" +#define MSG_AUTOSTART "Automatsko pokretanje" +#define MSG_DISABLE_STEPPERS "Ugasi steppere" +#define MSG_AUTO_HOME "Automatski homing" +#define MSG_AUTO_HOME_X "Home-aj X" +#define MSG_AUTO_HOME_Y "Home-aj Y" +#define MSG_AUTO_HOME_Z "Home-aj Z" +#define MSG_LEVEL_BED_HOMING "Home-aj XYZ" +#define MSG_LEVEL_BED_WAITING "Click to Begin" +#define MSG_LEVEL_BED_NEXT_POINT "Sljedeća točka" +#define MSG_LEVEL_BED_DONE "Niveliranje gotovo!" +#define MSG_LEVEL_BED_CANCEL "Otkaži" +#define MSG_SET_HOME_OFFSETS "Postavi home offsete" +#define MSG_HOME_OFFSETS_APPLIED "Offsets postavljeni" +#define MSG_SET_ORIGIN "Postavi ishodište" +#define MSG_PREHEAT_PLA "Predgrij PLA" +#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " " +#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " Sve" +#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Bed" +#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " conf" +#define MSG_PREHEAT_ABS "Predgrij ABS" +#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " " +#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " Sve" +#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Bed" +#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " conf" +#define MSG_H1 "1" +#define MSG_H2 "2" +#define MSG_H3 "3" +#define MSG_H4 "4" +#define MSG_COOLDOWN "Hlađenje" +#define MSG_SWITCH_PS_ON "Uključi napajanje" +#define MSG_SWITCH_PS_OFF "Isključi napajanje" +#define MSG_EXTRUDE "Extrude" +#define MSG_RETRACT "Retract" +#define MSG_MOVE_AXIS "Miči os" +#define MSG_LEVEL_BED "Niveliraj bed" +#define MSG_MOVE_X "Miči X" +#define MSG_MOVE_Y "Miči Y" +#define MSG_MOVE_Z "Miči Z" +#define MSG_MOVE_E "Extruder" +#define MSG_MOVE_E1 "1" +#define MSG_MOVE_E2 "2" +#define MSG_MOVE_E3 "3" +#define MSG_MOVE_E4 "4" +#define MSG_MOVE_01MM "Miči 0.1mm" +#define MSG_MOVE_1MM "Miči 1mm" +#define MSG_MOVE_10MM "Miči 10mm" +#define MSG_SPEED "Brzina" +#define MSG_BED_Z "Bed Z" +#define MSG_NOZZLE "Nozzle" +#define MSG_N1 " 1" +#define MSG_N2 " 2" +#define MSG_N3 " 3" +#define MSG_N4 " 4" +#define MSG_BED "Bed" +#define MSG_FAN_SPEED "Brzina ventilatora" +#define MSG_FLOW "Flow" +#define MSG_CONTROL "Control" +#define MSG_MIN " " LCD_STR_THERMOMETER " Min" +#define MSG_MAX " " LCD_STR_THERMOMETER " Max" +#define MSG_FACTOR " " LCD_STR_THERMOMETER " Fact" +#define MSG_AUTOTEMP "Autotemp" +#define MSG_ON "On " +#define MSG_OFF "Off" +#define MSG_PID_P "PID-P" +#define MSG_PID_I "PID-I" +#define MSG_PID_D "PID-D" +#define MSG_PID_C "PID-C" +#define MSG_E1 " E1" +#define MSG_E2 " E2" +#define MSG_E3 " E3" +#define MSG_E4 " E4" +#define MSG_ACC "Accel" +#define MSG_VXY_JERK "Vxy-jerk" +#define MSG_VZ_JERK "Vz-jerk" +#define MSG_VE_JERK "Ve-jerk" +#define MSG_VMAX "Vmax " +#define MSG_X "X" +#define MSG_Y "Y" +#define MSG_Z "Z" +#define MSG_E "E" +#define MSG_VMIN "Vmin" +#define MSG_VTRAV_MIN "VTrav min" +#define MSG_AMAX "Amax " +#define MSG_A_RETRACT "A-retract" +#define MSG_A_TRAVEL "A-travel" +#define MSG_XSTEPS "Xsteps/mm" +#define MSG_YSTEPS "Ysteps/mm" +#define MSG_ZSTEPS "Zsteps/mm" +#define MSG_ESTEPS "Esteps/mm" +#define MSG_TEMPERATURE "Temperature" +#define MSG_MOTION "Motion" +#define MSG_VOLUMETRIC "Filament" +#define MSG_VOLUMETRIC_ENABLED "E in mm3" +#define MSG_FILAMENT_DIAM "Fil. Dia." +#define MSG_DIAM_E1 " 1" +#define MSG_DIAM_E2 " 2" +#define MSG_DIAM_E3 " 3" +#define MSG_DIAM_E4 " 4" +#define MSG_CONTRAST "Kontrast LCD-a" +#define MSG_STORE_EPROM "Pohrani u memoriju" +#define MSG_LOAD_EPROM "Učitaj memoriju" +#define MSG_RESTORE_FAILSAFE "Učitaj failsafe" +#define MSG_REFRESH "Osvježi" +#define MSG_WATCH "Info screen" +#define MSG_PREPARE "Pripremi" +#define MSG_TUNE "Tune" +#define MSG_PAUSE_PRINT "Pauziraj print" +#define MSG_RESUME_PRINT "Nastavi print" +#define MSG_STOP_PRINT "Zaustavi print" +#define MSG_CARD_MENU "Printaj s SD kartice" +#define MSG_NO_CARD "Nema SD kartice" +#define MSG_DWELL "Sleep..." +#define MSG_USERWAIT "Čekaj korisnika..." +#define MSG_RESUMING "Nastavljam print" +#define MSG_PRINT_ABORTED "Print otkazan" +#define MSG_NO_MOVE "No move." +#define MSG_KILLED "KILLED. " +#define MSG_STOPPED "ZAUSTAVLJEN. " +#define MSG_CONTROL_RETRACT "Retract mm" +#define MSG_CONTROL_RETRACT_SWAP "Swap Re.mm" +#define MSG_CONTROL_RETRACTF "Retract 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_RECOVERF "UnRet V" +#define MSG_AUTORETRACT "AutoRetr." +#define MSG_FILAMENTCHANGE "Promijeni filament" +#define MSG_INIT_SDCARD "Init. SD karticu" +#define MSG_CNG_SDCARD "Promijeni SD karticu" +#define MSG_ZPROBE_OUT "Z probe out. bed" +#define MSG_YX_UNHOMED "Home-aj X/Y prije Z" +#define MSG_XYZ_UNHOMED "Home-aj XYZ prvo" +#define MSG_ZPROBE_ZOFFSET "Z Offset" +#define MSG_BABYSTEP_X "Babystep X" +#define MSG_BABYSTEP_Y "Babystep Y" +#define MSG_BABYSTEP_Z "Babystep Z" +#define MSG_ENDSTOP_ABORT "Endstop abort" +#define MSG_HEATING_FAILED_LCD "Heating failed" +#define MSG_ERR_REDUNDANT_TEMP "Err: REDUNDANT TEMP" +#define MSG_THERMAL_RUNAWAY "THERMAL RUNAWAY" +#define MSG_ERR_MAXTEMP "Err: MAXTEMP" +#define MSG_ERR_MINTEMP "Err: MINTEMP" +#define MSG_ERR_MAXTEMP_BED "Err: MAXTEMP BED" +#define MSG_ERR_MINTEMP_BED "Err: MINTEMP BED" +#define MSG_END_HOUR "sati" +#define MSG_END_MINUTE "minuta" +#define MSG_HEATING "Grijanje..." +#define MSG_HEATING_COMPLETE "Grijanje gotovo." +#define MSG_BED_HEATING "Grijanje Bed-a." +#define MSG_BED_DONE "Bed gotov." +#define MSG_DELTA_CALIBRATE "Delta Kalibracija" +#define MSG_DELTA_CALIBRATE_X "Kalibriraj X" +#define MSG_DELTA_CALIBRATE_Y "Kalibriraj Y" +#define MSG_DELTA_CALIBRATE_Z "Kalibriraj Z" +#define MSG_DELTA_CALIBRATE_CENTER "Kalibriraj Središte" + +#endif // LANGUAGE_HR_H From 2015aad867fc4e10cae8cc2e127ef31950ac1fb9 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 15 Jun 2016 22:01:57 -0700 Subject: [PATCH 2/3] Tweak Croatian language file heading --- Marlin/language_hr.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Marlin/language_hr.h b/Marlin/language_hr.h index edb2dd7cd..f3bf014f5 100644 --- a/Marlin/language_hr.h +++ b/Marlin/language_hr.h @@ -21,7 +21,7 @@ */ /** - * Croatian(Hrvatski) + * Croatian (Hrvatski) * * LCD Menu Messages * See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language @@ -30,15 +30,11 @@ #ifndef LANGUAGE_HR_H #define LANGUAGE_HR_H -#if DISABLED(MAPPER_NON) && DISABLED(MAPPER_C2C3) && DISABLED(MAPPER_D0D1) && DISABLED(MAPPER_D0D1_MOD) && DISABLED(MAPPER_E382E383) - #define MAPPER_NON // For direct ascii codes -#endif - -//#define SIMULATE_ROMFONT //Comment in to see what is seen on the character based displays -#if DISABLED(SIMULATE_ROMFONT) && DISABLED(DISPLAY_CHARSET_ISO10646_1) && DISABLED(DISPLAY_CHARSET_ISO10646_5) && DISABLED(DISPLAY_CHARSET_ISO10646_KANA) && DISABLED(DISPLAY_CHARSET_ISO10646_CN) - #define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays. -#endif +#define MAPPER_NON +// 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 // use the better font on full graphic displays. #define WELCOME_MSG MACHINE_NAME " spreman." #define MSG_SD_INSERTED "SD kartica umetnuta" From 02e5dad29a8c9c644d0f5a8c653ceb8458e4c2ac Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 15 Jun 2016 22:02:12 -0700 Subject: [PATCH 3/3] Include Croatian in language listings --- Marlin/Configuration.h | 6 ++- .../Felix/Configuration.h | 6 ++- .../Felix/DUAL/Configuration.h | 6 ++- .../Hephestos/Configuration.h | 6 ++- .../Hephestos_2/Configuration.h | 6 ++- .../K8200/Configuration.h | 6 ++- .../RepRapWorld/Megatronics/Configuration.h | 6 ++- .../RigidBot/Configuration.h | 6 ++- .../SCARA/Configuration.h | 6 ++- .../TAZ4/Configuration.h | 6 ++- .../WITBOX/Configuration.h | 6 ++- .../adafruit/ST7565/Configuration.h | 6 ++- .../delta/biv2.5/Configuration.h | 6 ++- .../delta/generic/Configuration.h | 6 ++- .../delta/kossel_mini/Configuration.h | 6 ++- .../delta/kossel_pro/Configuration.h | 6 ++- .../delta/kossel_xl/Configuration.h | 6 ++- .../makibox/Configuration.h | 6 ++- .../tvrrug/Round2/Configuration.h | 6 ++- Marlin/language.h | 37 ++++++++++--------- 20 files changed, 95 insertions(+), 56 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index afd024933..509427b61 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -820,8 +820,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: -// en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, -// fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test +// en, an, bg, ca, cn, cz, de, es, eu, fi, fr, gl, hr, it, kana, +// kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, test +// +// :{'en':'English','an':'Aragonese','bg':'Bulgarian','ca':'Catalan','cn':'Chinese','cz':'Czech','de':'German','es':'Spanish','eu':'Basque-Euskera','fi':'Finnish','fr':'French','gl':'Galician','hr':'Croatian','it':'Italian','kana':'Japanese','kana_utf8':'Japanese (UTF8)','nl':'Dutch','pl':'Polish','pt':'Portuguese','pt-br':'Portuguese (Brazilian)','pt-br_utf8':'Portuguese (Brazilian UTF8)','pt_utf8':'Portuguese (UTF8)','ru':'Russian','test':'TEST'} // #define LCD_LANGUAGE en diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index f9ed818d2..f92302db5 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -803,8 +803,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: -// en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, -// fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test +// en, an, bg, ca, cn, cz, de, es, eu, fi, fr, gl, hr, it, kana, +// kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, test +// +// :{'en':'English','an':'Aragonese','bg':'Bulgarian','ca':'Catalan','cn':'Chinese','cz':'Czech','de':'German','es':'Spanish','eu':'Basque-Euskera','fi':'Finnish','fr':'French','gl':'Galician','hr':'Croatian','it':'Italian','kana':'Japanese','kana_utf8':'Japanese (UTF8)','nl':'Dutch','pl':'Polish','pt':'Portuguese','pt-br':'Portuguese (Brazilian)','pt-br_utf8':'Portuguese (Brazilian UTF8)','pt_utf8':'Portuguese (UTF8)','ru':'Russian','test':'TEST'} // //#define LCD_LANGUAGE en diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index 6fbc59dc3..c243209d5 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -801,8 +801,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: -// en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, -// fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test +// en, an, bg, ca, cn, cz, de, es, eu, fi, fr, gl, hr, it, kana, +// kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, test +// +// :{'en':'English','an':'Aragonese','bg':'Bulgarian','ca':'Catalan','cn':'Chinese','cz':'Czech','de':'German','es':'Spanish','eu':'Basque-Euskera','fi':'Finnish','fr':'French','gl':'Galician','hr':'Croatian','it':'Italian','kana':'Japanese','kana_utf8':'Japanese (UTF8)','nl':'Dutch','pl':'Polish','pt':'Portuguese','pt-br':'Portuguese (Brazilian)','pt-br_utf8':'Portuguese (Brazilian UTF8)','pt_utf8':'Portuguese (UTF8)','ru':'Russian','test':'TEST'} // //#define LCD_LANGUAGE en diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 716e48ef5..34ee387ee 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -812,8 +812,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: -// en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, -// fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test +// en, an, bg, ca, cn, cz, de, es, eu, fi, fr, gl, hr, it, kana, +// kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, test +// +// :{'en':'English','an':'Aragonese','bg':'Bulgarian','ca':'Catalan','cn':'Chinese','cz':'Czech','de':'German','es':'Spanish','eu':'Basque-Euskera','fi':'Finnish','fr':'French','gl':'Galician','hr':'Croatian','it':'Italian','kana':'Japanese','kana_utf8':'Japanese (UTF8)','nl':'Dutch','pl':'Polish','pt':'Portuguese','pt-br':'Portuguese (Brazilian)','pt-br_utf8':'Portuguese (Brazilian UTF8)','pt_utf8':'Portuguese (UTF8)','ru':'Russian','test':'TEST'} // //#define LCD_LANGUAGE en diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index 983607fe9..d5e6a0df0 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -814,8 +814,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: -// en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, -// fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test +// en, an, bg, ca, cn, cz, de, es, eu, fi, fr, gl, hr, it, kana, +// kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, test +// +// :{'en':'English','an':'Aragonese','bg':'Bulgarian','ca':'Catalan','cn':'Chinese','cz':'Czech','de':'German','es':'Spanish','eu':'Basque-Euskera','fi':'Finnish','fr':'French','gl':'Galician','hr':'Croatian','it':'Italian','kana':'Japanese','kana_utf8':'Japanese (UTF8)','nl':'Dutch','pl':'Polish','pt':'Portuguese','pt-br':'Portuguese (Brazilian)','pt-br_utf8':'Portuguese (Brazilian UTF8)','pt_utf8':'Portuguese (UTF8)','ru':'Russian','test':'TEST'} // #define LCD_LANGUAGE en diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 9add3b8b0..6797fcd89 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -837,8 +837,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: -// en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, -// fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test +// en, an, bg, ca, cn, cz, de, es, eu, fi, fr, gl, hr, it, kana, +// kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, test +// +// :{'en':'English','an':'Aragonese','bg':'Bulgarian','ca':'Catalan','cn':'Chinese','cz':'Czech','de':'German','es':'Spanish','eu':'Basque-Euskera','fi':'Finnish','fr':'French','gl':'Galician','hr':'Croatian','it':'Italian','kana':'Japanese','kana_utf8':'Japanese (UTF8)','nl':'Dutch','pl':'Polish','pt':'Portuguese','pt-br':'Portuguese (Brazilian)','pt-br_utf8':'Portuguese (Brazilian UTF8)','pt_utf8':'Portuguese (UTF8)','ru':'Russian','test':'TEST'} // #define LCD_LANGUAGE en diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index 4c38e1e5d..9a4a2c7fb 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -820,8 +820,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: -// en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, -// fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test +// en, an, bg, ca, cn, cz, de, es, eu, fi, fr, gl, hr, it, kana, +// kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, test +// +// :{'en':'English','an':'Aragonese','bg':'Bulgarian','ca':'Catalan','cn':'Chinese','cz':'Czech','de':'German','es':'Spanish','eu':'Basque-Euskera','fi':'Finnish','fr':'French','gl':'Galician','hr':'Croatian','it':'Italian','kana':'Japanese','kana_utf8':'Japanese (UTF8)','nl':'Dutch','pl':'Polish','pt':'Portuguese','pt-br':'Portuguese (Brazilian)','pt-br_utf8':'Portuguese (Brazilian UTF8)','pt_utf8':'Portuguese (UTF8)','ru':'Russian','test':'TEST'} // #define LCD_LANGUAGE en diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 297b17915..dff38c635 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -815,8 +815,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: -// en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, -// fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test +// en, an, bg, ca, cn, cz, de, es, eu, fi, fr, gl, hr, it, kana, +// kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, test +// +// :{'en':'English','an':'Aragonese','bg':'Bulgarian','ca':'Catalan','cn':'Chinese','cz':'Czech','de':'German','es':'Spanish','eu':'Basque-Euskera','fi':'Finnish','fr':'French','gl':'Galician','hr':'Croatian','it':'Italian','kana':'Japanese','kana_utf8':'Japanese (UTF8)','nl':'Dutch','pl':'Polish','pt':'Portuguese','pt-br':'Portuguese (Brazilian)','pt-br_utf8':'Portuguese (Brazilian UTF8)','pt_utf8':'Portuguese (UTF8)','ru':'Russian','test':'TEST'} // #define LCD_LANGUAGE en diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index f64f2ea5c..5ac806382 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -828,8 +828,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: -// en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, -// fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test +// en, an, bg, ca, cn, cz, de, es, eu, fi, fr, gl, hr, it, kana, +// kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, test +// +// :{'en':'English','an':'Aragonese','bg':'Bulgarian','ca':'Catalan','cn':'Chinese','cz':'Czech','de':'German','es':'Spanish','eu':'Basque-Euskera','fi':'Finnish','fr':'French','gl':'Galician','hr':'Croatian','it':'Italian','kana':'Japanese','kana_utf8':'Japanese (UTF8)','nl':'Dutch','pl':'Polish','pt':'Portuguese','pt-br':'Portuguese (Brazilian)','pt-br_utf8':'Portuguese (Brazilian UTF8)','pt_utf8':'Portuguese (UTF8)','ru':'Russian','test':'TEST'} // //#define LCD_LANGUAGE en diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 1b51bb1b6..5c1742d68 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -841,8 +841,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: -// en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, -// fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test +// en, an, bg, ca, cn, cz, de, es, eu, fi, fr, gl, hr, it, kana, +// kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, test +// +// :{'en':'English','an':'Aragonese','bg':'Bulgarian','ca':'Catalan','cn':'Chinese','cz':'Czech','de':'German','es':'Spanish','eu':'Basque-Euskera','fi':'Finnish','fr':'French','gl':'Galician','hr':'Croatian','it':'Italian','kana':'Japanese','kana_utf8':'Japanese (UTF8)','nl':'Dutch','pl':'Polish','pt':'Portuguese','pt-br':'Portuguese (Brazilian)','pt-br_utf8':'Portuguese (Brazilian UTF8)','pt_utf8':'Portuguese (UTF8)','ru':'Russian','test':'TEST'} // #define LCD_LANGUAGE en diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index b8c94b588..4055e15a3 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -812,8 +812,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: -// en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, -// fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test +// en, an, bg, ca, cn, cz, de, es, eu, fi, fr, gl, hr, it, kana, +// kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, test +// +// :{'en':'English','an':'Aragonese','bg':'Bulgarian','ca':'Catalan','cn':'Chinese','cz':'Czech','de':'German','es':'Spanish','eu':'Basque-Euskera','fi':'Finnish','fr':'French','gl':'Galician','hr':'Croatian','it':'Italian','kana':'Japanese','kana_utf8':'Japanese (UTF8)','nl':'Dutch','pl':'Polish','pt':'Portuguese','pt-br':'Portuguese (Brazilian)','pt-br_utf8':'Portuguese (Brazilian UTF8)','pt_utf8':'Portuguese (UTF8)','ru':'Russian','test':'TEST'} // //#define LCD_LANGUAGE en diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index d3485e2db..fdbf9a869 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -820,8 +820,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: -// en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, -// fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test +// en, an, bg, ca, cn, cz, de, es, eu, fi, fr, gl, hr, it, kana, +// kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, test +// +// :{'en':'English','an':'Aragonese','bg':'Bulgarian','ca':'Catalan','cn':'Chinese','cz':'Czech','de':'German','es':'Spanish','eu':'Basque-Euskera','fi':'Finnish','fr':'French','gl':'Galician','hr':'Croatian','it':'Italian','kana':'Japanese','kana_utf8':'Japanese (UTF8)','nl':'Dutch','pl':'Polish','pt':'Portuguese','pt-br':'Portuguese (Brazilian)','pt-br_utf8':'Portuguese (Brazilian UTF8)','pt_utf8':'Portuguese (UTF8)','ru':'Russian','test':'TEST'} // #define LCD_LANGUAGE en diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index cbef37436..d6b783a95 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -909,8 +909,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: -// en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, -// fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test +// en, an, bg, ca, cn, cz, de, es, eu, fi, fr, gl, hr, it, kana, +// kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, test +// +// :{'en':'English','an':'Aragonese','bg':'Bulgarian','ca':'Catalan','cn':'Chinese','cz':'Czech','de':'German','es':'Spanish','eu':'Basque-Euskera','fi':'Finnish','fr':'French','gl':'Galician','hr':'Croatian','it':'Italian','kana':'Japanese','kana_utf8':'Japanese (UTF8)','nl':'Dutch','pl':'Polish','pt':'Portuguese','pt-br':'Portuguese (Brazilian)','pt-br_utf8':'Portuguese (Brazilian UTF8)','pt_utf8':'Portuguese (UTF8)','ru':'Russian','test':'TEST'} // #define LCD_LANGUAGE en diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 74c0ff8db..6f2963c37 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -903,8 +903,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: -// en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, -// fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test +// en, an, bg, ca, cn, cz, de, es, eu, fi, fr, gl, hr, it, kana, +// kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, test +// +// :{'en':'English','an':'Aragonese','bg':'Bulgarian','ca':'Catalan','cn':'Chinese','cz':'Czech','de':'German','es':'Spanish','eu':'Basque-Euskera','fi':'Finnish','fr':'French','gl':'Galician','hr':'Croatian','it':'Italian','kana':'Japanese','kana_utf8':'Japanese (UTF8)','nl':'Dutch','pl':'Polish','pt':'Portuguese','pt-br':'Portuguese (Brazilian)','pt-br_utf8':'Portuguese (Brazilian UTF8)','pt_utf8':'Portuguese (UTF8)','ru':'Russian','test':'TEST'} // #define LCD_LANGUAGE en diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 07041494f..5b4436647 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -906,8 +906,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: -// en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, -// fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test +// en, an, bg, ca, cn, cz, de, es, eu, fi, fr, gl, hr, it, kana, +// kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, test +// +// :{'en':'English','an':'Aragonese','bg':'Bulgarian','ca':'Catalan','cn':'Chinese','cz':'Czech','de':'German','es':'Spanish','eu':'Basque-Euskera','fi':'Finnish','fr':'French','gl':'Galician','hr':'Croatian','it':'Italian','kana':'Japanese','kana_utf8':'Japanese (UTF8)','nl':'Dutch','pl':'Polish','pt':'Portuguese','pt-br':'Portuguese (Brazilian)','pt-br_utf8':'Portuguese (Brazilian UTF8)','pt_utf8':'Portuguese (UTF8)','ru':'Russian','test':'TEST'} // #define LCD_LANGUAGE en diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 6e909558f..9ec47259d 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -906,8 +906,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: -// en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, -// fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test +// en, an, bg, ca, cn, cz, de, es, eu, fi, fr, gl, hr, it, kana, +// kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, test +// +// :{'en':'English','an':'Aragonese','bg':'Bulgarian','ca':'Catalan','cn':'Chinese','cz':'Czech','de':'German','es':'Spanish','eu':'Basque-Euskera','fi':'Finnish','fr':'French','gl':'Galician','hr':'Croatian','it':'Italian','kana':'Japanese','kana_utf8':'Japanese (UTF8)','nl':'Dutch','pl':'Polish','pt':'Portuguese','pt-br':'Portuguese (Brazilian)','pt-br_utf8':'Portuguese (Brazilian UTF8)','pt_utf8':'Portuguese (UTF8)','ru':'Russian','test':'TEST'} // #define LCD_LANGUAGE en diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index 7bca47766..646c89416 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -908,8 +908,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: -// en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, -// fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test +// en, an, bg, ca, cn, cz, de, es, eu, fi, fr, gl, hr, it, kana, +// kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, test +// +// :{'en':'English','an':'Aragonese','bg':'Bulgarian','ca':'Catalan','cn':'Chinese','cz':'Czech','de':'German','es':'Spanish','eu':'Basque-Euskera','fi':'Finnish','fr':'French','gl':'Galician','hr':'Croatian','it':'Italian','kana':'Japanese','kana_utf8':'Japanese (UTF8)','nl':'Dutch','pl':'Polish','pt':'Portuguese','pt-br':'Portuguese (Brazilian)','pt-br_utf8':'Portuguese (Brazilian UTF8)','pt_utf8':'Portuguese (UTF8)','ru':'Russian','test':'TEST'} // #define LCD_LANGUAGE en diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index d969f2e84..2ad761ce5 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -823,8 +823,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l // // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: -// en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, -// fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test +// en, an, bg, ca, cn, cz, de, es, eu, fi, fr, gl, hr, it, kana, +// kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, test +// +// :{'en':'English','an':'Aragonese','bg':'Bulgarian','ca':'Catalan','cn':'Chinese','cz':'Czech','de':'German','es':'Spanish','eu':'Basque-Euskera','fi':'Finnish','fr':'French','gl':'Galician','hr':'Croatian','it':'Italian','kana':'Japanese','kana_utf8':'Japanese (UTF8)','nl':'Dutch','pl':'Polish','pt':'Portuguese','pt-br':'Portuguese (Brazilian)','pt-br_utf8':'Portuguese (Brazilian UTF8)','pt_utf8':'Portuguese (UTF8)','ru':'Russian','test':'TEST'} // //#define LCD_LANGUAGE en diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 2e1282f16..4d8b04e38 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -814,8 +814,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo // // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: -// en, pl, fr, de, es, ru, bg, it, pt, pt_utf8, pt-br, pt-br_utf8, -// fi, an, nl, ca, eu, kana, kana_utf8, cn, cz, test +// en, an, bg, ca, cn, cz, de, es, eu, fi, fr, gl, hr, it, kana, +// kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, test +// +// :{'en':'English','an':'Aragonese','bg':'Bulgarian','ca':'Catalan','cn':'Chinese','cz':'Czech','de':'German','es':'Spanish','eu':'Basque-Euskera','fi':'Finnish','fr':'French','gl':'Galician','hr':'Croatian','it':'Italian','kana':'Japanese','kana_utf8':'Japanese (UTF8)','nl':'Dutch','pl':'Polish','pt':'Portuguese','pt-br':'Portuguese (Brazilian)','pt-br_utf8':'Portuguese (Brazilian UTF8)','pt_utf8':'Portuguese (UTF8)','ru':'Russian','test':'TEST'} // //#define LCD_LANGUAGE en diff --git a/Marlin/language.h b/Marlin/language.h index edef06be1..e675f93eb 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -42,28 +42,29 @@ // See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language // Languages -// en English -// pl Polish -// fr French -// de German -// es Spanish -// ru Russian -// bg Bulgarian -// it Italian -// pt Portuguese -// pt_utf8 Portuguese (UTF8) -// pt-br Portuguese (Brazilian) -// pt-br_utf8 Portuguese (Brazilian UTF8) -// fi Finnish // an Aragonese -// nl Dutch -// gl Galician +// bg Bulgarian // ca Catalan -// eu Basque-Euskera -// kana Japanese -// kana_utf8 Japanese (UTF8) // cn Chinese // cz Czech +// de German +// en English +// es Spanish +// eu Basque-Euskera +// fi Finnish +// fr French +// gl Galician +// hr Croatian +// it Italian +// kana Japanese +// kana_utf8 Japanese (UTF8) +// nl Dutch +// pl Polish +// pt Portuguese +// pt-br Portuguese (Brazilian) +// pt-br_utf8 Portuguese (Brazilian UTF8) +// pt_utf8 Portuguese (UTF8) +// ru Russian #if ENABLED(USE_AUTOMATIC_VERSIONING) #include "_Version.h"