From fc84878cbaf7a4ed5931f94fd4934619d7fb945b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 3 Nov 2018 02:20:06 -0500
Subject: [PATCH] MSG_UBL_EDIT_MESH_MENU => MSG_EDIT_MESH
---
Marlin/src/lcd/language/language_cz.h | 2 +-
Marlin/src/lcd/language/language_de.h | 2 +-
Marlin/src/lcd/language/language_en.h | 4 ++--
Marlin/src/lcd/language/language_eu.h | 2 +-
Marlin/src/lcd/language/language_fr.h | 2 +-
Marlin/src/lcd/language/language_it.h | 2 +-
Marlin/src/lcd/language/language_ko_KR.h | 2 +-
Marlin/src/lcd/language/language_pt-br.h | 2 +-
Marlin/src/lcd/language/language_ru.h | 2 +-
Marlin/src/lcd/language/language_sk.h | 2 +-
Marlin/src/lcd/language/language_zh_CN.h | 2 +-
Marlin/src/lcd/language/language_zh_TW.h | 2 +-
Marlin/src/lcd/menu/menu_ubl.cpp | 4 ++--
13 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
index 878ed6ef59..ba4a707bfe 100644
--- a/Marlin/src/lcd/language/language_cz.h
+++ b/Marlin/src/lcd/language/language_cz.h
@@ -127,7 +127,7 @@
#define MSG_UBL_OUTPUT_MAP_CSV _UxGT("Exportovat do CSV")
#define MSG_UBL_OUTPUT_MAP_BACKUP _UxGT("Záloha do PC")
#define MSG_UBL_INFO_UBL _UxGT("Info o UBL do PC")
-#define MSG_UBL_EDIT_MESH_MENU _UxGT("Upravit síť bodů")
+#define MSG_EDIT_MESH _UxGT("Upravit síť bodů")
#define MSG_UBL_FILLIN_AMOUNT _UxGT("Hustota mřížky")
#define MSG_UBL_MANUAL_FILLIN _UxGT("Ruční hustota")
#define MSG_UBL_SMART_FILLIN _UxGT("Chytrá hustota")
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
index 6b761948e3..f63142ede7 100644
--- a/Marlin/src/lcd/language/language_de.h
+++ b/Marlin/src/lcd/language/language_de.h
@@ -136,7 +136,7 @@
#define MSG_UBL_OUTPUT_MAP_CSV _UxGT("Ausgabe für CSV")
#define MSG_UBL_OUTPUT_MAP_BACKUP _UxGT("Externe Sicherung")
#define MSG_UBL_INFO_UBL _UxGT("UBL-Info ausgeben")
-#define MSG_UBL_EDIT_MESH_MENU _UxGT("Netz bearbeiten")
+#define MSG_EDIT_MESH _UxGT("Netz bearbeiten")
#define MSG_UBL_FILLIN_AMOUNT _UxGT("Menge an Füllung")
#define MSG_UBL_MANUAL_FILLIN _UxGT("Manuelles Füllen")
#define MSG_UBL_SMART_FILLIN _UxGT("Cleveres Füllen")
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index ec829406f1..6f6a6e1b2d 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -348,8 +348,8 @@
#ifndef MSG_UBL_INFO_UBL
#define MSG_UBL_INFO_UBL _UxGT("Output UBL Info")
#endif
-#ifndef MSG_UBL_EDIT_MESH_MENU
- #define MSG_UBL_EDIT_MESH_MENU _UxGT("Edit Mesh")
+#ifndef MSG_EDIT_MESH
+ #define MSG_EDIT_MESH _UxGT("Edit Mesh")
#endif
#ifndef MSG_UBL_FILLIN_AMOUNT
#define MSG_UBL_FILLIN_AMOUNT _UxGT("Fill-in Amount")
diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
index 05b46b4f7e..2acbb6a8d3 100644
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/language_eu.h
@@ -122,7 +122,7 @@
//#define MSG_UBL_OUTPUT_MAP_CSV _UxGT("Output for CSV")
//#define MSG_UBL_OUTPUT_MAP_BACKUP _UxGT("Off Printer Backup")
//#define MSG_UBL_INFO_UBL _UxGT("Output UBL Info")
-#define MSG_UBL_EDIT_MESH_MENU _UxGT("Sarea editatu")
+#define MSG_EDIT_MESH _UxGT("Sarea editatu")
//#define MSG_UBL_FILLIN_AMOUNT _UxGT("Fill-in Amount")
//#define MSG_UBL_MANUAL_FILLIN _UxGT("Manual Fill-in")
//#define MSG_UBL_SMART_FILLIN _UxGT("Smart Fill-in")
diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
index 0f09b83d06..5ddc58cf80 100644
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/language_fr.h
@@ -122,7 +122,7 @@
#define MSG_UBL_OUTPUT_MAP_CSV _UxGT("Voir pour CSV")
#define MSG_UBL_OUTPUT_MAP_BACKUP _UxGT("Voir pour sauveg.")
#define MSG_UBL_INFO_UBL _UxGT("Voir info UBL")
-#define MSG_UBL_EDIT_MESH_MENU _UxGT("Modifier maille")
+#define MSG_EDIT_MESH _UxGT("Modifier maille")
#define MSG_UBL_FILLIN_AMOUNT _UxGT("Taux de remplissage")
#define MSG_UBL_MANUAL_FILLIN _UxGT("Remplissage manuel")
#define MSG_UBL_SMART_FILLIN _UxGT("Remplissage auto")
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index 79e9c5efc1..c25900e48c 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -134,7 +134,7 @@
#define MSG_UBL_OUTPUT_MAP_CSV _UxGT("Esporta in CSV")
#define MSG_UBL_OUTPUT_MAP_BACKUP _UxGT("Backup esterno")
#define MSG_UBL_INFO_UBL _UxGT("Esporta Info UBL")
-#define MSG_UBL_EDIT_MESH_MENU _UxGT("Modifica Mesh")
+#define MSG_EDIT_MESH _UxGT("Modifica Mesh")
#define MSG_UBL_FILLIN_AMOUNT _UxGT("Riempimento")
#define MSG_UBL_MANUAL_FILLIN _UxGT("Riempimento Manuale")
#define MSG_UBL_SMART_FILLIN _UxGT("Riempimento Smart")
diff --git a/Marlin/src/lcd/language/language_ko_KR.h b/Marlin/src/lcd/language/language_ko_KR.h
index e39a2f8beb..b5296809a2 100644
--- a/Marlin/src/lcd/language/language_ko_KR.h
+++ b/Marlin/src/lcd/language/language_ko_KR.h
@@ -133,7 +133,7 @@
#define MSG_UBL_OUTPUT_MAP_CSV _UxGT("Output for CSV")
#define MSG_UBL_OUTPUT_MAP_BACKUP _UxGT("Off Printer Backup")
#define MSG_UBL_INFO_UBL _UxGT("Output UBL Info")
-#define MSG_UBL_EDIT_MESH_MENU _UxGT("Edit Mesh")
+#define MSG_EDIT_MESH _UxGT("Edit Mesh")
#define MSG_UBL_FILLIN_AMOUNT _UxGT("Fill-in Amount")
#define MSG_UBL_MANUAL_FILLIN _UxGT("Manual Fill-in")
#define MSG_UBL_SMART_FILLIN _UxGT("Smart Fill-in")
diff --git a/Marlin/src/lcd/language/language_pt-br.h b/Marlin/src/lcd/language/language_pt-br.h
index 9144547043..db28aac536 100644
--- a/Marlin/src/lcd/language/language_pt-br.h
+++ b/Marlin/src/lcd/language/language_pt-br.h
@@ -127,7 +127,7 @@
#define MSG_UBL_OUTPUT_MAP_CSV _UxGT("Salvar Malha CSV")
#define MSG_UBL_OUTPUT_MAP_BACKUP _UxGT("Salvar Backup")
#define MSG_UBL_INFO_UBL _UxGT("Informação do UBL")
-#define MSG_UBL_EDIT_MESH_MENU _UxGT("Editar Malha")
+#define MSG_EDIT_MESH _UxGT("Editar Malha")
#define MSG_UBL_FILLIN_AMOUNT _UxGT("Qtd de Enchimento")
#define MSG_UBL_MANUAL_FILLIN _UxGT("Enchimento Manual")
#define MSG_UBL_SMART_FILLIN _UxGT("Enchimento Smart")
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
index 8189e202fb..11772ac02e 100644
--- a/Marlin/src/lcd/language/language_ru.h
+++ b/Marlin/src/lcd/language/language_ru.h
@@ -123,7 +123,7 @@
#define MSG_UBL_OUTPUT_MAP_CSV _UxGT("Вывести в CSV")
#define MSG_UBL_OUTPUT_MAP_BACKUP _UxGT("Забекапить сетку")
#define MSG_UBL_INFO_UBL _UxGT("Вывод информации UBL")
-#define MSG_UBL_EDIT_MESH_MENU _UxGT("Редактировать сетку")
+#define MSG_EDIT_MESH _UxGT("Редактировать сетку")
#define MSG_UBL_FILLIN_AMOUNT _UxGT("Кол-во заполнителя")
#define MSG_UBL_MANUAL_FILLIN _UxGT("Ручное заполнение")
#define MSG_UBL_SMART_FILLIN _UxGT("Умное заполнение")
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
index 47e4d6e4a6..6c08dad91f 100644
--- a/Marlin/src/lcd/language/language_sk.h
+++ b/Marlin/src/lcd/language/language_sk.h
@@ -145,7 +145,7 @@
#define MSG_UBL_OUTPUT_MAP_CSV _UxGT("Exportovať do CSV")
#define MSG_UBL_OUTPUT_MAP_BACKUP _UxGT("Záloha do PC")
#define MSG_UBL_INFO_UBL _UxGT("Info. o UBL do PC")
-#define MSG_UBL_EDIT_MESH_MENU _UxGT("Upraviť sieť bodov")
+#define MSG_EDIT_MESH _UxGT("Upraviť sieť bodov")
#define MSG_UBL_FILLIN_AMOUNT _UxGT("Hustota mriežky")
#define MSG_UBL_MANUAL_FILLIN _UxGT("Ručné vyplnenie")
#define MSG_UBL_SMART_FILLIN _UxGT("Chytré vyplnenie")
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
index 39a407168b..adee5d5bdb 100644
--- a/Marlin/src/lcd/language/language_zh_CN.h
+++ b/Marlin/src/lcd/language/language_zh_CN.h
@@ -119,7 +119,7 @@
#define MSG_UBL_OUTPUT_MAP_CSV _UxGT("输出到CSV") // "Output for CSV"
#define MSG_UBL_OUTPUT_MAP_BACKUP _UxGT("输出到备份") // "Off Printer Backup"
#define MSG_UBL_INFO_UBL _UxGT("输出UBL信息") // "Output UBL Info"
-#define MSG_UBL_EDIT_MESH_MENU _UxGT("编辑网格") // "Edit Mesh"
+#define MSG_EDIT_MESH _UxGT("编辑网格") // "Edit Mesh"
#define MSG_UBL_FILLIN_AMOUNT _UxGT("填充合计") // "Fill-in Amount"
#define MSG_UBL_MANUAL_FILLIN _UxGT("手工填充") // "Manual Fill-in"
#define MSG_UBL_SMART_FILLIN _UxGT("聪明填充") // "Smart Fill-in"
diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h
index f780cbe043..c64ac2f2b6 100644
--- a/Marlin/src/lcd/language/language_zh_TW.h
+++ b/Marlin/src/lcd/language/language_zh_TW.h
@@ -119,7 +119,7 @@
#define MSG_UBL_OUTPUT_MAP_CSV _UxGT("輸出到CSV") // "Output for CSV"
#define MSG_UBL_OUTPUT_MAP_BACKUP _UxGT("輸出到備份") // "Off Printer Backup"
#define MSG_UBL_INFO_UBL _UxGT("輸出UBL信息") // "Output UBL Info"
-#define MSG_UBL_EDIT_MESH_MENU _UxGT("編輯網格") // "Edit Mesh"
+#define MSG_EDIT_MESH _UxGT("編輯網格") // "Edit Mesh"
#define MSG_UBL_FILLIN_AMOUNT _UxGT("填充合計") // "Fill-in Amount"
#define MSG_UBL_MANUAL_FILLIN _UxGT("手工填充") // "Manual Fill-in"
#define MSG_UBL_SMART_FILLIN _UxGT("聰明填充") // "Smart Fill-in"
diff --git a/Marlin/src/lcd/menu/menu_ubl.cpp b/Marlin/src/lcd/menu/menu_ubl.cpp
index e6335b9a28..e14f13fb14 100644
--- a/Marlin/src/lcd/menu/menu_ubl.cpp
+++ b/Marlin/src/lcd/menu/menu_ubl.cpp
@@ -158,7 +158,7 @@ void _lcd_ubl_adjust_height_cmd() {
*/
void _menu_ubl_height_adjust() {
START_MENU();
- MENU_BACK(MSG_UBL_EDIT_MESH_MENU);
+ MENU_BACK(MSG_EDIT_MESH);
MENU_ITEM_EDIT_CALLBACK(int3, MSG_UBL_MESH_HEIGHT_AMOUNT, &ubl_height_amount, -9, 9, _lcd_ubl_adjust_height_cmd);
MENU_ITEM(function, MSG_WATCH, lcd_return_to_status);
END_MENU();
@@ -542,7 +542,7 @@ void _menu_ubl_tools() {
MENU_ITEM(submenu, MSG_UBL_BUILD_MESH_MENU, _lcd_ubl_build_mesh);
MENU_ITEM(gcode, MSG_UBL_MANUAL_MESH, PSTR("G29 I999\nG29 P2 B T0"));
MENU_ITEM(submenu, MSG_UBL_VALIDATE_MESH_MENU, _lcd_ubl_validate_mesh);
- MENU_ITEM(submenu, MSG_UBL_EDIT_MESH_MENU, _lcd_ubl_edit_mesh);
+ MENU_ITEM(submenu, MSG_EDIT_MESH, _lcd_ubl_edit_mesh);
MENU_ITEM(submenu, MSG_UBL_MESH_LEVELING, _lcd_ubl_mesh_leveling);
END_MENU();
}
--
GitLab