diff --git a/Firmware/messages.c b/Firmware/messages.c index a18fb16de..8db87c528 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -123,7 +123,6 @@ const char MSG_WIZARD_WELCOME[] PROGMEM_I1 = ISTR("Hi, I am your Original Prusa const char MSG_WIZARD_WELCOME_SHIPPING[] PROGMEM_I1 = ISTR("Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."); ////c=20 r=16 const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); ////c=3 const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=18 -const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20 const char MSG_OFF[] PROGMEM_I1 = ISTR("Off"); ////c=3 const char MSG_ON[] PROGMEM_I1 = ISTR("On"); ////c=3 const char MSG_NA[] PROGMEM_I1 = ISTR("N/A"); ////c=3 @@ -171,6 +170,7 @@ const char MSG_IR_UNKNOWN[] PROGMEM_I1 = ISTR("unknown state");////c=18 #endif //not internationalized messages +const char WELCOME_MSG[] PROGMEM_N1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20 const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// const char MSG_BROWNOUT_RESET[] PROGMEM_N1 = " Brown out Reset"; //// const char MSG_EXTERNAL_RESET[] PROGMEM_N1 = " External Reset"; //// diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1730fe814..31937f66e 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1916,9 +1916,9 @@ static void lcd_support_menu() MENU_ITEM_BACK_P(PSTR("FW - " FW_version)); }*/ - MENU_ITEM_BACK_P(_i("prusa3d.com"));////MSG_PRUSA3D c=18 - MENU_ITEM_BACK_P(_i("forum.prusa3d.com"));////MSG_PRUSA3D_FORUM c=18 - MENU_ITEM_BACK_P(_i("howto.prusa3d.com"));////MSG_PRUSA3D_HOWTO c=18 + MENU_ITEM_BACK_P(_n("prusa3d.com"));////MSG_PRUSA3D c=18 + MENU_ITEM_BACK_P(_n("forum.prusa3d.com"));////MSG_PRUSA3D_FORUM c=18 + MENU_ITEM_BACK_P(_n("howto.prusa3d.com"));////MSG_PRUSA3D_HOWTO c=18 MENU_ITEM_BACK_P(STR_SEPARATOR); MENU_ITEM_BACK_P(PSTR(FILAMENT_SIZE)); MENU_ITEM_BACK_P(PSTR(ELECTRONICS)); diff --git a/lang/lang_en.txt b/lang/lang_en.txt index ba5f33bfb..fabf38e9f 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -286,9 +286,6 @@ #MSG_FLOW c=15 "Flow" -#MSG_PRUSA3D_FORUM c=18 -"forum.prusa3d.com" - #MSG_SELFTEST_COOLING_FAN c=20 "Front print fan?" @@ -313,9 +310,6 @@ #MSG_WIZARD_WELCOME c=20 r=7 "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" -#MSG_PRUSA3D_HOWTO c=18 -"howto.prusa3d.com" - #MSG_FILAMENTCHANGE c=18 "Change filament" @@ -667,9 +661,6 @@ #MSG_PLEASE_LOAD_PLA c=20 r=4 "Please load filament first." -#MSG_PRUSA3D c=18 -"prusa3d.com" - #MSG_BED_CORRECTION_REAR c=14 "Rear side [um]" @@ -685,9 +676,6 @@ #MSG_REMOVE_OLD_FILAMENT c=20 r=5 "Remove old filament and press the knob to start loading new filament." -# c=20 -"Prusa i3 MK3S OK." - #MSG_CALIBRATE_BED_RESET c=18 "Reset XYZ calibr." @@ -748,15 +736,6 @@ #MSG_SET_TEMPERATURE c=19 "Set temperature:" -# c=20 -"Prusa i3 MK2.5 OK." - -# c=20 -"Prusa i3 MK2.5S OK." - -# c=20 -"Prusa i3 MK3 OK." - #MSG_SETTINGS c=18 "Settings" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 1a43a165c..3e4f8ed55 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -382,10 +382,6 @@ "Flow" "Prutok" -#MSG_PRUSA3D_FORUM c=18 -"forum.prusa3d.com" -"\x00" - #MSG_SELFTEST_COOLING_FAN c=20 "Front print fan?" "Predni tiskovy vent?" @@ -418,10 +414,6 @@ "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" "Dobry den, jsem vase tiskarna Original Prusa i3. Chcete abych Vas provedla kalibracnim procesem?" -#MSG_PRUSA3D_HOWTO c=18 -"howto.prusa3d.com" -"\x00" - #MSG_FILAMENTCHANGE c=18 "Change filament" "Vymenit filament" @@ -890,10 +882,6 @@ "Please load filament first." "Prosim nejdriv zavedte filament" -#MSG_PRUSA3D c=18 -"prusa3d.com" -"\x00" - #MSG_BED_CORRECTION_REAR c=14 "Rear side [um]" "Vzadu [um]" @@ -914,10 +902,6 @@ "Remove old filament and press the knob to start loading new filament." "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho." -# c=20 -"Prusa i3 MK3S OK." -"\x00" - #MSG_CALIBRATE_BED_RESET c=18 "Reset XYZ calibr." "Reset XYZ kalibr." @@ -998,18 +982,6 @@ "Set temperature:" "Nastavte teplotu:" -# c=20 -"Prusa i3 MK2.5 OK." -"\x00" - -# c=20 -"Prusa i3 MK2.5S OK." -"\x00" - -# c=20 -"Prusa i3 MK3 OK." -"\x00" - #MSG_SETTINGS c=18 "Settings" "Nastaveni" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index c4b945637..2bba196c0 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -382,10 +382,6 @@ "Flow" "Durchfluss" -#MSG_PRUSA3D_FORUM c=18 -"forum.prusa3d.com" -"\x00" - #MSG_SELFTEST_COOLING_FAN c=20 "Front print fan?" "Teile Luefter?" @@ -418,10 +414,6 @@ "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" "Hallo, ich bin Ihr Original Prusa i3 Drucker. Moechten Sie, dass ich Sie durch den Einrich- tungsablauf fuehre?" -#MSG_PRUSA3D_HOWTO c=18 -"howto.prusa3d.com" -"\x00" - #MSG_FILAMENTCHANGE c=18 "Change filament" "Filament-Wechsel" @@ -890,10 +882,6 @@ "Please load filament first." "Bitte laden Sie zuerst das Filament." -#MSG_PRUSA3D c=18 -"prusa3d.com" -"\x00" - #MSG_BED_CORRECTION_REAR c=14 "Rear side [um]" "Hinten [um]" @@ -914,10 +902,6 @@ "Remove old filament and press the knob to start loading new filament." "Entfernen Sie das alte Filament und druecken Sie den Knopf, um das neue zu laden." -# c=20 -"Prusa i3 MK3S OK." -"\x00" - #MSG_CALIBRATE_BED_RESET c=18 "Reset XYZ calibr." "Reset XYZ Kalibr." @@ -998,18 +982,6 @@ "Set temperature:" "Temp. einstellen:" -# c=20 -"Prusa i3 MK2.5 OK." -"\x00" - -# c=20 -"Prusa i3 MK2.5S OK." -"\x00" - -# c=20 -"Prusa i3 MK3 OK." -"\x00" - #MSG_SETTINGS c=18 "Settings" "Einstellungen" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index bd8612555..08bf56d65 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -382,10 +382,6 @@ "Flow" "Flujo" -#MSG_PRUSA3D_FORUM c=18 -"forum.prusa3d.com" -"\x00" - #MSG_SELFTEST_COOLING_FAN c=20 "Front print fan?" "Vent. frontal?" @@ -418,10 +414,6 @@ "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" "Hola, soy tu impresora Original Prusa i3. Quieres que te guie a traves de la configuracion?" -#MSG_PRUSA3D_HOWTO c=18 -"howto.prusa3d.com" -"\x00" - #MSG_FILAMENTCHANGE c=18 "Change filament" "Cambiar filamento" @@ -890,10 +882,6 @@ "Please load filament first." "Por favor, cargar primero el filamento." -#MSG_PRUSA3D c=18 -"prusa3d.com" -"prusa3d.es" - #MSG_BED_CORRECTION_REAR c=14 "Rear side [um]" "Trasera [um]" @@ -914,10 +902,6 @@ "Remove old filament and press the knob to start loading new filament." "Retire el filamento viejo y presione el dial para comenzar a cargar el nuevo filamento." -# c=20 -"Prusa i3 MK3S OK." -"\x00" - #MSG_CALIBRATE_BED_RESET c=18 "Reset XYZ calibr." "\x00" @@ -998,18 +982,6 @@ "Set temperature:" "Establecer temp.:" -# c=20 -"Prusa i3 MK2.5 OK." -"\x00" - -# c=20 -"Prusa i3 MK2.5S OK." -"\x00" - -# c=20 -"Prusa i3 MK3 OK." -"\x00" - #MSG_SETTINGS c=18 "Settings" "Configuracion" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 2c5e4c1d9..9cb3e25d8 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -382,10 +382,6 @@ "Flow" "Flux" -#MSG_PRUSA3D_FORUM c=18 -"forum.prusa3d.com" -"\x00" - #MSG_SELFTEST_COOLING_FAN c=20 "Front print fan?" "Ventilo impr avant?" @@ -418,10 +414,6 @@ "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" "Bonjour, je suis votre imprimante Original Prusa i3. Voulez-vous que je vous guide a travers le processus d'installation?" -#MSG_PRUSA3D_HOWTO c=18 -"howto.prusa3d.com" -"\x00" - #MSG_FILAMENTCHANGE c=18 "Change filament" "Changer filament" @@ -890,10 +882,6 @@ "Please load filament first." "Veuillez d'abord charger un filament." -#MSG_PRUSA3D c=18 -"prusa3d.com" -"\x00" - #MSG_BED_CORRECTION_REAR c=14 "Rear side [um]" "Arriere [um]" @@ -914,10 +902,6 @@ "Remove old filament and press the knob to start loading new filament." "Retirez l'ancien filament puis appuyez sur le bouton pour charger le nouveau." -# c=20 -"Prusa i3 MK3S OK." -"\x00" - #MSG_CALIBRATE_BED_RESET c=18 "Reset XYZ calibr." "Reinit. calib. XYZ" @@ -998,18 +982,6 @@ "Set temperature:" "Regler temp.:" -# c=20 -"Prusa i3 MK2.5 OK." -"\x00" - -# c=20 -"Prusa i3 MK2.5S OK." -"\x00" - -# c=20 -"Prusa i3 MK3 OK." -"\x00" - #MSG_SETTINGS c=18 "Settings" "Reglages" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index bec8d9d32..e62fc779b 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -382,10 +382,6 @@ "Flow" "Flusso" -#MSG_PRUSA3D_FORUM c=18 -"forum.prusa3d.com" -"\x00" - #MSG_SELFTEST_COOLING_FAN c=20 "Front print fan?" "Ventola frontale?" @@ -418,10 +414,6 @@ "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" "Ciao, sono la tua stampante Original Prusa i3. Gradiresti un aiuto nel processo di configurazione?" -#MSG_PRUSA3D_HOWTO c=18 -"howto.prusa3d.com" -"\x00" - #MSG_FILAMENTCHANGE c=18 "Change filament" "Cambia filamento" @@ -890,10 +882,6 @@ "Please load filament first." "Per favore prima carica il filamento." -#MSG_PRUSA3D c=18 -"prusa3d.com" -"\x00" - #MSG_BED_CORRECTION_REAR c=14 "Rear side [um]" "Retro [um]" @@ -914,10 +902,6 @@ "Remove old filament and press the knob to start loading new filament." "Rimuovi il filamento precedente e premi la manopola per caricare il nuovo filamento." -# c=20 -"Prusa i3 MK3S OK." -"\x00" - #MSG_CALIBRATE_BED_RESET c=18 "Reset XYZ calibr." "Reset calibr. XYZ." @@ -998,18 +982,6 @@ "Set temperature:" "Imposta temperatura:" -# c=20 -"Prusa i3 MK2.5 OK." -"\x00" - -# c=20 -"Prusa i3 MK2.5S OK." -"\x00" - -# c=20 -"Prusa i3 MK3 OK." -"\x00" - #MSG_SETTINGS c=18 "Settings" "Impostazioni" diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt index f5857c416..cbd8675db 100644 --- a/lang/lang_en_nl.txt +++ b/lang/lang_en_nl.txt @@ -382,10 +382,6 @@ "Flow" "Stromen" -#MSG_PRUSA3D_FORUM c=18 -"forum.prusa3d.com" -"\x00" - #MSG_SELFTEST_COOLING_FAN c=20 "Front print fan?" "Voorzijde fan?" @@ -418,10 +414,6 @@ "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" "Hallo, ik ben uw Original Prusa i3 printer. Zullen we beginnen met het installatieproces?" -#MSG_PRUSA3D_HOWTO c=18 -"howto.prusa3d.com" -"\x00" - #MSG_FILAMENTCHANGE c=18 "Change filament" "Wissel filament" @@ -890,10 +882,6 @@ "Please load filament first." "Laad a.u.b. eerst filament." -#MSG_PRUSA3D c=18 -"prusa3d.com" -"\x00" - #MSG_BED_CORRECTION_REAR c=14 "Rear side [um]" "Achterkant[um]" @@ -914,10 +902,6 @@ "Remove old filament and press the knob to start loading new filament." "Verwijder de oude filament en druk op de knop om nieuwe filament te laden." -# c=20 -"Prusa i3 MK3S OK." -"\x00" - #MSG_CALIBRATE_BED_RESET c=18 "Reset XYZ calibr." "Reset XYZ kalibr." @@ -998,18 +982,6 @@ "Set temperature:" "Temp. instellen:" -# c=20 -"Prusa i3 MK2.5 OK." -"\x00" - -# c=20 -"Prusa i3 MK2.5S OK." -"\x00" - -# c=20 -"Prusa i3 MK3 OK." -"\x00" - #MSG_SETTINGS c=18 "Settings" "Instellingen" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 200c9c824..806429e09 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -382,10 +382,6 @@ "Flow" "Przeplyw" -#MSG_PRUSA3D_FORUM c=18 -"forum.prusa3d.com" -"\x00" - #MSG_SELFTEST_COOLING_FAN c=20 "Front print fan?" "Przedni went. druku?" @@ -418,10 +414,6 @@ "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" "Czesc, jestem Twoja drukarka Original Prusa i3. Czy potrzebujesz pomocy z ustawieniem?" -#MSG_PRUSA3D_HOWTO c=18 -"howto.prusa3d.com" -"\x00" - #MSG_FILAMENTCHANGE c=18 "Change filament" "Wymiana filamentu" @@ -890,10 +882,6 @@ "Please load filament first." "Najpierw zaladuj filament." -#MSG_PRUSA3D c=18 -"prusa3d.com" -"\x00" - #MSG_BED_CORRECTION_REAR c=14 "Rear side [um]" "Tyl [um]" @@ -914,10 +902,6 @@ "Remove old filament and press the knob to start loading new filament." "Wyciagnij poprzedni filament i nacisnij pokretlo aby zaladowac nowy." -# c=20 -"Prusa i3 MK3S OK." -"\x00" - #MSG_CALIBRATE_BED_RESET c=18 "Reset XYZ calibr." "Reset kalibr. XYZ" @@ -998,18 +982,6 @@ "Set temperature:" "Ustaw temperature:" -# c=20 -"Prusa i3 MK2.5 OK." -"\x00" - -# c=20 -"Prusa i3 MK2.5S OK." -"\x00" - -# c=20 -"Prusa i3 MK3 OK." -"\x00" - #MSG_SETTINGS c=18 "Settings" "Ustawienia"