diff --git a/Firmware/messages.c b/Firmware/messages.c index c4b9cdff4..c38e50a66 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -53,11 +53,7 @@ const char MSG_HEATING[] PROGMEM_I1 = ISTR("Heating"); ////c=20 const char MSG_HEATING_COMPLETE[] PROGMEM_I1 = ISTR("Heating done."); ////c=20 const char MSG_HOMEYZ[] PROGMEM_I1 = ISTR("Calibrate Z"); ////c=18 const char MSG_ITERATION[] PROGMEM_I1 = ISTR("Iteration"); ////c=12 -<<<<<<< HEAD const char MSG_SELECT_EXTRUDER[] PROGMEM_I1 = ISTR("Select extruder:"); ////c=20 -======= -const char MSG_CHOOSE_EXTRUDER[] PROGMEM_I1 = ISTR("Choose extruder:"); ////c=20 ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` const char MSG_SELECT_FILAMENT[] PROGMEM_I1 = ISTR("Select filament:"); ////c=20 const char MSG_LAST_PRINT[] PROGMEM_I1 = ISTR("Last print"); ////c=18 const char MSG_LAST_PRINT_FAILURES[] PROGMEM_I1 = ISTR("Last print failures"); ////c=20 diff --git a/Firmware/messages.h b/Firmware/messages.h index e86c6a573..ba85eae60 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -54,11 +54,7 @@ extern const char MSG_HEATING[]; extern const char MSG_HEATING_COMPLETE[]; extern const char MSG_HOMEYZ[]; extern const char MSG_ITERATION[]; -<<<<<<< HEAD extern const char MSG_SELECT_EXTRUDER[]; -======= -extern const char MSG_CHOOSE_EXTRUDER[]; ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` extern const char MSG_SELECT_FILAMENT[]; extern const char MSG_LAST_PRINT[]; extern const char MSG_LAST_PRINT_FAILURES[]; diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 58e5463c2..b55d68967 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -334,13 +334,8 @@ #MSG_SELFTEST_CHECK_Z c=20 "Checking Z axis" -<<<<<<< HEAD #MSG_SELECT_EXTRUDER c=20 "Select extruder:" -======= -#MSG_CHOOSE_EXTRUDER c=20 -"Choose extruder:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` #MSG_FILAMENT c=17 "Filament" diff --git a/lang/lang_en_da.txt b/lang/lang_en_da.txt index 6caa5500c..700e7cac8 100644 --- a/lang/lang_en_da.txt +++ b/lang/lang_en_da.txt @@ -446,13 +446,8 @@ "Checking Z axis" "\x00" -<<<<<<< HEAD #MSG_SELECT_EXTRUDER c=20 "Select extruder:" -======= -#MSG_CHOOSE_EXTRUDER c=20 -"Choose extruder:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` "\x00" #MSG_FILAMENT c=17 diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index b93111557..a8ed33f71 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -446,15 +446,9 @@ "Checking Z axis" "Pr\xf5fe Z Achse" -<<<<<<< HEAD #MSG_SELECT_EXTRUDER c=20 "Select extruder:" "W\xe1hle extruder:" -======= -#MSG_CHOOSE_EXTRUDER c=20 -"Choose extruder:" -"Extruder w\xe1hlen:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` #MSG_FILAMENT c=17 "Filament" diff --git a/lang/lang_en_lb.txt b/lang/lang_en_lb.txt index fe6c3b683..ec3c06b14 100644 --- a/lang/lang_en_lb.txt +++ b/lang/lang_en_lb.txt @@ -446,13 +446,8 @@ "Checking Z axis" "\x00" -<<<<<<< HEAD #MSG_SELECT_EXTRUDER c=20 "Select extruder:" -======= -#MSG_CHOOSE_EXTRUDER c=20 -"Choose extruder:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` "\x00" #MSG_FILAMENT c=17 diff --git a/lang/lang_en_lt.txt b/lang/lang_en_lt.txt index ddb95205b..a57e3a909 100644 --- a/lang/lang_en_lt.txt +++ b/lang/lang_en_lt.txt @@ -446,13 +446,8 @@ "Checking Z axis" "\x00" -<<<<<<< HEAD #MSG_SELECT_EXTRUDER c=20 "Select extruder:" -======= -#MSG_CHOOSE_EXTRUDER c=20 -"Choose extruder:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` "\x00" #MSG_FILAMENT c=17 diff --git a/lang/lang_en_sl.txt b/lang/lang_en_sl.txt index ac4bdd31a..1e94d10f3 100644 --- a/lang/lang_en_sl.txt +++ b/lang/lang_en_sl.txt @@ -446,13 +446,8 @@ "Checking Z axis" "\x00" -<<<<<<< HEAD #MSG_SELECT_EXTRUDER c=20 "Select extruder:" -======= -#MSG_CHOOSE_EXTRUDER c=20 -"Choose extruder:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` "\x00" #MSG_FILAMENT c=17 diff --git a/lang/lang_en_sv.txt b/lang/lang_en_sv.txt index cfedd2b52..88baedc92 100644 --- a/lang/lang_en_sv.txt +++ b/lang/lang_en_sv.txt @@ -446,13 +446,8 @@ "Checking Z axis" "\x00" -<<<<<<< HEAD #MSG_SELECT_EXTRUDER c=20 "Select extruder:" -======= -#MSG_CHOOSE_EXTRUDER c=20 -"Choose extruder:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` "\x00" #MSG_FILAMENT c=17 diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 41af2d818..335fccf62 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -251,11 +251,7 @@ msgid "Crash det." msgstr "" # MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7 -<<<<<<< HEAD #: ultralcd.cpp:4824 -======= -#: ultralcd.cpp:4842 ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgid "Select a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "" @@ -579,15 +575,9 @@ msgstr "" msgid "Checking Z axis" msgstr "" -<<<<<<< HEAD # MSG_SELECT_EXTRUDER c=20 #: messages.c:56 msgid "Select extruder:" -======= -# MSG_CHOOSE_EXTRUDER c=20 -#: messages.c:54 -msgid "Choose extruder:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgstr "" # MSG_FILAMENT c=17 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 36b3dfcc2..e0e4c63ca 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -251,11 +251,7 @@ msgid "Crash det." msgstr "Det. narazu" # MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7 -<<<<<<< HEAD #: ultralcd.cpp:4824 -======= -#: ultralcd.cpp:4842 ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgid "Select a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Zvolte filament pro kalibraci prvni vrstvy z nasledujiciho menu" diff --git a/lang/po/Firmware_da.po b/lang/po/Firmware_da.po index 45adee28d..a31422a00 100644 --- a/lang/po/Firmware_da.po +++ b/lang/po/Firmware_da.po @@ -582,11 +582,7 @@ msgstr "" # MSG_SELECT_EXTRUDER c=20 #: messages.c:54 -<<<<<<< HEAD msgid "Select extruder:" -======= -msgid "Choose extruder:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgstr "" # MSG_FILAMENT c=17 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 61540368e..a91de1c47 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -251,11 +251,7 @@ msgid "Crash det." msgstr "Crash Erk." # MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7 -<<<<<<< HEAD #: ultralcd.cpp:4824 -======= -#: ultralcd.cpp:4842 ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgid "Select a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Wählen Sie ein Filament für Erste- Schichtkalibrierung aus und wählen Sie es im On-Screen-Menu aus." @@ -579,17 +575,10 @@ msgstr "Prüfe Y Achse" msgid "Checking Z axis" msgstr "Prüfe Z Achse" -<<<<<<< HEAD # MSG_SELECT_EXTRUDER c=20 #: messages.c:56 msgid "Select extruder:" msgstr "Wähle extruder:" -======= -# MSG_CHOOSE_EXTRUDER c=20 -#: messages.c:54 -msgid "Choose extruder:" -msgstr "Extruder wählen:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` # MSG_FILAMENT c=17 #: messages.c:35 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 59ff8c8fb..85ca93b3c 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -251,11 +251,7 @@ msgid "Crash det." msgstr "Det. choque" # MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7 -<<<<<<< HEAD #: ultralcd.cpp:4824 -======= -#: ultralcd.cpp:4842 ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgid "Select a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Escoge un filamento para la Calibracion de la Primera Capa y seleccionalo en el menu en pantalla." diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 694d4cdef..ba5b7cecd 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -251,11 +251,7 @@ msgid "Crash det." msgstr "Detect.crash" # MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7 -<<<<<<< HEAD #: ultralcd.cpp:4824 -======= -#: ultralcd.cpp:4842 ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgid "Select a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Choisissez un filament pour la Calibration de la Premiere Couche et selectionnez-le depuis le menu a l'ecran." diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 5de3675ae..d5239ab0e 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -251,11 +251,7 @@ msgid "Crash det." msgstr "Rileva.crash" # MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7 -<<<<<<< HEAD #: ultralcd.cpp:4824 -======= -#: ultralcd.cpp:4842 ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgid "Select a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Scegli un filamento per la calibrazione del primo strato e selezionalo nel menu sullo schermo." diff --git a/lang/po/Firmware_lb.po b/lang/po/Firmware_lb.po index 88849bc0e..004ab062f 100644 --- a/lang/po/Firmware_lb.po +++ b/lang/po/Firmware_lb.po @@ -582,11 +582,7 @@ msgstr "" # MSG_SELECT_EXTRUDER c=20 #: messages.c:54 -<<<<<<< HEAD msgid "Select extruder:" -======= -msgid "Choose extruder:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgstr "" # MSG_FILAMENT c=17 diff --git a/lang/po/Firmware_lt.po b/lang/po/Firmware_lt.po index 08acf4d6e..52612366f 100644 --- a/lang/po/Firmware_lt.po +++ b/lang/po/Firmware_lt.po @@ -582,11 +582,7 @@ msgstr "" # MSG_SELECT_EXTRUDER c=20 #: messages.c:54 -<<<<<<< HEAD msgid "Select extruder:" -======= -msgid "Choose extruder:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgstr "" # MSG_FILAMENT c=17 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 60c58210e..1e8f46abb 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -251,11 +251,7 @@ msgid "Crash det." msgstr "Wykr.zderzen" # MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7 -<<<<<<< HEAD #: ultralcd.cpp:4824 -======= -#: ultralcd.cpp:4842 ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgid "Select a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Wybierz filament do Kalibracji Pierwszej Warstwy i potwierdz w menu ekranowym." diff --git a/lang/po/Firmware_sl.po b/lang/po/Firmware_sl.po index fc261a285..d95490a07 100644 --- a/lang/po/Firmware_sl.po +++ b/lang/po/Firmware_sl.po @@ -582,11 +582,7 @@ msgstr "" # MSG_SELECT_EXTRUDER c=20 #: messages.c:54 -<<<<<<< HEAD msgid "Select extruder:" -======= -msgid "Choose extruder:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgstr "" # MSG_FILAMENT c=17 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 20f55073b..88f2814a3 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -582,11 +582,7 @@ msgstr "" # MSG_SELECT_EXTRUDER c=20 #: messages.c:54 -<<<<<<< HEAD msgid "Select extruder:" -======= -msgid "Choose extruder:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgstr "" # MSG_FILAMENT c=17 diff --git a/lang/po/new/cs.po b/lang/po/new/cs.po index f08991df9..32fc2b1bc 100644 --- a/lang/po/new/cs.po +++ b/lang/po/new/cs.po @@ -251,11 +251,7 @@ msgid "Crash det." msgstr "Det. narazu" # MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7 -<<<<<<< HEAD #: ultralcd.cpp:4824 -======= -#: ultralcd.cpp:4842 ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgid "Select a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Zvolte filament pro kalibraci prvni vrstvy z nasledujiciho menu" diff --git a/lang/po/new/da.po b/lang/po/new/da.po index 326c3d76a..6e1831a45 100644 --- a/lang/po/new/da.po +++ b/lang/po/new/da.po @@ -582,11 +582,7 @@ msgstr "" # MSG_SELECT_EXTRUDER c=20 #: messages.c:54 -<<<<<<< HEAD msgid "Select extruder:" -======= -msgid "Choose extruder:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgstr "" # MSG_FILAMENT c=17 diff --git a/lang/po/new/de.po b/lang/po/new/de.po index bb912b45e..a8beb16c7 100644 --- a/lang/po/new/de.po +++ b/lang/po/new/de.po @@ -251,11 +251,7 @@ msgid "Crash det." msgstr "Crash Erk." # MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7 -<<<<<<< HEAD #: ultralcd.cpp:4824 -======= -#: ultralcd.cpp:4842 ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgid "Select a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Wählen Sie ein Filament für Erste- Schichtkalibrierung aus und wählen Sie es im On-Screen-Menu aus." @@ -579,17 +575,10 @@ msgstr "Prüfe Y Achse" msgid "Checking Z axis" msgstr "Prüfe Z Achse" -<<<<<<< HEAD # MSG_SELECT_EXTRUDER c=20 #: messages.c:56 msgid "Select extruder:" msgstr "Wähle extruder:" -======= -# MSG_CHOOSE_EXTRUDER c=20 -#: messages.c:54 -msgid "Choose extruder:" -msgstr "Extruder wählen:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` # MSG_FILAMENT c=17 #: messages.c:35 diff --git a/lang/po/new/es.po b/lang/po/new/es.po index ee0976342..dec9290c7 100644 --- a/lang/po/new/es.po +++ b/lang/po/new/es.po @@ -251,11 +251,7 @@ msgid "Crash det." msgstr "Det. choque" # MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7 -<<<<<<< HEAD #: ultralcd.cpp:4824 -======= -#: ultralcd.cpp:4842 ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgid "Select a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Escoge un filamento para la Calibracion de la Primera Capa y seleccionalo en el menu en pantalla." diff --git a/lang/po/new/fr.po b/lang/po/new/fr.po index fd317ba67..329e46ea8 100644 --- a/lang/po/new/fr.po +++ b/lang/po/new/fr.po @@ -251,11 +251,7 @@ msgid "Crash det." msgstr "Detect.crash" # MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7 -<<<<<<< HEAD #: ultralcd.cpp:4824 -======= -#: ultralcd.cpp:4842 ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgid "Select a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Choisissez un filament pour la Calibration de la Premiere Couche et selectionnez-le depuis le menu a l'ecran." diff --git a/lang/po/new/it.po b/lang/po/new/it.po index 9acdc1142..62e600391 100644 --- a/lang/po/new/it.po +++ b/lang/po/new/it.po @@ -251,11 +251,7 @@ msgid "Crash det." msgstr "Rileva.crash" # MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7 -<<<<<<< HEAD #: ultralcd.cpp:4824 -======= -#: ultralcd.cpp:4842 ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgid "Select a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Scegli un filamento per la calibrazione del primo strato e selezionalo nel menu sullo schermo." diff --git a/lang/po/new/lb.po b/lang/po/new/lb.po index 10969be28..3f8835ba7 100644 --- a/lang/po/new/lb.po +++ b/lang/po/new/lb.po @@ -582,11 +582,7 @@ msgstr "" # MSG_SELECT_EXTRUDER c=20 #: messages.c:54 -<<<<<<< HEAD msgid "Select extruder:" -======= -msgid "Choose extruder:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgstr "" # MSG_FILAMENT c=17 diff --git a/lang/po/new/lt.po b/lang/po/new/lt.po index 118abe89d..6df97d7f3 100644 --- a/lang/po/new/lt.po +++ b/lang/po/new/lt.po @@ -582,11 +582,7 @@ msgstr "" # MSG_SELECT_EXTRUDER c=20 #: messages.c:54 -<<<<<<< HEAD msgid "Select extruder:" -======= -msgid "Choose extruder:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgstr "" # MSG_FILAMENT c=17 diff --git a/lang/po/new/pl.po b/lang/po/new/pl.po index 77c230abd..b89de745f 100644 --- a/lang/po/new/pl.po +++ b/lang/po/new/pl.po @@ -251,11 +251,7 @@ msgid "Crash det." msgstr "Wykr.zderzen" # MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7 -<<<<<<< HEAD #: ultralcd.cpp:4824 -======= -#: ultralcd.cpp:4842 ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgid "Select a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Wybierz filament do Kalibracji Pierwszej Warstwy i potwierdz w menu ekranowym." diff --git a/lang/po/new/sl.po b/lang/po/new/sl.po index 061203755..7fb7e5830 100644 --- a/lang/po/new/sl.po +++ b/lang/po/new/sl.po @@ -582,11 +582,7 @@ msgstr "" # MSG_SELECT_EXTRUDER c=20 #: messages.c:54 -<<<<<<< HEAD msgid "Select extruder:" -======= -msgid "Choose extruder:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgstr "" # MSG_FILAMENT c=17 diff --git a/lang/po/new/sv.po b/lang/po/new/sv.po index b04bf8f8c..b44539a74 100644 --- a/lang/po/new/sv.po +++ b/lang/po/new/sv.po @@ -582,11 +582,7 @@ msgstr "" # MSG_SELECT_EXTRUDER c=20 #: messages.c:54 -<<<<<<< HEAD msgid "Select extruder:" -======= -msgid "Choose extruder:" ->>>>>>> Remove `Choose filament` as it is a duplicate of `Select filament` msgstr "" # MSG_FILAMENT c=17