diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index f44f69dfde..8e9a929db9 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -38,15 +38,7 @@ msgstr ""
 #: main.c
 msgid ""
 "\n"
-"WARNING: Allocating pystack failed, defaulting back to build value. \n"
-"\n"
-msgstr ""
-
-#: main.c
-msgid ""
-"\n"
-"WARNING: Invalid CIRCUITPY_PYSTACK_SIZE, defaulting back to build value.\n"
-"\n"
+"WARNING: "
 msgstr ""
 
 #: py/obj.c
@@ -390,6 +382,12 @@ msgstr ""
 msgid "*x must be assignment target"
 msgstr ""
 
+#: main.c
+msgid ""
+", defaulting back to build value.\n"
+"\n"
+msgstr ""
+
 #: py/obj.c
 msgid ", in %q\n"
 msgstr ""
@@ -496,6 +494,10 @@ msgstr ""
 msgid "All timers in use"
 msgstr ""
 
+#: main.c
+msgid "Allocating pystack failed"
+msgstr ""
+
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Already advertising."
@@ -1244,6 +1246,10 @@ msgstr ""
 msgid "Invalid BSSID"
 msgstr ""
 
+#: main.c
+msgid "Invalid CIRCUITPY_PYSTACK_SIZE"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr ""
diff --git a/main.c b/main.c
index 82b0a54fd6..ad91b50434 100644
--- a/main.c
+++ b/main.c
@@ -150,13 +150,17 @@ STATIC vm_memory_t allocate_vm_memory(void) {
     // Check if value is valid
     pystack_size = pystack_size - pystack_size % sizeof(size_t); // Round down to multiple of 4.
     if (pystack_size < 384) {
-        serial_write_compressed(translate("\nWARNING: Invalid CIRCUITPY_PYSTACK_SIZE, defaulting back to build value.\n\n"));
+        serial_write_compressed(translate("\nWARNING: "));
+        serial_write_compressed(translate("Invalid CIRCUITPY_PYSTACK_SIZE"));
+        serial_write_compressed(translate(", defaulting back to build value.\n\n"));
         pystack_size = CIRCUITPY_PYSTACK_SIZE; // Reset
     }
     #endif
     res.pystack = allocate_memory(pystack_size, false, false);
     if (res.pystack == NULL) {
-        serial_write_compressed(translate("\nWARNING: Allocating pystack failed, defaulting back to build value. \n\n"));
+        serial_write_compressed(translate("\nWARNING: "));
+        serial_write_compressed(translate("Allocating pystack failed"));
+        serial_write_compressed(translate(", defaulting back to build value.\n\n"));
         res.pystack = allocate_memory(CIRCUITPY_PYSTACK_SIZE, false, false);
     }
     #endif