3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Choose filament as it is a duplicate of Select filament

Browse Source
This commit is contained in:
3d-gussner 2022-02-22 14:06:19 +01:00
parent 879803daa9
commit bcd2b6f8bf
32 changed files with 156 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/messages.c
View File

@ -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

4
Firmware/messages.h
View File

@ -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[];

5
lang/lang_en.txt
View File

@ -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"

5
lang/lang_en_da.txt
View File

@ -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

6
lang/lang_en_de.txt
View File

@ -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"

5
lang/lang_en_lb.txt
View File

@ -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

5
lang/lang_en_lt.txt
View File

@ -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

5
lang/lang_en_sl.txt
View File

@ -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

5
lang/lang_en_sv.txt
View File

@ -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

10
lang/po/Firmware.pot
View File

@ -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

4
lang/po/Firmware_cs.po
View File

@ -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"

4
lang/po/Firmware_da.po
View File

@ -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

11
lang/po/Firmware_de.po
View File

@ -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

4
lang/po/Firmware_es.po
View File

@ -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."

4
lang/po/Firmware_fr.po
View File

@ -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."

4
lang/po/Firmware_it.po
View File

@ -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."

4
lang/po/Firmware_lb.po
View File

@ -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

4
lang/po/Firmware_lt.po
View File

@ -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

4
lang/po/Firmware_pl.po
View File

@ -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."

4
lang/po/Firmware_sl.po
View File

@ -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

4
lang/po/Firmware_sv.po
View File

@ -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

4
lang/po/new/cs.po
View File

@ -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"

4
lang/po/new/da.po
View File

@ -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

11
lang/po/new/de.po
View File

@ -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

4
lang/po/new/es.po
View File

@ -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."

4
lang/po/new/fr.po
View File

@ -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."

4
lang/po/new/it.po
View File

@ -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."

4
lang/po/new/lb.po
View File

@ -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

4
lang/po/new/lt.po
View File

@ -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

4
lang/po/new/pl.po
View File

@ -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."

4
lang/po/new/sl.po
View File

@ -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

4
lang/po/new/sv.po
View File

@ -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