Remove `Choose filament` as it is a duplicate of `Select filament`

Firmware/messages.c

@@ -53,7 +53,11 @@ 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

Firmware/messages.h

@@ -54,7 +54,11 @@ 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[];

lang/lang_en.txt

@@ -334,8 +334,13 @@
 #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"

lang/lang_en_da.txt

@@ -446,8 +446,13 @@
 "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

lang/lang_en_de.txt

@@ -446,9 +446,15 @@
 "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"

lang/lang_en_lb.txt

@@ -446,8 +446,13 @@
 "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

lang/lang_en_lt.txt

@@ -446,8 +446,13 @@
 "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

lang/lang_en_sl.txt

@@ -446,8 +446,13 @@
 "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

lang/lang_en_sv.txt

@@ -446,8 +446,13 @@
 "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

lang/po/Firmware.pot

@@ -251,7 +251,11 @@ 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 ""
 
@@ -575,9 +579,15 @@ 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

lang/po/Firmware_cs.po

@@ -251,7 +251,11 @@ 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"
 

lang/po/Firmware_da.po

@@ -582,7 +582,11 @@ 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

lang/po/Firmware_de.po

@@ -251,7 +251,11 @@ 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."
 
@@ -575,10 +579,17 @@ 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

lang/po/Firmware_es.po

@@ -251,7 +251,11 @@ 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."
 

lang/po/Firmware_fr.po

@@ -251,7 +251,11 @@ 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."
 

lang/po/Firmware_it.po

@@ -251,7 +251,11 @@ 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."
 

lang/po/Firmware_lb.po

@@ -582,7 +582,11 @@ 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

lang/po/Firmware_lt.po

@@ -582,7 +582,11 @@ 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

lang/po/Firmware_pl.po

@@ -251,7 +251,11 @@ 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."
 

lang/po/Firmware_sl.po

@@ -582,7 +582,11 @@ 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

lang/po/Firmware_sv.po

@@ -582,7 +582,11 @@ 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

lang/po/new/cs.po

@@ -251,7 +251,11 @@ 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"
 

lang/po/new/da.po

@@ -582,7 +582,11 @@ 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

lang/po/new/de.po

@@ -251,7 +251,11 @@ 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."
 
@@ -575,10 +579,17 @@ 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

lang/po/new/es.po

@@ -251,7 +251,11 @@ 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."
 

lang/po/new/fr.po

@@ -251,7 +251,11 @@ 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."
 

lang/po/new/it.po

@@ -251,7 +251,11 @@ 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."
 

lang/po/new/lb.po

@@ -582,7 +582,11 @@ 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

lang/po/new/lt.po

@@ -582,7 +582,11 @@ 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

lang/po/new/pl.po

@@ -251,7 +251,11 @@ 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."
 

lang/po/new/sl.po

@@ -582,7 +582,11 @@ 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

lang/po/new/sv.po

@@ -582,7 +582,11 @@ 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