diff --git a/Firmware/messages.c b/Firmware/messages.c index c38e50a6..c4b9cdff 100644 --- a/Firmware/messages.c +++ b/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 diff --git a/Firmware/messages.h b/Firmware/messages.h index ba85eae6..e86c6a57 100644 --- a/Firmware/messages.h +++ b/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[]; diff --git a/lang/lang_en.txt b/lang/lang_en.txt index b55d6896..58e5463c 100644 --- a/lang/lang_en.txt +++ b/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" diff --git a/lang/lang_en_da.txt b/lang/lang_en_da.txt index 700e7cac..6caa5500 100644 --- a/lang/lang_en_da.txt +++ b/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 diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index a8ed33f7..b9311155 100644 --- a/lang/lang_en_de.txt +++ b/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" diff --git a/lang/lang_en_lb.txt b/lang/lang_en_lb.txt index ec3c06b1..fe6c3b68 100644 --- a/lang/lang_en_lb.txt +++ b/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 diff --git a/lang/lang_en_lt.txt b/lang/lang_en_lt.txt index a57e3a90..ddb95205 100644 --- a/lang/lang_en_lt.txt +++ b/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 diff --git a/lang/lang_en_sl.txt b/lang/lang_en_sl.txt index 1e94d10f..ac4bdd31 100644 --- a/lang/lang_en_sl.txt +++ b/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 diff --git a/lang/lang_en_sv.txt b/lang/lang_en_sv.txt index 88baedc9..cfedd2b5 100644 --- a/lang/lang_en_sv.txt +++ b/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 diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 335fccf6..41af2d81 100644 --- a/lang/po/Firmware.pot +++ b/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 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index e0e4c63c..36b3dfcc 100644 --- a/lang/po/Firmware_cs.po +++ b/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" diff --git a/lang/po/Firmware_da.po b/lang/po/Firmware_da.po index a31422a0..45adee28 100644 --- a/lang/po/Firmware_da.po +++ b/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 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index a91de1c4..61540368 100644 --- a/lang/po/Firmware_de.po +++ b/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 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 85ca93b3..59ff8c8f 100644 --- a/lang/po/Firmware_es.po +++ b/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." diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index ba5b7cec..694d4cde 100644 --- a/lang/po/Firmware_fr.po +++ b/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." diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index d5239ab0..5de3675a 100644 --- a/lang/po/Firmware_it.po +++ b/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." diff --git a/lang/po/Firmware_lb.po b/lang/po/Firmware_lb.po index 004ab062..88849bc0 100644 --- a/lang/po/Firmware_lb.po +++ b/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 diff --git a/lang/po/Firmware_lt.po b/lang/po/Firmware_lt.po index 52612366..08acf4d6 100644 --- a/lang/po/Firmware_lt.po +++ b/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 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 1e8f46ab..60c58210 100644 --- a/lang/po/Firmware_pl.po +++ b/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." diff --git a/lang/po/Firmware_sl.po b/lang/po/Firmware_sl.po index d95490a0..fc261a28 100644 --- a/lang/po/Firmware_sl.po +++ b/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 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 88f2814a..20f55073 100644 --- a/lang/po/Firmware_sv.po +++ b/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 diff --git a/lang/po/new/cs.po b/lang/po/new/cs.po index 32fc2b1b..f08991df 100644 --- a/lang/po/new/cs.po +++ b/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" diff --git a/lang/po/new/da.po b/lang/po/new/da.po index 6e1831a4..326c3d76 100644 --- a/lang/po/new/da.po +++ b/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 diff --git a/lang/po/new/de.po b/lang/po/new/de.po index a8beb16c..bb912b45 100644 --- a/lang/po/new/de.po +++ b/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 diff --git a/lang/po/new/es.po b/lang/po/new/es.po index dec9290c..ee097634 100644 --- a/lang/po/new/es.po +++ b/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." diff --git a/lang/po/new/fr.po b/lang/po/new/fr.po index 329e46ea..fd317ba6 100644 --- a/lang/po/new/fr.po +++ b/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." diff --git a/lang/po/new/it.po b/lang/po/new/it.po index 62e60039..9acdc114 100644 --- a/lang/po/new/it.po +++ b/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." diff --git a/lang/po/new/lb.po b/lang/po/new/lb.po index 3f8835ba..10969be2 100644 --- a/lang/po/new/lb.po +++ b/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 diff --git a/lang/po/new/lt.po b/lang/po/new/lt.po index 6df97d7f..118abe89 100644 --- a/lang/po/new/lt.po +++ b/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 diff --git a/lang/po/new/pl.po b/lang/po/new/pl.po index b89de745..77c230ab 100644 --- a/lang/po/new/pl.po +++ b/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." diff --git a/lang/po/new/sl.po b/lang/po/new/sl.po index 7fb7e583..06120375 100644 --- a/lang/po/new/sl.po +++ b/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 diff --git a/lang/po/new/sv.po b/lang/po/new/sv.po index b44539a7..b04bf8f8 100644 --- a/lang/po/new/sv.po +++ b/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