diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 52f350a65..6818066af 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2592,9 +2592,9 @@ static void lcd_LoadFilament()
 //!
 //! @code{.unparsed}
 //! |01234567890123456789|
-//! |Filament used:      | c=19
+//! |Filament used:      | MSG_FILAMENT_USED c=19
 //! |           0000.00m |
-//! |Print time:         | c=19 r=1
+//! |Print time:         | MSG_PRINT_TIME c=19
 //! |        00h 00m 00s |
 //! ----------------------
 //! @endcode
@@ -2603,9 +2603,9 @@ static void lcd_LoadFilament()
 //!
 //! @code{.unparsed}
 //! |01234567890123456789|
-//! |Total filament:     | c=19 r=1
+//! |Total filament:     | MSG_TOTAL_FILAMENT c=19
 //! |           0000.00m |
-//! |Total print time:   | c=19 r=1
+//! |Total print time:   | MSG_TOTAL_PRINT_TIME c=19
 //! |        00d 00h 00m |
 //! ----------------------
 //! @endcode
@@ -2628,8 +2628,8 @@ void lcd_menu_statistics()
 			"%S:\n"
 			"%10ldh %02hhdm %02hhds"
 		    ),
-            _i("Filament used"), _met,  ////c=19
-            _i("Print time"), _h, _m, _s);  ////c=19 r=1
+            _i("Filament used"), _met,  ////MSG_FILAMENT_USED c=19
+            _i("Print time"), _h, _m, _s);  ////MSG_PRINT_TIME c=19
 		menu_back_if_clicked_fb();
 	}
 	else
@@ -2650,8 +2650,8 @@ void lcd_menu_statistics()
 			"%S:\n"
 			"%10ldd %02hhdh %02hhdm"
             ),
-            _i("Total filament"), _filament_m,  ////c=19 r=1
-            _i("Total print time"), _days, _hours, _minutes);  ////c=19 r=1
+            _i("Total filament"), _filament_m,  ////MSG_TOTAL_FILAMENT c=19
+            _i("Total print time"), _days, _hours, _minutes);  ////MSG_TOTAL_PRINT_TIME c=19
         menu_back_if_clicked_fb();
 	}
 }
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 363c820a0..86243dcc1 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -859,10 +859,10 @@
 #MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9
 "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
 
-#
+#MSG_TOTAL_FILAMENT c=19
 "Total filament"
 
-#
+#MSG_TOTAL_PRINT_TIME c=19
 "Total print time"
 
 #MSG_TUNE c=18
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 270bf019e..0624f8af7 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1146,11 +1146,11 @@
 "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
 "Je potreba kalibrovat osu Z. Prosim postupujte dle prirucky, kapitola Zaciname, sekce Postup kalibrace."
 
-#
+#MSG_TOTAL_FILAMENT c=19
 "Total filament"
 "Filament celkem"
 
-#
+#MSG_TOTAL_PRINT_TIME c=19
 "Total print time"
 "Celkovy cas tisku"
 
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 56840a07f..871608a6b 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1146,11 +1146,11 @@
 "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
 "Es ist noch not- wendig die Z- Kalibrierung aus- zufuehren. Bitte befolgen Sie das Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrierablauf."
 
-#
+#MSG_TOTAL_FILAMENT c=19
 "Total filament"
 "Gesamtes Filament"
 
-#
+#MSG_TOTAL_PRINT_TIME c=19
 "Total print time"
 "Gesamte Druckzeit"
 
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 122d4eeab..0b084f1f9 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1146,11 +1146,11 @@
 "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
 "Todavia es necesario hacer una calibracion Z. Por favor siga el manual, capitulo Primeros pasos, seccion Calibracion del flujo."
 
-#
+#MSG_TOTAL_FILAMENT c=19
 "Total filament"
 "Filamento total"
 
-#
+#MSG_TOTAL_PRINT_TIME c=19
 "Total print time"
 "Tiempo total"
 
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index bfd658c6d..cacd27722 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1146,11 +1146,11 @@
 "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
 "Il faut toujours effectuer la Calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration."
 
-#
+#MSG_TOTAL_FILAMENT c=19
 "Total filament"
 "Filament total"
 
-#
+#MSG_TOTAL_PRINT_TIME c=19
 "Total print time"
 "Temps total impr."
 
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 4bdb46f25..49c35e2da 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1146,11 +1146,11 @@
 "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
 "E ancora necessario effettuare la calibrazione Z. Segui il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione. "
 
-#
+#MSG_TOTAL_FILAMENT c=19
 "Total filament"
 "Filamento totale"
 
-#
+#MSG_TOTAL_PRINT_TIME c=19
 "Total print time"
 "Tempo stampa totale"
 
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 902832c39..6b7d9d1a0 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1146,11 +1146,11 @@
 "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
 "Er is nog steeds een noodzaak om de Z-kalibratie uit te voeren. Volg de handleiding, hoofdstuk First steps, section Calibration flow."
 
-#
+#MSG_TOTAL_FILAMENT c=19
 "Total filament"
 "Totaal fil.   "
 
-#
+#MSG_TOTAL_PRINT_TIME c=19
 "Total print time"
 "Totaal printtijd"
 
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 103f1421b..363a40a2d 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1146,11 +1146,11 @@
 "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
 "Musimy przeprowadzic kalibracje Z. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Kalibracja."
 
-#
+#MSG_TOTAL_FILAMENT c=19
 "Total filament"
 "Zuzycie filamentu"
 
-#
+#MSG_TOTAL_PRINT_TIME c=19
 "Total print time"
 "Laczny czas druku"