diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index d501be8044576a1e4535e49011ab47b345537329..c797981b4826db8695a1c4c365a04bfdce9aece3 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -1723,17 +1723,30 @@ static void clean_up_after_endstop_or_probe_move() {
#endif //HAS_BED_PROBE
#if ENABLED(Z_PROBE_SLED) || ENABLED(Z_SAFE_HOMING) || HAS_PROBING_PROCEDURE
- static void axis_unhomed_error(bool xyz=false) {
- if (xyz) {
- LCD_MESSAGEPGM(MSG_XYZ_UNHOMED);
+ static bool axis_unhomed_error(const bool x, const bool y, const bool z) {
+ const bool xx = x && !axis_homed[X_AXIS],
+ yy = y && !axis_homed[Y_AXIS],
+ zz = z && !axis_homed[Z_AXIS];
+ if (xx || yy || zz) {
SERIAL_ECHO_START;
- SERIAL_ECHOLNPGM(MSG_XYZ_UNHOMED);
- }
- else {
- LCD_MESSAGEPGM(MSG_YX_UNHOMED);
- SERIAL_ECHO_START;
- SERIAL_ECHOLNPGM(MSG_YX_UNHOMED);
+ SERIAL_ECHOPGM(MSG_HOME " ");
+ if (xx) SERIAL_ECHOPGM(MSG_X);
+ if (yy) SERIAL_ECHOPGM(MSG_Y);
+ if (zz) SERIAL_ECHOPGM(MSG_Z);
+ SERIAL_ECHOLNPGM(" " MSG_FIRST);
+
+ #if ENABLED(ULTRA_LCD)
+ char message[3 * (LCD_WIDTH) + 1] = ""; // worst case is kana.utf with up to 3*LCD_WIDTH+1
+ strcat_P(message, PSTR(MSG_HOME " "));
+ if (xx) strcat_P(message, PSTR(MSG_X));
+ if (yy) strcat_P(message, PSTR(MSG_Y));
+ if (zz) strcat_P(message, PSTR(MSG_Z));
+ strcat_P(message, PSTR(" " MSG_FIRST));
+ lcd_setstatus(message);
+ #endif
+ return true;
}
+ return false;
}
#endif
@@ -1757,10 +1770,7 @@ static void clean_up_after_endstop_or_probe_move() {
}
#endif
- if (!axis_homed[X_AXIS]) {
- axis_unhomed_error(true);
- return;
- }
+ if (axis_unhomed_error(true, false, false)) return;
float oldXpos = current_position[X_AXIS]; // save x position
@@ -3000,32 +3010,27 @@ inline void gcode_G28() {
else if (homeZ) { // Don't need to Home Z twice
// Let's see if X and Y are homed
- if (axis_homed[X_AXIS] && axis_homed[Y_AXIS]) {
-
- /**
- * Make sure the Z probe is within the physical limits
- * NOTE: This doesn't necessarily ensure the Z probe is also
- * within the bed!
- */
- float cpx = current_position[X_AXIS], cpy = current_position[Y_AXIS];
- if ( cpx >= X_MIN_POS - (X_PROBE_OFFSET_FROM_EXTRUDER)
- && cpx <= X_MAX_POS - (X_PROBE_OFFSET_FROM_EXTRUDER)
- && cpy >= Y_MIN_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)
- && cpy <= Y_MAX_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)) {
-
- // Home the Z axis
- HOMEAXIS(Z);
- }
- else {
- LCD_MESSAGEPGM(MSG_ZPROBE_OUT);
- SERIAL_ECHO_START;
- SERIAL_ECHOLNPGM(MSG_ZPROBE_OUT);
- }
+ if (axis_unhomed_error(true, true, false)) return;
+
+ /**
+ * Make sure the Z probe is within the physical limits
+ * NOTE: This doesn't necessarily ensure the Z probe is also
+ * within the bed!
+ */
+ float cpx = current_position[X_AXIS], cpy = current_position[Y_AXIS];
+ if ( cpx >= X_MIN_POS - (X_PROBE_OFFSET_FROM_EXTRUDER)
+ && cpx <= X_MAX_POS - (X_PROBE_OFFSET_FROM_EXTRUDER)
+ && cpy >= Y_MIN_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)
+ && cpy <= Y_MAX_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)) {
+
+ // Home the Z axis
+ HOMEAXIS(Z);
}
else {
- axis_unhomed_error();
+ LCD_MESSAGEPGM(MSG_ZPROBE_OUT);
+ SERIAL_ECHO_START;
+ SERIAL_ECHOLNPGM(MSG_ZPROBE_OUT);
}
-
} // !home_all_axes && homeZ
#if ENABLED(DEBUG_LEVELING_FEATURE)
@@ -3366,10 +3371,7 @@ inline void gcode_G28() {
#endif
// Don't allow auto-leveling without homing first
- if (!axis_homed[X_AXIS] || !axis_homed[Y_AXIS] || !axis_homed[Z_AXIS]) {
- axis_unhomed_error(true);
- return;
- }
+ if (axis_unhomed_error(true, true, true)) return;
int verbose_level = code_seen('V') ? code_value_int() : 1;
if (verbose_level < 0 || verbose_level > 4) {
@@ -4121,10 +4123,7 @@ inline void gcode_M42() {
*/
inline void gcode_M48() {
- if (!axis_homed[X_AXIS] || !axis_homed[Y_AXIS] || !axis_homed[Z_AXIS]) {
- axis_unhomed_error(true);
- return;
- }
+ if (axis_unhomed_error(true, true, true)) return;
int8_t verbose_level = code_seen('V') ? code_value_byte() : 1;
if (verbose_level < 0 || verbose_level > 4) {
diff --git a/Marlin/language_an.h b/Marlin/language_an.h
index fbfb4dd0cbde5a947631d5af8dff199244785fc9..968fa5168f92033972263026bc00afc8300a1f95 100644
--- a/Marlin/language_an.h
+++ b/Marlin/language_an.h
@@ -142,7 +142,8 @@
#define MSG_INIT_SDCARD "Encetan. tarcheta"
#define MSG_CNG_SDCARD "Cambiar tarcheta"
#define MSG_ZPROBE_OUT "Z probe out. bed"
-#define MSG_YX_UNHOMED "Home X/Y before Z"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
diff --git a/Marlin/language_bg.h b/Marlin/language_bg.h
index c86e97b7d82764922ed5334fb8728825ac3fa108..3fc7a5bee78fdfb139c7f0efd281f703309e5100 100644
--- a/Marlin/language_bg.h
+++ b/Marlin/language_bg.h
@@ -143,7 +143,8 @@
#define MSG_INIT_SDCARD "Иниц. SD-Карта"
#define MSG_CNG_SDCARD "Смяна SD-Карта"
#define MSG_ZPROBE_OUT "Z-сондата е извадена"
-#define MSG_YX_UNHOMED "Задайте X/Y преди Z"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Z Отстояние"
#define MSG_BABYSTEP_X "Министъпка X"
#define MSG_BABYSTEP_Y "Министъпка Y"
diff --git a/Marlin/language_ca.h b/Marlin/language_ca.h
index 8866c9e6f15cea2c388ffbf178caf127fa055901..9c2ba49d3062eae137c7533cd16c615300301fbf 100644
--- a/Marlin/language_ca.h
+++ b/Marlin/language_ca.h
@@ -143,7 +143,8 @@
#define MSG_INIT_SDCARD "Iniciant SD"
#define MSG_CNG_SDCARD "Canviar SD"
#define MSG_ZPROBE_OUT "Z probe out. bed"
-#define MSG_YX_UNHOMED "Home X/Y abans Z"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
diff --git a/Marlin/language_cn.h b/Marlin/language_cn.h
index 40f1908a30b8d2d750b7fddf05a3ee812dbc6e93..e2306a401d66380060823b0d7049c9b59106da7c 100644
--- a/Marlin/language_cn.h
+++ b/Marlin/language_cn.h
@@ -142,7 +142,8 @@
#define MSG_INIT_SDCARD "Init. SD card"
#define MSG_CNG_SDCARD "Change SD card"
#define MSG_ZPROBE_OUT "Z probe out. bed"
-#define MSG_YX_UNHOMED "Home X/Y before Z"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
diff --git a/Marlin/language_cz.h b/Marlin/language_cz.h
index bd8ae6d59ddb13ecaa218aca716733fa0d2612aa..cc8508e14690c4712b069ab481ef172f5aa6464a 100644
--- a/Marlin/language_cz.h
+++ b/Marlin/language_cz.h
@@ -174,8 +174,8 @@
#define MSG_INIT_SDCARD "Nacist SD kartu"
#define MSG_CNG_SDCARD "Vymenit SD kartu"
#define MSG_ZPROBE_OUT "Sonda Z mimo podl"
-#define MSG_YX_UNHOMED "Domu X/Y pred Z"
-#define MSG_XYZ_UNHOMED "Domu XYZ prvni"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Z ofset"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
diff --git a/Marlin/language_da.h b/Marlin/language_da.h
index 42d8dfa50c92bc499d719b159f7bfce63eb740cd..55c9fd48c6b52a8a89dba669ad82e1dd2bc7efd1 100644
--- a/Marlin/language_da.h
+++ b/Marlin/language_da.h
@@ -170,8 +170,8 @@
#define MSG_INIT_SDCARD "Init. SD card"
#define MSG_CNG_SDCARD "Skift SD kort"
#define MSG_ZPROBE_OUT "Probe udenfor plade"
-#define MSG_YX_UNHOMED "Home X/Y før Z"
-#define MSG_XYZ_UNHOMED "Home XYZ first"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
diff --git a/Marlin/language_de.h b/Marlin/language_de.h
index d4d5c3c9833f4f39214482264ed1e9b29ac29cf6..58acd952783c143bdda86ce9dded0d88fcf2d4c5 100644
--- a/Marlin/language_de.h
+++ b/Marlin/language_de.h
@@ -145,7 +145,8 @@
#define MSG_INIT_SDCARD "SD-Karte erkennen" // Manually initialize the SD-card via user interface
#define MSG_CNG_SDCARD "SD-Karte getauscht" // SD-card changed by user. For machines with no autocarddetect. Both send "M21"
#define MSG_ZPROBE_OUT "Sensor ausserhalb"
-#define MSG_YX_UNHOMED "X/Y vor Z homen!"
+#define MSG_HOME "Vorher" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "homen"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
diff --git a/Marlin/language_en.h b/Marlin/language_en.h
index e85d342d0fc5a221374a44f760de2afbdfa3f150..8f20bc03062242aa8e8df33acddb1a70919653d9 100644
--- a/Marlin/language_en.h
+++ b/Marlin/language_en.h
@@ -445,11 +445,11 @@
#ifndef MSG_ZPROBE_OUT
#define MSG_ZPROBE_OUT "Z probe out. bed"
#endif
-#ifndef MSG_YX_UNHOMED
- #define MSG_YX_UNHOMED "Home X/Y before Z"
+#ifndef MSG_HOME
+ #define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
#endif
-#ifndef MSG_XYZ_UNHOMED
- #define MSG_XYZ_UNHOMED "Home XYZ first"
+#ifndef MSG_FIRST
+ #define MSG_FIRST "first"
#endif
#ifndef MSG_ZPROBE_ZOFFSET
#define MSG_ZPROBE_ZOFFSET "Z Offset"
diff --git a/Marlin/language_es.h b/Marlin/language_es.h
index cf1785c79047283bd4d6af8d206b5ca7da54a24e..9722ccd2ef92a42f1fa30828264d2879dc78e6c8 100644
--- a/Marlin/language_es.h
+++ b/Marlin/language_es.h
@@ -169,8 +169,8 @@
#define MSG_INIT_SDCARD "Iniciando tarjeta"
#define MSG_CNG_SDCARD "Cambiar tarjeta"
#define MSG_ZPROBE_OUT "Sonda Z fuera"
-#define MSG_YX_UNHOMED "Reiniciar X/Y y Z"
-#define MSG_XYZ_UNHOMED "Reiniciar XYZ"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Desfase Z"
#define MSG_BABYSTEP_X "Micropaso X"
#define MSG_BABYSTEP_Y "Micropaso Y"
diff --git a/Marlin/language_eu.h b/Marlin/language_eu.h
index 8af3aab55badb2926d73239d2a83810cd6398ded..f87ac2f1c19439541ba3443877912ac5dce88423 100644
--- a/Marlin/language_eu.h
+++ b/Marlin/language_eu.h
@@ -142,7 +142,8 @@
#define MSG_INIT_SDCARD "Hasieratu txartela"
#define MSG_CNG_SDCARD "Aldatu txartela"
#define MSG_ZPROBE_OUT "Z ohe hasiera"
-#define MSG_YX_UNHOMED "Posizio ezezaguna"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Z konpentsatu"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
diff --git a/Marlin/language_fi.h b/Marlin/language_fi.h
index 87cbb1fc4d8d8ffe3b7dfc843168a3918a4b8b93..be3db646c581f9c3c2e1ab0e9eefe68432174145 100644
--- a/Marlin/language_fi.h
+++ b/Marlin/language_fi.h
@@ -142,7 +142,8 @@
#define MSG_INIT_SDCARD "Init. SD-Card"
#define MSG_CNG_SDCARD "Change SD-Card"
#define MSG_ZPROBE_OUT "Z probe out. bed"
-#define MSG_YX_UNHOMED "Home X/Y before Z"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
diff --git a/Marlin/language_fr.h b/Marlin/language_fr.h
index 7536d53a8607c7e78b8edf69025b3a630fbf9d55..f22abce00f3f6daacc44f3d5dbb1196d9f4d8be5 100644
--- a/Marlin/language_fr.h
+++ b/Marlin/language_fr.h
@@ -145,7 +145,8 @@
#define MSG_INIT_SDCARD "Init. la carte SD"
#define MSG_CNG_SDCARD "Changer de carte"
#define MSG_ZPROBE_OUT "Z sonde exte. lit"
-#define MSG_YX_UNHOMED "Rev. dans XY av.Z"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Decalage Z"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
diff --git a/Marlin/language_gl.h b/Marlin/language_gl.h
index 5363010e859b585934b7d8493a2a1a3969570a82..f4e4639fc319657b85f741e29e4b9f95d3bd4df3 100644
--- a/Marlin/language_gl.h
+++ b/Marlin/language_gl.h
@@ -170,8 +170,8 @@
#define MSG_INIT_SDCARD "Iniciando SD"
#define MSG_CNG_SDCARD "Cambiar SD"
#define MSG_ZPROBE_OUT "Sonda-Z sen cama"
-#define MSG_YX_UNHOMED "X/Y antes que Z"
-#define MSG_XYZ_UNHOMED "Orixe XYZ antes"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Offset Z"
#define MSG_BABYSTEP_X "Micropaso X"
#define MSG_BABYSTEP_Y "Micropaso Y"
diff --git a/Marlin/language_hr.h b/Marlin/language_hr.h
index f3bf014f559306e0df54c52671a13a622a92dc56..d48e58ccb14bf188d2bf8d30a00eead0d0ccf296 100644
--- a/Marlin/language_hr.h
+++ b/Marlin/language_hr.h
@@ -171,8 +171,8 @@
#define MSG_INIT_SDCARD "Init. SD karticu"
#define MSG_CNG_SDCARD "Promijeni SD karticu"
#define MSG_ZPROBE_OUT "Z probe out. bed"
-#define MSG_YX_UNHOMED "Home-aj X/Y prije Z"
-#define MSG_XYZ_UNHOMED "Home-aj XYZ prvo"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
diff --git a/Marlin/language_it.h b/Marlin/language_it.h
index 6e305e1b3e276ec63cbf27ab75eb5a4bd97f86a7..481b725abf66fe9d427874f6ab2689c74b58845c 100644
--- a/Marlin/language_it.h
+++ b/Marlin/language_it.h
@@ -150,8 +150,8 @@
#define MSG_INIT_SDCARD "Iniz. SD-Card"
#define MSG_CNG_SDCARD "Cambia SD-Card"
#define MSG_ZPROBE_OUT "Z probe out. bed"
-#define MSG_YX_UNHOMED "Home X/Y prima di Z"
-#define MSG_XYZ_UNHOMED "Home XYZ prima"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
diff --git a/Marlin/language_kana.h b/Marlin/language_kana.h
index 80c4224623b28f6aacb250b5481fbc7226657e6e..7eb6f592a5d4bd27827ea392e35115170fcdb4bf 100644
--- a/Marlin/language_kana.h
+++ b/Marlin/language_kana.h
@@ -184,6 +184,10 @@
#define MSG_INIT_SDCARD "SD\xb6\xb0\xc4\xde\xbb\xb2\xd6\xd0\xba\xd0" // "SDｶｰﾄﾞｻｲﾖﾐｺﾐ" ("Init. SD card")
#define MSG_CNG_SDCARD "SD\xb6\xb0\xc4\xde\xba\xb3\xb6\xdd" // "SDｶｰﾄﾞｺｳｶﾝ" ("Change SD card")
#define MSG_ZPROBE_OUT "Z\xcc\xdf\xdb\xb0\xcc\xde\x20\xcd\xde\xaf\xc4\xde\xb6\xde\xb2" // "Zﾌﾟﾛｰﾌﾞ ﾍﾞｯﾄﾞｶﾞｲ" ("Z probe out. bed")
+
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
+/*
#if LCD_WIDTH < 20
#define MSG_YX_UNHOMED "\xbb\xb7\xc6X/Y\xa6\xcc\xaf\xb7\xbb\xbe\xd6" // "ｻｷﾆX/Yｦﾌｯｷｻｾﾖ" ("Home X/Y before Z")
#define MSG_XYZ_UNHOMED "\xbb\xb7\xc6\xb9\xde\xdd\xc3\xdd\xcc\xaf\xb7\xa6\xbe\xd6" // "ｻｷﾆｹﾞﾝﾃﾝﾌｯｷｦｾﾖ" ("Home XYZ first")
@@ -191,6 +195,7 @@
#define MSG_YX_UNHOMED "\xbb\xb7\xc6X/Y\xa6\xcc\xaf\xb7\xbb\xbe\xc3\xb8\xc0\xde\xbb\xb2" // "ｻｷﾆX/Yｦﾌｯｷｻｾﾃｸﾀﾞｻｲ" ("Home X/Y before Z")
#define MSG_XYZ_UNHOMED "\xbb\xb7\xc6\xb9\xde\xdd\xc3\xdd\xcc\xaf\xb7\xa6\xbc\xc3\xb8\xc0\xde\xbb\xb2" // "ｻｷﾆｹﾞﾝﾃﾝﾌｯｷｦｼﾃｸﾀﾞｻｲ" ("Home XYZ first")
#endif
+*/
#define MSG_ZPROBE_ZOFFSET "Z\xb5\xcc\xbe\xaf\xc4" // "Zｵﾌｾｯﾄ" ("Z Offset")
#define MSG_BABYSTEP_X "X\xbc\xde\xb8\x20\xcb\xde\xc4\xde\xb3" // "Xｼﾞｸ ﾋﾞﾄﾞｳ" ("Babystep X")
#define MSG_BABYSTEP_Y "Y\xbc\xde\xb8\x20\xcb\xde\xc4\xde\xb3" // "Yｼﾞｸ ﾋﾞﾄﾞｳ" ("Babystep Y")
diff --git a/Marlin/language_kana_utf8.h b/Marlin/language_kana_utf8.h
index 1188c63d321f143e2a5bdda4e933b123eb201f78..8a35e7cef8e1aa049c65e257bd1682ebe0c15d5c 100644
--- a/Marlin/language_kana_utf8.h
+++ b/Marlin/language_kana_utf8.h
@@ -155,8 +155,8 @@
#define MSG_INIT_SDCARD "SDカードサイヨミコミ" // "Init. SD card"
#define MSG_CNG_SDCARD "SDカードコウカン" // "Change SD card"
#define MSG_ZPROBE_OUT "Zプローブ ベッドガイ" // "Z probe out. bed"
-#define MSG_YX_UNHOMED "サキニX/Yヲフッキサセテクダサイ" // "Home X/Y before Z"
-#define MSG_XYZ_UNHOMED "サキニゲンテンフッキヲシテクダサイ" // "Home XYZ first"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Zオフセット" // "Z Offset"
#define MSG_BABYSTEP_X "Xジク ビドウ" // "Babystep X"
#define MSG_BABYSTEP_Y "Yジク ビドウ" // "Babystep Y"
diff --git a/Marlin/language_nl.h b/Marlin/language_nl.h
index dcac94019d8e0e7cf341e647644c59d4892dbf84..c74ad8fbd76f9cbf4373ce2b8f15988990a12feb 100644
--- a/Marlin/language_nl.h
+++ b/Marlin/language_nl.h
@@ -144,7 +144,8 @@
#define MSG_INIT_SDCARD "Init. SD kaart"
#define MSG_CNG_SDCARD "Verv. SD Kaart"
#define MSG_ZPROBE_OUT "Z probe uit. bed"
-#define MSG_YX_UNHOMED "Home X/Y voor Z"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystap X"
#define MSG_BABYSTEP_Y "Babystap Y"
diff --git a/Marlin/language_pl.h b/Marlin/language_pl.h
index 8a54f6484565589c31c3376fccb28f00698f380a..bbaae33cd5bb11e1e2afa9a250a25bb92bdde416 100644
--- a/Marlin/language_pl.h
+++ b/Marlin/language_pl.h
@@ -167,7 +167,8 @@
#define MSG_INIT_SDCARD "Inicjal. karty SD"
#define MSG_CNG_SDCARD "Zmiana karty SD"
#define MSG_ZPROBE_OUT "Sonda Z za lozem"
-#define MSG_YX_UNHOMED "Wroc w XY przed Z"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Offset Z"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
diff --git a/Marlin/language_pt-br.h b/Marlin/language_pt-br.h
index 3bc25d9af5c01e6bf6623043e447b93c9dd42c60..cc37f31dae9138b66fdd439cc568e12a2ea7b2a7 100644
--- a/Marlin/language_pt-br.h
+++ b/Marlin/language_pt-br.h
@@ -144,7 +144,8 @@
#define MSG_INIT_SDCARD "Iniciar SD"
#define MSG_CNG_SDCARD "Trocar SD"
#define MSG_ZPROBE_OUT "Son. fora da mesa"
-#define MSG_YX_UNHOMED "Pos. Desconhecida"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Deslocamento no Z"
#define MSG_BABYSTEP_X "Passinho X"
#define MSG_BABYSTEP_Y "Passinho Y"
diff --git a/Marlin/language_pt-br_utf8.h b/Marlin/language_pt-br_utf8.h
index a746ad6b956ea71445300d6e5616a1a33ce53079..feb38b49685115cf2bba94949aafd51860ee9ea7 100644
--- a/Marlin/language_pt-br_utf8.h
+++ b/Marlin/language_pt-br_utf8.h
@@ -144,7 +144,8 @@
#define MSG_INIT_SDCARD "Iniciar SD"
#define MSG_CNG_SDCARD "Trocar SD"
#define MSG_ZPROBE_OUT "Son. fora da mesa"
-#define MSG_YX_UNHOMED "Pos. Desconhecida"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Deslocamento no Z"
#define MSG_BABYSTEP_X "Passinho X"
#define MSG_BABYSTEP_Y "Passinho Y"
diff --git a/Marlin/language_pt.h b/Marlin/language_pt.h
index e4bb049a822f78803e2376b0d98e910931a3a4ca..4c857a7c1dae1186b347ef47469fb9e567c98789 100644
--- a/Marlin/language_pt.h
+++ b/Marlin/language_pt.h
@@ -152,7 +152,8 @@
#define MSG_INIT_SDCARD "Inici. cartao SD"
#define MSG_CNG_SDCARD "Trocar cartao SD"
#define MSG_ZPROBE_OUT "Sensor fora/base"
-#define MSG_YX_UNHOMED "XY antes de Z"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Desvio Z"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
diff --git a/Marlin/language_pt_utf8.h b/Marlin/language_pt_utf8.h
index 02b46bd9258bf607042b34b01fe0e9b7d963a334..c2fab4d63677a3e3f72a47a8517543114156ae4a 100644
--- a/Marlin/language_pt_utf8.h
+++ b/Marlin/language_pt_utf8.h
@@ -152,7 +152,8 @@
#define MSG_INIT_SDCARD "Inici. cartão SD"
#define MSG_CNG_SDCARD "Trocar cartão SD"
#define MSG_ZPROBE_OUT "Sensor fora/base"
-#define MSG_YX_UNHOMED "XY antes de Z"
+#define MSG_HOME "Home" // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST
+#define MSG_FIRST "first"
#define MSG_ZPROBE_ZOFFSET "Desvio Z"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"