From 35d69ce22041c43e614679fb56a3268ec48bf1d8 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 28 Nov 2024 13:31:40 +0100 Subject: [PATCH] Add multiscreen message with `Cont.|Cancel` Remove `Continue?` from some mesages to save "translation space" and replace multiscreen from `Yes|No` to `Cont.|Cancel` Remove `Print canceled.` from check messages to save again "translation sapce" and after confirming the message the Status Line shows that it has been stopped. --- Firmware/messages.cpp | 25 +++++++------- Firmware/messages.h | 3 +- Firmware/ultralcd.cpp | 20 +++++++++--- Firmware/ultralcd.h | 1 + Firmware/util.cpp | 6 ++-- lang/po/Firmware.pot | 41 ++++++++--------------- lang/po/Firmware_cs.po | 68 ++++++++++++++------------------------ lang/po/Firmware_de.po | 69 ++++++++++++++------------------------- lang/po/Firmware_es.po | 63 ++++++++++++++--------------------- lang/po/Firmware_fr.po | 69 ++++++++++++++------------------------- lang/po/Firmware_hr.po | 69 ++++++++++++++------------------------- lang/po/Firmware_hu.po | 66 ++++++++++++++----------------------- lang/po/Firmware_it.po | 69 ++++++++++++++------------------------- lang/po/Firmware_nl.po | 74 ++++++++++++++++-------------------------- lang/po/Firmware_no.po | 70 +++++++++++++++------------------------ lang/po/Firmware_pl.po | 70 ++++++++++++++------------------------- lang/po/Firmware_ro.po | 73 +++++++++++++++-------------------------- lang/po/Firmware_sk.po | 70 ++++++++++++++------------------------- lang/po/Firmware_sv.po | 73 +++++++++++++++-------------------------- 19 files changed, 377 insertions(+), 622 deletions(-) diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 1c5a31c309..23ee1d51c6 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -19,7 +19,7 @@ const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling f 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_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_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_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_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_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_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_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_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. 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. Print cancelled."); ////MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 +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."); ////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."); ////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."); ////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."); ////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."); ////MSG_GCODE_DIFF_CANCELLED c=20 r=8 +const char MSG_MISSING_FILAMENT[] PROGMEM_I1 = ISTR("There is no filament loaded."); ////MSG_MISSING_FILAMENT c=20 r=3 +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_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_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 @@ -295,7 +294,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 +371,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 diff --git a/Firmware/messages.h b/Firmware/messages.h index 8ce0568406..5abd460a5e 100644 --- a/Firmware/messages.h +++ b/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_CANCELLED[]; +extern const char MSG_MISSING_FILAMENT[]; extern const char MSG_NOZZLE_DIFFERS_CONTINUE[]; extern const char MSG_NOZZLE_DIFFERS_CANCELLED[]; extern const char MSG_NOZZLE_DIAMETER[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0faec8a907..3a5a23dab2 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1977,7 +1977,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) @@ -3039,6 +3040,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 @@ -3614,7 +3626,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 { @@ -3657,7 +3669,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); @@ -7110,7 +7122,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) { diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index f2446110cf..ace96a75f1 100755 --- a/Firmware/ultralcd.h +++ b/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. diff --git a/Firmware/util.cpp b/Firmware/util.cpp index ae9da486e9..e9bd9017bc 100644 --- a/Firmware/util.cpp +++ b/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_CANCELLED) + _T(MSG_MISSING_FILAMENT) + ,_T(MSG_MISSING_FILAMENT) //Identical messages ,(uint8_t)oCheckFilament ); diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 7ef7dc553b..33afcc7bed 100644 --- a/lang/po/Firmware.pot +++ b/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 @@ -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 "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." +msgid "G-code sliced for a different level. Please re-slice the model again." 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 "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." +msgid "G-code sliced for a different printer type. Please re-slice the model again." 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 "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." +msgid "G-code sliced for a newer firmware. Please update the firmware." 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 "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." +msgid "Nozzle diameter differs from the G-code. Please check the value in settings." 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?" -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." +msgid "There is no filament loaded." msgstr "" #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 99c7b44786..b6c65cbeb3 100644 --- a/lang/po/Firmware_cs.po +++ b/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" -msgstr ">Zrušit" +msgid "Cancel" +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?" -msgstr "Soubor nekompletní. Pokračovat?" +msgid "File incomplete." +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?" -msgstr "G-code je připraven pro jinou verzi. Pokračovat?" +msgid "G-code sliced for a different level." +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 "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"G-code je připraven pro jinou verzi. Vyslicujte model znovu. Tisk zrušen." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "G-code je připraven pro jinou verzi. Vyslicujte model znovu." #. 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 "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-code je připraven pro jiný typ tiskarny. Vyslicujte model znovu. Tisk " -"zrušen." +msgid "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." #. 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?" -msgstr "G-code je pripraven pro novější FW. Pokračovat?" +msgid "G-code sliced for a newer firmware." +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 "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "G-code je připraven pro novější FW. Aktualizujte FW. Tisk zrušen." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-code je připraven pro novější FW. Aktualizujte FW." #. 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?" -msgstr "Průměr trysky tiskárny se liší od G-code. Pokračovat?" +msgid "Nozzle diameter differs from the G-code." +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 "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." -msgstr "" -"Průměr trysky tiskárny se liší od G-code. Zkontrolujte nastavení. Tisk " -"zrušen." +msgid "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í." #. 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 @@ -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?" -msgstr "Není vložen filament. Pokračovat?" - -#. 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." +msgid "There is no filament loaded." +msgstr "Není vložen filament." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 52b3a6f204..5344d03ebd 100644 --- a/lang/po/Firmware_de.po +++ b/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" -msgstr ">Abbruch" +msgid "Cancel" +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?" -msgstr "G-Code ist für einen anderen Level geslict. Fortfahren?" +msgid "G-code sliced for a different level." +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 "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"G-Code ist für einen anderen Level geslict. Slicen Sie das Modell erneut. " -"Druck abgebrochen." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "G-Code ist für einen anderen Level geslict. Slicen Sie das Modell erneut." #. 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?" -msgstr "G-Code ist für einen anderen Drucker geslict. Fortfahren?" +msgid "G-code sliced for a different printer type." +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 "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-Code ist für einen anderen Drucker geslict. Slicen Sie das Modell erneut. " -"Druck abgebrochen." +msgid "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." #. 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?" -msgstr "G-Code ist für eine neuere Firmware geslict. Fortfahren?" +msgid "G-code sliced for a newer firmware." +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 "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-Code ist für eine neuere Firmware geslict. Aktualisieren die Firmware. " -"Druck abgebrochen." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-Code ist für eine neuere Firmware geslict. Aktualisieren die Firmware." #. 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?" -msgstr "Düsendurchmesser weicht vom G-Code ab. Fortfahren?" +msgid "Nozzle diameter differs from the G-code." +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 "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." +msgid "Nozzle diameter differs from the G-code. Please check the value in settings." 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 @@ -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?" -msgstr "Kein Filament geladen. Fortfahren?" - -#. 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." +msgid "There is no filament loaded." +msgstr "Kein Filament geladen." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 6eec2af073..922e799209 100644 --- a/lang/po/Firmware_es.po +++ b/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" -msgstr ">Cancelar" +msgid "Cancel" +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?" -msgstr "Código G laminado para un nivel dif. ¿Continuar?" +msgid "G-code sliced for a different level." +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 "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." +msgid "G-code sliced for a different level. Please re-slice the model again." 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 "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." +msgid "G-code sliced for a different printer type. Please re-slice the model again." 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?" -msgstr "Código G laminado para nuevo firmware. ¿Continuar?" +msgid "G-code sliced for a newer firmware." +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 "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"Código G laminado para nuevo firmware. Actualiza el firmware. Impresión " -"cancelada." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "Código G laminado para nuevo firmware. Actualiza el firmware." #. 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?" -msgstr "Diámetro boquilla impresora difiere de cod.G. ¿Continuar?" +msgid "Nozzle diameter differs from the G-code." +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 "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." +msgid "Nozzle diameter differs from the G-code. Please check the value in settings." 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 @@ -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?" -msgstr "No hay ningún filamento cargado. ¿Continuar?" - -#. 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." +msgid "There is no filament loaded." +msgstr "No hay ningún filamento cargado." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index b05ee59326..1f73d8b446 100644 --- a/lang/po/Firmware_fr.po +++ b/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" -msgstr ">Annuler" +msgid "Cancel" +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?" -msgstr "G-code a été préparé pour un niveau diff. Continuer?" +msgid "G-code sliced for a different level." +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 "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"G-code a été préparé pour un niveau différent. Découpez le modèle à nouveau." -" Impression annulée." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "G-code a été préparé pour un niveau différent. Découpez le modèle à nouveau." #. 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?" -msgstr "G-code pour un type d'imprimante différent. Continue?" +msgid "G-code sliced for a different printer type." +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 "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-code pour un type d'imprimante différent. Découpez le modèle à nouveau. " -"Impression annulée." +msgid "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." #. 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 "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-code a été préparé pour un nouveau FW. Mettre à jour le FW. Impression " -"annulée." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-code a été préparé pour un nouveau FW. Mettre à jour le FW." #. 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?" -msgstr "Diamètre de la buse diffère du G-Code. Continuer?" +msgid "Nozzle diameter differs from the G-code." +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 "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." -msgstr "" -"Diamètre de la buse diffère du G-Code. Vérifiez la valeur. Impression " -"annulée." +msgid "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." #. 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 @@ -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?" -msgstr "Il n'y a pas de filament chargé. Continuer?" - -#. 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." +msgid "There is no filament loaded." +msgstr "Il n'y a pas de filament chargé." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index dea20725db..71bf8fb559 100644 --- a/lang/po/Firmware_hr.po +++ b/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" -msgstr ">Otkazati" +msgid "Cancel" +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?" -msgstr "G-kod izrezan za drugu razinu. Nastavite?" +msgid "G-code sliced for a different level." +msgstr "G-kod izrezan za drugu razinu." #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418 -msgid "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"G-kod izrezan za drugu razinu. Molimo ponovo izrezite model. Print je " -"otkazan." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "G-kod izrezan za drugu razinu. Molimo ponovo izrezite model." #. 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?" -msgstr "G-kod izrezan za drugu vrstu printera. Nastavite?" +msgid "G-code sliced for a different printer type." +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 "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-kod izrezan za drugu vrstu printera. Molimo ponovo izrezite model. Print " -"je otkazan." +msgid "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." #. 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?" -msgstr "G-kod izrezan za noviji firmware. Nastavite?" +msgid "G-code sliced for a newer firmware." +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 "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-kod izrezan za noviji firmware. Molimo azurirajte firmware. Prime je " -"otkazan." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-kod izrezan za noviji firmware. Molimo azurirajte firmware." #. 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?" -msgstr "Promjer mlaznice razlikuje se od G-koda. Nastavite?" +msgid "Nozzle diameter differs from the G-code." +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 "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." +msgid "Nozzle diameter differs from the G-code. Please check the value in settings." 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 @@ -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?" -msgstr "Nema umetnute niti. Nastavite?" - -#. 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." +msgid "There is no filament loaded." +msgstr "Nema umetnute niti." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 6a43dbb6f4..122718157a 100644 --- a/lang/po/Firmware_hu.po +++ b/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" -msgstr ">Megsem" +msgid "Cancel" +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?" -msgstr "A G-kod mas szintre lett elokesztve. Folytassam?" +msgid "G-code sliced for a different level." +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 "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"A G-kod mas szintre lett elokesztve. Szeleteld ujra a modellt. Nyomtatas " -"megallitva." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "A G-kod mas szintre lett elokesztve. Szeleteld ujra a modellt." #. 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?" -msgstr "A G-kod mas nyomtato tipusra lett elokesztve.Folytassam?" +msgid "G-code sliced for a different printer type." +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 "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"A G-kod mas nyomtato tipusra lett elokesztve. Szeleteld ujra a modellt. " -"Nyomtatas megallitva." +msgid "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." #. 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?" -msgstr "A G-kod ujabb firmverre lett elokesztve.Folytassam?" +msgid "G-code sliced for a newer firmware." +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 "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"A G-kod ujabb firmverre lett elokesztve. Frissitsd a nyomtato firmveret. " -"Nyomtatas megallitva." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "A G-kod ujabb firmverre lett elokesztve. Frissitsd a nyomtato firmveret." #. 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?" -msgstr "A fuvoka atmeroje elter a G-kodtol. Folytasasm?" +msgid "Nozzle diameter differs from the G-code." +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 @@ -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?" -msgstr "Nincs befűzve filament. Folytassam?" - -#. 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." +msgid "There is no filament loaded." +msgstr "Nincs befűzve filament." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 093c82b9d4..2496eb45b2 100644 --- a/lang/po/Firmware_it.po +++ b/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" -msgstr ">Annulla" +msgid "Cancel" +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?" -msgstr "G-code processato per un livello diverso. Continuare?" +msgid "G-code sliced for a different level." +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 "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." +msgid "G-code sliced for a different level. Please re-slice the model again." 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?" -msgstr "G-code processato per una stampante diversa. Continuare?" +msgid "G-code sliced for a different printer type." +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 "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-code processato per un'altra stampante. Per favore rislice il modello. " -"Annullamento stampa." +msgid "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." #. 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?" -msgstr "G-code processato per un FW piu recente. Continuare?" +msgid "G-code sliced for a newer firmware." +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 "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-code processato per un FW piu recente. Per favore aggiorna il FW. Stampa " -"annullata." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-code processato per un FW piu recente. Per favore aggiorna il FW." #. 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?" -msgstr "Diametro ugello diverso da G-Code. Continuare?" +msgid "Nozzle diameter differs from the G-code." +msgstr "Diametro ugello diverso da G-Code." #. 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 "" -"Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni. " -"Stampa annullata." +msgid "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." #. 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 @@ -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?" -msgstr "Nessun filamento caricato. Continuare?" - -#. 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." +msgid "There is no filament loaded." +msgstr "Nessun filamento caricato." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index e587951fa3..1586424e8f 100644 --- a/lang/po/Firmware_nl.po +++ b/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" -msgstr ">Annuleren" +msgid "Cancel" +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?" -msgstr "G-Code is voor een ander niveau geslict. Doorgaan?" +msgid "G-code sliced for a different level." +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 "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"G-Code is voor een ander niveau geslict. Slice het model opniew alsjeblieft." -" Druk geannuleerd." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "G-Code is voor een ander niveau geslict. Slice het model opniew alsjeblieft." #. 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?" -msgstr "G-Code is voor een ander printertype geslict. Doorgaan?" +msgid "G-code sliced for a different printer type." +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 "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-Code is voor een ander printertype geslict. Slice het model opniew " -"alsjeblieft. Druk geannuleerd." +msgid "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 " +"alsjeblieft." #. 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?" -msgstr "G-Code is voor een nieuwere firmware geslict. Doorgaan?" +msgid "G-code sliced for a newer firmware." +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 "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-Code is voor een nieuwere firmware geslict. Update de firmware " -"alsjeblieft. Druk geannuleerd." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-Code is voor een nieuwere firmware geslict. Update de firmware " +"alsjeblieft." #. 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?" -msgstr "Tuitdiameter wijkt af van de G-code. Doorgaan?" +msgid "Nozzle diameter differs from the G-code." +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 "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." -msgstr "" -"De diameter van de tuit van de printer verschilt van de G-code. Controleer " -"de waarde in de instellingen. Printen geannuleerd." +msgid "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 " +"de waarde in de instellingen." #. 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 @@ -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?" -msgstr "Geen filament geladen. Doorgaan?" - -#. 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." +msgid "There is no filament loaded." +msgstr "Geen filament geladen." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index a3aceb78c2..7a060c5ce5 100644 --- a/lang/po/Firmware_no.po +++ b/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" -msgstr ">Avbryt" +msgid "Cancel" +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?" -msgstr "G-code sliced for en annen høyde. Fortsette?" +msgid "G-code sliced for a different level." +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 "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"G-code sliced for en annen høyde. Vennligst slice igjen. Print avbrutt." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "G-code sliced for en annen høyde. Vennligst slice igjen." #. 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?" -msgstr "G-code sliced for en annen printer. Fortsette?" +msgid "G-code sliced for a different printer type." +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 "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-code sliced for en annen printer. Vennligst slice igjen. Print avbrutt." +msgid "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." #. 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?" -msgstr "G-code sliced for nyere fastvare. Fortsette?" +msgid "G-code sliced for a newer firmware." +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 "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-code sliced for nyere fastvare. Vennligst oppdater systemet. Print " -"avbrutt." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-code sliced for nyere fastvare. Vennligst oppdater systemet." #. 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?" -msgstr "Dysediameteren er forskjellig fra G-Code. Fortsette?" +msgid "Nozzle diameter differs from the G-code." +msgstr "Dysediameteren er forskjellig fra G-Code." #. 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 "" -"Printerens dysediameter er forskjellig fra G-Code. Sjekk Innstillinger for " -"hva som er satt. Print avbrutt." +msgid "Nozzle diameter differs from the G-code. Please check the value in settings." +msgstr "Printerens dysediameter er forskjellig fra G-Code. Sjekk Innstillinger for " +"hva som er satt." #. 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 @@ -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?" -msgstr "Det er ingen filament lastet. Fortsette?" - -#. 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." +msgid "There is no filament loaded." +msgstr "Det er ingen filament lastet." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 251e686d03..4198f470db 100644 --- a/lang/po/Firmware_pl.po +++ b/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" -msgstr ">Anuluj" +msgid "Cancel" +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?" -msgstr "G-code pocięty dla innej wersji. Kontynuować?" +msgid "G-code sliced for a different level." +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 "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"G-code pocięty na innym poziomie. Potnij model ponownie. Druk anulowany." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "G-code pocięty na innym poziomie. Potnij model ponownie." #. 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?" -msgstr "G-code pocięty dla innej drukarki. Kontynuować?" +msgid "G-code sliced for a different printer type." +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 "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-code pocięty dla drukarki innego typu. Potnij model ponownie. Druk " -"anulowany." +msgid "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." #. 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?" -msgstr "G-code pocięty dla nowszego firmware. Kontynuować?" +msgid "G-code sliced for a newer firmware." +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 "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-code pocięty dla nowszego firmware. Zaktualizuj firmware. Druk anulowany." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-code pocięty dla nowszego firmware. Zaktualizuj firmware." #. 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?" -msgstr "Średnica dyszy różni się od tej w G-code. Kontynuować?" +msgid "Nozzle diameter differs from the G-code." +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 "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." -msgstr "" -"Średnica dyszy różni się od tej w G-code. Sprawdź ustawienia. Druk " -"anulowany." +msgid "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." #. 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. " -"Kontynuować?" +"Włączenie Asystenta usunie obecne dane kalibracyjne i zacznie od początku." #. MSG_SD_CARD c=8 #: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:4476 @@ -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?" -msgstr "Nie ma załadowanego filamentu. Kontynuować?" - -#. 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." +msgid "There is no filament loaded." +msgstr "Nie ma załadowanego filamentu." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 03eaf90028..7f1fa6c533 100644 --- a/lang/po/Firmware_ro.po +++ b/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" -msgstr ">Anulează" +msgid "Cancel" +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?" -msgstr "Versiune de G-code e incorectă. Continuați?" +msgid "G-code sliced for a different level." +msgstr "Versiune de G-code e incorectă." #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418 -msgid "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"Versiune de G-code e incorectă. Vă rugăm pregătiți modelul din nou. Print " -"anulat." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "Versiune de G-code e incorectă. Vă rugăm pregătiți modelul din nou." #. 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?" -msgstr "G-code pregătit pentru un alt tip de printer. Continuați?" +msgid "G-code sliced for a different printer type." +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 "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-code pregătit pentru un alt tip de printer. Vă rugăm să pregătiți modelul " -"din nou. Print anulat." +msgid "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 " +"din nou." #. 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?" -msgstr "G-code pregătit pentru firmware mai nou. Continuați?" +msgid "G-code sliced for a newer firmware." +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 "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-code pregătit pentru firmware mai nou. Vă rugăm actualizați firmware-ul. " -"Print anulat." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-code pregătit pentru firmware mai nou. Vă rugăm actualizați firmware-ul." #. 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?" -msgstr "Diametrul vârfului diferă de cel din G-code. Continuați?" +msgid "Nozzle diameter differs from the G-code." +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 "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." -msgstr "" -"Diametrul vârfului diferă de cel din G-code. Vă rugăm verificați valoarea în" -" setări. Print anulat." +msgid "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" +" setări." #. 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 @@ -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?" -msgstr "Filamentul nu este detectat. Continuați?" - -#. 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." +msgid "There is no filament loaded." +msgstr "Filamentul nu este detectat." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index be54da8269..6225a5207e 100644 --- a/lang/po/Firmware_sk.po +++ b/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" -msgstr ">Zrušiť" +msgid "Cancel" +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?" -msgstr "Súbor nekompletný. Pokračovať?" +msgid "File incomplete." +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?" -msgstr "G-code pripravený pre inú úroveň. Pokračovať?" +msgid "G-code sliced for a different level." +msgstr "G-code pripravený pre inú úroveň." #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 #: ../../Firmware/messages.cpp:157 ../../Firmware/util.cpp:418 -msgid "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"G-code pripravený pre inú verziu. Vygenerujte G-code znova. Tlač zrušená." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "G-code pripravený pre inú verziu. Vygenerujte G-code znova." #. 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 "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-code je pripravený pre iný typ tlačiarne. Vygenerujte G-code znova. Tlač " -"zrušená." +msgid "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." #. 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?" -msgstr "G-code je pripravený pre novší firmware. Pokračovať?" +msgid "G-code sliced for a newer firmware." +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 "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-code je pripravený pre novší firmware. Prosím aktualizujte firmware. Tlač " -"zrušená." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-code je pripravený pre novší firmware. Prosím aktualizujte firmware." #. 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?" -msgstr "Priemer trysky tlačiarne sa líši od G-code. Pokračovať?" +msgid "Nozzle diameter differs from the G-code." +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 "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." -msgstr "" -"Priemer trysky tlačiarne sa líši od G-code. Prosím skontrolujte nastavenie. " -"Tlač zrušená." +msgid "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." #. 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 @@ -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?" -msgstr "Nie je zavedený žiaden filament. Pokračovať?" - -#. 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á." +msgid "There is no filament loaded." +msgstr "Nie je zavedený žiaden filament." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 40d9a6cd47..1d96d18a98 100644 --- a/lang/po/Firmware_sv.po +++ b/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" -msgstr ">Avbryt" +msgid "Cancel" +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?" -msgstr "G-code genererad för en annan nivå. Fortsätta?" +msgid "G-code sliced for a different level." +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 "" -"G-code sliced for a different level. Please re-slice the model again. Print " -"cancelled." -msgstr "" -"G-code genererad för en annan nivå. Vänligen re-generera modellen igen. " -"Utskriften avbröts." +msgid "G-code sliced for a different level. Please re-slice the model again." +msgstr "G-code genererad för en annan nivå. Vänligen re-generera modellen igen." #. 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?" -msgstr "G-code genererad för en annan skrivartyp. Fortsätta?" +msgid "G-code sliced for a different printer type." +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 "" -"G-code sliced for a different printer type. Please re-slice the model again." -" Print cancelled." -msgstr "" -"G-code genererad för en annan skrivartyp. Vänligen re-generera modellen " -"igen. Utskriften avbröts." +msgid "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 " +"igen." #. 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?" -msgstr "G-code genererad för en nyare firmware. Fortsätta?" +msgid "G-code sliced for a newer firmware." +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 "" -"G-code sliced for a newer firmware. Please update the firmware. Print " -"cancelled." -msgstr "" -"G-code genererad för en nyare firmware. Vänligen uppdatera firmware. " -"Utskriften avbröts." +msgid "G-code sliced for a newer firmware. Please update the firmware." +msgstr "G-code genererad för en nyare firmware. Vänligen uppdatera firmware." #. 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?" -msgstr "Munstycksdiametern skiljer sig från G-codeen. Fortsätta?" +msgid "Nozzle diameter differs from the G-code." +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 "" -"Nozzle diameter differs from the G-code. Please check the value in settings." -" Print cancelled." -msgstr "" -"Skrivarmunstyckets diameter skiljer sig från G-codeen. Kontrollera värdet i " -"inställningarna. Utskriften avbröts." +msgid "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 " +"inställningarna." #. 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 @@ -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?" -msgstr "Det finns ingen filament laddad. Fortsätta?" - -#. 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." +msgid "There is no filament loaded." +msgstr "Det finns ingen filament laddad." #. MSG_Z_CALIBRATION_PROMPT c=20 r=3 #: ../../Firmware/messages.cpp:128 ../../Firmware/ultralcd.cpp:3752