Merge pull request #4858 from 3d-gussner/MK3_build_tags

Add `t` and `c` build

.github/workflows/build.yml

@@ -8,6 +8,8 @@ on:
     branches: [ MK3, MK3_* ]
     tags:
     - 'v*'
+    - 't*'
+    - 'c*'
 
 env:
   GH_ANNOTATIONS: 1
@@ -41,7 +43,7 @@ jobs:
         fetch-depth: 0
 
     - name: Cache Dependencies
-      uses: actions/cache@v4.0.0
+      uses: actions/cache@v4
       id: cache-pkgs
       with:
           path: ".dependencies"
@@ -63,16 +65,17 @@ jobs:
 
     - name: Upload artifacts
       if: ${{ !github.event.pull_request }}
-      uses: actions/upload-artifact@v3.1.1
+      uses: actions/upload-artifact@v4
       with:
         name: Firmware
         path: build/*.hex
 
     - name: RELEASE THE KRAKEN
-      if: startsWith(github.ref, 'refs/tags/v')
+      if: startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/t') || startsWith(github.ref, 'refs/tags/c')
       uses: "marvinpinto/action-automatic-releases@latest"
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
+        automatic_release_tag: ${{ github.ref_name }}
         draft: true
         files: |
           ${{ github.workspace }}/build/release/*.hex
@@ -106,7 +109,7 @@ jobs:
         fetch-depth: 0
 
     - name: Cache Dependencies
-      uses: actions/cache@v4.0.0
+      uses: actions/cache@v4
       id: cache-pkgs
       with:
           path: ".dependencies"
@@ -154,7 +157,7 @@ jobs:
         fetch-depth: 0
 
     - name: Cache Dependencies
-      uses: actions/cache@v4.0.0
+      uses: actions/cache@v4
       id: cache-pkgs
       with:
           path: ".dependencies"

.github/workflows/pr-size.yml

@@ -26,7 +26,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Cache Dependencies
-      uses: actions/cache@v4.0.0
+      uses: actions/cache@v4
       id: cache-pkgs
       with:
           path: ".dependencies"

CMakeLists.txt

@@ -58,7 +58,7 @@ message(STATUS "Filename debug suffix ...........: ${FN_VERSION_DEBUG_SUFFIX}")
 # SET(FW_COMMIT_DSC "v3.13.0-1234")
 
 if(NOT "${PROJECT_VERSION_HASH}" STREQUAL "UNKNOWN" AND NOT "${FW_COMMIT_DSC}" MATCHES ".+NOTFOUND.+") # else -> no commit hash is known... likely no git.
-string(REGEX MATCH "[v|t]([0-9]+)\.([0-9]+)\.([0-9]+)-?(${DEV_TAG_REGEX})?([0-9]+)?-([0-9]+)" TAG_VERSION "${FW_COMMIT_DSC}")
+string(REGEX MATCH "[v|t|c]([0-9]+)\.([0-9]+)\.([0-9]+)-?(${DEV_TAG_REGEX})?([0-9]+)?-([0-9]+)" TAG_VERSION "${FW_COMMIT_DSC}")
 
 if (CMAKE_MATCH_4) # Do we have a build type?
     decode_flavor_code(PROJECT_VER_TAG_FLV "${CMAKE_MATCH_4}" "${CMAKE_MATCH_5}")
@@ -268,7 +268,7 @@ set(FW_SOURCES
     tmc2130.cpp
     tone04.c
     twi.cpp
-    uart2.c
+    uart2.cpp
     ultralcd.cpp
     util.cpp
     xflash.c

Firmware/Configuration.h

@@ -22,9 +22,9 @@ extern const char _sPrinterMmuName[] PROGMEM;
 #define FW_MAJOR 3
 #define FW_MINOR 14
 #define FW_REVISION 1
-#define FW_COMMITNR 8237
+#define FW_COMMITNR 8225
-//#define FW_FLAVOR RC      //uncomment if DEV, ALPHA, BETA or RC
+#define FW_FLAVOR RC      //uncomment if DEV, ALPHA, BETA or RC
-//#define FW_FLAVERSION 1     //uncomment if FW_FLAVOR is defined and versioning is needed. Limited to max 8.
+#define FW_FLAVERSION 1     //uncomment if FW_FLAVOR is defined and versioning is needed. Limited to max 8.
 #endif
 
 #ifndef FW_FLAVOR
@@ -324,6 +324,10 @@ your extruder heater takes 2 minutes to hit the target on heating.
 #define SDSUPPORT
 #define LCD_WIDTH 20
 #define LCD_HEIGHT 4
+#define LCD_BACKLIGHT_LEVEL_HIGH 130
+#define LCD_BACKLIGHT_LEVEL_LOW 50
+#define LCD_BACKLIGHT_FORCE_ON 30
+#define LCD_BACKLIGHT_TIMEOUT 15
 
 
 // Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino
@@ -358,8 +362,8 @@ your extruder heater takes 2 minutes to hit the target on heating.
 
 // Try to maintain a minimum distance from the bed even when Z is
 // unknown when doing the following operations
-#define MIN_Z_FOR_LOAD    50 // lcd filament loading or autoload
+#define MIN_Z_FOR_LOAD    35 // lcd filament loading or autoload (values for load and unload have been unified to prevent movement between unload & load operations!)
-#define MIN_Z_FOR_UNLOAD  20 // lcd filament unloading
+#define MIN_Z_FOR_UNLOAD  35 // lcd filament unloading
 #define MIN_Z_FOR_SWAP    27 // filament change (including M600)
 #define MIN_Z_FOR_PREHEAT 10 // lcd preheat
 

Firmware/ConfigurationStore.cpp

@@ -106,6 +106,9 @@ void Config_PrintSettings(uint8_t level)
 #ifdef THERMAL_MODEL
     thermal_model_report_settings();
 #endif
+		printf_P(PSTR(
+        "%SStatistics:\n%S  M78 S%lu T%lu\n"),
+        echomagic, echomagic, eeprom_read_dword((uint32_t *)EEPROM_FILAMENTUSED), eeprom_read_dword((uint32_t *)EEPROM_TOTALTIME));
 }
 #endif
 

Firmware/Configuration_adv.h

@@ -125,34 +125,6 @@
 #endif //End auto min/max positions
 //END AUTOSET LOCATIONS OF LIMIT SWITCHES -ZP
 
-
-// A single Z stepper driver is usually used to drive 2 stepper motors.
-// Uncomment this define to utilize a separate stepper driver for each Z axis motor.
-// Only a few motherboards support this, like RAMPS, which have dual extruder support (the 2nd, often unused, extruder driver is used
-// to control the 2nd Z axis stepper motor). The pins are currently only defined for a RAMPS motherboards.
-// On a RAMPS (or other 5 driver) motherboard, using this feature will limit you to using 1 extruder.
-//#define Z_DUAL_STEPPER_DRIVERS
-
-#ifdef Z_DUAL_STEPPER_DRIVERS
-  #undef EXTRUDERS
-  #define EXTRUDERS 1
-#endif
-
-// Same again but for Y Axis.
-//#define Y_DUAL_STEPPER_DRIVERS
-
-// Define if the two Y drives need to rotate in opposite directions
-#define INVERT_Y2_VS_Y_DIR 1
-
-#ifdef Y_DUAL_STEPPER_DRIVERS
-  #undef EXTRUDERS
-  #define EXTRUDERS 1
-#endif
-
-#if defined (Z_DUAL_STEPPER_DRIVERS) && defined (Y_DUAL_STEPPER_DRIVERS)
-  #error "You cannot have dual drivers for both Y and Z"
-#endif
-
 //homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
 #define X_HOME_RETRACT_MM 5
 #define Y_HOME_RETRACT_MM 5

Firmware/Marlin.h

@@ -121,13 +121,8 @@ void manage_inactivity(bool ignore_stepper_queue=false);
 #endif
 
 #if defined(Y_ENABLE_PIN) && Y_ENABLE_PIN > -1
-  #ifdef Y_DUAL_STEPPER_DRIVERS
+  #define  enable_y() WRITE(Y_ENABLE_PIN, Y_ENABLE_ON)
-    #define  enable_y() { WRITE(Y_ENABLE_PIN, Y_ENABLE_ON); WRITE(Y2_ENABLE_PIN,  Y_ENABLE_ON); }
+  #define disable_y() { WRITE(Y_ENABLE_PIN,!Y_ENABLE_ON); axis_known_position[Y_AXIS] = false; }
-    #define disable_y() { WRITE(Y_ENABLE_PIN,!Y_ENABLE_ON); WRITE(Y2_ENABLE_PIN, !Y_ENABLE_ON); axis_known_position[Y_AXIS] = false; }
-  #else
-    #define  enable_y() WRITE(Y_ENABLE_PIN, Y_ENABLE_ON)
-    #define disable_y() { WRITE(Y_ENABLE_PIN,!Y_ENABLE_ON); axis_known_position[Y_AXIS] = false; }
-  #endif
 #else
   #define enable_y() ;
   #define disable_y() ;
@@ -135,21 +130,11 @@ void manage_inactivity(bool ignore_stepper_queue=false);
 
 #if defined(Z_ENABLE_PIN) && Z_ENABLE_PIN > -1
 	#if defined(Z_AXIS_ALWAYS_ON)
-		  #ifdef Z_DUAL_STEPPER_DRIVERS
-			#define  poweron_z() { WRITE(Z_ENABLE_PIN, Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN, Z_ENABLE_ON); }
-			#define poweroff_z() { WRITE(Z_ENABLE_PIN,!Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN,!Z_ENABLE_ON); axis_known_position[Z_AXIS] = false; }
-		  #else
 			#define  poweron_z() WRITE(Z_ENABLE_PIN, Z_ENABLE_ON)
 			#define poweroff_z() {}
-		  #endif
 	#else
-		#ifdef Z_DUAL_STEPPER_DRIVERS
-			#define  poweron_z() { WRITE(Z_ENABLE_PIN, Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN, Z_ENABLE_ON); }
-			#define poweroff_z() { WRITE(Z_ENABLE_PIN,!Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN,!Z_ENABLE_ON); axis_known_position[Z_AXIS] = false; }
-		#else
 			#define  poweron_z() WRITE(Z_ENABLE_PIN, Z_ENABLE_ON)
 			#define poweroff_z() { WRITE(Z_ENABLE_PIN,!Z_ENABLE_ON); axis_known_position[Z_AXIS] = false; }
-		#endif
 	#endif
 #else
     #define  poweron_z() {}

Firmware/Marlin_main.cpp

@@ -3710,7 +3710,7 @@ extern uint8_t st_backlash_y;
 //!@n M221 - Set extrude factor override percentage
 //!@n M226 - Wait for Pin state
 //!@n M240 - Trigger camera
-//!@n M250 - Set LCD contrast C<contrast value> (value 0..63)
+//!@n M256 - Set LCD brightness
 //!@n M300 - Play tone
 //!@n M301 - Set hotend PID
 //!@n M302 - Allow cold extrude, or set minimum extrude temperature
@@ -5241,16 +5241,41 @@ void process_commands()
     }
 
     /*!
-    ### M78 - Show statistical information about the print jobs <a href="https://reprap.org/wiki/G-code#M78:_Show_statistical_information_about_the_print_jobs">M78: Show statistical information about the print jobs</a>
+    ### M78 - Get/set statistics <a href="https://reprap.org/wiki/G-code#M78:_Show_statistical_information_about_the_print_jobs">M78: Show statistical information about the print jobs</a>
+
+    #### Usage
+
+        M78 [ S | T ]
+
+    #### Parameters
+    - `S` - Set used filament length in cm
+    - `T` - Set total print time in minutes
     */
     case 78:
     {
-        // @todo useful for maintenance notifications
+        const char *_m_fil;
-        SERIAL_ECHOPGM("STATS ");
+        const char *_m_time;
-        SERIAL_ECHO(eeprom_read_dword((uint32_t *)EEPROM_TOTALTIME));
+        uint32_t _cm = 0;
-        SERIAL_ECHOPGM(" min ");
+        uint32_t _min = 0;
-        SERIAL_ECHO(eeprom_read_dword((uint32_t *)EEPROM_FILAMENTUSED));
+
-        SERIAL_ECHOLNPGM(" cm.");
+        if (printJobOngoing()) {
+          _m_fil = _O(MSG_FILAMENT_USED);
+          _m_time = _O(MSG_PRINT_TIME);
+          _cm = (uint32_t)total_filament_used / 1000;
+          _min = print_job_timer.duration() / 60;
+        } else {
+          if (code_seen('S')) {
+          eeprom_update_dword_notify((uint32_t *)EEPROM_FILAMENTUSED, code_value());
+          }
+          if (code_seen('T')) {
+          eeprom_update_dword_notify((uint32_t *)EEPROM_TOTALTIME, code_value());
+          }
+          _m_fil = _O(MSG_TOTAL_FILAMENT);
+          _m_time = _O(MSG_TOTAL_PRINT_TIME);
+          _cm = eeprom_read_dword((uint32_t *)EEPROM_FILAMENTUSED);
+          _min = eeprom_read_dword((uint32_t *)EEPROM_TOTALTIME);
+        }
+        printf_P(_N("%S:%lu cm\n%S:%lu min\n"),_m_fil,_cm,_m_time,_min);
         break;
     }
 
@@ -6490,11 +6515,11 @@ void process_commands()
 
     #### Parameters
     - `S` - frequency in Hz. Not all firmware versions support this parameter
-    - `P` - duration in milliseconds
+    - `P` - duration in milliseconds max 3500ms
     */
     case 300: // M300
     {
-      uint16_t beepP = code_seen('P') ? code_value() : 1000;
+      uint16_t beepP = code_seen('P') ? min(code_value(), 3500) : 1000;
       uint16_t beepS;
       if (!code_seen('S'))
           beepS = 0;
@@ -6616,6 +6641,42 @@ void process_commands()
     break;
     #ifdef PREVENT_DANGEROUS_EXTRUDE
 
+    /*!
+    ### M256 - Set LCD brightness <a href="https://reprap.org/wiki/G-code#M256:_Set_LCD_brightness">M256: Set LCD brightness</a>
+    Set and/or get the LCD brightness. The value is constrained based on the LCD, but typically a value of 0 is the dimmest and 255 is the brightest.
+    #### Usage
+
+        M256 [ B | D | S | T ]
+
+    #### Parameters
+    - `B` - Normal Brightness value (0 - 255), default 130
+    - `D` - Dimmed Brightness value (0 - 255), default 50
+    - `S` - Brightness mode, default Auto
+      - `0` - Dim
+      - `1` - Bright
+      - `2` - Auto
+    - `T` - Brightness timeout  (15 - 900), default 15 seconds
+    */
+    #ifdef LCD_BL_PIN
+     case 256:
+    {
+      if (backlightSupport) {
+        if (code_seen('B') ) backlightLevel_HIGH = code_value_uint8();
+        if (code_seen('D')) backlightLevel_LOW = code_value_uint8();
+        if (code_seen('S')) {
+          uint8_t mode = code_value_uint8();
+          if (mode <= BACKLIGHT_MODE_AUTO) {
+            backlightMode = static_cast<Backlight_Mode>(mode);
+         }
+        }
+        if (code_seen('T')) backlightTimer_period = constrain(code_value_short(), LCD_BACKLIGHT_TIMEOUT, LCD_BACKLIGHT_TIMEOUT*60);
+        printf_P(PSTR("M256 B%d D%d S%d T%u\n"), backlightLevel_HIGH, backlightLevel_LOW, backlightMode, backlightTimer_period);
+        backlight_save();
+      }
+    }
+    break;
+    #endif //LCD_BL_PIN
+
     /*!
     ### M302 - Allow cold extrude, or set minimum extrude temperature <a href="https://reprap.org/wiki/G-code#M302:_Allow_cold_extrudes">M302: Allow cold extrudes</a>
     This tells the printer to allow movement of the extruder motor above a certain temperature, or if disabled, to allow extruder movement when the hotend is below a safe printing temperature.
@@ -9153,7 +9214,7 @@ void setPwmFrequency(uint8_t pin, int val)
 #endif //FAST_PWM_FAN
 
 void save_statistics() {
-    uint32_t _previous_filament = eeprom_init_default_dword((uint32_t *)EEPROM_FILAMENTUSED, 0); //_previous_filament unit: meter
+    uint32_t _previous_filament = eeprom_init_default_dword((uint32_t *)EEPROM_FILAMENTUSED, 0); //_previous_filament unit: centimeter
     uint32_t _previous_time = eeprom_init_default_dword((uint32_t *)EEPROM_TOTALTIME, 0);        //_previous_time unit: min
 
     uint32_t time_minutes = print_job_timer.duration() / 60;

Firmware/SpoolJoin.cpp

@@ -55,7 +55,7 @@ uint8_t SpoolJoin::nextSlot()
     SERIAL_ECHOPGM("SpoolJoin: ");
     SERIAL_ECHO((int)currentMMUSlot);
 
-    if (currentMMUSlot >= 4) currentMMUSlot = 0;
+    if (currentMMUSlot >= MMU_FILAMENT_COUNT-1) currentMMUSlot = 0;
     else currentMMUSlot++;
 
     SERIAL_ECHOPGM(" -> ");

Firmware/backlight.cpp

@@ -17,7 +17,7 @@ bool backlightSupport = 0; //only if it's true will any of the settings be visib
 uint8_t backlightLevel_HIGH = 0;
 uint8_t backlightLevel_LOW = 0;
 uint8_t backlightMode = BACKLIGHT_MODE_BRIGHT;
-int16_t backlightTimer_period = 10;
+int16_t backlightTimer_period = LCD_BACKLIGHT_TIMEOUT;
 LongTimer backlightTimer;
 
 static void backlightTimer_reset() //used for resetting the timer and waking the display. Triggered on user interactions.
@@ -32,7 +32,7 @@ void force_bl_on(bool section_start)
     if (section_start)
     {
         backlightMode = BACKLIGHT_MODE_BRIGHT;
-        if (backlightLevel_HIGH < 30) backlightLevel_HIGH = 30;
+        if (backlightLevel_HIGH < LCD_BACKLIGHT_FORCE_ON) backlightLevel_HIGH = LCD_BACKLIGHT_FORCE_ON;
     }
     else
     {
@@ -93,9 +93,9 @@ void backlight_init()
 
     //initialize backlight
     backlightMode = eeprom_init_default_byte((uint8_t *)EEPROM_BACKLIGHT_MODE, BACKLIGHT_MODE_AUTO);
-    backlightLevel_HIGH = eeprom_init_default_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH, 130);
+    backlightLevel_HIGH = eeprom_init_default_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH, LCD_BACKLIGHT_LEVEL_HIGH);
-    backlightLevel_LOW = eeprom_init_default_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_LOW, 50);
+    backlightLevel_LOW = eeprom_init_default_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_LOW, LCD_BACKLIGHT_LEVEL_LOW);
-    backlightTimer_period = eeprom_init_default_word((uint16_t *)EEPROM_BACKLIGHT_TIMEOUT, 10); // in seconds
+    backlightTimer_period = eeprom_init_default_word((uint16_t *)EEPROM_BACKLIGHT_TIMEOUT, LCD_BACKLIGHT_TIMEOUT); // in seconds
 
     SET_OUTPUT(LCD_BL_PIN);
     backlightTimer_reset();

Firmware/cmdqueue.cpp

@@ -670,7 +670,9 @@ void get_command()
           sprintf_P(time, PSTR("%i hours %i minutes"),hours, minutes);
           SERIAL_ECHO_START;
           SERIAL_ECHOLN(time);
+#ifndef SHOW_FILENAME_AFTER_FINISH
           lcd_setstatus(time);
+#endif //SHOW_FILENAME_AFTER_FINISH
           card.printingHasFinished();
           card.checkautostart(true);
 

Firmware/eeprom.h

@@ -108,7 +108,7 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP
 | ^           | ^       | ^                                     | fah 250      | ^                     | needs XYZ calibration                             | ^            | ^
 | ^           | ^       | ^                                     | 00h 0        | ^                     | Unknown (legacy)                                  | ^            | ^
 | 0x0FF5 4085 | uint16  | _EEPROM_FREE_NR12_                    | ???          | ff ffh 65535          | _Free EEPROM space_                               | _free space_ | D3 Ax0ff5 C2
-| 0x0FF1 4081 | uint32  | EEPROM_FILAMENTUSED                   | ???          | 00 00 00 00h 0 __S/P__| Filament used in meters                           | ???          | D3 Ax0ff1 C4
+| 0x0FF1 4081 | uint32  | EEPROM_FILAMENTUSED                   | ???          | 00 00 00 00h 0 __S/P__| Filament used in centimeters                      | ???          | D3 Ax0ff1 C4
 | 0x0FED 4077 | uint32  | EEPROM_TOTALTIME                      | ???          | 00 00 00 00h 0 __S/P__| Total print time in minutes                       | ???          | D3 Ax0fed C4
 | 0x0FE5 4069 | float   | EEPROM_BED_CALIBRATION_CENTER         | ???          | ff ff ff ffh          | ???                                               | ???          | D3 Ax0fe5 C8
 | 0x0FDD 4061 | float   | EEPROM_BED_CALIBRATION_VEC_X          | ???          | ff ff ff ffh          | ???                                               | ???          | D3 Ax0fdd C8

Firmware/first_lay_cal.cpp

@@ -37,12 +37,31 @@ static constexpr float spacing(float layer_height, float extrusion_width, float
 static void lay1cal_common_enqueue_loop(const char * const * cmd_sequence, const uint8_t steps) {
     for (uint8_t i = 0; i < steps; ++i)
     {
-        enquecommand_P(static_cast<char*>(pgm_read_ptr(cmd_sequence + i)));
+        void * const pgm_ptr = pgm_read_ptr(cmd_sequence + i);
+
+        // M702 is currently only used with MMU enabled
+        if (pgm_ptr == MSG_M702 && !MMU2::mmu2.Enabled()) {
+            continue;
+        }
+
+        enquecommand_P(static_cast<char*>(pgm_ptr));
     }
 }
 
-static const char extrude_fmt[] PROGMEM = "G1 X%d Y%d E%-.5f";
+static const char extrude_fmt_X[] PROGMEM = "G1X%.4fE%.4f";
-static const char zero_extrusion[] PROGMEM = "G92 E0";
+static const char extrude_fmt_Y[] PROGMEM = "G1Y%.4fE%.4f";
+static const char zero_extrusion[] PROGMEM = "G92E0";
+static const char feedrate_F1080[] PROGMEM = "G1F1080";
+#ifndef NEW_FIRST_LAYER_CAL
+static constexpr int8_t invert = 1;
+static constexpr float short_length = 20;
+static constexpr float square_width = short_length;
+#else
+static constexpr int8_t invert = -1;
+static constexpr float short_length = 13.2812; //max_pos[1]/2 / meander * 2
+static constexpr float square_width = short_length*2;
+#endif //NEW_FIRST_LAYER_CAL
+static constexpr float long_length = 150;
 
 //! @brief Wait for preheat
 void lay1cal_wait_preheat()
@@ -72,8 +91,8 @@ bool lay1cal_load_filament(uint8_t filament)
     if (MMU2::mmu2.Enabled())
     {
         enquecommand_P(MSG_M83);
-        enquecommand_P(PSTR("G1 Y-3 F1000"));
+        enquecommand_P(PSTR("G1Y-3F1000"));
-        enquecommand_P(PSTR("G1 Z0.4 F1000"));
+        enquecommand_P(PSTR("G1Z0.4"));
 
         uint8_t currentTool = MMU2::mmu2.get_current_tool();
         if(currentTool == filament ){
@@ -96,22 +115,19 @@ bool lay1cal_load_filament(uint8_t filament)
 //! @param extrusion_width the width of the extrusion layer
 void lay1cal_intro_line(bool extraPurgeNeeded, float layer_height, float extrusion_width)
 {
-    static const char cmd_intro_mmu_3[] PROGMEM = "G1 X55 E29 F1073";
+    static const char cmd_intro_mmu_3[] PROGMEM = "G1X55E29F1073";
-    static const char cmd_intro_mmu_4[] PROGMEM = "G1 X5 E29 F1800";
+    static const char cmd_intro_mmu_4[] PROGMEM = "G1X5E29F1800";
-    static const char cmd_intro_mmu_5[] PROGMEM = "G1 X55 E8 F2000";
+    static const char cmd_intro_mmu_5[] PROGMEM = "G1X55E8F2000";
-    static const char cmd_intro_mmu_6[] PROGMEM = "G1 Z0.3 F1000";
+    static const char cmd_intro_mmu_6[] PROGMEM = "G1Z0.3F1000";
-    static const char cmd_intro_mmu_8[] PROGMEM = "G1 X240 E25  F2200";
+    static const char cmd_intro_mmu_8[] PROGMEM = "G1X240E25F2200";
-    static const char cmd_intro_mmu_9[] PROGMEM = "G1 Y-2 F1000";
+    static const char cmd_intro_mmu_9[] PROGMEM = "G1Y-2F1000";
-    static const char cmd_intro_mmu_10[] PROGMEM = "G1 X55 E25 F1400";
+    static const char cmd_intro_mmu_10[] PROGMEM = "G1X202.5E8F1400";
-    static const char cmd_intro_mmu_11[] PROGMEM = "G1 Z0.2 F1000";
+    static const char cmd_intro_mmu_11[] PROGMEM = "G1Z0.2";
-    static const char cmd_intro_mmu_12[] PROGMEM = "G1 X5 E4 F1000";
+    static const char * const cmd_intro_mmu[] PROGMEM =
-
-    static const char * const intro_mmu_cmd[] PROGMEM =
     {
         // first 2 items are only relevant if filament was not loaded - i.e. extraPurgeNeeded == true
         cmd_intro_mmu_3,
         cmd_intro_mmu_4,
-
         cmd_intro_mmu_5,
         cmd_intro_mmu_6,
         zero_extrusion,
@@ -119,42 +135,42 @@ void lay1cal_intro_line(bool extraPurgeNeeded, float layer_height, float extrusi
         cmd_intro_mmu_9,
         cmd_intro_mmu_10,
         cmd_intro_mmu_11,
-        cmd_intro_mmu_12,
     };
 
     if (MMU2::mmu2.Enabled())
     {
-        for (uint8_t i = (extraPurgeNeeded ? 0 : 2); i < (sizeof(intro_mmu_cmd)/sizeof(intro_mmu_cmd[0])); ++i)
+        for (uint8_t i = (extraPurgeNeeded ? 0 : 2); i < (sizeof(cmd_intro_mmu)/sizeof(cmd_intro_mmu[0])); ++i)
         {
-            enquecommand_P(static_cast<char*>(pgm_read_ptr(&intro_mmu_cmd[i])));
+            enquecommand_P(static_cast<char*>(pgm_read_ptr(&cmd_intro_mmu[i])));
         }
     }
     else
     {
-        static const char fmt1[] PROGMEM = "G1 X%d E%-.3f F1000";
+        enquecommand_P(feedrate_F1080); //fixed velocity for the intro line
-        enquecommandf_P(fmt1, 60, count_e(layer_height, extrusion_width * 4.f, 60));
+        enquecommandf_P(extrude_fmt_X, 60.f, count_e(layer_height, extrusion_width * 4.f, 60));
-        enquecommandf_P(fmt1, 100, count_e(layer_height, extrusion_width * 8.f, 40));
+        enquecommandf_P(extrude_fmt_X, 202.5f, count_e(layer_height, extrusion_width * 8.f, 142.5));
     }
 }
 
 //! @brief Setup for printing meander
 void lay1cal_before_meander()
 {
-    static const char cmd_pre_meander_2[] PROGMEM = "G90"; //use absolute coordinates
+#ifndef NEW_FIRST_LAYER_CAL
-    static const char cmd_pre_meander_4[] PROGMEM = "G1 E-1.5 F2100";
+    static const char cmd_pre_meander_4[] PROGMEM = "G1E-1.5F2100";
-    static const char cmd_pre_meander_5[] PROGMEM = "G1 Z5 F7200";
+    static const char cmd_pre_meander_5[] PROGMEM = "G1Z5F7200";
-    static const char cmd_pre_meander_6[] PROGMEM = "M204 S1000"; //set acceleration
+#endif //NEW_FIRST_LAYER_CAL
-    static const char cmd_pre_meander_7[] PROGMEM = "G1 F4000";
+    static const char cmd_pre_meander_6[] PROGMEM = "M204S1000"; //set acceleration
 
     static const char * const cmd_pre_meander[] PROGMEM =
     {
             zero_extrusion,
-            cmd_pre_meander_2,
+            MSG_G90,
             MSG_M83, // use relative distances for extrusion
+#ifndef NEW_FIRST_LAYER_CAL
             cmd_pre_meander_4,
             cmd_pre_meander_5,
+#endif //NEW_FIRST_LAYER_CAL
             cmd_pre_meander_6,
-            cmd_pre_meander_7,
     };
 
     lay1cal_common_enqueue_loop(cmd_pre_meander, (sizeof(cmd_pre_meander)/sizeof(cmd_pre_meander[0])));
@@ -163,88 +179,86 @@ void lay1cal_before_meander()
 //! @brief Print meander start
 void lay1cal_meander_start(float layer_height, float extrusion_width)
 {
-    enquecommand_P(PSTR("G1 X50 Y155"));
+#ifndef NEW_FIRST_LAYER_CAL
-
+    enquecommand_P(PSTR("G1X50Y155"));
-    static const char fmt1[] PROGMEM = "G1 Z%-.3f F7200";
+#endif //_NEW_FIRST_LAYER_CAL
+    static const char fmt1[] PROGMEM = "G1Z%.2f";
     enquecommandf_P(fmt1, layer_height);
-
+    enquecommand_P(feedrate_F1080);
-    enquecommand_P(PSTR("G1 F1080"));
+    enquecommand_P(MSG_G91); //enable relative XYZ
-
+#ifdef NEW_FIRST_LAYER_CAL
-    enquecommandf_P(extrude_fmt,  75, 155, count_e(layer_height, extrusion_width * 4.f, 25));
+    enquecommandf_P(extrude_fmt_Y, short_length, count_e(layer_height, extrusion_width, short_length));
-    enquecommandf_P(extrude_fmt, 100, 155, count_e(layer_height, extrusion_width * 2.f, 25));
+    enquecommandf_P(extrude_fmt_X, long_length*invert, count_e(layer_height, extrusion_width, long_length));
-    enquecommandf_P(extrude_fmt, 200, 155, count_e(layer_height, extrusion_width, 100));
+    enquecommandf_P(extrude_fmt_Y, -short_length*invert, count_e(layer_height, extrusion_width, short_length));
-    enquecommandf_P(extrude_fmt, 200, 135, count_e(layer_height, extrusion_width, 20));
+#else
+    enquecommandf_P(extrude_fmt_X, 25.f*invert, count_e(layer_height, extrusion_width * 4.f, 25));
+    enquecommandf_P(extrude_fmt_X, 25.f*invert, count_e(layer_height, extrusion_width * 2.f, 25));
+    enquecommandf_P(extrude_fmt_X, 100.f*invert, count_e(layer_height, extrusion_width, 100));
+    enquecommandf_P(extrude_fmt_Y, -20.f*invert, count_e(layer_height, extrusion_width, 20));
+#endif //_NEW_FIRST_LAYER_CAL
 }
 
 //! @brief Print meander
 //! @param cmd_buffer character buffer needed to format gcodes
 void lay1cal_meander(float layer_height, float extrusion_width)
 {
-    const float short_length = 20;
-    float long_length = 150;
     const float long_extrusion = count_e(layer_height, extrusion_width, long_length);
     const float short_extrusion = count_e(layer_height, extrusion_width, short_length);
 
-    uint8_t y_pos = 135;
+    for(int8_t i = 0, xdir = -invert; i <= 4; i++, xdir = -xdir)
-    uint8_t x_pos = 50;
-    for(uint8_t i = 0; i <= 4; ++i)
     {
-        enquecommandf_P(extrude_fmt, x_pos, y_pos, long_extrusion);
+        enquecommandf_P(extrude_fmt_X, xdir * long_length, long_extrusion);
-
+        enquecommandf_P(extrude_fmt_Y, invert * -short_length, short_extrusion);
-        y_pos -= short_length;
-
-        enquecommandf_P(extrude_fmt, x_pos, y_pos, short_extrusion);
-
-        x_pos += long_length;
-
-        long_length = -long_length;
     }
+#ifdef NEW_FIRST_LAYER_CAL
+    constexpr float mid_length = 0.5f * long_length - 0.5f * square_width;
+    const float mid_extrusion = count_e(layer_height, extrusion_width, mid_length);
+    enquecommandf_P(extrude_fmt_X, -mid_length, mid_extrusion); //~Middle of bed X125
+    enquecommandf_P(extrude_fmt_Y, short_length, short_extrusion); //~Middle of bed Y105
+#endif //NEW_FIRST_LAYER_CAL
 
 }
 
 //! @brief Print square
 //!
-//! This function needs to be called 4 times with step of 0,4,8,12
+//! This function enqueues 4 lines of the square, so it needs to be called multiple times
 //!
 //! @param cmd_buffer character buffer needed to format gcodes
-//! @param i iteration
+void lay1cal_square(float layer_height, float extrusion_width)
-void lay1cal_square(uint8_t step, float layer_height, float extrusion_width)
 {
-    const float long_length = 20;
+    const float Y_spacing = spacing(layer_height, extrusion_width);
-    const float short_length = spacing(layer_height, extrusion_width);
+    const float long_extrusion = count_e(layer_height, extrusion_width, square_width);
-    const float long_extrusion = count_e(layer_height, extrusion_width, long_length);
+    const float short_extrusion = count_e(layer_height, extrusion_width, Y_spacing);
-    const float short_extrusion = count_e(layer_height, extrusion_width, short_length);
-    static const char fmt1[] PROGMEM = "G1 X%d Y%-.2f E%-.3f";
 
-    for (uint8_t i = step; i < step+4; ++i)
+    for (uint8_t i = 0; i < 4; i++)
     {
-        enquecommandf_P(fmt1, 70, (35 - i*short_length * 2), long_extrusion);
+        enquecommandf_P(extrude_fmt_X, square_width*invert, long_extrusion);
-        enquecommandf_P(fmt1, 70, (35 - (2 * i + 1)*short_length), short_extrusion);
+        enquecommandf_P(extrude_fmt_Y, -Y_spacing*invert, short_extrusion);
-        enquecommandf_P(fmt1, 50, (35 - (2 * i + 1)*short_length), long_extrusion);
+        enquecommandf_P(extrude_fmt_X, -square_width*invert, long_extrusion);
-        enquecommandf_P(fmt1, 50, (35 - (i + 1)*short_length * 2), short_extrusion);
+        enquecommandf_P(extrude_fmt_Y, -Y_spacing*invert, short_extrusion);
     }
 }
 
-void lay1cal_finish(bool mmu_enabled)
+void lay1cal_finish()
 {
-    static const char cmd_cal_finish_1[] PROGMEM = "G1 E-0.075 F2100"; //retract
+    static const char cmd_cal_finish_3[] PROGMEM = "G1E-0.075F2100"; // Retract
-    static const char cmd_cal_finish_2[] PROGMEM = "M104 S0"; // turn off temperature
+    static const char cmd_cal_finish_4[] PROGMEM = "M140S0";         // Turn off bed heater
-    static const char cmd_cal_finish_3[] PROGMEM = "M140 S0"; // turn off heatbed
+    static const char cmd_cal_finish_5[] PROGMEM = "G1Z10F1300";     // Lift Z
-    static const char cmd_cal_finish_4[] PROGMEM = "G1 Z10 F1300"; //lift Z
+    static const char cmd_cal_finish_6[] PROGMEM = "G1X10Y180F4000"; // Go to parking position
-    static const char cmd_cal_finish_5[] PROGMEM = "G1 X10 Y180 F4000"; //Go to parking position
+    static const char cmd_cal_finish_8[] PROGMEM = "M104S0";         // Turn off hotend heater
 
     static const char * const cmd_cal_finish[] PROGMEM =
     {
-            MSG_M107, // turn off printer fan
+        MSG_G90,          // Set to Absolute Positioning
-            cmd_cal_finish_1,
+        MSG_M107,         // Turn off printer fan
-            cmd_cal_finish_2,
+        cmd_cal_finish_3, // Retract
-            cmd_cal_finish_3,
+        cmd_cal_finish_4, // Turn off bed heater
-            cmd_cal_finish_4,
+        cmd_cal_finish_5, // Lift Z
-            cmd_cal_finish_5
+        cmd_cal_finish_6, // Go to parking position
+        MSG_M702,         // Unload filament (MMU only)
+        cmd_cal_finish_8, // Turn off hotend heater
+        MSG_M84           // Disable stepper motors
     };
 
     lay1cal_common_enqueue_loop(cmd_cal_finish, (sizeof(cmd_cal_finish)/sizeof(cmd_cal_finish[0])));
-
-    if (mmu_enabled) enquecommand_P(MSG_M702); //unload from nozzle
-    enquecommand_P(MSG_M84);// disable motors
 }

Firmware/first_lay_cal.h

@@ -12,7 +12,7 @@ void lay1cal_intro_line(bool skipExtraPurge, float layer_height, float extrusion
 void lay1cal_before_meander();
 void lay1cal_meander_start(float layer_height, float extrusion_width);
 void lay1cal_meander(float layer_height, float extrusion_width);
-void lay1cal_square(uint8_t step, float layer_height, float extrusion_width);
+void lay1cal_square(float layer_height, float extrusion_width);
-void lay1cal_finish(bool mmu_enabled);
+void lay1cal_finish();
 
 #endif /* FIRMWARE_FIRST_LAY_CAL_H_ */

Firmware/menu.cpp

@@ -475,10 +475,8 @@ static void _menu_edit_P()
             // disable after first use and/or if the initial value is not minEditValue
             _md->minJumpValue = 0;
         }
-
 		_md->currentValue += lcd_encoder;
 		lcd_encoder = 0; // Consume knob rotation event
-
 		// Constrain the value in case it's outside the allowed limits
 		_md->currentValue = constrain(_md->currentValue, _md->minEditValue, _md->maxEditValue);
 		lcd_set_cursor(0, 1);

Firmware/messages.cpp

@@ -18,8 +18,8 @@ const char MSG_BED_HEATING[] PROGMEM_I1 = ISTR("Bed Heating"); ////MSG_BED_HEATI
 const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."); ////MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6
 const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ calibration failed. Please consult the manual."); ////MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8
 const char MSG_BELT_STATUS[] PROGMEM_I1 = ISTR("Belt status");////MSG_BELT_STATUS c=18
-const char MSG_EJECT[] PROGMEM_I1 = ISTR("Eject"); ////MSG_EJECT c=8
+const char MSG_EJECT[] PROGMEM_I1 = ISTR("Eject"); ////MSG_EJECT c=9
-const char MSG_CANCEL[] PROGMEM_I1 = ISTR(">Cancel");////MSG_CANCEL c=10
+const char MSG_CANCEL[] PROGMEM_I1 = ISTR("Cancel");////MSG_CANCEL c=9
 const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////MSG_CALIBRATE_Z_AUTO c=20 r=2
 const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); ////MSG_CARD_MENU c=18
 const char MSG_CHECKING_X[] PROGMEM_I1 = ISTR("Checking X axis"); ////MSG_CHECKING_X c=20
@@ -149,16 +149,15 @@ const char MSG_NONE[] PROGMEM_I1 = ISTR("None"); ////MSG_NONE c=8
 const char MSG_WARN[] PROGMEM_I1 = ISTR("Warn"); ////MSG_WARN c=8
 const char MSG_STRICT[] PROGMEM_I1 = ISTR("Strict"); ////MSG_STRICT c=8
 const char MSG_MODEL[] PROGMEM_I1 = ISTR("Model"); ////MSG_MODEL c=8
-const char MSG_GCODE_DIFF_PRINTER_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a different printer type. Continue?"); ////MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3
+const char MSG_GCODE_DIFF_PRINTER_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a different printer type."); ////MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3
-const char MSG_GCODE_DIFF_PRINTER_CANCELLED[] PROGMEM_I1 =ISTR("G-code sliced for a different printer type. Please re-slice the model again. Print cancelled."); ////MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8
+const char MSG_GCODE_DIFF_PRINTER_CANCELLED[] PROGMEM_I1 =ISTR("G-code sliced for a different printer type. Please re-slice the model again."); ////MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8
-const char MSG_GCODE_NEWER_FIRMWARE_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a newer firmware. Continue?"); ////MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3
+const char MSG_GCODE_NEWER_FIRMWARE_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a newer firmware."); ////MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3
-const char MSG_GCODE_NEWER_FIRMWARE_CANCELLED[] PROGMEM_I1 = ISTR("G-code sliced for a newer firmware. Please update the firmware. Print cancelled."); ////MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
+const char MSG_GCODE_NEWER_FIRMWARE_CANCELLED[] PROGMEM_I1 = ISTR("G-code sliced for a newer firmware. Please update the firmware."); ////MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
-const char MSG_GCODE_DIFF_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a different level. Continue?"); ////MSG_GCODE_DIFF_CONTINUE c=20 r=3
+const char MSG_GCODE_DIFF_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a different level."); ////MSG_GCODE_DIFF_CONTINUE c=20 r=3
-const char MSG_GCODE_DIFF_CANCELLED[] PROGMEM_I1 = ISTR("G-code sliced for a different level. Please re-slice the model again. Print cancelled."); ////MSG_GCODE_DIFF_CANCELLED c=20 r=8
+const char MSG_GCODE_DIFF_CANCELLED[] PROGMEM_I1 = ISTR("G-code sliced for a different level. Please re-slice the model again."); ////MSG_GCODE_DIFF_CANCELLED c=20 r=8
-const char MSG_MISSING_FILAMENT_CONTINUE[] PROGMEM_I1 = ISTR("There is no filament loaded. Continue?"); ////MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
+const char MSG_MISSING_FILAMENT[] PROGMEM_I1 = ISTR("There is no filament loaded."); ////MSG_MISSING_FILAMENT c=20 r=3
-const char MSG_MISSING_FILAMENT_CANCELLED[] PROGMEM_I1 = ISTR("There is no filament loaded. Print cancelled."); ////MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
+const char MSG_NOZZLE_DIFFERS_CONTINUE[] PROGMEM_I1 = ISTR("Nozzle diameter differs from the G-code."); ////MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3
-const char MSG_NOZZLE_DIFFERS_CONTINUE[] PROGMEM_I1 = ISTR("Nozzle diameter differs from the G-code. Continue?"); ////MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3
+const char MSG_NOZZLE_DIFFERS_CANCELLED[] PROGMEM_I1 = ISTR("Nozzle diameter differs from the G-code. Please check the value in settings."); ////MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8
-const char MSG_NOZZLE_DIFFERS_CANCELLED[] PROGMEM_I1 = ISTR("Nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."); ////MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8
 const char MSG_NOZZLE_DIAMETER[] PROGMEM_I1 = ISTR("Nozzle d."); ////MSG_NOZZLE_DIAMETER c=10
 const char MSG_MMU_MODE[] PROGMEM_I1 = ISTR("MMU Mode"); ////MSG_MMU_MODE c=8
 const char MSG_SD_CARD[] PROGMEM_I1 = ISTR("SD card"); ////MSG_SD_CARD c=8
@@ -254,7 +253,9 @@ extern const char MSG_LOADING_COLOR [] PROGMEM_I1 = ISTR("Loading color"); ////M
 extern const char MSG_CORRECTLY [] PROGMEM_I1 = ISTR("Changed correctly"); ////MSG_CORRECTLY c=19
 extern const char MSG_NOT_LOADED [] PROGMEM_I1 = ISTR("Filament not loaded"); ////MSG_NOT_LOADED c=19
 extern const char MSG_NOT_COLOR [] PROGMEM_I1 = ISTR("Color not correct"); ////MSG_NOT_COLOR c=19
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 extern const char MSG_AUTOLOADING_ENABLED [] PROGMEM_I1 = ISTR("Autoloading filament is active, just press the knob and insert filament..."); ////MSG_AUTOLOADING_ENABLED c=20 r=4
+#endif //REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 extern const char MSG_FILAMENT_USED [] PROGMEM_I1 = ISTR("Filament used"); ////MSG_FILAMENT_USED c=19
 extern const char MSG_PRINT_TIME [] PROGMEM_I1 = ISTR("Print time"); ////MSG_PRINT_TIME c=19
 extern const char MSG_TOTAL_FILAMENT [] PROGMEM_I1 = ISTR("Total filament"); ////MSG_TOTAL_FILAMENT c=19
@@ -295,7 +296,7 @@ extern const char MSG_MODE_CHANGE_IN_PROGRESS [] PROGMEM_I1 = ISTR("Mode change
 extern const char MSG_COPY_SEL_LANG [] PROGMEM_I1 = ISTR("Copy selected language?"); ////MSG_COPY_SEL_LANG c=20 r=3
 extern const char MSG_SHEET_OFFSET [] PROGMEM_I1 = ISTR("Sheet %.7s\nZ offset: %+1.3fmm\n%cContinue\n%cReset"); ////MSG_SHEET_OFFSET c=20 r=4
 extern const char MSG_PLEASE_LOAD_PLA [] PROGMEM_I1 = ISTR("Please load filament first."); ////MSG_PLEASE_LOAD_PLA c=20 r=4
-extern const char MSG_WIZARD_RERUN [] PROGMEM_I1 = ISTR("Running Wizard will delete current calibration results and start from the beginning. Continue?"); ////MSG_WIZARD_RERUN c=20 r=7
+extern const char MSG_WIZARD_RERUN [] PROGMEM_I1 = ISTR("Running Wizard will delete current calibration results and start from the beginning."); ////MSG_WIZARD_RERUN c=20 r=7
 extern const char MSG_MMU_INSERT_FILAMENT_FIRST_TUBE [] PROGMEM_I1 = ISTR("Please insert filament into the first tube of the MMU, then press the knob to load it."); ////MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6
 extern const char MSG_WIZARD_LOAD_FILAMENT [] PROGMEM_I1 = ISTR("Please insert filament into the extruder, then press the knob to load it."); ////MSG_WIZARD_LOAD_FILAMENT c=20 r=6
 extern const char MSG_WIZARD_V2_CAL [] PROGMEM_I1 = ISTR("Now I will calibrate distance between tip of the nozzle and heatbed surface."); ////MSG_WIZARD_V2_CAL c=20 r=8
@@ -372,7 +373,7 @@ extern const char MSG_SELFTEST_CHECK_HOTEND [] PROGMEM_I1 = ISTR("Checking hoten
 extern const char MSG_SELFTEST_CHECK_ALLCORRECT [] PROGMEM_I1 = ISTR("All correct"); ////MSG_SELFTEST_CHECK_ALLCORRECT c=20
 extern const char MSG_CALIBRATING_HOME [] PROGMEM_I1 = ISTR("Calibrating home"); ////MSG_CALIBRATING_HOME c=20
 extern const char MSG_CHECKING_FILE [] PROGMEM_I1 = ISTR("Checking file"); ////MSG_CHECKING_FILE c=17
-extern const char MSG_FILE_INCOMPLETE [] PROGMEM_I1 = ISTR("File incomplete. Continue anyway?"); ////MSG_FILE_INCOMPLETE c=20 r=3
+extern const char MSG_FILE_INCOMPLETE [] PROGMEM_I1 = ISTR("File incomplete."); ////MSG_FILE_INCOMPLETE c=20 r=3
 extern const char MSG_SD_REMOVED [] PROGMEM_I1 = ISTR("Card removed"); ////MSG_SD_REMOVED c=20
 extern const char MSG_NEW_FIRMWARE_AVAILABLE [] PROGMEM_I1 = ISTR("New firmware version available:"); ////MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2
 extern const char MSG_NEW_FIRMWARE_PLEASE_UPGRADE [] PROGMEM_I1 = ISTR("Please upgrade."); ////MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20
@@ -428,6 +429,8 @@ const char MSG_FILAMENT_RUNOUT_DETECTED[] PROGMEM_N1 = "Filament runout detected
 // Common G-gcodes
 const char G1_E_F2700[] PROGMEM_N1 = "G1 E%-.3f F2700";
 const char G28W[] PROGMEM_N1 = "G28 W";
+const char MSG_G90[] PROGMEM_N1 = "G90";
+const char MSG_G91[] PROGMEM_N1 = "G91";
 const char MSG_M23[] PROGMEM_N1 = "M23 %s";
 const char MSG_M24[] PROGMEM_N1 = "M24";
 const char MSG_M83[] PROGMEM_N1 = "M83";

Firmware/messages.h

@@ -157,8 +157,7 @@ extern const char MSG_GCODE_NEWER_FIRMWARE_CONTINUE[];
 extern const char MSG_GCODE_NEWER_FIRMWARE_CANCELLED[];
 extern const char MSG_GCODE_DIFF_CONTINUE[];
 extern const char MSG_GCODE_DIFF_CANCELLED[];
-extern const char MSG_MISSING_FILAMENT_CONTINUE[];
+extern const char MSG_MISSING_FILAMENT[];
-extern const char MSG_MISSING_FILAMENT_CANCELLED[];
 extern const char MSG_NOZZLE_DIFFERS_CONTINUE[];
 extern const char MSG_NOZZLE_DIFFERS_CANCELLED[];
 extern const char MSG_NOZZLE_DIAMETER[];
@@ -253,7 +252,9 @@ extern const char MSG_LOADING_COLOR [];
 extern const char MSG_CORRECTLY [];
 extern const char MSG_NOT_LOADED [];
 extern const char MSG_NOT_COLOR [];
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 extern const char MSG_AUTOLOADING_ENABLED [];
+#endif //REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 extern const char MSG_FILAMENT_USED [];
 extern const char MSG_PRINT_TIME [];
 extern const char MSG_TOTAL_FILAMENT [];
@@ -430,6 +431,8 @@ extern const char MSG_FILAMENT_RUNOUT_DETECTED[];
 // Common G-gcodes
 extern const char G1_E_F2700[];
 extern const char G28W[];
+extern const char MSG_G90[];
+extern const char MSG_G91[];
 extern const char MSG_M23[];
 extern const char MSG_M24[];
 extern const char MSG_M83[];

Firmware/mmu2/errors_list.h

@@ -355,7 +355,7 @@ static const char MSG_BTN_RETRY[] PROGMEM_I1 = ISTR("Retry"); ////MSG_BTN_RETRY
 static const char MSG_BTN_RESET_MMU[] PROGMEM_I1 = ISTR("ResetMMU"); ////MSG_BTN_RESET_MMU c=8
 static const char MSG_BTN_UNLOAD[] PROGMEM_I1 = ISTR("Unload"); ////MSG_BTN_UNLOAD c=8
 static const char MSG_BTN_LOAD[] PROGMEM_I1 = ISTR("Load"); ////MSG_BTN_LOAD c=8
-//static const char MSG_BTN_EJECT[] PROGMEM_I1 = ISTR("Eject"); //Reuse MSG_EJECT c=8
+//static const char MSG_BTN_EJECT[] PROGMEM_I1 = ISTR("Eject"); //Reuse MSG_EJECT c=9
 //static const char MSG_BTN_TUNE_MMU[] PROGMEM_I1 = ISTR("Tune"); //Reuse MSG_TUNE c=8
 static const char MSG_BTN_STOP[] PROGMEM_I1 = ISTR("Stop"); ////MSG_BTN_STOP c=8
 static const char MSG_BTN_DISABLE_MMU[] PROGMEM_I1 = ISTR("Disable"); ////MSG_BTN_DISABLE_MMU c=8

Firmware/stepper.cpp

@@ -59,14 +59,6 @@ uint16_t SP_min = 0x21FF;
 #ifdef DEBUG_YSTEP_DUP_PIN
 #define _STEP_PIN_Y_DUP_AXIS DEBUG_YSTEP_DUP_PIN
 #endif
-#ifdef Y_DUAL_STEPPER_DRIVERS
-#error Y_DUAL_STEPPER_DRIVERS not fully implemented
-#define _STEP_PIN_Y2_AXIS Y2_STEP_PIN
-#endif
-#ifdef Z_DUAL_STEPPER_DRIVERS
-#error Z_DUAL_STEPPER_DRIVERS not fully implemented
-#define _STEP_PIN_Z2_AXIS Z2_STEP_PIN
-#endif
 
 #ifdef TMC2130
 #define STEPPER_MINIMUM_PULSE TMC2130_MINIMUM_PULSE
@@ -1079,17 +1071,9 @@ void st_init()
   #endif
   #if defined(Y_DIR_PIN) && Y_DIR_PIN > -1
     SET_OUTPUT(Y_DIR_PIN);
-
-	#if defined(Y_DUAL_STEPPER_DRIVERS) && defined(Y2_DIR_PIN) && (Y2_DIR_PIN > -1)
-	  SET_OUTPUT(Y2_DIR_PIN);
-	#endif
   #endif
   #if defined(Z_DIR_PIN) && Z_DIR_PIN > -1
     SET_OUTPUT(Z_DIR_PIN);
-
-    #if defined(Z_DUAL_STEPPER_DRIVERS) && defined(Z2_DIR_PIN) && (Z2_DIR_PIN > -1)
-      SET_OUTPUT(Z2_DIR_PIN);
-    #endif
   #endif
   #if defined(E0_DIR_PIN) && E0_DIR_PIN > -1
     SET_OUTPUT(E0_DIR_PIN);
@@ -1108,20 +1092,10 @@ void st_init()
   #if defined(Y_ENABLE_PIN) && Y_ENABLE_PIN > -1
     SET_OUTPUT(Y_ENABLE_PIN);
     if(!Y_ENABLE_ON) WRITE(Y_ENABLE_PIN,HIGH);
-
-	#if defined(Y_DUAL_STEPPER_DRIVERS) && defined(Y2_ENABLE_PIN) && (Y2_ENABLE_PIN > -1)
-	  SET_OUTPUT(Y2_ENABLE_PIN);
-	  if(!Y_ENABLE_ON) WRITE(Y2_ENABLE_PIN,HIGH);
-	#endif
   #endif
   #if defined(Z_ENABLE_PIN) && Z_ENABLE_PIN > -1
     SET_OUTPUT(Z_ENABLE_PIN);
     if(!Z_ENABLE_ON) WRITE(Z_ENABLE_PIN,HIGH);
-
-    #if defined(Z_DUAL_STEPPER_DRIVERS) && defined(Z2_ENABLE_PIN) && (Z2_ENABLE_PIN > -1)
-      SET_OUTPUT(Z2_ENABLE_PIN);
-      if(!Z_ENABLE_ON) WRITE(Z2_ENABLE_PIN,HIGH);
-    #endif
   #endif
   #if defined(E0_ENABLE_PIN) && (E0_ENABLE_PIN > -1)
     SET_OUTPUT(E0_ENABLE_PIN);
@@ -1201,19 +1175,11 @@ void st_init()
     SET_OUTPUT(DEBUG_YSTEP_DUP_PIN);
     WRITE(DEBUG_YSTEP_DUP_PIN,INVERT_Y_STEP_PIN);
 #endif //DEBUG_YSTEP_DUP_PIN
-    #if defined(Y_DUAL_STEPPER_DRIVERS) && defined(Y2_STEP_PIN) && (Y2_STEP_PIN > -1)
-      SET_OUTPUT(Y2_STEP_PIN);
-      WRITE(Y2_STEP_PIN,INVERT_Y_STEP_PIN);
-    #endif
     disable_y();
   #endif
   #if defined(Z_STEP_PIN) && (Z_STEP_PIN > -1)
     SET_OUTPUT(Z_STEP_PIN);
     WRITE(Z_STEP_PIN,INVERT_Z_STEP_PIN);
-    #if defined(Z_DUAL_STEPPER_DRIVERS) && defined(Z2_STEP_PIN) && (Z2_STEP_PIN > -1)
-      SET_OUTPUT(Z2_STEP_PIN);
-      WRITE(Z2_STEP_PIN,INVERT_Z_STEP_PIN);
-    #endif
     #ifdef PSU_Delta
       init_force_z();
     #endif // PSU_Delta
@@ -1373,7 +1339,7 @@ void babystep(const uint8_t axis,const bool direction)
     case X_AXIS:
     {
         enable_x();
-        uint8_t old_x_dir_pin = READ(X_DIR_PIN);  //if dualzstepper, both point to same direction.
+        uint8_t old_x_dir_pin = READ(X_DIR_PIN);
         uint8_t new_x_dir_pin = (INVERT_X_DIR)^direction;
 
         //setup new step
@@ -1401,7 +1367,7 @@ void babystep(const uint8_t axis,const bool direction)
     case Y_AXIS:
     {
         enable_y();
-        uint8_t old_y_dir_pin = READ(Y_DIR_PIN);  //if dualzstepper, both point to same direction.
+        uint8_t old_y_dir_pin = READ(Y_DIR_PIN);
         uint8_t new_y_dir_pin = (INVERT_Y_DIR)^direction;
 
         //setup new step
@@ -1429,35 +1395,23 @@ void babystep(const uint8_t axis,const bool direction)
     case Z_AXIS:
     {
         enable_z();
-        uint8_t old_z_dir_pin = READ(Z_DIR_PIN);  //if dualzstepper, both point to same direction.
+        uint8_t old_z_dir_pin = READ(Z_DIR_PIN);
         uint8_t new_z_dir_pin = (INVERT_Z_DIR)^direction^BABYSTEP_INVERT_Z;
 
         //setup new step
         if (new_z_dir_pin != old_z_dir_pin) {
             WRITE_NC(Z_DIR_PIN, new_z_dir_pin);
-#ifdef Z_DUAL_STEPPER_DRIVERS
-            WRITE_NC(Z2_DIR_PIN, new_z_dir_pin);
-#endif
             delayMicroseconds(STEPPER_SET_DIR_DELAY);
         }
 
         //perform step
         STEP_NC_HI(Z_AXIS);
-#ifdef Z_DUAL_STEPPER_DRIVERS
-        STEP_NC_HI(Z2_AXIS);
-#endif
         STEPPER_MINIMUM_DELAY;
         STEP_NC_LO(Z_AXIS);
-#ifdef Z_DUAL_STEPPER_DRIVERS
-        STEP_NC_LO(Z2_AXIS);
-#endif
 
         //get old pin state back.
         if (new_z_dir_pin != old_z_dir_pin) {
             WRITE_NC(Z_DIR_PIN, old_z_dir_pin);
-#ifdef Z_DUAL_STEPPER_DRIVERS
-            WRITE_NC(Z2_DIR_PIN, old_z_dir_pin);
-#endif
         }
     }
     break;

Firmware/uart2.c

@@ -1,85 +0,0 @@
-//uart2.c
-#include "uart2.h"
-#include <avr/io.h>
-#include <avr/interrupt.h>
-#include <avr/pgmspace.h>
-#include "rbuf.h"
-#include "macros.h"
-
-#define UART2_BAUD 115200
-#define UART_BAUD_SELECT(baudRate,xtalCpu) (((float)(xtalCpu))/(((float)(baudRate))*8.0)-1.0+0.5)
-#define uart2_rxcomplete (UCSR2A & (1 << RXC2))
-#define uart2_txcomplete (UCSR2A & (1 << TXC2))
-#define uart2_txready    (UCSR2A & (1 << UDRE2))
-
-uint8_t uart2_ibuf[20] = {0, 0};
-
-FILE _uart2io = {0};
-
-
-int uart2_putchar(char c, _UNUSED FILE *stream)
-{
-	while (!uart2_txready);
-	UDR2 = c; // transmit byte
-//	while (!uart2_txcomplete); // wait until byte sent
-//	UCSR2A |= (1 << TXC2); // delete TXCflag
-	return 0;
-}
-
-int uart2_getchar(_UNUSED FILE *stream)
-{
-	if (rbuf_empty(uart2_ibuf)) return -1;
-	return rbuf_get(uart2_ibuf);
-}
-
-//uart init (io + FILE stream)
-void uart2_init(uint32_t baudRate)
-{
-	DDRH &=	~0x01;
-	PORTH |= 0x01;
-	rbuf_ini(uart2_ibuf, sizeof(uart2_ibuf) - 4);
-	UCSR2A |= (1 << U2X2); // baudrate multiplier
-	UBRR2L = UART_BAUD_SELECT(baudRate, F_CPU); // select baudrate
-	UCSR2B = (1 << RXEN2) | (1 << TXEN2); // enable receiver and transmitter
-	UCSR2B |= (1 << RXCIE2); // enable rx interrupt
-	fdev_setup_stream(uart2io, uart2_putchar, uart2_getchar, _FDEV_SETUP_WRITE | _FDEV_SETUP_READ); //setup uart2 i/o stream
-}
-
-//returns 1 if chars in input buffer match to str
-//returns -1 if chars does not match and 0 for empty buffer
-int8_t uart2_rx_str_P(const char* str)
-{
-	uint8_t r = rbuf_r(uart2_ibuf);            //get read index
-	uint8_t w = rbuf_w(uart2_ibuf);            //get write index
-//	printf_P(PSTR("uart2_rx_str_P r=%d w=%d\n"), r, w);
-	uint8_t e = rbuf_l(uart2_ibuf) - 1;        //get end index
-	uint8_t len = strlen_P(str);                 //get string length
-	str += len;                                //last char will be compared first
-//	printf_P(PSTR(" len=%d\n"), len);
-	while (len--)                              //loop over all chars
-	{
-		if (w == r) return 0;                  //empty buffer - return 0
-		if ((--w) == 255) w = e;               //decrement index
-		char c0 = pgm_read_byte(--str);        //read char from str
-		char c1 = uart2_ibuf[4 + w];           //read char from input buffer
-//		printf_P(PSTR(" uart2_rx_str_P w=%d l=%d c0=%02x c1=%02x\n"), w, len, c0, c1);
-		if (c0 == c1) continue;                //if match, continue with next char
-		if ((c0 == '\r') && (c1 == '\n'))      //match cr as lf
-			continue;
-		if ((c0 == '\n') && (c1 == '\r'))      //match lf as cr
-			continue;
-		return -1;                             //no match - return -1
-	}
-	return 1;                                  //all characters match - return 1
-}
-
-ISR(USART2_RX_vect)
-{
-	//printf_P(PSTR("USART2_RX_vect \n") );
-	if (rbuf_put(uart2_ibuf, UDR2) < 0) // put received byte to buffer
-	{ //rx buffer full
-		//uart2_rx_clr(); //for sure, clear input buffer
-		puts_P(PSTR("USART2 rx Full!!!"));
-	}
-}
-

Firmware/uart2.cpp

@@ -0,0 +1,50 @@
+//uart2.c
+#include "uart2.h"
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <avr/pgmspace.h>
+#include "rbuf.h"
+#include "macros.h"
+
+#define UART_BAUD_SELECT(baudRate,xtalCpu) (((float)(xtalCpu))/(((float)(baudRate))*8.0)-1.0+0.5)
+#define uart2_txready    (UCSR2A & (1 << UDRE2))
+
+uint8_t uart2_ibuf[20] = {0, 0};
+FILE _uart2io;
+
+static int uart2_putchar(char c, _UNUSED FILE *stream)
+{
+	while (!uart2_txready);
+
+	UDR2 = c; // transmit byte
+
+	return 0;
+}
+
+static int uart2_getchar(_UNUSED FILE *stream)
+{
+	if (rbuf_empty(uart2_ibuf)) return -1;
+	return rbuf_get(uart2_ibuf);
+}
+
+//uart init (io + FILE stream)
+void uart2_init(uint32_t baudRate)
+{
+	DDRH &=	~0x01;
+	PORTH |= 0x01;
+	rbuf_ini(uart2_ibuf, sizeof(uart2_ibuf) - 4);
+	UCSR2A |= (1 << U2X2); // baudrate multiplier
+	UBRR2L = UART_BAUD_SELECT(baudRate, F_CPU); // select baudrate
+	UCSR2B = (1 << RXEN2) | (1 << TXEN2); // enable receiver and transmitter
+	UCSR2B |= (1 << RXCIE2); // enable rx interrupt
+	fdev_setup_stream(uart2io, uart2_putchar, uart2_getchar, _FDEV_SETUP_WRITE | _FDEV_SETUP_READ); //setup uart2 i/o stream
+}
+
+ISR(USART2_RX_vect)
+{
+	if (rbuf_put(uart2_ibuf, UDR2) < 0) // put received byte to buffer
+	{ //rx buffer full
+		puts_P(PSTR("USART2 rx Full!!!"));
+	}
+}
+

Firmware/uart2.h

@@ -5,22 +5,9 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-
-#if defined(__cplusplus)
-extern "C" {
-#endif //defined(__cplusplus)
-
-
 extern FILE _uart2io;
 #define uart2io (&_uart2io)
 
+void uart2_init(uint32_t baudRate);
 
-extern void uart2_init(uint32_t baudRate);
-
-extern int8_t uart2_rx_str_P(const char* str);
-
-
-#if defined(__cplusplus)
-}
-#endif //defined(__cplusplus)
 #endif //_UART2_H

Firmware/ultralcd.cpp

@@ -542,7 +542,11 @@ void lcdui_print_status_line(void) {
             break;
         }
     }
-    else if ((IS_SD_PRINTING) &&
+    else if (((IS_SD_PRINTING)
+#ifdef SHOW_FILENAME_AFTER_FINISH
+        || (GetPrinterState() == PrinterState::SDPrintingFinished)
+#endif //SHOW_FILENAME_AFTER_FINISH
+        ) &&
         (custom_message_type == CustomMsg::Status) &&
         (lcd_status_message_level <= LCD_STATUS_INFO) &&
         lcd_status_message_timeout.expired_cont(LCD_STATUS_INFO_TIMEOUT))
@@ -857,19 +861,13 @@ void lcd_commands()
                 lay1cal_meander(layer_height, extrusion_width);
                 break;
             case 6:
-                lay1cal_square(0, layer_height, extrusion_width);
-                break;
             case 5:
-                lay1cal_square(4, layer_height, extrusion_width);
-                break;
             case 4:
-                lay1cal_square(8, layer_height, extrusion_width);
-                break;
             case 3:
-                lay1cal_square(12, layer_height, extrusion_width);
+                lay1cal_square(layer_height, extrusion_width);
                 break;
             case 2:
-                lay1cal_finish(MMU2::mmu2.Enabled());
+                lay1cal_finish();
                 break;
             case 1:
                 lcd_setstatuspgm(MSG_WELCOME);
@@ -1983,7 +1981,8 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
             lcd_draw_update = 1;
 
             lcd_clear();
-            lcd_puts_at_P(0, 3, _T(MSG_CANCEL));
+            lcd_puts_at_P(0,3, PSTR(">"));
+            lcd_puts_at_P(1, 3, _T(MSG_CANCEL));
 
             lcd_set_cursor(0, 1);
             switch (eFilamentAction)
@@ -2272,24 +2271,38 @@ void show_preheat_nozzle_warning()
 
 void lcd_load_filament_color_check()
 {
-    uint8_t clean = lcd_show_multiscreen_message_with_choices_and_wait_P(_T(MSG_FILAMENT_CLEAN), false, LCD_LEFT_BUTTON_CHOICE, _T(MSG_YES), _T(MSG_NO), _T(MSG_EJECT), 8);
+    // The total length of the individual messages MSG_YES c=4, MSG_NO c=4 and MSG_EJECT c=9 with the selectors and spaces between
+    // exceeds the LCD width.
+    // 01234567890123456789
+    // >yyyy >nnnn >eeeeeeee
+    // As long the translations of MSG_YES, MSG_NO and MSG_EJECT combined length do not exceed 15 chars, we don't have to shorten
+    // the MSG_EJECT message/translation. We can set the second_col value to the length of the first choice + the selector and space.
+    // Examples:
+    // German
+    // 01234567890123456789
+    // >Ja >Nein >Auswerfen
+    // Hungarian
+    // 01234567890123456789
+    // >Igen >Nem   >Kiadás
+
+    uint8_t clean = lcd_show_multiscreen_message_with_choices_and_wait_P(_T(MSG_FILAMENT_CLEAN), false, LCD_LEFT_BUTTON_CHOICE, _T(MSG_YES), _T(MSG_NO), _T(MSG_EJECT), strlen_P(_T(MSG_YES))+2);
     while (clean == LCD_MIDDLE_BUTTON_CHOICE) {
         load_filament_final_feed();
         st_synchronize();
-        clean = lcd_show_multiscreen_message_with_choices_and_wait_P(_T(MSG_FILAMENT_CLEAN), false, LCD_LEFT_BUTTON_CHOICE, _T(MSG_YES), _T(MSG_NO), _T(MSG_EJECT), 8);
+        clean = lcd_show_multiscreen_message_with_choices_and_wait_P(_T(MSG_FILAMENT_CLEAN), false, LCD_LEFT_BUTTON_CHOICE, _T(MSG_YES), _T(MSG_NO), _T(MSG_EJECT), strlen_P(_T(MSG_YES))+2);
     }
     if (clean == LCD_RIGHT_BUTTON_CHOICE) {
         unload_filament(FILAMENTCHANGE_FINALRETRACT);
     }
 }
 
-#ifdef FILAMENT_SENSOR
+#if defined(FILAMENT_SENSOR) && !defined(REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY)
 static void lcd_menu_AutoLoadFilament()
 {
     lcd_display_message_fullscreen_nonBlocking_P(_T(MSG_AUTOLOADING_ENABLED));
     menu_back_if_clicked();
 }
-#endif //FILAMENT_SENSOR
+#endif //FILAMENT_SENSOR && REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
 
 static void preheat_or_continue(FilamentAction action) {
 
@@ -2367,7 +2380,7 @@ void lcd_menu_statistics()
 	}
 	else
 	{
-		uint32_t _filament = eeprom_read_dword((uint32_t *)EEPROM_FILAMENTUSED); // in meters
+		uint32_t _filament = eeprom_read_dword((uint32_t *)EEPROM_FILAMENTUSED); // in centimeters
 		uint32_t _time = eeprom_read_dword((uint32_t *)EEPROM_TOTALTIME); // in minutes
 		uint8_t _hours, _minutes;
 		uint32_t _days;
@@ -3045,6 +3058,17 @@ uint8_t lcd_show_multiscreen_message_yes_no_and_wait_P(const char *msg, bool all
 {
     return lcd_show_multiscreen_message_with_choices_and_wait_P(msg, allow_timeouting, default_selection, _T(MSG_YES), _T(MSG_NO), nullptr, 10);
 }
+//! @brief Show multiple screen message with yes and no possible choices and wait with possible timeout
+//! @param msg Message to show. If NULL, do not clear the screen and handle choice selection only.
+//! @param allow_timeouting if true, allows time outing of the screen
+//! @param default_selection if 0, 'Yes' choice is selected by default, otherwise 'No' choice is preselected
+//! @retval 0 cont choice selected by user
+//! @retval 1 cancel choice selected by user
+//! @retval 0xFF button timeout (only possible if allow_timeouting is true)
+uint8_t lcd_show_multiscreen_message_cont_cancel_and_wait_P(const char *msg, bool allow_timeouting, uint8_t default_selection) //currently just max. n*4 + 3 lines supported (set in language header files)
+{
+    return lcd_show_multiscreen_message_with_choices_and_wait_P(msg, allow_timeouting, default_selection, _T(MSG_CONTINUE_SHORT), _T(MSG_CANCEL), nullptr, 10);
+}
 //! @brief Show a two-choice prompt on the last line of the LCD
 //! @param selected Show first choice as selected if true, the second otherwise
 //! @param first_choice text caption of first possible choice
@@ -3620,7 +3644,7 @@ void lcd_v2_calibration() {
 	if (MMU2::mmu2.Enabled()) {
 		const uint8_t filament = choose_menu_P(
 			_T(MSG_SELECT_FILAMENT),
-			MSG_FILAMENT,(_T(MSG_CANCEL)+1)); //Hack to reuse MSG but strip 1st char off
+			MSG_FILAMENT,_T(MSG_CANCEL));
 		if (filament < MMU_FILAMENT_COUNT) {
 			lay1cal_filament = filament;
 		} else {
@@ -3663,7 +3687,7 @@ void lcd_wizard() {
 	bool result = true;
 	if (calibration_status_get(CALIBRATION_WIZARD_STEPS)) {
 		// calibration already performed: ask before clearing the previous status
-		result = !lcd_show_multiscreen_message_yes_no_and_wait_P(_T(MSG_WIZARD_RERUN), false);
+		result = !lcd_show_multiscreen_message_cont_cancel_and_wait_P(_T(MSG_WIZARD_RERUN), false);
 	}
 	if (result) {
 		calibration_status_clear(CALIBRATION_WIZARD_STEPS);
@@ -4735,7 +4759,7 @@ static void lcd_disable_farm_mode()
 }
 
 static inline void load_all_wrapper(){
-    for(uint8_t i = 0; i < 5; ++i){
+    for(uint8_t i = 0; i < MMU_FILAMENT_COUNT; ++i){
         MMU2::mmu2.load_filament(i);
     }
 }
@@ -4812,7 +4836,7 @@ static void mmu_cut_filament_menu() {
 #endif //MMU_HAS_CUTTER
 
 static inline void loading_test_all_wrapper(){
-    for(uint8_t i = 0; i < 5; ++i){
+    for(uint8_t i = 0; i < MMU_FILAMENT_COUNT; ++i){
         MMU2::mmu2.loading_test(i);
     }
 
@@ -5327,13 +5351,16 @@ static void lcd_main_menu()
                     if (!fsensor.getAutoLoadEnabled()) {
                         MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament);
                     }
-                    if (!fsensor.getFilamentPresent()) {
+                    if (fsensor.getFilamentPresent()) {
-                        if (fsensor.getAutoLoadEnabled()) {
-                            MENU_ITEM_SUBMENU_P(_T(MSG_AUTOLOAD_FILAMENT), lcd_menu_AutoLoadFilament);
-                        }
-                    } else {
                         MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), lcd_unLoadFilament);
                     }
+#ifndef REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+                    else {
+                        if (fsensor.getAutoLoadEnabled()) {
+                            MENU_ITEM_SUBMENU_P(_T(MSG_AUTOLOAD_FILAMENT), lcd_menu_AutoLoadFilament);
+                        }                        
+                    }
+#endif //REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY 
                 } else {
 #endif //FILAMENT_SENSOR
                     MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), lcd_LoadFilament);
@@ -5596,7 +5623,7 @@ static void lcd_backlight_menu()
     MENU_ITEM_EDIT_int3_P(_T(MSG_BL_HIGH), &backlightLevel_HIGH, backlightLevel_LOW, 255);
     MENU_ITEM_EDIT_int3_P(_T(MSG_BL_LOW), &backlightLevel_LOW, 0, backlightLevel_HIGH);
 	MENU_ITEM_TOGGLE_P(_T(MSG_MODE), ((backlightMode==BACKLIGHT_MODE_BRIGHT) ? _T(MSG_BRIGHT) : ((backlightMode==BACKLIGHT_MODE_DIM) ? _T(MSG_DIM) : _T(MSG_AUTO))), backlight_mode_toggle);
-    MENU_ITEM_EDIT_int3_P(_T(MSG_TIMEOUT), &backlightTimer_period, 1, 999);
+    MENU_ITEM_EDIT_int3_P(_T(MSG_TIMEOUT), &backlightTimer_period, LCD_BACKLIGHT_TIMEOUT, LCD_BACKLIGHT_TIMEOUT*60);
 
     MENU_END();
 }
@@ -7116,7 +7143,7 @@ static void menu_action_sdfile(const char* filename)
     }
 
   if (!check_file(selected_filename)) {
-      result = !lcd_show_multiscreen_message_yes_no_and_wait_P(_T(MSG_FILE_INCOMPLETE), false);
+      result = !lcd_show_multiscreen_message_cont_cancel_and_wait_P(_T(MSG_FILE_INCOMPLETE), false);
       lcd_update_enable(true);
   }
   if (result) {

Firmware/ultralcd.h

@@ -98,6 +98,7 @@ extern uint8_t lcd_show_multiscreen_message_with_choices_and_wait_P(
     const char * const first_choice, const char * const second_choice, const char * const third_choice = nullptr,
     uint8_t second_col = 7);
 extern uint8_t lcd_show_multiscreen_message_yes_no_and_wait_P(const char *msg, bool allow_timeouting = true, uint8_t default_selection = LCD_MIDDLE_BUTTON_CHOICE);
+extern uint8_t lcd_show_multiscreen_message_cont_cancel_and_wait_P(const char *msg, bool allow_timeouting = true, uint8_t default_selection = LCD_MIDDLE_BUTTON_CHOICE);
 // Ask the user to move the Z axis up to the end stoppers and let
 // the user confirm that it has been done.
 

Firmware/util.cpp

@@ -268,7 +268,7 @@ void fCheckModeInit() {
 static void render_M862_warnings(const char* warning, const char* strict, uint8_t check)
 {
     if (check == 1) { // Warning, stop print if user selects 'No'
-        if (lcd_show_multiscreen_message_yes_no_and_wait_P(warning, true, LCD_LEFT_BUTTON_CHOICE) == LCD_MIDDLE_BUTTON_CHOICE) {
+        if (lcd_show_multiscreen_message_cont_cancel_and_wait_P(warning, true, LCD_LEFT_BUTTON_CHOICE) == LCD_MIDDLE_BUTTON_CHOICE) {
             lcd_print_stop();
         }
     } else if (check == 2) { // Strict, always stop print
@@ -385,8 +385,8 @@ bool filament_presence_check() {
         }
 
         render_M862_warnings(
-            _T(MSG_MISSING_FILAMENT_CONTINUE)
+            _T(MSG_MISSING_FILAMENT)
-            ,_T(MSG_MISSING_FILAMENT_CANCELLED)
+            ,_T(MSG_MISSING_FILAMENT) //Identical messages
             ,(uint8_t)oCheckFilament
         );
 

Firmware/variants/MK25-RAMBo10a.h

@@ -24,6 +24,7 @@
 
 #define HEATBED_V2
 #define STEEL_SHEET
+//#define NEW_FIRST_LAYER_CAL //from front to back
 #define TACH0PULLUP
 
 // Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier)
@@ -519,4 +520,14 @@
 #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius.  Set to 0 to disable
 #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable
 
+/*------------------------------------
+ COMMUNITY FEATURES
+ *------------------------------------*/
+
+//Show filename instead of print time after SD card print finished
+//#define SHOW_FILENAME_AFTER_FINISH
+
+//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
+//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+
 #endif //__CONFIGURATION_PRUSA_H

Firmware/variants/MK25-RAMBo13a.h

@@ -24,6 +24,7 @@
 
 #define HEATBED_V2
 #define STEEL_SHEET
+//#define NEW_FIRST_LAYER_CAL //from front to back
 #define TACH0PULLUP
 
 // Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier)
@@ -523,4 +524,14 @@
 #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius.  Set to 0 to disable
 #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable
 
+/*------------------------------------
+ COMMUNITY FEATURES
+ *------------------------------------*/
+
+//Show filename instead of print time after SD card print finished
+//#define SHOW_FILENAME_AFTER_FINISH
+
+//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
+//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+
 #endif //__CONFIGURATION_PRUSA_H

Firmware/variants/MK25S-RAMBo10a.h

@@ -24,6 +24,7 @@
 
 #define HEATBED_V2
 #define STEEL_SHEET
+//#define NEW_FIRST_LAYER_CAL //from front to back
 #define TACH0PULLUP
 
 // Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier)
@@ -527,4 +528,14 @@
 #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius.  Set to 0 to disable
 #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable
 
+/*------------------------------------
+ COMMUNITY FEATURES
+ *------------------------------------*/
+
+//Show filename instead of print time after SD card print finished
+//#define SHOW_FILENAME_AFTER_FINISH
+
+//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
+//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+
 #endif //__CONFIGURATION_PRUSA_H

Firmware/variants/MK25S-RAMBo13a.h

@@ -24,6 +24,7 @@
 
 #define HEATBED_V2
 #define STEEL_SHEET
+//#define NEW_FIRST_LAYER_CAL //from front to back
 #define TACH0PULLUP
 
 // Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier)
@@ -528,4 +529,14 @@
 #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius.  Set to 0 to disable
 #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable
 
+/*------------------------------------
+ COMMUNITY FEATURES
+ *------------------------------------*/
+
+//Show filename instead of print time after SD card print finished
+//#define SHOW_FILENAME_AFTER_FINISH
+
+//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
+//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+
 #endif //__CONFIGURATION_PRUSA_H

Firmware/variants/MK3-E3DREVO.h

@@ -23,6 +23,7 @@
 // Electronics
 #define MOTHERBOARD BOARD_EINSY_1_0a
 #define STEEL_SHEET
+//#define NEW_FIRST_LAYER_CAL //from front to back
 #define HAS_SECOND_SERIAL_PORT
 
 
@@ -686,4 +687,14 @@
 #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius.  Set to 0 to disable
 #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable
 
+/*------------------------------------
+ COMMUNITY FEATURES
+ *------------------------------------*/
+
+//Show filename instead of print time after SD card print finished
+//#define SHOW_FILENAME_AFTER_FINISH
+
+//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
+//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+
 #endif //__CONFIGURATION_PRUSA_H

Firmware/variants/MK3-E3DREVO_HF_60W.h

@@ -23,6 +23,7 @@
 // Electronics
 #define MOTHERBOARD BOARD_EINSY_1_0a
 #define STEEL_SHEET
+//#define NEW_FIRST_LAYER_CAL //from front to back
 #define HAS_SECOND_SERIAL_PORT
 
 
@@ -687,4 +688,14 @@
 #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius.  Set to 0 to disable
 #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable
 
+/*------------------------------------
+ COMMUNITY FEATURES
+ *------------------------------------*/
+
+//Show filename instead of print time after SD card print finished
+//#define SHOW_FILENAME_AFTER_FINISH
+
+//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
+//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+
 #endif //__CONFIGURATION_PRUSA_H

Firmware/variants/MK3.h

@@ -23,6 +23,7 @@
 // Electronics
 #define MOTHERBOARD BOARD_EINSY_1_0a
 #define STEEL_SHEET
+//#define NEW_FIRST_LAYER_CAL //from front to back
 #define HAS_SECOND_SERIAL_PORT
 
 
@@ -689,4 +690,14 @@
 #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius.  Set to 0 to disable
 #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable
 
+/*------------------------------------
+ COMMUNITY FEATURES
+ *------------------------------------*/
+
+//Show filename instead of print time after SD card print finished
+//#define SHOW_FILENAME_AFTER_FINISH
+
+//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
+//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+
 #endif //__CONFIGURATION_PRUSA_H

Firmware/variants/MK3S-E3DREVO.h

@@ -22,6 +22,7 @@
 // Electronics
 #define MOTHERBOARD BOARD_EINSY_1_0a
 #define STEEL_SHEET
+//#define NEW_FIRST_LAYER_CAL //from front to back
 #define HAS_SECOND_SERIAL_PORT
 
 // PSU
@@ -698,4 +699,14 @@
 #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius.  Set to 0 to disable
 #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable
 
+/*------------------------------------
+ COMMUNITY FEATURES
+ *------------------------------------*/
+
+//Show filename instead of print time after SD card print finished
+//#define SHOW_FILENAME_AFTER_FINISH
+
+//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
+//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+
 #endif //__CONFIGURATION_PRUSA_H

Firmware/variants/MK3S-E3DREVO_HF_60W.h

@@ -22,6 +22,7 @@
 // Electronics
 #define MOTHERBOARD BOARD_EINSY_1_0a
 #define STEEL_SHEET
+//#define NEW_FIRST_LAYER_CAL //from front to back
 #define HAS_SECOND_SERIAL_PORT
 
 // PSU
@@ -699,4 +700,14 @@
 #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius.  Set to 0 to disable
 #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable
 
+/*------------------------------------
+ COMMUNITY FEATURES
+ *------------------------------------*/
+
+//Show filename instead of print time after SD card print finished
+//#define SHOW_FILENAME_AFTER_FINISH
+
+//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
+//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+
 #endif //__CONFIGURATION_PRUSA_H

Firmware/variants/MK3S.h

@@ -22,6 +22,7 @@
 // Electronics
 #define MOTHERBOARD BOARD_EINSY_1_0a
 #define STEEL_SHEET
+//#define NEW_FIRST_LAYER_CAL //from front to back
 #define HAS_SECOND_SERIAL_PORT
 
 // PSU
@@ -701,4 +702,14 @@
 #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius.  Set to 0 to disable
 #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable
 
+/*------------------------------------
+ COMMUNITY FEATURES
+ *------------------------------------*/
+
+//Show filename instead of print time after SD card print finished
+//#define SHOW_FILENAME_AFTER_FINISH
+
+//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
+//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+
 #endif //__CONFIGURATION_PRUSA_H

Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h

@@ -430,4 +430,14 @@ THERMISTORS SETTINGS
 #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius.  Set to 0 to disable
 #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable
 
+/*------------------------------------
+ COMMUNITY FEATURES
+ *------------------------------------*/
+
+//Show filename instead of print time after SD card print finished
+//#define SHOW_FILENAME_AFTER_FINISH
+
+//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
+//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+
 #endif //__CONFIGURATION_PRUSA_H

Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h

@@ -429,4 +429,14 @@ THERMISTORS SETTINGS
 #define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius.  Set to 0 to disable
 #define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable
 
+/*------------------------------------
+ COMMUNITY FEATURES
+ *------------------------------------*/
+
+//Show filename instead of print time after SD card print finished
+//#define SHOW_FILENAME_AFTER_FINISH
+
+//Remove the "AutoLoad filament" LCD menu entry if autoload is enabled.
+//#define REMOVE_AUTOLOAD_FILAMENT_MENU_ENTRY
+
 #endif //__CONFIGURATION_PRUSA_H

README.md

@@ -49,6 +49,12 @@ Assuming a recent Debian/Ubuntu distribution, install the dependencies globally
 
     sudo apt-get install cmake ninja python3-pyelftools python3-polib python3-regex gettext
 
+When using a recent Fedora(non-atomic)/RHEL distribution, install the dependencies globally with:
+
+    sudo dnf install cmake ninja-build python3-pyelftools python3-polib python3-regex gettext
+
+When using a Fedora Atomic/UBlue distribution use `rpm-ostree install --allow-inactive` instead of `sudo dnf install`
+
 Prusa-Firmware depends on a pinned version of `avr-gcc` and the external `prusa3dboards` package. These can be setup using `./utils/bootstrap.py`:
 
     # automatically setup dependencies

lang/po/Firmware.pot

@@ -23,10 +23,10 @@ msgstr ""
 msgid "%s level expected"
 msgstr ""
 
-#. MSG_CANCEL c=10
+#. MSG_CANCEL c=9
 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986
 #: ../../Firmware/ultralcd.cpp:3623
-msgid ">Cancel"
+msgid "Cancel"
 msgstr ""
 
 #. MSG_BABYSTEPPING_Z c=13
@@ -470,7 +470,7 @@ msgstr ""
 msgid "ERROR:"
 msgstr ""
 
-#. MSG_EJECT c=8
+#. MSG_EJECT c=9
 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371
 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279
 msgid "Eject"
@@ -727,7 +727,7 @@ msgstr ""
 
 #. MSG_FILE_INCOMPLETE c=20 r=3
 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119
-msgid "File incomplete. Continue anyway?"
+msgid "File incomplete."
 msgstr ""
 
 #. MSG_FINISHING_MOVEMENTS c=20
@@ -778,40 +778,34 @@ msgstr ""
 
 #. MSG_GCODE_DIFF_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417
-msgid "G-code sliced for a different level. Continue?"
+msgid "G-code sliced for a different level."
 msgstr ""
 
 #. MSG_GCODE_DIFF_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418
-msgid ""
+msgid "G-code sliced for a different level. Please re-slice the model again."
-"G-code sliced for a different level. Please re-slice the model again. Print "
-"cancelled."
 msgstr ""
 
 #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319
 #: ../../Firmware/util.cpp:436
-msgid "G-code sliced for a different printer type. Continue?"
+msgid "G-code sliced for a different printer type."
 msgstr ""
 
 #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320
 #: ../../Firmware/util.cpp:437
-msgid ""
+msgid "G-code sliced for a different printer type. Please re-slice the model again."
-"G-code sliced for a different printer type. Please re-slice the model again."
-" Print cancelled."
 msgstr ""
 
 #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369
-msgid "G-code sliced for a newer firmware. Continue?"
+msgid "G-code sliced for a newer firmware."
 msgstr ""
 
 #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370
-msgid ""
+msgid "G-code sliced for a newer firmware. Please update the firmware."
-"G-code sliced for a newer firmware. Please update the firmware. Print "
-"cancelled."
 msgstr ""
 
 #. MSG_HW_SETUP c=18
@@ -1373,14 +1367,12 @@ msgstr ""
 
 #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296
-msgid "Nozzle diameter differs from the G-code. Continue?"
+msgid "Nozzle diameter differs from the G-code."
 msgstr ""
 
 #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297
-msgid ""
+msgid "Nozzle diameter differs from the G-code. Please check the value in settings."
-"Nozzle diameter differs from the G-code. Please check the value in settings."
-" Print cancelled."
 msgstr ""
 
 #. MSG_NOZZLE_CNG_COOLDOWN c=20 r=3
@@ -1828,7 +1820,7 @@ msgstr ""
 #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666
 msgid ""
 "Running Wizard will delete current calibration results and start from the "
-"beginning. Continue?"
+"beginning."
 msgstr ""
 
 #. MSG_SD_CARD c=8
@@ -2175,14 +2167,9 @@ msgid ""
 "chapter)."
 msgstr ""
 
-#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
+#. MSG_MISSING_FILAMENT c=20 r=3
 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388
-msgid "There is no filament loaded. Continue?"
+msgid "There is no filament loaded."
-msgstr ""
-
-#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
-#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389
-msgid "There is no filament loaded. Print cancelled."
 msgstr ""
 
 #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8

lang/po/Firmware_cs.po

@@ -32,11 +32,11 @@ msgstr " 0.4 nebo novější"
 msgid "%s level expected"
 msgstr "%s očekávaná verze"
 
-#. MSG_CANCEL c=10
+#. MSG_CANCEL c=9
 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986
 #: ../../Firmware/ultralcd.cpp:3623
-msgid ">Cancel"
+msgid "Cancel"
-msgstr ">Zrušit"
+msgstr "Zrušit"
 
 #. MSG_BABYSTEPPING_Z c=13
 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652
@@ -731,8 +731,8 @@ msgstr "Spotřebováno filam."
 
 #. MSG_FILE_INCOMPLETE c=20 r=3
 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119
-msgid "File incomplete. Continue anyway?"
+msgid "File incomplete."
-msgstr "Soubor nekompletní. Pokračovat?"
+msgstr "Soubor nekompletní."
 
 #. MSG_FINISHING_MOVEMENTS c=20
 #: ../../Firmware/messages.cpp:45
@@ -786,44 +786,35 @@ msgstr "Přední/levý vent."
 
 #. MSG_GCODE_DIFF_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417
-msgid "G-code sliced for a different level. Continue?"
+msgid "G-code sliced for a different level."
-msgstr "G-code je připraven pro jinou verzi. Pokračovat?"
+msgstr "G-code je připraven pro jinou verzi."
 
 #. MSG_GCODE_DIFF_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418
-msgid ""
+msgid "G-code sliced for a different level. Please re-slice the model again."
-"G-code sliced for a different level. Please re-slice the model again. Print "
+msgstr "G-code je připraven pro jinou verzi. Vyslicujte model znovu."
-"cancelled."
-msgstr ""
-"G-code je připraven pro jinou verzi. Vyslicujte model znovu. Tisk zrušen."
 
 #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319
 #: ../../Firmware/util.cpp:436
-msgid "G-code sliced for a different printer type. Continue?"
+msgid "G-code sliced for a different printer type."
 msgstr "G-code je připraven pro jiný typ tiskárny.Pokračovat?"
 
 #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320
 #: ../../Firmware/util.cpp:437
-msgid ""
+msgid "G-code sliced for a different printer type. Please re-slice the model again."
-"G-code sliced for a different printer type. Please re-slice the model again."
+msgstr "G-code je připraven pro jiný typ tiskarny. Vyslicujte model znovu."
-" Print cancelled."
-msgstr ""
-"G-code je připraven pro jiný typ tiskarny. Vyslicujte model znovu. Tisk "
-"zrušen."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369
-msgid "G-code sliced for a newer firmware. Continue?"
+msgid "G-code sliced for a newer firmware."
-msgstr "G-code je pripraven pro novější FW. Pokračovat?"
+msgstr "G-code je pripraven pro novější FW."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370
-msgid ""
+msgid "G-code sliced for a newer firmware. Please update the firmware."
-"G-code sliced for a newer firmware. Please update the firmware. Print "
+msgstr "G-code je připraven pro novější FW. Aktualizujte FW."
-"cancelled."
-msgstr "G-code je připraven pro novější FW. Aktualizujte FW. Tisk zrušen."
 
 #. MSG_HW_SETUP c=18
 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325
@@ -1663,17 +1654,13 @@ msgstr ""
 
 #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296
-msgid "Nozzle diameter differs from the G-code. Continue?"
+msgid "Nozzle diameter differs from the G-code."
-msgstr "Průměr trysky tiskárny se liší od G-code. Pokračovat?"
+msgstr "Průměr trysky tiskárny se liší od G-code."
 
 #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297
-msgid ""
+msgid "Nozzle diameter differs from the G-code. Please check the value in settings."
-"Nozzle diameter differs from the G-code. Please check the value in settings."
+msgstr "Průměr trysky tiskárny se liší od G-code. Zkontrolujte nastavení."
-" Print cancelled."
-msgstr ""
-"Průměr trysky tiskárny se liší od G-code. Zkontrolujte nastavení. Tisk "
-"zrušen."
 
 #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8
 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302
@@ -1775,10 +1762,10 @@ msgstr "Vpravo [µm]"
 #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666
 msgid ""
 "Running Wizard will delete current calibration results and start from the "
-"beginning. Continue?"
+"beginning."
 msgstr ""
 "Spuštění Průvodce vymaže uložene výsledky všech kalibrací a spustí "
-"kalibrační proces od začátku. Pokračovat?"
+"kalibrační proces od začátku."
 
 #. MSG_SD_CARD c=8
 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476
@@ -2518,7 +2505,7 @@ msgstr "NEZNÁMÁ CHYBA"
 msgid "Unexpected error occurred."
 msgstr "Došlo k neočekávané chybě."
 
-#. MSG_EJECT c=8
+#. MSG_EJECT c=9
 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371
 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279
 msgid "Eject"
@@ -2585,15 +2572,10 @@ msgstr "Tryska je horká! Počkejte na vychladnutí."
 msgid "Nozzle changed?"
 msgstr "Vyměnili jste trysku?"
 
-#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
+#. MSG_MISSING_FILAMENT c=20 r=3
 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388
-msgid "There is no filament loaded. Continue?"
+msgid "There is no filament loaded."
-msgstr "Není vložen filament. Pokračovat?"
+msgstr "Není vložen filament."
-
-#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
-#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389
-msgid "There is no filament loaded. Print cancelled."
-msgstr "Není vložen filament. Tisk zrušen."
 
 #. MSG_Z_CALIBRATION_PROMPT c=20 r=3
 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752

lang/po/Firmware_de.po

@@ -32,11 +32,11 @@ msgstr " 0.4 oder neuer"
 msgid "%s level expected"
 msgstr "%s Level erwartet"
 
-#. MSG_CANCEL c=10
+#. MSG_CANCEL c=9
 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986
 #: ../../Firmware/ultralcd.cpp:3623
-msgid ">Cancel"
+msgid "Cancel"
-msgstr ">Abbruch"
+msgstr "Abbruch"
 
 #. MSG_BABYSTEPPING_Z c=13
 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652
@@ -734,7 +734,7 @@ msgstr "Filament benutzt"
 
 #. MSG_FILE_INCOMPLETE c=20 r=3
 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119
-msgid "File incomplete. Continue anyway?"
+msgid "File incomplete."
 msgstr "Datei unvollständig. Trotzdem fortfahren?"
 
 #. MSG_FINISHING_MOVEMENTS c=20
@@ -789,47 +789,35 @@ msgstr "Druck/Hotend Lüfter"
 
 #. MSG_GCODE_DIFF_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417
-msgid "G-code sliced for a different level. Continue?"
+msgid "G-code sliced for a different level."
-msgstr "G-Code ist für einen anderen Level geslict. Fortfahren?"
+msgstr "G-Code ist für einen anderen Level geslict."
 
 #. MSG_GCODE_DIFF_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418
-msgid ""
+msgid "G-code sliced for a different level. Please re-slice the model again."
-"G-code sliced for a different level. Please re-slice the model again. Print "
+msgstr "G-Code ist für einen anderen Level geslict. Slicen Sie das Modell erneut."
-"cancelled."
-msgstr ""
-"G-Code ist für einen anderen Level geslict. Slicen Sie das Modell erneut. "
-"Druck abgebrochen."
 
 #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319
 #: ../../Firmware/util.cpp:436
-msgid "G-code sliced for a different printer type. Continue?"
+msgid "G-code sliced for a different printer type."
-msgstr "G-Code ist für einen anderen Drucker geslict. Fortfahren?"
+msgstr "G-Code ist für einen anderen Drucker geslict."
 
 #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320
 #: ../../Firmware/util.cpp:437
-msgid ""
+msgid "G-code sliced for a different printer type. Please re-slice the model again."
-"G-code sliced for a different printer type. Please re-slice the model again."
+msgstr "G-Code ist für einen anderen Drucker geslict. Slicen Sie das Modell erneut."
-" Print cancelled."
-msgstr ""
-"G-Code ist für einen anderen Drucker geslict. Slicen Sie das Modell erneut. "
-"Druck abgebrochen."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369
-msgid "G-code sliced for a newer firmware. Continue?"
+msgid "G-code sliced for a newer firmware."
-msgstr "G-Code ist für eine neuere Firmware geslict. Fortfahren?"
+msgstr "G-Code ist für eine neuere Firmware geslict."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370
-msgid ""
+msgid "G-code sliced for a newer firmware. Please update the firmware."
-"G-code sliced for a newer firmware. Please update the firmware. Print "
+msgstr "G-Code ist für eine neuere Firmware geslict. Aktualisieren die Firmware."
-"cancelled."
-msgstr ""
-"G-Code ist für eine neuere Firmware geslict. Aktualisieren die Firmware. "
-"Druck abgebrochen."
 
 #. MSG_HW_SETUP c=18
 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325
@@ -1683,17 +1671,15 @@ msgstr ""
 
 #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296
-msgid "Nozzle diameter differs from the G-code. Continue?"
+msgid "Nozzle diameter differs from the G-code."
-msgstr "Düsendurchmesser weicht vom G-Code ab. Fortfahren?"
+msgstr "Düsendurchmesser weicht vom G-Code ab."
 
 #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297
-msgid ""
+msgid "Nozzle diameter differs from the G-code. Please check the value in settings."
-"Nozzle diameter differs from the G-code. Please check the value in settings."
-" Print cancelled."
 msgstr ""
 "Der Durchmesser der Druckerdüse weicht vom G-Code ab. Bitte überprüfen Sie "
-"den Wert in den Einstellungen. Druck abgebrochen."
+"den Wert in den Einstellungen."
 
 #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8
 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302
@@ -1795,10 +1781,10 @@ msgstr "Rechts [µm]"
 #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666
 msgid ""
 "Running Wizard will delete current calibration results and start from the "
-"beginning. Continue?"
+"beginning."
 msgstr ""
 "Der Assistent wird die aktuellen Kalibrierungsdaten löschen und von vorne "
-"beginnen. Fortfahren?"
+"beginnen."
 
 #. MSG_SD_CARD c=8
 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476
@@ -2544,11 +2530,11 @@ msgstr "UNBEKANNTER FEHLER"
 msgid "Unexpected error occurred."
 msgstr "Ein unerwarteter Fehler ist aufgetreten."
 
-#. MSG_EJECT c=8
+#. MSG_EJECT c=9
 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371
 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279
 msgid "Eject"
-msgstr "Auswerf."
+msgstr "Auswerfen"
 
 #. MSG_TITLE_FILAMENT_CHANGE c=20
 #: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:236
@@ -2613,15 +2599,10 @@ msgstr "Die Düse ist heiß! Auf Abkühlung warten."
 msgid "Nozzle changed?"
 msgstr "Düse gewechselt?"
 
-#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
+#. MSG_MISSING_FILAMENT c=20 r=3
 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388
-msgid "There is no filament loaded. Continue?"
+msgid "There is no filament loaded."
-msgstr "Kein Filament geladen. Fortfahren?"
+msgstr "Kein Filament geladen."
-
-#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
-#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389
-msgid "There is no filament loaded. Print cancelled."
-msgstr "Kein Filament geladen. Druck abgebrochen."
 
 #. MSG_Z_CALIBRATION_PROMPT c=20 r=3
 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752

lang/po/Firmware_es.po

@@ -32,11 +32,11 @@ msgstr " 0.4 o más nueva"
 msgid "%s level expected"
 msgstr "%s nivel esperado"
 
-#. MSG_CANCEL c=10
+#. MSG_CANCEL c=9
 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986
 #: ../../Firmware/ultralcd.cpp:3623
-msgid ">Cancel"
+msgid "Cancel"
-msgstr ">Cancelar"
+msgstr "Cancelar"
 
 #. MSG_BABYSTEPPING_Z c=13
 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652
@@ -738,7 +738,7 @@ msgstr "Filamento usado"
 
 #. MSG_FILE_INCOMPLETE c=20 r=3
 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119
-msgid "File incomplete. Continue anyway?"
+msgid "File incomplete."
 msgstr "¿Archivo incompleto. Continuar de todos modos?"
 
 #. MSG_FINISHING_MOVEMENTS c=20
@@ -793,47 +793,39 @@ msgstr "Vents. front/izqui."
 
 #. MSG_GCODE_DIFF_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417
-msgid "G-code sliced for a different level. Continue?"
+msgid "G-code sliced for a different level."
-msgstr "Código G laminado para un nivel dif. ¿Continuar?"
+msgstr "Código G laminado para un nivel dif."
 
 #. MSG_GCODE_DIFF_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418
-msgid ""
+msgid "G-code sliced for a different level. Please re-slice the model again."
-"G-code sliced for a different level. Please re-slice the model again. Print "
-"cancelled."
 msgstr ""
 "Código G laminado para un nivel diferente. Vuelve a laminar el modelo de "
-"nuevo. Impresión cancelada."
+"nuevo."
 
 #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319
 #: ../../Firmware/util.cpp:436
-msgid "G-code sliced for a different printer type. Continue?"
+msgid "G-code sliced for a different printer type."
 msgstr "Código G laminado para un tipo de impresora dif.Cont.?"
 
 #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320
 #: ../../Firmware/util.cpp:437
-msgid ""
+msgid "G-code sliced for a different printer type. Please re-slice the model again."
-"G-code sliced for a different printer type. Please re-slice the model again."
-" Print cancelled."
 msgstr ""
 "Código G laminado para una impresora diferente. Vuelve a laminar el modelo "
-"de nuevo. Impresión cancelada."
+"de nuevo."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369
-msgid "G-code sliced for a newer firmware. Continue?"
+msgid "G-code sliced for a newer firmware."
-msgstr "Código G laminado para nuevo firmware. ¿Continuar?"
+msgstr "Código G laminado para nuevo firmware."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370
-msgid ""
+msgid "G-code sliced for a newer firmware. Please update the firmware."
-"G-code sliced for a newer firmware. Please update the firmware. Print "
+msgstr "Código G laminado para nuevo firmware. Actualiza el firmware."
-"cancelled."
-msgstr ""
-"Código G laminado para nuevo firmware. Actualiza el firmware. Impresión "
-"cancelada."
 
 #. MSG_HW_SETUP c=18
 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325
@@ -1681,17 +1673,15 @@ msgstr ""
 
 #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296
-msgid "Nozzle diameter differs from the G-code. Continue?"
+msgid "Nozzle diameter differs from the G-code."
-msgstr "Diámetro boquilla impresora difiere de cod.G. ¿Continuar?"
+msgstr "Diámetro boquilla impresora difiere de cod.G."
 
 #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297
-msgid ""
+msgid "Nozzle diameter differs from the G-code. Please check the value in settings."
-"Nozzle diameter differs from the G-code. Please check the value in settings."
-" Print cancelled."
 msgstr ""
 "Diámetro boquilla Impresora difiere de cod.G. Comprueba los valores en "
-"ajustes. Impresión cancelada."
+"ajustes."
 
 #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8
 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302
@@ -1793,10 +1783,10 @@ msgstr "Derecha [µm]"
 #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666
 msgid ""
 "Running Wizard will delete current calibration results and start from the "
-"beginning. Continue?"
+"beginning."
 msgstr ""
 "Ejecutar el Asistente borrara los valores de calibración actuales y "
-"comenzará de nuevo. ¿Continuar?"
+"comenzará de nuevo."
 
 #. MSG_SD_CARD c=8
 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476
@@ -2540,7 +2530,7 @@ msgstr "ERROR DESCONOCIDO"
 msgid "Unexpected error occurred."
 msgstr "Ocurrió un error inesperado."
 
-#. MSG_EJECT c=8
+#. MSG_EJECT c=9
 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371
 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279
 msgid "Eject"
@@ -2608,15 +2598,10 @@ msgstr "La boquilla está caliente! Espere a que se enfríe."
 msgid "Nozzle changed?"
 msgstr "Cambió la boquilla?"
 
-#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
+#. MSG_MISSING_FILAMENT c=20 r=3
 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388
-msgid "There is no filament loaded. Continue?"
+msgid "There is no filament loaded."
-msgstr "No hay ningún filamento cargado. ¿Continuar?"
+msgstr "No hay ningún filamento cargado."
-
-#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
-#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389
-msgid "There is no filament loaded. Print cancelled."
-msgstr "No hay ningún filamento cargado. Impresión cancelada."
 
 #. MSG_Z_CALIBRATION_PROMPT c=20 r=3
 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752

lang/po/Firmware_fr.po

@@ -32,11 +32,11 @@ msgstr " 0.4 ou +recent"
 msgid "%s level expected"
 msgstr "niveau %s attendu"
 
-#. MSG_CANCEL c=10
+#. MSG_CANCEL c=9
 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986
 #: ../../Firmware/ultralcd.cpp:3623
-msgid ">Cancel"
+msgid "Cancel"
-msgstr ">Annuler"
+msgstr "Annuler"
 
 #. MSG_BABYSTEPPING_Z c=13
 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652
@@ -741,7 +741,7 @@ msgstr "Filament utilise"
 
 #. MSG_FILE_INCOMPLETE c=20 r=3
 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119
-msgid "File incomplete. Continue anyway?"
+msgid "File incomplete."
 msgstr "Fichier incomplet. Continuer qd meme?"
 
 #. MSG_FINISHING_MOVEMENTS c=20
@@ -796,47 +796,35 @@ msgstr "Ventilos avt/gauche"
 
 #. MSG_GCODE_DIFF_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417
-msgid "G-code sliced for a different level. Continue?"
+msgid "G-code sliced for a different level."
-msgstr "G-code a été préparé pour un niveau diff. Continuer?"
+msgstr "G-code a été préparé pour un niveau diff."
 
 #. MSG_GCODE_DIFF_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418
-msgid ""
+msgid "G-code sliced for a different level. Please re-slice the model again."
-"G-code sliced for a different level. Please re-slice the model again. Print "
+msgstr "G-code a été préparé pour un niveau différent. Découpez le modèle à nouveau."
-"cancelled."
-msgstr ""
-"G-code a été préparé pour un niveau différent. Découpez le modèle à nouveau."
-" Impression annulée."
 
 #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319
 #: ../../Firmware/util.cpp:436
-msgid "G-code sliced for a different printer type. Continue?"
+msgid "G-code sliced for a different printer type."
-msgstr "G-code pour un type d'imprimante différent. Continue?"
+msgstr "G-code pour un type d'imprimante différent"
 
 #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320
 #: ../../Firmware/util.cpp:437
-msgid ""
+msgid "G-code sliced for a different printer type. Please re-slice the model again."
-"G-code sliced for a different printer type. Please re-slice the model again."
+msgstr "G-code pour un type d'imprimante différent. Découpez le modèle à nouveau."
-" Print cancelled."
-msgstr ""
-"G-code pour un type d'imprimante différent. Découpez le modèle à nouveau. "
-"Impression annulée."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369
-msgid "G-code sliced for a newer firmware. Continue?"
+msgid "G-code sliced for a newer firmware."
 msgstr "G-code a été préparé pour un FW plus récent. Cont.?"
 
 #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370
-msgid ""
+msgid "G-code sliced for a newer firmware. Please update the firmware."
-"G-code sliced for a newer firmware. Please update the firmware. Print "
+msgstr "G-code a été préparé pour un nouveau FW. Mettre à jour le FW."
-"cancelled."
-msgstr ""
-"G-code a été préparé pour un nouveau FW. Mettre à jour le FW. Impression "
-"annulée."
 
 #. MSG_HW_SETUP c=18
 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325
@@ -1688,17 +1676,13 @@ msgstr "L'imprimante n'a pas encore été calibrée. Suivez le manuel."
 
 #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296
-msgid "Nozzle diameter differs from the G-code. Continue?"
+msgid "Nozzle diameter differs from the G-code."
-msgstr "Diamètre de la buse diffère du G-Code. Continuer?"
+msgstr "Diamètre de la buse diffère du G-Code."
 
 #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297
-msgid ""
+msgid "Nozzle diameter differs from the G-code. Please check the value in settings."
-"Nozzle diameter differs from the G-code. Please check the value in settings."
+msgstr "Diamètre de la buse diffère du G-Code. Vérifiez la valeur."
-" Print cancelled."
-msgstr ""
-"Diamètre de la buse diffère du G-Code. Vérifiez la valeur. Impression "
-"annulée."
 
 #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8
 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302
@@ -1800,10 +1784,10 @@ msgstr "Droite [µm]"
 #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666
 msgid ""
 "Running Wizard will delete current calibration results and start from the "
-"beginning. Continue?"
+"beginning."
 msgstr ""
 "Le lancement de l'Assistant supprimera les résultats actuels de calibration "
-"et commencera du début. Continuer?"
+"et commencera du début."
 
 #. MSG_SD_CARD c=8
 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476
@@ -2553,7 +2537,7 @@ msgstr "ERREUR INCONNUE"
 msgid "Unexpected error occurred."
 msgstr "Une erreur inattendue s'est produite."
 
-#. MSG_EJECT c=8
+#. MSG_EJECT c=9
 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371
 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279
 msgid "Eject"
@@ -2622,15 +2606,10 @@ msgstr "La buse est chaude! Attendre le refroidissement."
 msgid "Nozzle changed?"
 msgstr "La buse a été changée?"
 
-#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
+#. MSG_MISSING_FILAMENT c=20 r=3
 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388
-msgid "There is no filament loaded. Continue?"
+msgid "There is no filament loaded."
-msgstr "Il n'y a pas de filament chargé. Continuer?"
+msgstr "Il n'y a pas de filament chargé."
-
-#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
-#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389
-msgid "There is no filament loaded. Print cancelled."
-msgstr "Il n'y a pas de filament chargé. Impression annulée."
 
 #. MSG_Z_CALIBRATION_PROMPT c=20 r=3
 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752

lang/po/Firmware_hr.po

@@ -32,11 +32,11 @@ msgstr " 0.4 ili noviji"
 msgid "%s level expected"
 msgstr "%s level ocekivan"
 
-#. MSG_CANCEL c=10
+#. MSG_CANCEL c=9
 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986
 #: ../../Firmware/ultralcd.cpp:3623
-msgid ">Cancel"
+msgid "Cancel"
-msgstr ">Otkazati"
+msgstr "Otkazati"
 
 #. MSG_BABYSTEPPING_Z c=13
 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652
@@ -735,7 +735,7 @@ msgstr "Iskoristeni fil."
 
 #. MSG_FILE_INCOMPLETE c=20 r=3
 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119
-msgid "File incomplete. Continue anyway?"
+msgid "File incomplete."
 msgstr "Datoteka je nepotpuna. Svejedno nastaviti?"
 
 #. MSG_FINISHING_MOVEMENTS c=20
@@ -790,47 +790,35 @@ msgstr "Prednji/lijevi vent"
 
 #. MSG_GCODE_DIFF_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417
-msgid "G-code sliced for a different level. Continue?"
+msgid "G-code sliced for a different level."
-msgstr "G-kod izrezan za drugu razinu. Nastavite?"
+msgstr "G-kod izrezan za drugu razinu."
 
 #. MSG_GCODE_DIFF_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418
-msgid ""
+msgid "G-code sliced for a different level. Please re-slice the model again."
-"G-code sliced for a different level. Please re-slice the model again. Print "
+msgstr "G-kod izrezan za drugu razinu. Molimo ponovo izrezite model."
-"cancelled."
-msgstr ""
-"G-kod izrezan za drugu razinu. Molimo ponovo izrezite model. Print je "
-"otkazan."
 
 #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319
 #: ../../Firmware/util.cpp:436
-msgid "G-code sliced for a different printer type. Continue?"
+msgid "G-code sliced for a different printer type."
-msgstr "G-kod izrezan za drugu vrstu printera. Nastavite?"
+msgstr "G-kod izrezan za drugu vrstu printera."
 
 #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320
 #: ../../Firmware/util.cpp:437
-msgid ""
+msgid "G-code sliced for a different printer type. Please re-slice the model again."
-"G-code sliced for a different printer type. Please re-slice the model again."
+msgstr "G-kod izrezan za drugu vrstu printera. Molimo ponovo izrezite model."
-" Print cancelled."
-msgstr ""
-"G-kod izrezan za drugu vrstu printera. Molimo ponovo izrezite model. Print "
-"je otkazan."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369
-msgid "G-code sliced for a newer firmware. Continue?"
+msgid "G-code sliced for a newer firmware."
-msgstr "G-kod izrezan za noviji firmware. Nastavite?"
+msgstr "G-kod izrezan za noviji firmware."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370
-msgid ""
+msgid "G-code sliced for a newer firmware. Please update the firmware."
-"G-code sliced for a newer firmware. Please update the firmware. Print "
+msgstr "G-kod izrezan za noviji firmware. Molimo azurirajte firmware."
-"cancelled."
-msgstr ""
-"G-kod izrezan za noviji firmware. Molimo azurirajte firmware. Prime je "
-"otkazan."
 
 #. MSG_HW_SETUP c=18
 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325
@@ -1677,17 +1665,15 @@ msgstr ""
 
 #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296
-msgid "Nozzle diameter differs from the G-code. Continue?"
+msgid "Nozzle diameter differs from the G-code."
-msgstr "Promjer mlaznice razlikuje se od G-koda. Nastavite?"
+msgstr "Promjer mlaznice razlikuje se od G-koda."
 
 #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297
-msgid ""
+msgid "Nozzle diameter differs from the G-code. Please check the value in settings."
-"Nozzle diameter differs from the G-code. Please check the value in settings."
-" Print cancelled."
 msgstr ""
 "Promjer mlaznice printera razlikuje se od G-koda. Molimo provjerite "
-"vrijednost u postavkama. Print je otkazan."
+"vrijednost u postavkama."
 
 #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8
 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302
@@ -1789,10 +1775,10 @@ msgstr "Desna str.[µm]"
 #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666
 msgid ""
 "Running Wizard will delete current calibration results and start from the "
-"beginning. Continue?"
+"beginning."
 msgstr ""
 "Pokrenuti carobnjak ce izbrisati trenutne rezultate kalibracije i poceti "
-"ispocetka. Nastavite?"
+"ispocetka."
 
 #. MSG_SD_CARD c=8
 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476
@@ -2535,7 +2521,7 @@ msgstr "NEPOZNATA POGREŠKA"
 msgid "Unexpected error occurred."
 msgstr "Došlo je do neočekivane pogreške."
 
-#. MSG_EJECT c=8
+#. MSG_EJECT c=9
 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371
 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279
 msgid "Eject"
@@ -2602,15 +2588,10 @@ msgstr "Mlaznica je vruća! Pričekajte hlađenje."
 msgid "Nozzle changed?"
 msgstr "Mlaznica se promijenila?"
 
-#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
+#. MSG_MISSING_FILAMENT c=20 r=3
 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388
-msgid "There is no filament loaded. Continue?"
+msgid "There is no filament loaded."
-msgstr "Nema umetnute niti. Nastavite?"
+msgstr "Nema umetnute niti."
-
-#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
-#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389
-msgid "There is no filament loaded. Print cancelled."
-msgstr "Nema umetnute niti. Print je otkazan."
 
 #. MSG_Z_CALIBRATION_PROMPT c=20 r=3
 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752

lang/po/Firmware_hu.po

@@ -32,11 +32,11 @@ msgstr " 0.4 v. ujabb"
 msgid "%s level expected"
 msgstr "Vart szint: %s"
 
-#. MSG_CANCEL c=10
+#. MSG_CANCEL c=9
 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986
 #: ../../Firmware/ultralcd.cpp:3623
-msgid ">Cancel"
+msgid "Cancel"
-msgstr ">Megsem"
+msgstr "Megsem"
 
 #. MSG_BABYSTEPPING_Z c=13
 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652
@@ -738,7 +738,7 @@ msgstr "Felhasznalt filam."
 
 #. MSG_FILE_INCOMPLETE c=20 r=3
 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119
-msgid "File incomplete. Continue anyway?"
+msgid "File incomplete."
 msgstr "A fajl vege hianyzik. Folytatod igy is?"
 
 #. MSG_FINISHING_MOVEMENTS c=20
@@ -793,47 +793,35 @@ msgstr "Elso/bal ventillator"
 
 #. MSG_GCODE_DIFF_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417
-msgid "G-code sliced for a different level. Continue?"
+msgid "G-code sliced for a different level."
-msgstr "A G-kod mas szintre lett elokesztve. Folytassam?"
+msgstr "A G-kod mas szintre lett elokesztve."
 
 #. MSG_GCODE_DIFF_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418
-msgid ""
+msgid "G-code sliced for a different level. Please re-slice the model again."
-"G-code sliced for a different level. Please re-slice the model again. Print "
+msgstr "A G-kod mas szintre lett elokesztve. Szeleteld ujra a modellt."
-"cancelled."
-msgstr ""
-"A G-kod mas szintre lett elokesztve. Szeleteld ujra a modellt. Nyomtatas "
-"megallitva."
 
 #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319
 #: ../../Firmware/util.cpp:436
-msgid "G-code sliced for a different printer type. Continue?"
+msgid "G-code sliced for a different printer type."
-msgstr "A G-kod mas nyomtato tipusra lett elokesztve.Folytassam?"
+msgstr "A G-kod mas nyomtato tipusra lett elokesztve."
 
 #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320
 #: ../../Firmware/util.cpp:437
-msgid ""
+msgid "G-code sliced for a different printer type. Please re-slice the model again."
-"G-code sliced for a different printer type. Please re-slice the model again."
+msgstr "A G-kod mas nyomtato tipusra lett elokesztve. Szeleteld ujra a modellt."
-" Print cancelled."
-msgstr ""
-"A G-kod mas nyomtato tipusra lett elokesztve. Szeleteld ujra a modellt. "
-"Nyomtatas megallitva."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369
-msgid "G-code sliced for a newer firmware. Continue?"
+msgid "G-code sliced for a newer firmware."
-msgstr "A G-kod ujabb firmverre lett elokesztve.Folytassam?"
+msgstr "A G-kod ujabb firmverre lett elokesztve."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370
-msgid ""
+msgid "G-code sliced for a newer firmware. Please update the firmware."
-"G-code sliced for a newer firmware. Please update the firmware. Print "
+msgstr "A G-kod ujabb firmverre lett elokesztve. Frissitsd a nyomtato firmveret."
-"cancelled."
-msgstr ""
-"A G-kod ujabb firmverre lett elokesztve. Frissitsd a nyomtato firmveret. "
-"Nyomtatas megallitva."
 
 #. MSG_HW_SETUP c=18
 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325
@@ -1683,17 +1671,16 @@ msgstr ""
 
 #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296
-msgid "Nozzle diameter differs from the G-code. Continue?"
+msgid "Nozzle diameter differs from the G-code."
-msgstr "A fuvoka atmeroje elter a G-kodtol. Folytasasm?"
+msgstr "A fuvoka atmeroje elter a G-kodtol."
 
 #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297
 msgid ""
 "Nozzle diameter differs from the G-code. Please check the value in settings."
-" Print cancelled."
 msgstr ""
 "A nyomtato fuvoka atmeroje elter a G-kodtol. Ellenorizd az erteket a "
-"beallitasokban. Nyomtatas megallitva."
+"beallitasokban."
 
 #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8
 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302
@@ -1793,10 +1780,10 @@ msgstr "Jobb old.[µm]"
 #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666
 msgid ""
 "Running Wizard will delete current calibration results and start from the "
-"beginning. Continue?"
+"beginning."
 msgstr ""
 "A Varazslo futtatasa nullazza a jelenlegi kalibracios ertekeket es elolrol "
-"fog mindent kezdeni. Folytatod?"
+"fog mindent kezdeni."
 
 #. MSG_SD_CARD c=8
 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476
@@ -2541,7 +2528,7 @@ msgstr "ISMERETLEN HIBA"
 msgid "Unexpected error occurred."
 msgstr "Váratlan hiba történt."
 
-#. MSG_EJECT c=8
+#. MSG_EJECT c=9
 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371
 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279
 msgid "Eject"
@@ -2609,15 +2596,10 @@ msgstr "A fúvóka forró! Várja meg a lehűlést."
 msgid "Nozzle changed?"
 msgstr "Fúvóka cserélve?"
 
-#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
+#. MSG_MISSING_FILAMENT c=20 r=3
 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388
-msgid "There is no filament loaded. Continue?"
+msgid "There is no filament loaded."
-msgstr "Nincs befűzve filament. Folytassam?"
+msgstr "Nincs befűzve filament."
-
-#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
-#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389
-msgid "There is no filament loaded. Print cancelled."
-msgstr "Nincs befűzve filament. Nyomtatás megállítva."
 
 #. MSG_Z_CALIBRATION_PROMPT c=20 r=3
 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752

lang/po/Firmware_it.po

@@ -32,11 +32,11 @@ msgstr " 0.4 o superiore"
 msgid "%s level expected"
 msgstr "atteso livello %s"
 
-#. MSG_CANCEL c=10
+#. MSG_CANCEL c=9
 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986
 #: ../../Firmware/ultralcd.cpp:3623
-msgid ">Cancel"
+msgid "Cancel"
-msgstr ">Annulla"
+msgstr "Annulla"
 
 #. MSG_BABYSTEPPING_Z c=13
 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652
@@ -740,7 +740,7 @@ msgstr "Fil. utilizzato"
 
 #. MSG_FILE_INCOMPLETE c=20 r=3
 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119
-msgid "File incomplete. Continue anyway?"
+msgid "File incomplete."
 msgstr "File incompleto. Continuare comunque?"
 
 #. MSG_FINISHING_MOVEMENTS c=20
@@ -795,47 +795,37 @@ msgstr "Ventola frontale/sin"
 
 #. MSG_GCODE_DIFF_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417
-msgid "G-code sliced for a different level. Continue?"
+msgid "G-code sliced for a different level."
-msgstr "G-code processato per un livello diverso. Continuare?"
+msgstr "G-code processato per un livello diverso."
 
 #. MSG_GCODE_DIFF_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418
-msgid ""
+msgid "G-code sliced for a different level. Please re-slice the model again."
-"G-code sliced for a different level. Please re-slice the model again. Print "
-"cancelled."
 msgstr ""
 "G-code processato per un livello diverso. Per favore esegui nuovamente lo "
-"slice del modello. Stampa annullata."
+"slice del modello."
 
 #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319
 #: ../../Firmware/util.cpp:436
-msgid "G-code sliced for a different printer type. Continue?"
+msgid "G-code sliced for a different printer type."
-msgstr "G-code processato per una stampante diversa. Continuare?"
+msgstr "G-code processato per una stampante diversa."
 
 #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320
 #: ../../Firmware/util.cpp:437
-msgid ""
+msgid "G-code sliced for a different printer type. Please re-slice the model again."
-"G-code sliced for a different printer type. Please re-slice the model again."
+msgstr "G-code processato per un'altra stampante. Per favore rislice il modello."
-" Print cancelled."
-msgstr ""
-"G-code processato per un'altra stampante. Per favore rislice il modello. "
-"Annullamento stampa."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369
-msgid "G-code sliced for a newer firmware. Continue?"
+msgid "G-code sliced for a newer firmware."
-msgstr "G-code processato per un FW piu recente. Continuare?"
+msgstr "G-code processato per un FW piu recente."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370
-msgid ""
+msgid "G-code sliced for a newer firmware. Please update the firmware."
-"G-code sliced for a newer firmware. Please update the firmware. Print "
+msgstr "G-code processato per un FW piu recente. Per favore aggiorna il FW."
-"cancelled."
-msgstr ""
-"G-code processato per un FW piu recente. Per favore aggiorna il FW. Stampa "
-"annullata."
 
 #. MSG_HW_SETUP c=18
 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325
@@ -1682,17 +1672,13 @@ msgstr ""
 
 #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296
-msgid "Nozzle diameter differs from the G-code. Continue?"
+msgid "Nozzle diameter differs from the G-code."
-msgstr "Diametro ugello diverso da G-Code. Continuare?"
+msgstr "Diametro ugello diverso da G-Code."
 
 #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297
-msgid ""
+msgid "Nozzle diameter differs from the G-code. Please check the value in settings."
-"Nozzle diameter differs from the G-code. Please check the value in settings."
+msgstr "Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni."
-" Print cancelled."
-msgstr ""
-"Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni. "
-"Stampa annullata."
 
 #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8
 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302
@@ -1794,10 +1780,10 @@ msgstr "Destra [µm]"
 #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666
 msgid ""
 "Running Wizard will delete current calibration results and start from the "
-"beginning. Continue?"
+"beginning."
 msgstr ""
 "Se avvi il Wizard perderai la calibrazione preesistente e dovrai "
-"ricominciare dall'inizio. Continuare?"
+"ricominciare dall'inizio."
 
 #. MSG_SD_CARD c=8
 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476
@@ -2540,7 +2526,7 @@ msgstr "ERRORE SCONOSCIUTO"
 msgid "Unexpected error occurred."
 msgstr "Si è verificato un errore imprevisto."
 
-#. MSG_EJECT c=8
+#. MSG_EJECT c=9
 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371
 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279
 msgid "Eject"
@@ -2608,15 +2594,10 @@ msgstr "L'ugello è caldo! Attendere il raffreddamento."
 msgid "Nozzle changed?"
 msgstr "L'ugello è cambiato?"
 
-#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
+#. MSG_MISSING_FILAMENT c=20 r=3
 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388
-msgid "There is no filament loaded. Continue?"
+msgid "There is no filament loaded."
-msgstr "Nessun filamento caricato. Continuare?"
+msgstr "Nessun filamento caricato."
-
-#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
-#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389
-msgid "There is no filament loaded. Print cancelled."
-msgstr "Nessun filamento caricato. Stampa annullata."
 
 #. MSG_Z_CALIBRATION_PROMPT c=20 r=3
 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752

lang/po/Firmware_nl.po

@@ -32,11 +32,11 @@ msgstr " 0.4 of nieuwer"
 msgid "%s level expected"
 msgstr "%s niveau verwacht"
 
-#. MSG_CANCEL c=10
+#. MSG_CANCEL c=9
 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986
 #: ../../Firmware/ultralcd.cpp:3623
-msgid ">Cancel"
+msgid "Cancel"
-msgstr ">Annuleren"
+msgstr "Annuleren"
 
 #. MSG_BABYSTEPPING_Z c=13
 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652
@@ -740,7 +740,7 @@ msgstr "Gebruikte filament"
 
 #. MSG_FILE_INCOMPLETE c=20 r=3
 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119
-msgid "File incomplete. Continue anyway?"
+msgid "File incomplete."
 msgstr "Bestand onvolledig. Toch doorgaan?"
 
 #. MSG_FINISHING_MOVEMENTS c=20
@@ -795,47 +795,37 @@ msgstr "Fans voor/links"
 
 #. MSG_GCODE_DIFF_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417
-msgid "G-code sliced for a different level. Continue?"
+msgid "G-code sliced for a different level."
-msgstr "G-Code is voor een ander niveau geslict. Doorgaan?"
+msgstr "G-Code is voor een ander niveau geslict."
 
 #. MSG_GCODE_DIFF_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418
-msgid ""
+msgid "G-code sliced for a different level. Please re-slice the model again."
-"G-code sliced for a different level. Please re-slice the model again. Print "
+msgstr "G-Code is voor een ander niveau geslict. Slice het model opniew alsjeblieft."
-"cancelled."
-msgstr ""
-"G-Code is voor een ander niveau geslict. Slice het model opniew alsjeblieft."
-" Druk geannuleerd."
 
 #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319
 #: ../../Firmware/util.cpp:436
-msgid "G-code sliced for a different printer type. Continue?"
+msgid "G-code sliced for a different printer type."
-msgstr "G-Code is voor een ander printertype geslict. Doorgaan?"
+msgstr "G-Code is voor een ander printertype geslict."
 
 #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320
 #: ../../Firmware/util.cpp:437
-msgid ""
+msgid "G-code sliced for a different printer type. Please re-slice the model again."
-"G-code sliced for a different printer type. Please re-slice the model again."
+msgstr "G-Code is voor een ander printertype geslict. Slice het model opniew "
-" Print cancelled."
+"alsjeblieft."
-msgstr ""
-"G-Code is voor een ander printertype geslict. Slice het model opniew "
-"alsjeblieft. Druk geannuleerd."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369
-msgid "G-code sliced for a newer firmware. Continue?"
+msgid "G-code sliced for a newer firmware."
-msgstr "G-Code is voor een nieuwere firmware geslict. Doorgaan?"
+msgstr "G-Code is voor een nieuwere firmware geslict."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370
-msgid ""
+msgid "G-code sliced for a newer firmware. Please update the firmware."
-"G-code sliced for a newer firmware. Please update the firmware. Print "
+msgstr "G-Code is voor een nieuwere firmware geslict. Update de firmware "
-"cancelled."
+"alsjeblieft."
-msgstr ""
-"G-Code is voor een nieuwere firmware geslict. Update de firmware "
-"alsjeblieft. Druk geannuleerd."
 
 #. MSG_HW_SETUP c=18
 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325
@@ -1685,17 +1675,14 @@ msgstr ""
 
 #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296
-msgid "Nozzle diameter differs from the G-code. Continue?"
+msgid "Nozzle diameter differs from the G-code."
-msgstr "Tuitdiameter wijkt af van de G-code. Doorgaan?"
+msgstr "Tuitdiameter wijkt af van de G-code."
 
 #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297
-msgid ""
+msgid "Nozzle diameter differs from the G-code. Please check the value in settings."
-"Nozzle diameter differs from the G-code. Please check the value in settings."
+msgstr "De diameter van de tuit van de printer verschilt van de G-code. Controleer "
-" Print cancelled."
+"de waarde in de instellingen."
-msgstr ""
-"De diameter van de tuit van de printer verschilt van de G-code. Controleer "
-"de waarde in de instellingen. Printen geannuleerd."
 
 #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8
 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302
@@ -1797,10 +1784,10 @@ msgstr "Recht.kant[µm]"
 #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666
 msgid ""
 "Running Wizard will delete current calibration results and start from the "
-"beginning. Continue?"
+"beginning."
 msgstr ""
 "Starten van de Wizard verwijdert de huidige kalibreringsresultaten en begint"
-" vanaf het begin. Doorgaan?"
+" vanaf het begin."
 
 #. MSG_SD_CARD c=8
 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476
@@ -2543,11 +2530,11 @@ msgstr "ONBEKENDE FOUT"
 msgid "Unexpected error occurred."
 msgstr "Er is een onverwachte fout opgetreden."
 
-#. MSG_EJECT c=8
+#. MSG_EJECT c=9
 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371
 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279
 msgid "Eject"
-msgstr "Uitwerp."
+msgstr "Uitwerpen"
 
 #. MSG_TITLE_FILAMENT_CHANGE c=20
 #: ../../Firmware/mmu2/errors_list.h:189 ../../Firmware/mmu2/errors_list.h:236
@@ -2610,15 +2597,10 @@ msgstr "Mondstuk is heet! Wacht op afkoeling."
 msgid "Nozzle changed?"
 msgstr "Mondstuk veranderd?"
 
-#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
+#. MSG_MISSING_FILAMENT c=20 r=3
 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388
-msgid "There is no filament loaded. Continue?"
+msgid "There is no filament loaded."
-msgstr "Geen filament geladen. Doorgaan?"
+msgstr "Geen filament geladen."
-
-#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
-#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389
-msgid "There is no filament loaded. Print cancelled."
-msgstr "Geen filament geladen. Printen geannuleerd."
 
 #. MSG_Z_CALIBRATION_PROMPT c=20 r=3
 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752

lang/po/Firmware_no.po

@@ -32,11 +32,11 @@ msgstr " 0.4 eller nyere"
 msgid "%s level expected"
 msgstr "%s nivå ventet"
 
-#. MSG_CANCEL c=10
+#. MSG_CANCEL c=9
 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986
 #: ../../Firmware/ultralcd.cpp:3623
-msgid ">Cancel"
+msgid "Cancel"
-msgstr ">Avbryt"
+msgstr "Avbryt"
 
 #. MSG_BABYSTEPPING_Z c=13
 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652
@@ -738,7 +738,7 @@ msgstr "Brukt filament"
 
 #. MSG_FILE_INCOMPLETE c=20 r=3
 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119
-msgid "File incomplete. Continue anyway?"
+msgid "File incomplete."
 msgstr "Fil er ukomplett. Fortsette allikevel?"
 
 #. MSG_FINISHING_MOVEMENTS c=20
@@ -791,45 +791,35 @@ msgstr "Fremre/venstre vifte"
 
 #. MSG_GCODE_DIFF_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417
-msgid "G-code sliced for a different level. Continue?"
+msgid "G-code sliced for a different level."
-msgstr "G-code sliced for en annen høyde. Fortsette?"
+msgstr "G-code sliced for en annen høyde."
 
 #. MSG_GCODE_DIFF_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418
-msgid ""
+msgid "G-code sliced for a different level. Please re-slice the model again."
-"G-code sliced for a different level. Please re-slice the model again. Print "
+msgstr "G-code sliced for en annen høyde. Vennligst slice igjen."
-"cancelled."
-msgstr ""
-"G-code sliced for en annen høyde. Vennligst slice igjen. Print avbrutt."
 
 #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319
 #: ../../Firmware/util.cpp:436
-msgid "G-code sliced for a different printer type. Continue?"
+msgid "G-code sliced for a different printer type."
-msgstr "G-code sliced for en annen printer. Fortsette?"
+msgstr "G-code sliced for en annen printer."
 
 #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320
 #: ../../Firmware/util.cpp:437
-msgid ""
+msgid "G-code sliced for a different printer type. Please re-slice the model again."
-"G-code sliced for a different printer type. Please re-slice the model again."
+msgstr "G-code sliced for en annen printer. Vennligst slice igjen."
-" Print cancelled."
-msgstr ""
-"G-code sliced for en annen printer. Vennligst slice igjen. Print avbrutt."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369
-msgid "G-code sliced for a newer firmware. Continue?"
+msgid "G-code sliced for a newer firmware."
-msgstr "G-code sliced for nyere fastvare. Fortsette?"
+msgstr "G-code sliced for nyere fastvare."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370
-msgid ""
+msgid "G-code sliced for a newer firmware. Please update the firmware."
-"G-code sliced for a newer firmware. Please update the firmware. Print "
+msgstr "G-code sliced for nyere fastvare. Vennligst oppdater systemet."
-"cancelled."
-msgstr ""
-"G-code sliced for nyere fastvare. Vennligst oppdater systemet. Print "
-"avbrutt."
 
 #. MSG_HW_SETUP c=18
 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325
@@ -1672,17 +1662,14 @@ msgstr ""
 
 #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296
-msgid "Nozzle diameter differs from the G-code. Continue?"
+msgid "Nozzle diameter differs from the G-code."
-msgstr "Dysediameteren er forskjellig fra G-Code. Fortsette?"
+msgstr "Dysediameteren er forskjellig fra G-Code."
 
 #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297
-msgid ""
+msgid "Nozzle diameter differs from the G-code. Please check the value in settings."
-"Nozzle diameter differs from the G-code. Please check the value in settings."
+msgstr "Printerens dysediameter er forskjellig fra G-Code. Sjekk Innstillinger for "
-" Print cancelled."
+"hva som er satt."
-msgstr ""
-"Printerens dysediameter er forskjellig fra G-Code. Sjekk Innstillinger for "
-"hva som er satt. Print avbrutt."
 
 #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8
 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302
@@ -1782,10 +1769,10 @@ msgstr "Høyre side[µm]"
 #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666
 msgid ""
 "Running Wizard will delete current calibration results and start from the "
-"beginning. Continue?"
+"beginning."
 msgstr ""
 "Ved å kjøre Veilederen slettes all nåværende kalibreringsdata og du må "
-"begynne på nytt. Fortsette?"
+"begynne på nytt."
 
 #. MSG_SD_CARD c=8
 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476
@@ -2517,7 +2504,7 @@ msgstr "UKJENT FEIL"
 msgid "Unexpected error occurred."
 msgstr "Det oppstod en uventet feil."
 
-#. MSG_EJECT c=8
+#. MSG_EJECT c=9
 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371
 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279
 msgid "Eject"
@@ -2584,15 +2571,10 @@ msgstr "Dysen er varm! Vent på nedkjøling."
 msgid "Nozzle changed?"
 msgstr "Har du byttet dyse?"
 
-#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
+#. MSG_MISSING_FILAMENT c=20 r=3
 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388
-msgid "There is no filament loaded. Continue?"
+msgid "There is no filament loaded."
-msgstr "Det er ingen filament lastet. Fortsette?"
+msgstr "Det er ingen filament lastet."
-
-#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
-#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389
-msgid "There is no filament loaded. Print cancelled."
-msgstr "Det er ingen filament lastet. Print avbrutt."
 
 #. MSG_Z_CALIBRATION_PROMPT c=20 r=3
 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752

lang/po/Firmware_pl.po

@@ -32,11 +32,11 @@ msgstr " 0.4 lub nowszy"
 msgid "%s level expected"
 msgstr "Oczekiwano wersji %s"
 
-#. MSG_CANCEL c=10
+#. MSG_CANCEL c=9
 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986
 #: ../../Firmware/ultralcd.cpp:3623
-msgid ">Cancel"
+msgid "Cancel"
-msgstr ">Anuluj"
+msgstr "Anuluj"
 
 #. MSG_BABYSTEPPING_Z c=13
 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652
@@ -740,7 +740,7 @@ msgstr "Użyty filament"
 
 #. MSG_FILE_INCOMPLETE c=20 r=3
 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119
-msgid "File incomplete. Continue anyway?"
+msgid "File incomplete."
 msgstr "Plik niekompletny. Kontynuowac?"
 
 #. MSG_FINISHING_MOVEMENTS c=20
@@ -795,45 +795,35 @@ msgstr "Przedni/lewy wentyl."
 
 #. MSG_GCODE_DIFF_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417
-msgid "G-code sliced for a different level. Continue?"
+msgid "G-code sliced for a different level."
-msgstr "G-code pocięty dla innej wersji. Kontynuować?"
+msgstr "G-code pocięty dla innej wersji."
 
 #. MSG_GCODE_DIFF_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418
-msgid ""
+msgid "G-code sliced for a different level. Please re-slice the model again."
-"G-code sliced for a different level. Please re-slice the model again. Print "
+msgstr "G-code pocięty na innym poziomie. Potnij model ponownie."
-"cancelled."
-msgstr ""
-"G-code pocięty na innym poziomie. Potnij model ponownie. Druk anulowany."
 
 #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319
 #: ../../Firmware/util.cpp:436
-msgid "G-code sliced for a different printer type. Continue?"
+msgid "G-code sliced for a different printer type."
-msgstr "G-code pocięty dla innej drukarki. Kontynuować?"
+msgstr "G-code pocięty dla innej drukarki."
 
 #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320
 #: ../../Firmware/util.cpp:437
-msgid ""
+msgid "G-code sliced for a different printer type. Please re-slice the model again."
-"G-code sliced for a different printer type. Please re-slice the model again."
+msgstr "G-code pocięty dla drukarki innego typu. Potnij model ponownie."
-" Print cancelled."
-msgstr ""
-"G-code pocięty dla drukarki innego typu. Potnij model ponownie. Druk "
-"anulowany."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369
-msgid "G-code sliced for a newer firmware. Continue?"
+msgid "G-code sliced for a newer firmware."
-msgstr "G-code pocięty dla nowszego firmware. Kontynuować?"
+msgstr "G-code pocięty dla nowszego firmware."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370
-msgid ""
+msgid "G-code sliced for a newer firmware. Please update the firmware."
-"G-code sliced for a newer firmware. Please update the firmware. Print "
+msgstr "G-code pocięty dla nowszego firmware. Zaktualizuj firmware."
-"cancelled."
-msgstr ""
-"G-code pocięty dla nowszego firmware. Zaktualizuj firmware. Druk anulowany."
 
 #. MSG_HW_SETUP c=18
 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325
@@ -1679,17 +1669,13 @@ msgstr ""
 
 #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296
-msgid "Nozzle diameter differs from the G-code. Continue?"
+msgid "Nozzle diameter differs from the G-code."
-msgstr "Średnica dyszy różni się od tej w G-code. Kontynuować?"
+msgstr "Średnica dyszy różni się od tej w G-code."
 
 #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297
-msgid ""
+msgid "Nozzle diameter differs from the G-code. Please check the value in settings."
-"Nozzle diameter differs from the G-code. Please check the value in settings."
+msgstr "Średnica dyszy różni się od tej w G-code. Sprawdź ustawienia."
-" Print cancelled."
-msgstr ""
-"Średnica dyszy różni się od tej w G-code. Sprawdź ustawienia. Druk "
-"anulowany."
 
 #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8
 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302
@@ -1791,10 +1777,9 @@ msgstr "Prawo [µm]"
 #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666
 msgid ""
 "Running Wizard will delete current calibration results and start from the "
-"beginning. Continue?"
+"beginning."
 msgstr ""
-"Włączenie Asystenta usunie obecne dane kalibracyjne i zacznie od początku. "
+"Włączenie Asystenta usunie obecne dane kalibracyjne i zacznie od początku."
-"Kontynuować?"
 
 #. MSG_SD_CARD c=8
 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476
@@ -2533,7 +2518,7 @@ msgstr "NIEZNANY BŁĄD"
 msgid "Unexpected error occurred."
 msgstr "Pojawił się nieoczekiwany błąd."
 
-#. MSG_EJECT c=8
+#. MSG_EJECT c=9
 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371
 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279
 msgid "Eject"
@@ -2600,15 +2585,10 @@ msgstr "Dysza jest gorąca! Poczekaj na schłodzenie."
 msgid "Nozzle changed?"
 msgstr "Dysza została zmieniona?"
 
-#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
+#. MSG_MISSING_FILAMENT c=20 r=3
 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388
-msgid "There is no filament loaded. Continue?"
+msgid "There is no filament loaded."
-msgstr "Nie ma załadowanego filamentu. Kontynuować?"
+msgstr "Nie ma załadowanego filamentu."
-
-#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
-#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389
-msgid "There is no filament loaded. Print cancelled."
-msgstr "Nie ma załadowanego filamentu. Druk anulowany."
 
 #. MSG_Z_CALIBRATION_PROMPT c=20 r=3
 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752

lang/po/Firmware_ro.po

@@ -32,11 +32,11 @@ msgstr " 0.4 / mai nou"
 msgid "%s level expected"
 msgstr "nivel %s așteptat"
 
-#. MSG_CANCEL c=10
+#. MSG_CANCEL c=9
 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986
 #: ../../Firmware/ultralcd.cpp:3623
-msgid ">Cancel"
+msgid "Cancel"
-msgstr ">Anulează"
+msgstr "Anulează"
 
 #. MSG_BABYSTEPPING_Z c=13
 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652
@@ -740,7 +740,7 @@ msgstr "Filament folosit"
 
 #. MSG_FILE_INCOMPLETE c=20 r=3
 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119
-msgid "File incomplete. Continue anyway?"
+msgid "File incomplete."
 msgstr "Fișier incomplet. Continuă oricum?"
 
 #. MSG_FINISHING_MOVEMENTS c=20
@@ -795,47 +795,36 @@ msgstr "Ventilatoarele sunt"
 
 #. MSG_GCODE_DIFF_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417
-msgid "G-code sliced for a different level. Continue?"
+msgid "G-code sliced for a different level."
-msgstr "Versiune de G-code e incorectă. Continuați?"
+msgstr "Versiune de G-code e incorectă."
 
 #. MSG_GCODE_DIFF_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418
-msgid ""
+msgid "G-code sliced for a different level. Please re-slice the model again."
-"G-code sliced for a different level. Please re-slice the model again. Print "
+msgstr "Versiune de G-code e incorectă. Vă rugăm pregătiți modelul din nou."
-"cancelled."
-msgstr ""
-"Versiune de G-code e incorectă. Vă rugăm pregătiți modelul din nou. Print "
-"anulat."
 
 #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319
 #: ../../Firmware/util.cpp:436
-msgid "G-code sliced for a different printer type. Continue?"
+msgid "G-code sliced for a different printer type."
-msgstr "G-code pregătit pentru un alt tip de printer. Continuați?"
+msgstr "G-code pregătit pentru un alt tip de printer."
 
 #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320
 #: ../../Firmware/util.cpp:437
-msgid ""
+msgid "G-code sliced for a different printer type. Please re-slice the model again."
-"G-code sliced for a different printer type. Please re-slice the model again."
+msgstr "G-code pregătit pentru un alt tip de printer. Vă rugăm să pregătiți modelul "
-" Print cancelled."
+"din nou."
-msgstr ""
-"G-code pregătit pentru un alt tip de printer. Vă rugăm să pregătiți modelul "
-"din nou. Print anulat."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369
-msgid "G-code sliced for a newer firmware. Continue?"
+msgid "G-code sliced for a newer firmware."
-msgstr "G-code pregătit pentru firmware mai nou. Continuați?"
+msgstr "G-code pregătit pentru firmware mai nou."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370
-msgid ""
+msgid "G-code sliced for a newer firmware. Please update the firmware."
-"G-code sliced for a newer firmware. Please update the firmware. Print "
+msgstr "G-code pregătit pentru firmware mai nou. Vă rugăm actualizați firmware-ul."
-"cancelled."
-msgstr ""
-"G-code pregătit pentru firmware mai nou. Vă rugăm actualizați firmware-ul. "
-"Print anulat."
 
 #. MSG_HW_SETUP c=18
 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325
@@ -1681,17 +1670,14 @@ msgstr ""
 
 #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296
-msgid "Nozzle diameter differs from the G-code. Continue?"
+msgid "Nozzle diameter differs from the G-code."
-msgstr "Diametrul vârfului diferă de cel din G-code. Continuați?"
+msgstr "Diametrul vârfului diferă de cel din G-code."
 
 #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297
-msgid ""
+msgid "Nozzle diameter differs from the G-code. Please check the value in settings."
-"Nozzle diameter differs from the G-code. Please check the value in settings."
+msgstr "Diametrul vârfului diferă de cel din G-code. Vă rugăm verificați valoarea în"
-" Print cancelled."
+" setări."
-msgstr ""
-"Diametrul vârfului diferă de cel din G-code. Vă rugăm verificați valoarea în"
-" setări. Print anulat."
 
 #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8
 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302
@@ -1793,10 +1779,10 @@ msgstr "Dreapta [µm]"
 #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666
 msgid ""
 "Running Wizard will delete current calibration results and start from the "
-"beginning. Continue?"
+"beginning."
 msgstr ""
 "Rularea Wizard-ului va șterge rezultatele curente ale calibrării și va porni"
-" de la început. Continuați?"
+" de la început."
 
 #. MSG_SD_CARD c=8
 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476
@@ -2541,7 +2527,7 @@ msgstr "EROARE NECUNOSCUTĂ"
 msgid "Unexpected error occurred."
 msgstr "A apărut o eroare neașteptată."
 
-#. MSG_EJECT c=8
+#. MSG_EJECT c=9
 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371
 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279
 msgid "Eject"
@@ -2609,15 +2595,10 @@ msgstr "Duza este fierbinte! Așteptați să se răcească."
 msgid "Nozzle changed?"
 msgstr "S-a schimbat duza?"
 
-#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
+#. MSG_MISSING_FILAMENT c=20 r=3
 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388
-msgid "There is no filament loaded. Continue?"
+msgid "There is no filament loaded."
-msgstr "Filamentul nu este detectat. Continuați?"
+msgstr "Filamentul nu este detectat."
-
-#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
-#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389
-msgid "There is no filament loaded. Print cancelled."
-msgstr "Filamentul nu este detectat. Print anulat."
 
 #. MSG_Z_CALIBRATION_PROMPT c=20 r=3
 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752

lang/po/Firmware_sk.po

@@ -32,11 +32,11 @@ msgstr " 0.4 a novšie"
 msgid "%s level expected"
 msgstr "Očakávaná verzia %s"
 
-#. MSG_CANCEL c=10
+#. MSG_CANCEL c=9
 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986
 #: ../../Firmware/ultralcd.cpp:3623
-msgid ">Cancel"
+msgid "Cancel"
-msgstr ">Zrušiť"
+msgstr "Zrušiť"
 
 #. MSG_BABYSTEPPING_Z c=13
 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652
@@ -737,8 +737,8 @@ msgstr "Spotrebovaný filam."
 
 #. MSG_FILE_INCOMPLETE c=20 r=3
 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119
-msgid "File incomplete. Continue anyway?"
+msgid "File incomplete."
-msgstr "Súbor nekompletný. Pokračovať?"
+msgstr "Súbor nekompletný."
 
 #. MSG_FINISHING_MOVEMENTS c=20
 #: ../../Firmware/messages.cpp:45
@@ -792,46 +792,35 @@ msgstr "Predný/ľavý vent."
 
 #. MSG_GCODE_DIFF_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417
-msgid "G-code sliced for a different level. Continue?"
+msgid "G-code sliced for a different level."
-msgstr "G-code pripravený pre inú úroveň. Pokračovať?"
+msgstr "G-code pripravený pre inú úroveň."
 
 #. MSG_GCODE_DIFF_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418
-msgid ""
+msgid "G-code sliced for a different level. Please re-slice the model again."
-"G-code sliced for a different level. Please re-slice the model again. Print "
+msgstr "G-code pripravený pre inú verziu. Vygenerujte G-code znova."
-"cancelled."
-msgstr ""
-"G-code pripravený pre inú verziu. Vygenerujte G-code znova. Tlač zrušená."
 
 #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319
 #: ../../Firmware/util.cpp:436
-msgid "G-code sliced for a different printer type. Continue?"
+msgid "G-code sliced for a different printer type."
 msgstr "G-code je pripravený pre iný typ tlačiarne.Pokračovať?"
 
 #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320
 #: ../../Firmware/util.cpp:437
-msgid ""
+msgid "G-code sliced for a different printer type. Please re-slice the model again."
-"G-code sliced for a different printer type. Please re-slice the model again."
+msgstr "G-code je pripravený pre iný typ tlačiarne. Vygenerujte G-code znova."
-" Print cancelled."
-msgstr ""
-"G-code je pripravený pre iný typ tlačiarne. Vygenerujte G-code znova. Tlač "
-"zrušená."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369
-msgid "G-code sliced for a newer firmware. Continue?"
+msgid "G-code sliced for a newer firmware."
-msgstr "G-code je pripravený pre novší firmware. Pokračovať?"
+msgstr "G-code je pripravený pre novší firmware."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370
-msgid ""
+msgid "G-code sliced for a newer firmware. Please update the firmware."
-"G-code sliced for a newer firmware. Please update the firmware. Print "
+msgstr "G-code je pripravený pre novší firmware. Prosím aktualizujte firmware."
-"cancelled."
-msgstr ""
-"G-code je pripravený pre novší firmware. Prosím aktualizujte firmware. Tlač "
-"zrušená."
 
 #. MSG_HW_SETUP c=18
 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325
@@ -1675,17 +1664,13 @@ msgstr ""
 
 #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296
-msgid "Nozzle diameter differs from the G-code. Continue?"
+msgid "Nozzle diameter differs from the G-code."
-msgstr "Priemer trysky tlačiarne sa líši od G-code. Pokračovať?"
+msgstr "Priemer trysky tlačiarne sa líši od G-code."
 
 #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297
-msgid ""
+msgid "Nozzle diameter differs from the G-code. Please check the value in settings."
-"Nozzle diameter differs from the G-code. Please check the value in settings."
+msgstr "Priemer trysky tlačiarne sa líši od G-code. Prosím skontrolujte nastavenie."
-" Print cancelled."
-msgstr ""
-"Priemer trysky tlačiarne sa líši od G-code. Prosím skontrolujte nastavenie. "
-"Tlač zrušená."
 
 #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8
 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302
@@ -1787,10 +1772,10 @@ msgstr "Pravá str.[µm]"
 #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666
 msgid ""
 "Running Wizard will delete current calibration results and start from the "
-"beginning. Continue?"
+"beginning."
 msgstr ""
 "Spustenie Sprievodcu vymaže uložené výsledky všetkých kalibrácií a spustí "
-"kalibračný proces od začiatku. Pokračovať?"
+"kalibračný proces od začiatku."
 
 #. MSG_SD_CARD c=8
 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476
@@ -2523,7 +2508,7 @@ msgstr "NEZNÁMA CHYBA"
 msgid "Unexpected error occurred."
 msgstr "Vyskytla sa neočakávaná chyba."
 
-#. MSG_EJECT c=8
+#. MSG_EJECT c=9
 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371
 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279
 msgid "Eject"
@@ -2590,15 +2575,10 @@ msgstr "Tryska je horúca! Počkajte na vychladnutie."
 msgid "Nozzle changed?"
 msgstr "Vymenili ste trysku?"
 
-#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
+#. MSG_MISSING_FILAMENT c=20 r=3
 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388
-msgid "There is no filament loaded. Continue?"
+msgid "There is no filament loaded."
-msgstr "Nie je zavedený žiaden filament. Pokračovať?"
+msgstr "Nie je zavedený žiaden filament."
-
-#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
-#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389
-msgid "There is no filament loaded. Print cancelled."
-msgstr "Nie je zavedený žiaden filament. Tlač zrušená."
 
 #. MSG_Z_CALIBRATION_PROMPT c=20 r=3
 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752

lang/po/Firmware_sv.po

@@ -32,11 +32,11 @@ msgstr " 0.4 el nyare"
 msgid "%s level expected"
 msgstr "%s nivå förväntad"
 
-#. MSG_CANCEL c=10
+#. MSG_CANCEL c=9
 #: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:1986
 #: ../../Firmware/ultralcd.cpp:3623
-msgid ">Cancel"
+msgid "Cancel"
-msgstr ">Avbryt"
+msgstr "Avbryt"
 
 #. MSG_BABYSTEPPING_Z c=13
 #: ../../Firmware/messages.cpp:269 ../../Firmware/ultralcd.cpp:2652
@@ -738,7 +738,7 @@ msgstr "Använt filament"
 
 #. MSG_FILE_INCOMPLETE c=20 r=3
 #: ../../Firmware/messages.cpp:375 ../../Firmware/ultralcd.cpp:7119
-msgid "File incomplete. Continue anyway?"
+msgid "File incomplete."
 msgstr "Filen är ofullständig. Fortsätta ändå?"
 
 #. MSG_FINISHING_MOVEMENTS c=20
@@ -793,47 +793,36 @@ msgstr "Front/vänster fläkt"
 
 #. MSG_GCODE_DIFF_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:156 ../../Firmware/util.cpp:417
-msgid "G-code sliced for a different level. Continue?"
+msgid "G-code sliced for a different level."
-msgstr "G-code genererad för en annan nivå. Fortsätta?"
+msgstr "G-code genererad för en annan nivå."
 
 #. MSG_GCODE_DIFF_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418
-msgid ""
+msgid "G-code sliced for a different level. Please re-slice the model again."
-"G-code sliced for a different level. Please re-slice the model again. Print "
+msgstr "G-code genererad för en annan nivå. Vänligen re-generera modellen igen."
-"cancelled."
-msgstr ""
-"G-code genererad för en annan nivå. Vänligen re-generera modellen igen. "
-"Utskriften avbröts."
 
 #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:152 ../../Firmware/util.cpp:319
 #: ../../Firmware/util.cpp:436
-msgid "G-code sliced for a different printer type. Continue?"
+msgid "G-code sliced for a different printer type."
-msgstr "G-code genererad för en annan skrivartyp. Fortsätta?"
+msgstr "G-code genererad för en annan skrivartyp."
 
 #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:153 ../../Firmware/util.cpp:320
 #: ../../Firmware/util.cpp:437
-msgid ""
+msgid "G-code sliced for a different printer type. Please re-slice the model again."
-"G-code sliced for a different printer type. Please re-slice the model again."
+msgstr "G-code genererad för en annan skrivartyp. Vänligen re-generera modellen "
-" Print cancelled."
+"igen."
-msgstr ""
-"G-code genererad för en annan skrivartyp. Vänligen re-generera modellen "
-"igen. Utskriften avbröts."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:154 ../../Firmware/util.cpp:369
-msgid "G-code sliced for a newer firmware. Continue?"
+msgid "G-code sliced for a newer firmware."
-msgstr "G-code genererad för en nyare firmware. Fortsätta?"
+msgstr "G-code genererad för en nyare firmware."
 
 #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:155 ../../Firmware/util.cpp:370
-msgid ""
+msgid "G-code sliced for a newer firmware. Please update the firmware."
-"G-code sliced for a newer firmware. Please update the firmware. Print "
+msgstr "G-code genererad för en nyare firmware. Vänligen uppdatera firmware."
-"cancelled."
-msgstr ""
-"G-code genererad för en nyare firmware. Vänligen uppdatera firmware. "
-"Utskriften avbröts."
 
 #. MSG_HW_SETUP c=18
 #: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4325
@@ -1681,17 +1670,14 @@ msgstr ""
 
 #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3
 #: ../../Firmware/messages.cpp:160 ../../Firmware/util.cpp:296
-msgid "Nozzle diameter differs from the G-code. Continue?"
+msgid "Nozzle diameter differs from the G-code."
-msgstr "Munstycksdiametern skiljer sig från G-codeen. Fortsätta?"
+msgstr "Munstycksdiametern skiljer sig från G-codeen."
 
 #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8
 #: ../../Firmware/messages.cpp:161 ../../Firmware/util.cpp:297
-msgid ""
+msgid "Nozzle diameter differs from the G-code. Please check the value in settings."
-"Nozzle diameter differs from the G-code. Please check the value in settings."
+msgstr "Skrivarmunstyckets diameter skiljer sig från G-codeen. Kontrollera värdet i "
-" Print cancelled."
+"inställningarna."
-msgstr ""
-"Skrivarmunstyckets diameter skiljer sig från G-codeen. Kontrollera värdet i "
-"inställningarna. Utskriften avbröts."
 
 #. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8
 #: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:302
@@ -1793,10 +1779,10 @@ msgstr "Höger sida[µm]"
 #: ../../Firmware/messages.cpp:298 ../../Firmware/ultralcd.cpp:3666
 msgid ""
 "Running Wizard will delete current calibration results and start from the "
-"beginning. Continue?"
+"beginning."
 msgstr ""
 "Att utföra guiden kommer att radera aktuella kalibreringsinställningar och "
-"börja om från början. Fortsätta?"
+"börja om från början."
 
 #. MSG_SD_CARD c=8
 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476
@@ -2530,7 +2516,7 @@ msgstr "OKÄNT FEL"
 msgid "Unexpected error occurred."
 msgstr "Ett oväntat fel inträffade."
 
-#. MSG_EJECT c=8
+#. MSG_EJECT c=9
 #: ../../Firmware/messages.cpp:21 ../../Firmware/mmu2/errors_list.h:371
 #: ../../Firmware/ultralcd.cpp:2275 ../../Firmware/ultralcd.cpp:2279
 msgid "Eject"
@@ -2597,15 +2583,10 @@ msgstr "Munstycket är varmt! Vänta på nedkylning."
 msgid "Nozzle changed?"
 msgstr "Har munstycket ändrats?"
 
-#. MSG_MISSING_FILAMENT_CONTINUE c=20 r=3
+#. MSG_MISSING_FILAMENT c=20 r=3
 #: ../../Firmware/messages.cpp:158 ../../Firmware/util.cpp:388
-msgid "There is no filament loaded. Continue?"
+msgid "There is no filament loaded."
-msgstr "Det finns ingen filament laddad. Fortsätta?"
+msgstr "Det finns ingen filament laddad."
-
-#. MSG_MISSING_FILAMENT_CANCELLED c=20 r=8
-#: ../../Firmware/messages.cpp:159 ../../Firmware/util.cpp:389
-msgid "There is no filament loaded. Print cancelled."
-msgstr "Det finns ingen filament laddad. Utskriften avbröts."
 
 #. MSG_Z_CALIBRATION_PROMPT c=20 r=3
 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752