From ab5aad636f9ad71c06a1273585f23ec21c33012f Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 26 Jan 2021 09:05:38 +0100 Subject: [PATCH] Remove duplicate string `Mesh Bed Leveling` and `Mesh bed leveling` using `MSG_MESH_BED_LEVELING` Fixed few too long translations --- Firmware/messages.c | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 4 ++-- lang/lang_en.txt | 5 +---- lang/lang_en_cz.txt | 6 +----- lang/lang_en_de.txt | 6 +----- lang/lang_en_es.txt | 8 ++------ lang/lang_en_fr.txt | 6 +----- lang/lang_en_it.txt | 6 +----- lang/lang_en_pl.txt | 8 ++------ 10 files changed, 13 insertions(+), 38 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index b720d9e6..ed5858fb 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -141,6 +141,7 @@ const char MSG_SOUND_LOUD[] PROGMEM_I1 = ISTR("Loud"); //// const char MSG_SOUND_ONCE[] PROGMEM_I1 = ISTR("Once"); //// const char MSG_SOUND_BLIND[] PROGMEM_I1 = ISTR("Assist"); //// const char MSG_MESH[] PROGMEM_I1 = ISTR("Mesh"); //// +const char MSG_MESH_BED_LEVELING[] PROGMEM_I1 = ISTR("Mesh Bed Leveling"); ////c=18 const char MSG_Z_PROBE_NR[] PROGMEM_I1 = ISTR("Z-probe nr."); //// const char MSG_MAGNETS_COMP[] PROGMEM_I1 = ISTR("Magnets comp."); //// const char MSG_FS_ACTION[] PROGMEM_I1 = ISTR("FS Action"); ////c=10 diff --git a/Firmware/messages.h b/Firmware/messages.h index 7c288275..40294a33 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -141,6 +141,7 @@ extern const char MSG_SOUND_LOUD[]; extern const char MSG_SOUND_ONCE[]; extern const char MSG_SOUND_BLIND[]; extern const char MSG_MESH[]; +extern const char MSG_MESH_BED_LEVELING[]; extern const char MSG_Z_PROBE_NR[]; extern const char MSG_MAGNETS_COMP[]; extern const char MSG_FS_ACTION[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 2c095024..54578875 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5700,7 +5700,7 @@ static void lcd_settings_menu() SETTINGS_MMU_MODE; - MENU_ITEM_SUBMENU_P(_i("Mesh bed leveling"), lcd_mesh_bed_leveling_settings);////MSG_MBL_SETTINGS c=18 r=1 + MENU_ITEM_SUBMENU_P(_T(MSG_MESH_BED_LEVELING), lcd_mesh_bed_leveling_settings); #if defined (TMC2130) && defined (LINEARITY_CORRECTION) MENU_ITEM_SUBMENU_P(_i("Lin. correction"), lcd_settings_linearity_correction_menu); @@ -5795,7 +5795,7 @@ static void lcd_calibration_menu() //MENU_ITEM_FUNCTION_P(_i("Calibrate E"), lcd_calibrate_extruder);////MSG_CALIBRATE_E c=20 r=1 #endif // "Mesh Bed Leveling" - MENU_ITEM_SUBMENU_P(_i("Mesh Bed Leveling"), lcd_mesh_bedleveling);////MSG_MESH_BED_LEVELING + MENU_ITEM_SUBMENU_P(_T(MSG_MESH_BED_LEVELING), lcd_mesh_bedleveling);////MSG_MESH_BED_LEVELING #endif //MK1BP diff --git a/lang/lang_en.txt b/lang/lang_en.txt index e069677d..a0ab70d0 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -436,7 +436,7 @@ #MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 "Measuring reference height of calibration point" -#MSG_MESH_BED_LEVELING +#MSG_MESH_BED_LEVELING c=18 "Mesh Bed Leveling" #MSG_MMU_OK_RESUMING_POSITION c=20 r=4 @@ -1024,9 +1024,6 @@ #MSG_MESH "Mesh" -# -"Mesh bed leveling" - # "MK3S firmware detected on MK3 printer" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 3517dd13..31350c0a 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -582,7 +582,7 @@ "Measuring reference height of calibration point" "Merim referencni vysku kalibracniho bodu" -#MSG_MESH_BED_LEVELING +#MSG_MESH_BED_LEVELING c=18 "Mesh Bed Leveling" "\x00" @@ -1366,10 +1366,6 @@ "Mesh" "\x00" -# -"Mesh bed leveling" -"Mesh Bed Leveling" - # "MK3S firmware detected on MK3 printer" "MK3S firmware detekovan na tiskarne MK3" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 9494ff72..d1da88d8 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -582,7 +582,7 @@ "Measuring reference height of calibration point" "Messen der Referenzhoehe des Kalibrierpunktes" -#MSG_MESH_BED_LEVELING +#MSG_MESH_BED_LEVELING c=18 "Mesh Bed Leveling" "MeshBett Ausgleich" @@ -1366,10 +1366,6 @@ "Mesh" "Gitter" -# -"Mesh bed leveling" -"MeshBett Ausgleich" - # "MK3S firmware detected on MK3 printer" "MK3S-Firmware auf MK3-Drucker erkannt" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index aae73f26..aa33c217 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -582,9 +582,9 @@ "Measuring reference height of calibration point" "Midiendo altura del punto de calibracion" -#MSG_MESH_BED_LEVELING +#MSG_MESH_BED_LEVELING c=18 "Mesh Bed Leveling" -"Nivelacion Mesh Level" +"Nivela. Mesh Level" #MSG_MMU_OK_RESUMING_POSITION c=20 r=4 "MMU OK. Resuming position..." @@ -1366,10 +1366,6 @@ "Mesh" "Malla" -# -"Mesh bed leveling" -"Nivelacion Malla Base" - # "MK3S firmware detected on MK3 printer" "Firmware MK3S detectado en impresora MK3" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 91eba194..13868553 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -582,7 +582,7 @@ "Measuring reference height of calibration point" "Je mesure la hauteur de reference du point de calibrage" -#MSG_MESH_BED_LEVELING +#MSG_MESH_BED_LEVELING c=18 "Mesh Bed Leveling" "\x00" @@ -1366,10 +1366,6 @@ "Mesh" "\x00" -# -"Mesh bed leveling" -"\x00" - # "MK3S firmware detected on MK3 printer" "Firmware MK3S detecte sur imprimante MK3" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 1573772f..efeed6a1 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -582,7 +582,7 @@ "Measuring reference height of calibration point" "Misura altezza di rif. del punto di calib." -#MSG_MESH_BED_LEVELING +#MSG_MESH_BED_LEVELING c=18 "Mesh Bed Leveling" "Liv. grilia piano" @@ -1366,10 +1366,6 @@ "Mesh" "Griglia" -# -"Mesh bed leveling" -"Liv. griglia piano" - # "MK3S firmware detected on MK3 printer" "Firmware MK3S rilevato su stampante MK3" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 3fca0614..09224d8c 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -582,9 +582,9 @@ "Measuring reference height of calibration point" "Okreslam wysokosc odniesienia punktu kalibracyjnego" -#MSG_MESH_BED_LEVELING +#MSG_MESH_BED_LEVELING c=18 "Mesh Bed Leveling" -"Poziomowanie stolu wg siatki" +"Poziomowanie stolu" #MSG_MMU_OK_RESUMING_POSITION c=20 r=4 "MMU OK. Resuming position..." @@ -1366,10 +1366,6 @@ "Mesh" "Siatka" -# -"Mesh bed leveling" -"Poziomowanie stolu" - # "MK3S firmware detected on MK3 printer" "Wykryto firmware MK3S w drukarce MK3"