3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

more i18n

Browse source
This commit is contained in:
Victor Mateus Oliveira 2020-11-11 11:19:58 -03:00
parent 38e5fe4d2c
commit 5b713292d5
8 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/lcd/dogm/u8g_dev_tft_upscale_from_128x64.cpp
View file

@ -512,7 +512,7 @@ U8G_PB_DEV(u8g_dev_tft_320x240_upscale_from_128x64, WIDTH, HEIGHT, PAGE_HEIGHT,
} }
else { else {
// end calibration // end calibration
str = calibration_stage == CALIBRATION_SUCCESS ? "Calibration Completed" : "Calibration Failed"; str = calibration_stage == CALIBRATION_SUCCESS ? GET_TEXT(MSG_CALIBRATION_COMPLETED) : GET_TEXT(MSG_CALIBRATION_FAILED);
defer_status_screen(false); defer_status_screen(false);
touch_calibration.calibration_end(); touch_calibration.calibration_end();
TERN_(HAS_TOUCH_BUTTONS, redrawTouchButtons = true); TERN_(HAS_TOUCH_BUTTONS, redrawTouchButtons = true);

2
Marlin/src/lcd/extui/lib/mks_ui/draw_touch_calibration.cpp
View file

@ -79,7 +79,7 @@ void lv_update_touch_calibration_screen() {
} }
else { else {
// end calibration // end calibration
str = calibration_stage == CALIBRATION_SUCCESS ? "Calibration Completed" : "Calibration Failed, send M995 to try again"; str = calibration_stage == CALIBRATION_SUCCESS ? GET_TEXT(MSG_CALIBRATION_COMPLETED) : GET_TEXT(MSG_CALIBRATION_FAILED);
touch_calibration.calibration_end(); touch_calibration.calibration_end();
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_TC_RETURN); lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_TC_RETURN);
} }

2
Marlin/src/lcd/language/language_en.h
View file

@ -677,6 +677,8 @@ namespace Language_en {
PROGMEM Language_Str MSG_BOTTOM_LEFT = _UxGT("Bottom Left"); PROGMEM Language_Str MSG_BOTTOM_LEFT = _UxGT("Bottom Left");
PROGMEM Language_Str MSG_TOP_RIGHT = _UxGT("Top Right"); PROGMEM Language_Str MSG_TOP_RIGHT = _UxGT("Top Right");
PROGMEM Language_Str MSG_BOTTOM_RIGHT = _UxGT("Bottom Right"); PROGMEM Language_Str MSG_BOTTOM_RIGHT = _UxGT("Bottom Right");
PROGMEM Language_Str MSG_CALIBRATION_COMPLETED = _UxGT("Calibration Completed");
PROGMEM Language_Str MSG_CALIBRATION_FAILED = _UxGT("Calibration Failed");
#endif #endif
} }

2
Marlin/src/lcd/language/language_fr.h
View file

@ -576,5 +576,7 @@ namespace Language_fr {
PROGMEM Language_Str MSG_BOTTOM_LEFT = _UxGT("Bas à Gauche"); PROGMEM Language_Str MSG_BOTTOM_LEFT = _UxGT("Bas à Gauche");
PROGMEM Language_Str MSG_TOP_RIGHT = _UxGT("Haut à Droite"); PROGMEM Language_Str MSG_TOP_RIGHT = _UxGT("Haut à Droite");
PROGMEM Language_Str MSG_BOTTOM_RIGHT = _UxGT("Bas à Droite"); PROGMEM Language_Str MSG_BOTTOM_RIGHT = _UxGT("Bas à Droite");
PROGMEM Language_Str MSG_CALIBRATION_COMPLETED = _UxGT("Calibration Terminée");
PROGMEM Language_Str MSG_CALIBRATION_FAILED = _UxGT("Échec de l'étalonnage");
#endif #endif
} }

2
Marlin/src/lcd/language/language_pt.h
View file

@ -166,5 +166,7 @@ namespace Language_pt {
PROGMEM Language_Str MSG_BOTTOM_LEFT = _UxGT("Inferior Esquerdo"); PROGMEM Language_Str MSG_BOTTOM_LEFT = _UxGT("Inferior Esquerdo");
PROGMEM Language_Str MSG_TOP_RIGHT = _UxGT("Superior Direto"); PROGMEM Language_Str MSG_TOP_RIGHT = _UxGT("Superior Direto");
PROGMEM Language_Str MSG_BOTTOM_RIGHT = _UxGT("Inferior Direto"); PROGMEM Language_Str MSG_BOTTOM_RIGHT = _UxGT("Inferior Direto");
PROGMEM Language_Str MSG_CALIBRATION_COMPLETED = _UxGT("Calibração Completa");
PROGMEM Language_Str MSG_CALIBRATION_FAILED = _UxGT("Calibração Falhou");
#endif #endif
} }

2
Marlin/src/lcd/language/language_pt_br.h
View file

@ -484,5 +484,7 @@ namespace Language_pt_br {
PROGMEM Language_Str MSG_BOTTOM_LEFT = _UxGT("Inferior Esquerdo"); PROGMEM Language_Str MSG_BOTTOM_LEFT = _UxGT("Inferior Esquerdo");
PROGMEM Language_Str MSG_TOP_RIGHT = _UxGT("Superior Direto"); PROGMEM Language_Str MSG_TOP_RIGHT = _UxGT("Superior Direto");
PROGMEM Language_Str MSG_BOTTOM_RIGHT = _UxGT("Inferior Direto"); PROGMEM Language_Str MSG_BOTTOM_RIGHT = _UxGT("Inferior Direto");
PROGMEM Language_Str MSG_CALIBRATION_COMPLETED = _UxGT("Calibração Completa");
PROGMEM Language_Str MSG_CALIBRATION_FAILED = _UxGT("Calibração Falhou");
#endif #endif
} }

2
Marlin/src/lcd/tft/ui_320x240.cpp
View file

@ -623,7 +623,7 @@ void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const
touch.add_control(CALIBRATE, 0, 0, TFT_WIDTH, TFT_HEIGHT, uint32_t(x) << 16 | uint32_t(y)); touch.add_control(CALIBRATE, 0, 0, TFT_WIDTH, TFT_HEIGHT, uint32_t(x) << 16 | uint32_t(y));
} }
else { else {
tft_string.set(calibration_stage == CALIBRATION_SUCCESS ? "Calibration Completed" : "Calibration Failed"); tft_string.set(calibration_stage == CALIBRATION_SUCCESS ? GET_TEXT(MSG_CALIBRATION_COMPLETED) : GET_TEXT(MSG_CALIBRATION_FAILED));
defer_status_screen(false); defer_status_screen(false);
touch_calibration.calibration_end(); touch_calibration.calibration_end();
touch.add_control(BACK, 0, 0, TFT_WIDTH, TFT_HEIGHT); touch.add_control(BACK, 0, 0, TFT_WIDTH, TFT_HEIGHT);

2
Marlin/src/lcd/tft/ui_480x320.cpp
View file

@ -628,7 +628,7 @@ void MenuItem_confirm::draw_select_screen(PGM_P const yes, PGM_P const no, const
touch.add_control(CALIBRATE, 0, 0, TFT_WIDTH, TFT_HEIGHT, uint32_t(x) << 16 | uint32_t(y)); touch.add_control(CALIBRATE, 0, 0, TFT_WIDTH, TFT_HEIGHT, uint32_t(x) << 16 | uint32_t(y));
} }
else { else {
tft_string.set(calibration_stage == CALIBRATION_SUCCESS ? "Calibration Completed" : "Calibration Failed"); tft_string.set(calibration_stage == CALIBRATION_SUCCESS ? GET_TEXT(MSG_CALIBRATION_COMPLETED) : GET_TEXT(MSG_CALIBRATION_FAILED));
defer_status_screen(false); defer_status_screen(false);
touch_calibration.calibration_end(); touch_calibration.calibration_end();
touch.add_control(BACK, 0, 0, TFT_WIDTH, TFT_HEIGHT); touch.add_control(BACK, 0, 0, TFT_WIDTH, TFT_HEIGHT);