From a7334fd2a0b9db675ea570a3c63578d63d193107 Mon Sep 17 00:00:00 2001 From: Florian Heilmann Date: Mon, 19 Dec 2016 14:19:06 +0100 Subject: [PATCH 1/3] Allow negative retract values in the LCD This can already be done via G-Code, so adding the capability to the LCD should be straight forward. --- Marlin/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 4da0ae4ebd..92eb8ad887 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -2162,7 +2162,7 @@ KeepDrawing: #endif MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACTF, &retract_feedrate_mm_s, 1, 999); MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_ZLIFT, &retract_zlift, 0, 999); - MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER, &retract_recover_length, 0, 100); + MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER, &retract_recover_length, -100, 100); #if EXTRUDERS > 1 MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER_SWAP, &retract_recover_length_swap, 0, 100); #endif From 1cba425308ae5dcb80dc90e4ee468cb2840fe429 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 20 Dec 2016 01:16:08 -0800 Subject: [PATCH 2/3] Allow negative recover-swap length from LCD --- Marlin/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 92eb8ad887..87b9eb4ac8 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -2164,7 +2164,7 @@ KeepDrawing: MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_ZLIFT, &retract_zlift, 0, 999); MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER, &retract_recover_length, -100, 100); #if EXTRUDERS > 1 - MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER_SWAP, &retract_recover_length_swap, 0, 100); + MENU_ITEM_EDIT(float52, MSG_CONTROL_RETRACT_RECOVER_SWAP, &retract_recover_length_swap, -100, 100); #endif MENU_ITEM_EDIT(float3, MSG_CONTROL_RETRACT_RECOVERF, &retract_recover_feedrate_mm_s, 1, 999); END_MENU(); From 7739c0affac03fc67159f7d76f4886eb29f34342 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 20 Dec 2016 01:16:51 -0800 Subject: [PATCH 3/3] Change "+mm" to "mm" in most languages - Japanese and Chinese still need update --- Marlin/language_an.h | 4 ++-- Marlin/language_bg.h | 4 ++-- Marlin/language_ca.h | 4 ++-- Marlin/language_cn.h | 4 ++-- Marlin/language_cz.h | 4 ++-- Marlin/language_da.h | 4 ++-- Marlin/language_de.h | 4 ++-- Marlin/language_el-gr.h | 4 ++-- Marlin/language_el.h | 4 ++-- Marlin/language_en.h | 4 ++-- Marlin/language_es.h | 4 ++-- Marlin/language_eu.h | 4 ++-- Marlin/language_fi.h | 4 ++-- Marlin/language_fr.h | 4 ++-- Marlin/language_hr.h | 4 ++-- Marlin/language_it.h | 4 ++-- Marlin/language_nl.h | 4 ++-- Marlin/language_pl.h | 4 ++-- Marlin/language_pt-br.h | 4 ++-- Marlin/language_pt-br_utf8.h | 4 ++-- Marlin/language_pt.h | 4 ++-- Marlin/language_pt_utf8.h | 4 ++-- Marlin/language_ru.h | 4 ++-- Marlin/language_tr.h | 4 ++-- 24 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Marlin/language_an.h b/Marlin/language_an.h index 39822d02b8..421e33c5c4 100644 --- a/Marlin/language_an.h +++ b/Marlin/language_an.h @@ -141,8 +141,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Swap Retraer mm") #define MSG_CONTROL_RETRACTF _UxGT("Retraer F") #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Devantar mm") -#define MSG_CONTROL_RETRACT_RECOVER _UxGT("DesRet +mm") -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Swap DesRet +mm") +#define MSG_CONTROL_RETRACT_RECOVER _UxGT("DesRet mm") +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Swap DesRet mm") #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("DesRet F") #define MSG_AUTORETRACT _UxGT("Retraccion auto.") #define MSG_FILAMENTCHANGE _UxGT("Cambear filamento") diff --git a/Marlin/language_bg.h b/Marlin/language_bg.h index fb279f5435..0499b1ecdd 100644 --- a/Marlin/language_bg.h +++ b/Marlin/language_bg.h @@ -142,8 +142,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Смяна Откат mm") #define MSG_CONTROL_RETRACTF _UxGT("Откат V") #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Скок mm") -#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Възврат +mm") -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Смяна Възврат +mm") +#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Възврат mm") +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Смяна Възврат mm") #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("Възврат V") #define MSG_AUTORETRACT _UxGT("Автоoткат") #define MSG_FILAMENTCHANGE _UxGT("Смяна нишка") diff --git a/Marlin/language_ca.h b/Marlin/language_ca.h index 852571a2ff..9a694192a3 100644 --- a/Marlin/language_ca.h +++ b/Marlin/language_ca.h @@ -133,8 +133,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Swap Retreure mm") #define MSG_CONTROL_RETRACTF _UxGT("Retreure F") #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Aixecar mm") -#define MSG_CONTROL_RETRACT_RECOVER _UxGT("DesRet +mm") -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Swap DesRet +mm") +#define MSG_CONTROL_RETRACT_RECOVER _UxGT("DesRet mm") +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Swap DesRet mm") #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("DesRet F") #define MSG_AUTORETRACT _UxGT("AutoRetr.") #define MSG_FILAMENTCHANGE _UxGT("Canviar filament") diff --git a/Marlin/language_cn.h b/Marlin/language_cn.h index 05e26c886c..81546b6df7 100644 --- a/Marlin/language_cn.h +++ b/Marlin/language_cn.h @@ -134,8 +134,8 @@ #define MSG_CONTROL_RETRACT_SWAP "Swap Re.mm" #define MSG_CONTROL_RETRACTF "Retract V" #define MSG_CONTROL_RETRACT_ZLIFT "Hop mm" -#define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm" -#define MSG_CONTROL_RETRACT_RECOVER_SWAP "S UnRet+mm" +#define MSG_CONTROL_RETRACT_RECOVER "UnRet mm" +#define MSG_CONTROL_RETRACT_RECOVER_SWAP "S UnRetmm" #define MSG_CONTROL_RETRACT_RECOVERF "UnRet V" #define MSG_AUTORETRACT "AutoRetr." #define MSG_FILAMENTCHANGE "Change filament" diff --git a/Marlin/language_cz.h b/Marlin/language_cz.h index 7de1f7038a..5a1578f709 100644 --- a/Marlin/language_cz.h +++ b/Marlin/language_cz.h @@ -145,8 +145,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Vymena Re.mm") #define MSG_CONTROL_RETRACTF _UxGT("Retraktovat V") #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Zvednuti Z mm") -#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm") -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRet+mm") +#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm") +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRetmm") #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V") #define MSG_AUTORETRACT _UxGT("AutoRetr.") #define MSG_FILAMENTCHANGE _UxGT("Vymenit filament") diff --git a/Marlin/language_da.h b/Marlin/language_da.h index d114d680a8..866111a1d6 100644 --- a/Marlin/language_da.h +++ b/Marlin/language_da.h @@ -143,8 +143,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Skift Re.mm") #define MSG_CONTROL_RETRACTF _UxGT("Tilbagetræk V") #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Hop mm") -#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm") -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Skift UnRet+mm") +#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm") +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Skift UnRetmm") #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V") #define MSG_AUTORETRACT _UxGT("AutoRetr.") #define MSG_FILAMENTCHANGE _UxGT("Skift filament") diff --git a/Marlin/language_de.h b/Marlin/language_de.h index 564e0c7787..a5b5cfd389 100644 --- a/Marlin/language_de.h +++ b/Marlin/language_de.h @@ -142,8 +142,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Wechs. Retract mm") #define MSG_CONTROL_RETRACTF _UxGT("Retract V") #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Z-Hop mm") -#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm") -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Wechs. UnRet +mm") +#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm") +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Wechs. UnRet mm") #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V") #define MSG_AUTORETRACT _UxGT("AutoRetract") #define MSG_FILAMENTCHANGE _UxGT("Filament wechseln") diff --git a/Marlin/language_el-gr.h b/Marlin/language_el-gr.h index 85475b17f4..d4fcb163b7 100644 --- a/Marlin/language_el-gr.h +++ b/Marlin/language_el-gr.h @@ -141,8 +141,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Εναλλαγή ανάσυρσης μμ") #define MSG_CONTROL_RETRACTF _UxGT("Ανάσυρση V") #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Μεταπήδηση μμ") -#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm") -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRet+mm") +#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm") +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRetmm") #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V") #define MSG_AUTORETRACT _UxGT("Αυτόματη ανάσυρση") #define MSG_FILAMENTCHANGE _UxGT("Αλλαγή νήματος") diff --git a/Marlin/language_el.h b/Marlin/language_el.h index 3131a64cf1..44c5d09d1c 100644 --- a/Marlin/language_el.h +++ b/Marlin/language_el.h @@ -141,8 +141,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Εναλλαγή ανάσυρσης μμ") //SHORTEN #define MSG_CONTROL_RETRACTF _UxGT("Ανάσυρση V") #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Μεταπήδηση μμ") -#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm") -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRet+mm") +#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm") +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRetmm") #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V") #define MSG_AUTORETRACT _UxGT("Αυτόματη ανάσυρση") #define MSG_FILAMENTCHANGE _UxGT("Αλλαγή νήματος") diff --git a/Marlin/language_en.h b/Marlin/language_en.h index 219e41fdcd..eaee72620a 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -364,10 +364,10 @@ #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Hop mm") #endif #ifndef MSG_CONTROL_RETRACT_RECOVER - #define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm") + #define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm") #endif #ifndef MSG_CONTROL_RETRACT_RECOVER_SWAP - #define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRet+mm") + #define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRetmm") #endif #ifndef MSG_CONTROL_RETRACT_RECOVERF #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V") diff --git a/Marlin/language_es.h b/Marlin/language_es.h index 27b35c1b8e..743572f7a5 100644 --- a/Marlin/language_es.h +++ b/Marlin/language_es.h @@ -139,8 +139,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Interc. Retraer mm") #define MSG_CONTROL_RETRACTF _UxGT("Retraer V") #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Levantar mm") -#define MSG_CONTROL_RETRACT_RECOVER _UxGT("DesRet +mm") -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Interc. DesRet +mm") +#define MSG_CONTROL_RETRACT_RECOVER _UxGT("DesRet mm") +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Interc. DesRet mm") #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("DesRet V") #define MSG_AUTORETRACT _UxGT("Retraccion Auto.") #define MSG_FILAMENTCHANGE _UxGT("Cambiar filamento") diff --git a/Marlin/language_eu.h b/Marlin/language_eu.h index ffa62b95cb..116d1e20ce 100644 --- a/Marlin/language_eu.h +++ b/Marlin/language_eu.h @@ -132,8 +132,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Swap Atzera egin mm") #define MSG_CONTROL_RETRACTF _UxGT("Atzera egin V") #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Igo mm") -#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Atzera egin +mm") -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Swap Atzera egin +mm") +#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Atzera egin mm") +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Swap Atzera egin mm") #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("Atzera egin V") #define MSG_AUTORETRACT _UxGT("Atzera egin") #define MSG_FILAMENTCHANGE _UxGT("Aldatu filament.") diff --git a/Marlin/language_fi.h b/Marlin/language_fi.h index 05caabd7e9..7fde1ca429 100644 --- a/Marlin/language_fi.h +++ b/Marlin/language_fi.h @@ -133,8 +133,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Va. Vedä mm") #define MSG_CONTROL_RETRACTF _UxGT("Vedä V") #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Z mm") -#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm") -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Va. UnRet +mm") +#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm") +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Va. UnRet mm") #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V") #define MSG_AUTORETRACT _UxGT("AutoVeto.") #define MSG_FILAMENTCHANGE _UxGT("Change filament") diff --git a/Marlin/language_fr.h b/Marlin/language_fr.h index 97b82d0d9c..f30cf88b3a 100644 --- a/Marlin/language_fr.h +++ b/Marlin/language_fr.h @@ -141,8 +141,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Ech. Retr. mm") #define MSG_CONTROL_RETRACTF _UxGT("Retraction V") #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Hop mm") -#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm") -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Ech. UnRet +mm") +#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm") +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Ech. UnRet mm") #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V") #define MSG_AUTORETRACT _UxGT("Retract. Auto.") #define MSG_FILAMENTCHANGE _UxGT("Changer filament") diff --git a/Marlin/language_hr.h b/Marlin/language_hr.h index 6870e502bf..4b1e96d6fd 100644 --- a/Marlin/language_hr.h +++ b/Marlin/language_hr.h @@ -141,8 +141,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Swap Re.mm") #define MSG_CONTROL_RETRACTF _UxGT("Retract V") #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Hop mm") -#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm") -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRet+mm") +#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm") +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRetmm") #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V") #define MSG_AUTORETRACT _UxGT("AutoRetr.") #define MSG_FILAMENTCHANGE _UxGT("Promijeni filament") diff --git a/Marlin/language_it.h b/Marlin/language_it.h index f3553948f3..62db246e2a 100644 --- a/Marlin/language_it.h +++ b/Marlin/language_it.h @@ -149,8 +149,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Scamb. Ritrai mm") #define MSG_CONTROL_RETRACTF _UxGT("Ritrai V") #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Salta mm") -#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm") -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Scamb. UnRet+mm") +#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm") +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Scamb. UnRetmm") #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V") #define MSG_AUTORETRACT _UxGT("AutoRitrai") #define MSG_FILAMENTCHANGE _UxGT("Cambia filamento") diff --git a/Marlin/language_nl.h b/Marlin/language_nl.h index f1c9763b11..5d15a699a8 100644 --- a/Marlin/language_nl.h +++ b/Marlin/language_nl.h @@ -141,8 +141,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Ruil Retract mm") #define MSG_CONTROL_RETRACTF _UxGT("Retract F") #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Hop mm") -#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm") -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Ruil UnRet +mm") +#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm") +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Ruil UnRet mm") #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet F") #define MSG_AUTORETRACT _UxGT("AutoRetr.") #define MSG_FILAMENTCHANGE _UxGT("Verv. Filament") diff --git a/Marlin/language_pl.h b/Marlin/language_pl.h index f5d2529ea4..6531ad7da5 100644 --- a/Marlin/language_pl.h +++ b/Marlin/language_pl.h @@ -141,8 +141,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Z Wycof. mm") #define MSG_CONTROL_RETRACTF _UxGT("Wycofaj V") #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Skok Z mm") -#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Cof. wycof. +mm") -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Z Cof. wyc. +mm") +#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Cof. wycof. mm") +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Z Cof. wyc. mm") #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("Cof. wycof. V") #define MSG_AUTORETRACT _UxGT("Auto. wycofanie") #define MSG_FILAMENTCHANGE _UxGT("Zmien filament") diff --git a/Marlin/language_pt-br.h b/Marlin/language_pt-br.h index 7154dbfc51..1c83f2167e 100644 --- a/Marlin/language_pt-br.h +++ b/Marlin/language_pt-br.h @@ -134,8 +134,8 @@ #define MSG_CONTROL_RETRACT_SWAP "Retrair Troca mm" #define MSG_CONTROL_RETRACTF "Retrair V" #define MSG_CONTROL_RETRACT_ZLIFT "Levantar mm" -#define MSG_CONTROL_RETRACT_RECOVER "Des Retrair +mm" -#define MSG_CONTROL_RETRACT_RECOVER_SWAP "Des RetTroca +mm" +#define MSG_CONTROL_RETRACT_RECOVER "Des Retrair mm" +#define MSG_CONTROL_RETRACT_RECOVER_SWAP "Des RetTroca mm" #define MSG_CONTROL_RETRACT_RECOVERF "Des Retrair V" #define MSG_AUTORETRACT "Retracao Autom." #define MSG_FILAMENTCHANGE "Trocar Filamento" diff --git a/Marlin/language_pt-br_utf8.h b/Marlin/language_pt-br_utf8.h index fc61df80f5..bed0a8cd7b 100644 --- a/Marlin/language_pt-br_utf8.h +++ b/Marlin/language_pt-br_utf8.h @@ -134,8 +134,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Retrair Troca mm") #define MSG_CONTROL_RETRACTF _UxGT("Retrair V") #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Levantar mm") -#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Des Retrair +mm") -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Des RetTroca +mm") +#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Des Retrair mm") +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Des RetTroca mm") #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("Des Retrair V") #define MSG_AUTORETRACT _UxGT("Retração Autom.") #define MSG_FILAMENTCHANGE _UxGT("Trocar Filamento") diff --git a/Marlin/language_pt.h b/Marlin/language_pt.h index 54a5f67c5d..bb281644e1 100644 --- a/Marlin/language_pt.h +++ b/Marlin/language_pt.h @@ -138,8 +138,8 @@ #define MSG_CONTROL_RETRACT_SWAP "Troca Retrair mm" #define MSG_CONTROL_RETRACTF " Retrair V" #define MSG_CONTROL_RETRACT_ZLIFT " Levantar mm" -#define MSG_CONTROL_RETRACT_RECOVER " DesRet +mm" -#define MSG_CONTROL_RETRACT_RECOVER_SWAP "Troca DesRet +mm" +#define MSG_CONTROL_RETRACT_RECOVER " DesRet mm" +#define MSG_CONTROL_RETRACT_RECOVER_SWAP "Troca DesRet mm" #define MSG_CONTROL_RETRACT_RECOVERF " DesRet V" #define MSG_AUTORETRACT " AutoRetr." #define MSG_FILAMENTCHANGE "Trocar filamento" diff --git a/Marlin/language_pt_utf8.h b/Marlin/language_pt_utf8.h index d33fd8d998..84698f44e6 100644 --- a/Marlin/language_pt_utf8.h +++ b/Marlin/language_pt_utf8.h @@ -138,8 +138,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Troca Retrair mm") #define MSG_CONTROL_RETRACTF _UxGT(" Retrair V") #define MSG_CONTROL_RETRACT_ZLIFT _UxGT(" Levantar mm") -#define MSG_CONTROL_RETRACT_RECOVER _UxGT(" DesRet +mm") -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Troca DesRet +mm") +#define MSG_CONTROL_RETRACT_RECOVER _UxGT(" DesRet mm") +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Troca DesRet mm") #define MSG_CONTROL_RETRACT_RECOVERF _UxGT(" DesRet V") #define MSG_AUTORETRACT _UxGT(" AutoRetr.") #define MSG_FILAMENTCHANGE _UxGT("Trocar filamento") diff --git a/Marlin/language_ru.h b/Marlin/language_ru.h index 464fb2f8a0..9026899a23 100644 --- a/Marlin/language_ru.h +++ b/Marlin/language_ru.h @@ -138,8 +138,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Втяг. смены mm") #define MSG_CONTROL_RETRACTF _UxGT("Втягивание V") #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Втяг. прыжка mm") -#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Возврат +mm") -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Возврат смены +mm") +#define MSG_CONTROL_RETRACT_RECOVER _UxGT("Возврат mm") +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("Возврат смены mm") #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("Возврат V") #define MSG_AUTORETRACT _UxGT("Авто Втягивание") #define MSG_FILAMENTCHANGE _UxGT("Смена прутка") diff --git a/Marlin/language_tr.h b/Marlin/language_tr.h index 102f6293bb..18028932f9 100644 --- a/Marlin/language_tr.h +++ b/Marlin/language_tr.h @@ -146,8 +146,8 @@ #define MSG_CONTROL_RETRACT_SWAP _UxGT("Swap Re.mm") // Swap Re.mm #define MSG_CONTROL_RETRACTF _UxGT("Geri Çekme V") // Geri Çekme V #define MSG_CONTROL_RETRACT_ZLIFT _UxGT("Hop mm") // Hop mm -#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet +mm") // UnRet +mm -#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRet+mm") // S UnRet+mm +#define MSG_CONTROL_RETRACT_RECOVER _UxGT("UnRet mm") // UnRet mm +#define MSG_CONTROL_RETRACT_RECOVER_SWAP _UxGT("S UnRetmm") // S UnRetmm #define MSG_CONTROL_RETRACT_RECOVERF _UxGT("UnRet V") // UnRet V #define MSG_AUTORETRACT _UxGT("AutoRetr.") // AutoRetr. #define MSG_FILAMENTCHANGE _UxGT("Filaman Değiştir") // Filaman Değiştir