Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Croatian language support #4052

Closed
wants to merge 2 commits into from
Closed

Add Croatian language support #4052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b22a79
Add Croatian language
robimarko Jun 15, 2016
f2fe9de
Minor tweak to language.h and massive example config update
jbrazio Jun 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Marlin/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,8 +807,8 @@ 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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to sort these here too…

I was also adding a JSON array here for the putative configurator. I guess I should redo it (a) in the same order and (b) as an associative array so it shows the full names of the languages.

//
#define LCD_LANGUAGE en

Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/Felix/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,8 +790,8 @@ 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
//
//#define LCD_LANGUAGE en

Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/Felix/DUAL/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,8 +788,8 @@ 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
//
//#define LCD_LANGUAGE en

Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/Hephestos/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,8 +799,8 @@ 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
//
//#define LCD_LANGUAGE en

Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/Hephestos_2/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,8 +801,8 @@ 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
//
#define LCD_LANGUAGE en

Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/K8200/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,8 +824,8 @@ 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
//
#define LCD_LANGUAGE en

Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,8 +807,8 @@ 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
//
#define LCD_LANGUAGE en

Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/RigidBot/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,8 +802,8 @@ 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
//
#define LCD_LANGUAGE en

Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/SCARA/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,8 +815,8 @@ 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
//
//#define LCD_LANGUAGE en

Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/TAZ4/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,8 +828,8 @@ 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
//
#define LCD_LANGUAGE en

Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/WITBOX/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,8 +799,8 @@ 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
//
//#define LCD_LANGUAGE en

Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/adafruit/ST7565/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,8 +807,8 @@ 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
//
#define LCD_LANGUAGE en

Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/delta/biv2.5/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,8 +896,8 @@ 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
//
#define LCD_LANGUAGE en

Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/delta/generic/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,8 +890,8 @@ 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
//
#define LCD_LANGUAGE en

Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/delta/kossel_mini/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,8 +893,8 @@ 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
//
#define LCD_LANGUAGE en

Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/delta/kossel_pro/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,8 +893,8 @@ 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
//
#define LCD_LANGUAGE en

Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/delta/kossel_xl/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,8 +895,8 @@ 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
//
#define LCD_LANGUAGE en

Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/makibox/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,8 +810,8 @@ 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
//
//#define LCD_LANGUAGE en

Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/tvrrug/Round2/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,8 +801,8 @@ 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
//
//#define LCD_LANGUAGE en

Expand Down
38 changes: 19 additions & 19 deletions Marlin/language.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,35 +35,35 @@
#define WESTERN 2
#define CYRILLIC 3

// NOTE: IF YOU CHANGE LANGUAGE FILES OR MERGE A FILE WITH CHANGES
// NOTE: IF YOU CHANGE LANGUAGE FILES OR MERGE A FILE WITH CHANGES TRY ALL
// AVAILABLE LANGUAGE OPTIONS !
//
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Travis checks this for us.

// ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h"
// ==> ALSO TRY ALL AVAILABLE LANGUAGE OPTIONS
// See also https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language

// Languages
// en English
// pl Polish
// fr French
// an Aragonese
// bg Bulgarian
// ca Catalan
// cn Chinese
// cz Czech
// de German
// en English
// es Spanish
// ru Russian
// bg Bulgarian
// it Italian
// pt Portuguese
// pt_utf8 Portuguese (UTF8)
// pt-br Portuguese (Brazilian)
// pt-br_utf8 Portuguese (Brazilian UTF8)
// eu Basque-Euskera
// fi Finnish
// an Aragonese
// nl Dutch
// fr French
// gl Galician
// ca Catalan
// eu Basque-Euskera
// hr Croatian
// it Italian
// kana Japanese
// kana_utf8 Japanese (UTF8)
// cn Chinese
// cz Czech
// nl Dutch
// pl Polish
// pt Portuguese
// pt-br Portuguese (Brazilian)
// pt-br_utf8 Portuguese (Brazilian UTF8)
// pt_utf8 Portuguese (UTF8)
// ru Russian
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haha, and we both sorted this list too. Nice.


#if ENABLED(USE_AUTOMATIC_VERSIONING)
#include "_Version.h"
Expand Down
Loading