Browse Source

Remove duplicate string `Mesh Bed Leveling` and `Mesh bed leveling` using `MSG_MESH_BED_LEVELING`
Fixed few too long translations

3d-gussner 3 years ago
parent
commit
ab5aad636f

+ 1 - 0
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_ONCE[] PROGMEM_I1 = ISTR("Once"); ////
 const char MSG_SOUND_BLIND[] PROGMEM_I1 = ISTR("Assist"); ////
 const char MSG_SOUND_BLIND[] PROGMEM_I1 = ISTR("Assist"); ////
 const char MSG_MESH[] PROGMEM_I1 = ISTR("Mesh"); ////
 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_Z_PROBE_NR[] PROGMEM_I1 = ISTR("Z-probe nr."); ////
 const char MSG_MAGNETS_COMP[] PROGMEM_I1 = ISTR("Magnets comp."); ////
 const char MSG_MAGNETS_COMP[] PROGMEM_I1 = ISTR("Magnets comp."); ////
 const char MSG_FS_ACTION[] PROGMEM_I1 = ISTR("FS Action"); ////c=10
 const char MSG_FS_ACTION[] PROGMEM_I1 = ISTR("FS Action"); ////c=10

+ 1 - 0
Firmware/messages.h

@@ -141,6 +141,7 @@ extern const char MSG_SOUND_LOUD[];
 extern const char MSG_SOUND_ONCE[];
 extern const char MSG_SOUND_ONCE[];
 extern const char MSG_SOUND_BLIND[];
 extern const char MSG_SOUND_BLIND[];
 extern const char MSG_MESH[];
 extern const char MSG_MESH[];
+extern const char MSG_MESH_BED_LEVELING[];
 extern const char MSG_Z_PROBE_NR[];
 extern const char MSG_Z_PROBE_NR[];
 extern const char MSG_MAGNETS_COMP[];
 extern const char MSG_MAGNETS_COMP[];
 extern const char MSG_FS_ACTION[];
 extern const char MSG_FS_ACTION[];

+ 2 - 2
Firmware/ultralcd.cpp

@@ -5700,7 +5700,7 @@ static void lcd_settings_menu()
     
     
 	SETTINGS_MMU_MODE;
 	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)
 #if defined (TMC2130) && defined (LINEARITY_CORRECTION)
     MENU_ITEM_SUBMENU_P(_i("Lin. correction"), lcd_settings_linearity_correction_menu);
     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
 	//MENU_ITEM_FUNCTION_P(_i("Calibrate E"), lcd_calibrate_extruder);////MSG_CALIBRATE_E c=20 r=1
 #endif
 #endif
     // "Mesh Bed Leveling"
     // "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
 #endif //MK1BP
 
 

+ 1 - 4
lang/lang_en.txt

@@ -436,7 +436,7 @@
 #MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60
 #MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60
 "Measuring reference height of calibration point"
 "Measuring reference height of calibration point"
 
 
-#MSG_MESH_BED_LEVELING
+#MSG_MESH_BED_LEVELING c=18
 "Mesh Bed Leveling"
 "Mesh Bed Leveling"
 
 
 #MSG_MMU_OK_RESUMING_POSITION c=20 r=4
 #MSG_MMU_OK_RESUMING_POSITION c=20 r=4
@@ -1024,9 +1024,6 @@
 #MSG_MESH
 #MSG_MESH
 "Mesh"
 "Mesh"
 
 
-#
-"Mesh bed leveling"
-
 #
 #
 "MK3S firmware detected on MK3 printer"
 "MK3S firmware detected on MK3 printer"
 
 

+ 1 - 5
lang/lang_en_cz.txt

@@ -582,7 +582,7 @@
 "Measuring reference height of calibration point"
 "Measuring reference height of calibration point"
 "Merim referencni vysku kalibracniho bodu"
 "Merim referencni vysku kalibracniho bodu"
 
 
-#MSG_MESH_BED_LEVELING
+#MSG_MESH_BED_LEVELING c=18
 "Mesh Bed Leveling"
 "Mesh Bed Leveling"
 "\x00"
 "\x00"
 
 
@@ -1366,10 +1366,6 @@
 "Mesh"
 "Mesh"
 "\x00"
 "\x00"
 
 
-#
-"Mesh bed leveling"
-"Mesh Bed Leveling"
-
 #
 #
 "MK3S firmware detected on MK3 printer"
 "MK3S firmware detected on MK3 printer"
 "MK3S firmware detekovan na tiskarne MK3"
 "MK3S firmware detekovan na tiskarne MK3"

+ 1 - 5
lang/lang_en_de.txt

@@ -582,7 +582,7 @@
 "Measuring reference height of calibration point"
 "Measuring reference height of calibration point"
 "Messen der Referenzhoehe des Kalibrierpunktes"
 "Messen der Referenzhoehe des Kalibrierpunktes"
 
 
-#MSG_MESH_BED_LEVELING
+#MSG_MESH_BED_LEVELING c=18
 "Mesh Bed Leveling"
 "Mesh Bed Leveling"
 "MeshBett Ausgleich"
 "MeshBett Ausgleich"
 
 
@@ -1366,10 +1366,6 @@
 "Mesh"
 "Mesh"
 "Gitter"
 "Gitter"
 
 
-#
-"Mesh bed leveling"
-"MeshBett Ausgleich"
-
 #
 #
 "MK3S firmware detected on MK3 printer"
 "MK3S firmware detected on MK3 printer"
 "MK3S-Firmware auf MK3-Drucker erkannt"
 "MK3S-Firmware auf MK3-Drucker erkannt"

+ 2 - 6
lang/lang_en_es.txt

@@ -582,9 +582,9 @@
 "Measuring reference height of calibration point"
 "Measuring reference height of calibration point"
 "Midiendo altura del punto de calibracion"
 "Midiendo altura del punto de calibracion"
 
 
-#MSG_MESH_BED_LEVELING
+#MSG_MESH_BED_LEVELING c=18
 "Mesh Bed Leveling"
 "Mesh Bed Leveling"
-"Nivelacion Mesh Level"
+"Nivela. Mesh Level"
 
 
 #MSG_MMU_OK_RESUMING_POSITION c=20 r=4
 #MSG_MMU_OK_RESUMING_POSITION c=20 r=4
 "MMU OK. Resuming position..."
 "MMU OK. Resuming position..."
@@ -1366,10 +1366,6 @@
 "Mesh"
 "Mesh"
 "Malla"
 "Malla"
 
 
-#
-"Mesh bed leveling"
-"Nivelacion Malla Base"
-
 #
 #
 "MK3S firmware detected on MK3 printer"
 "MK3S firmware detected on MK3 printer"
 "Firmware MK3S detectado en impresora MK3"
 "Firmware MK3S detectado en impresora MK3"

+ 1 - 5
lang/lang_en_fr.txt

@@ -582,7 +582,7 @@
 "Measuring reference height of calibration point"
 "Measuring reference height of calibration point"
 "Je mesure la hauteur de reference du point de calibrage"
 "Je mesure la hauteur de reference du point de calibrage"
 
 
-#MSG_MESH_BED_LEVELING
+#MSG_MESH_BED_LEVELING c=18
 "Mesh Bed Leveling"
 "Mesh Bed Leveling"
 "\x00"
 "\x00"
 
 
@@ -1366,10 +1366,6 @@
 "Mesh"
 "Mesh"
 "\x00"
 "\x00"
 
 
-#
-"Mesh bed leveling"
-"\x00"
-
 #
 #
 "MK3S firmware detected on MK3 printer"
 "MK3S firmware detected on MK3 printer"
 "Firmware MK3S detecte sur imprimante MK3"
 "Firmware MK3S detecte sur imprimante MK3"

+ 1 - 5
lang/lang_en_it.txt

@@ -582,7 +582,7 @@
 "Measuring reference height of calibration point"
 "Measuring reference height of calibration point"
 "Misura altezza di rif. del punto di calib."
 "Misura altezza di rif. del punto di calib."
 
 
-#MSG_MESH_BED_LEVELING
+#MSG_MESH_BED_LEVELING c=18
 "Mesh Bed Leveling"
 "Mesh Bed Leveling"
 "Liv. grilia piano"
 "Liv. grilia piano"
 
 
@@ -1366,10 +1366,6 @@
 "Mesh"
 "Mesh"
 "Griglia"
 "Griglia"
 
 
-#
-"Mesh bed leveling"
-"Liv. griglia piano"
-
 #
 #
 "MK3S firmware detected on MK3 printer"
 "MK3S firmware detected on MK3 printer"
 "Firmware MK3S rilevato su stampante MK3"
 "Firmware MK3S rilevato su stampante MK3"

+ 2 - 6
lang/lang_en_pl.txt

@@ -582,9 +582,9 @@
 "Measuring reference height of calibration point"
 "Measuring reference height of calibration point"
 "Okreslam wysokosc odniesienia punktu kalibracyjnego"
 "Okreslam wysokosc odniesienia punktu kalibracyjnego"
 
 
-#MSG_MESH_BED_LEVELING
+#MSG_MESH_BED_LEVELING c=18
 "Mesh Bed Leveling"
 "Mesh Bed Leveling"
-"Poziomowanie stolu wg siatki"
+"Poziomowanie stolu"
 
 
 #MSG_MMU_OK_RESUMING_POSITION c=20 r=4
 #MSG_MMU_OK_RESUMING_POSITION c=20 r=4
 "MMU OK. Resuming position..."
 "MMU OK. Resuming position..."
@@ -1366,10 +1366,6 @@
 "Mesh"
 "Mesh"
 "Siatka"
 "Siatka"
 
 
-#
-"Mesh bed leveling"
-"Poziomowanie stolu"
-
 #
 #
 "MK3S firmware detected on MK3 printer"
 "MK3S firmware detected on MK3 printer"
 "Wykryto firmware MK3S w drukarce MK3"
 "Wykryto firmware MK3S w drukarce MK3"