From 5c119501c0283a36212591595083a91796b2ce9a Mon Sep 17 00:00:00 2001 From: bubnikv Date: Fri, 5 Aug 2016 19:03:55 +0200 Subject: [PATCH] Shortened some long Italian texts. --- Firmware/language_all.cpp | 24 ++++++++++++------------ Firmware/language_en.h | 2 +- Firmware/language_it.h | 35 +++++++++++++++++------------------ Firmware/ultralcd.cpp | 10 ++++++---- 4 files changed, 36 insertions(+), 35 deletions(-) diff --git a/Firmware/language_all.cpp b/Firmware/language_all.cpp index e6387c0c..f242b932 100644 --- a/Firmware/language_all.cpp +++ b/Firmware/language_all.cpp @@ -153,7 +153,7 @@ const char * const MSG_BED_CORRECTION_MENU_LANG_TABLE[LANG_NUM] PROGMEM = { const char MSG_BED_CORRECTION_REAR_EN[] PROGMEM = "Rear side um"; const char MSG_BED_CORRECTION_REAR_CZ[] PROGMEM = "Vzadu [um]"; -const char MSG_BED_CORRECTION_REAR_IT[] PROGMEM = "Lato posteriore um"; +const char MSG_BED_CORRECTION_REAR_IT[] PROGMEM = "Lato posteriore"; const char MSG_BED_CORRECTION_REAR_ES[] PROGMEM = "Atras [um]"; const char MSG_BED_CORRECTION_REAR_PL[] PROGMEM = "Do tylu [um]"; const char * const MSG_BED_CORRECTION_REAR_LANG_TABLE[LANG_NUM] PROGMEM = { @@ -210,7 +210,7 @@ const char * const MSG_BED_HEATING_LANG_TABLE[LANG_NUM] PROGMEM = { const char MSG_BED_LEVELING_FAILED_POINT_HIGH_EN[] PROGMEM = "Bed leveling failed. Sensor triggered too high. Waiting for reset."; const char MSG_BED_LEVELING_FAILED_POINT_HIGH_CZ[] PROGMEM = "Kalibrace Z selhala. Sensor sepnul prilis vysoko. Cekam na reset."; -const char MSG_BED_LEVELING_FAILED_POINT_HIGH_IT[] PROGMEM = "Livellamento letto fallito. Sensore scoccato troppo presto. In attesa di reset."; +const char MSG_BED_LEVELING_FAILED_POINT_HIGH_IT[] PROGMEM = "Livellamento letto fallito. Sensore scocc. troppo presto In attesa di reset."; const char MSG_BED_LEVELING_FAILED_POINT_HIGH_ES[] PROGMEM = "Nivelacion fallada. Sensor funciona demasiado temprano. Esperando reset."; const char MSG_BED_LEVELING_FAILED_POINT_HIGH_PL[] PROGMEM = "Kalibracja Z nieudana. Sensor dotk. za wysoko. Czekam na reset."; const char * const MSG_BED_LEVELING_FAILED_POINT_HIGH_LANG_TABLE[LANG_NUM] PROGMEM = { @@ -223,7 +223,7 @@ const char * const MSG_BED_LEVELING_FAILED_POINT_HIGH_LANG_TABLE[LANG_NUM] PROGM const char MSG_BED_LEVELING_FAILED_POINT_LOW_EN[] PROGMEM = "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."; const char MSG_BED_LEVELING_FAILED_POINT_LOW_CZ[] PROGMEM = "Kalibrace Z selhala. Sensor nesepnul. Znecistena tryska? Cekam na reset."; -const char MSG_BED_LEVELING_FAILED_POINT_LOW_IT[] PROGMEM = "Livellamento letto fallito. Sensore non scoccato. Detriti sull'ugello? In attesa di reset."; +const char MSG_BED_LEVELING_FAILED_POINT_LOW_IT[] PROGMEM = "Livellamento letto fallito. Sensore non scocc.DetritiUgello? In attesa di reset."; const char MSG_BED_LEVELING_FAILED_POINT_LOW_ES[] PROGMEM = "Nivelacion fallada. Sensor no funciona. Escombros en Boqui.? Esperando reset."; const char MSG_BED_LEVELING_FAILED_POINT_LOW_PL[] PROGMEM = "Kalibracja nieudana. Sensor nie dotknal. Zanieczysz. dysza? Czekam na reset."; const char * const MSG_BED_LEVELING_FAILED_POINT_LOW_LANG_TABLE[LANG_NUM] PROGMEM = { @@ -236,7 +236,7 @@ const char * const MSG_BED_LEVELING_FAILED_POINT_LOW_LANG_TABLE[LANG_NUM] PROGME const char MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED_EN[] PROGMEM = "Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset."; const char MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED_CZ[] PROGMEM = "Kalibrace Z selhala. Sensor je odpojeny nebo preruseny kabel. Cekam na reset."; -const char MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED_IT[] PROGMEM = "Livellamento letto fallito. Sensore disconnesso o con cavo danneggiato. In attesa di reset."; +const char MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED_IT[] PROGMEM = "Livellamento letto fallito. Sensore disc. oCavoDanneggi. In attesa di reset."; const char MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED_ES[] PROGMEM = "Nivelacion fallada. Sensor desconectado o cables danados. Esperando reset."; const char MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED_PL[] PROGMEM = "Kalibracja nieudana. Sensor odlaczony lub uszkodz. kabel. Czekam na reset."; const char * const MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED_LANG_TABLE[LANG_NUM] PROGMEM = { @@ -474,7 +474,7 @@ const char * const MSG_CONFIGURATION_VER_LANG_TABLE[1] PROGMEM = { const char MSG_CONFIRM_CARRIAGE_AT_THE_TOP_EN[] PROGMEM = "Are left and right Z~carriages all up?"; const char MSG_CONFIRM_CARRIAGE_AT_THE_TOP_CZ[] PROGMEM = "Dojely oba Z voziky k~hornimu dorazu?"; -const char MSG_CONFIRM_CARRIAGE_AT_THE_TOP_IT[] PROGMEM = "I carrelli Z sinistro/destro sono alla massima atezza?"; +const char MSG_CONFIRM_CARRIAGE_AT_THE_TOP_IT[] PROGMEM = "I carrelli Z sin/des sono massima atezza?"; const char MSG_CONFIRM_CARRIAGE_AT_THE_TOP_ES[] PROGMEM = "Carros Z izq./der. estan arriba maximo?"; const char MSG_CONFIRM_CARRIAGE_AT_THE_TOP_PL[] PROGMEM = "Oba wozki dojechaly do gornej ramy?"; const char * const MSG_CONFIRM_CARRIAGE_AT_THE_TOP_LANG_TABLE[LANG_NUM] PROGMEM = { @@ -536,7 +536,7 @@ const char * const MSG_COUNT_X_LANG_TABLE[1] PROGMEM = { const char MSG_DISABLE_STEPPERS_EN[] PROGMEM = "Disable steppers"; const char MSG_DISABLE_STEPPERS_CZ[] PROGMEM = "Vypnout motory"; -const char MSG_DISABLE_STEPPERS_IT[] PROGMEM = "Disablilita motori"; +const char MSG_DISABLE_STEPPERS_IT[] PROGMEM = "Disablilit motori"; const char MSG_DISABLE_STEPPERS_ES[] PROGMEM = "Apagar motores"; const char MSG_DISABLE_STEPPERS_PL[] PROGMEM = "Wylaczyc silniki"; const char * const MSG_DISABLE_STEPPERS_LANG_TABLE[LANG_NUM] PROGMEM = { @@ -664,7 +664,7 @@ const char * const MSG_FAN_SPEED_LANG_TABLE[LANG_NUM] PROGMEM = { const char MSG_FILAMENTCHANGE_EN[] PROGMEM = "Change filament"; const char MSG_FILAMENTCHANGE_CZ[] PROGMEM = "Vymenit filament"; -const char MSG_FILAMENTCHANGE_IT[] PROGMEM = "Cambiare filamento"; +const char MSG_FILAMENTCHANGE_IT[] PROGMEM = "Camb. filamento"; const char MSG_FILAMENTCHANGE_ES[] PROGMEM = "Cambiar filamento"; const char MSG_FILAMENTCHANGE_PL[] PROGMEM = "Wymienic filament"; const char * const MSG_FILAMENTCHANGE_LANG_TABLE[LANG_NUM] PROGMEM = { @@ -700,7 +700,7 @@ const char * const MSG_FIND_BED_OFFSET_AND_SKEW_LINE1_LANG_TABLE[LANG_NUM] PROGM const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2_EN[] PROGMEM = "calibration point"; const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2_CZ[] PROGMEM = "bod podlozky"; -const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2_IT[] PROGMEM = "punto di calibrazione"; +const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2_IT[] PROGMEM = "punto di calibraz."; const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2_ES[] PROGMEM = "punto de calibracion"; const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2_PL[] PROGMEM = "punktu podkladki"; const char * const MSG_FIND_BED_OFFSET_AND_SKEW_LINE2_LANG_TABLE[LANG_NUM] PROGMEM = { @@ -829,7 +829,7 @@ const char * const MSG_HOTEND_OFFSET_LANG_TABLE[1] PROGMEM = { const char MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1_EN[] PROGMEM = "Improving bed"; const char MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1_CZ[] PROGMEM = "Zlepsuji presnost"; -const char MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1_IT[] PROGMEM = "Perfezionando il letto"; +const char MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1_IT[] PROGMEM = "Perfezion. il letto"; const char MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1_ES[] PROGMEM = "Mejorando cama"; const char MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1_PL[] PROGMEM = "Ulepszam dokladnosc"; const char * const MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1_LANG_TABLE[LANG_NUM] PROGMEM = { @@ -842,7 +842,7 @@ const char * const MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1_LANG_TABLE[LANG_NUM] PR const char MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2_EN[] PROGMEM = "calibration point"; const char MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2_CZ[] PROGMEM = "kalibracniho bodu"; -const char MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2_IT[] PROGMEM = "punto di calibrazione"; +const char MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2_IT[] PROGMEM = "punto di calibraz."; const char MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2_ES[] PROGMEM = "punto de calibracion"; const char MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2_PL[] PROGMEM = "punktu kalibracyj."; const char * const MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2_LANG_TABLE[LANG_NUM] PROGMEM = { @@ -1091,7 +1091,7 @@ const char * const MSG_MOVE_AXIS_LANG_TABLE[LANG_NUM] PROGMEM = { const char MSG_MOVE_CARRIAGE_TO_THE_TOP_EN[] PROGMEM = "Calibrating XYZ. Move Z carriage up to the end stoppers. Click when done."; const char MSG_MOVE_CARRIAGE_TO_THE_TOP_CZ[] PROGMEM = "Kalibrace XYZ. Posunte prosim Z osu az k~hornimu dorazu. Potvrdte tlacitkem."; -const char MSG_MOVE_CARRIAGE_TO_THE_TOP_IT[] PROGMEM = "Calibrando X/Y. Muovere carrello Z fino alla massima altezza, poi fare clik."; +const char MSG_MOVE_CARRIAGE_TO_THE_TOP_IT[] PROGMEM = "Calibrando X/Y. Muovere Z fino massima altezza, poi fare clik."; const char MSG_MOVE_CARRIAGE_TO_THE_TOP_ES[] PROGMEM = "Calibrando XYZ. Subir carro Z hasta maximo. Click cuando acabes."; const char MSG_MOVE_CARRIAGE_TO_THE_TOP_PL[] PROGMEM = "Kalibracja XYZ. Prosze przesunac os Z do gornej ramy. Potw. guzikiem."; const char * const MSG_MOVE_CARRIAGE_TO_THE_TOP_LANG_TABLE[LANG_NUM] PROGMEM = { @@ -1167,7 +1167,7 @@ const char * const MSG_NEW_FIRMWARE_AVAILABLE_LANG_TABLE[LANG_NUM] PROGMEM = { const char MSG_NEW_FIRMWARE_PLEASE_UPGRADE_EN[] PROGMEM = "Please upgrade."; const char MSG_NEW_FIRMWARE_PLEASE_UPGRADE_CZ[] PROGMEM = "Prosim aktualizujte."; -const char MSG_NEW_FIRMWARE_PLEASE_UPGRADE_IT[] PROGMEM = "Si prega di effettuare aggiornamento."; +const char MSG_NEW_FIRMWARE_PLEASE_UPGRADE_IT[] PROGMEM = "Prega aggiorna."; const char MSG_NEW_FIRMWARE_PLEASE_UPGRADE_ES[] PROGMEM = "Actualizar por favor"; const char MSG_NEW_FIRMWARE_PLEASE_UPGRADE_PL[] PROGMEM = "Prosze zaktualizowac"; const char * const MSG_NEW_FIRMWARE_PLEASE_UPGRADE_LANG_TABLE[LANG_NUM] PROGMEM = { diff --git a/Firmware/language_en.h b/Firmware/language_en.h index bcfe4c50..94c86b91 100644 --- a/Firmware/language_en.h +++ b/Firmware/language_en.h @@ -113,7 +113,7 @@ #define MSG_ERR_NO_THERMISTORS "No thermistors - no temperature" #define MSG_M109_INVALID_EXTRUDER "M109 Invalid extruder " #define MSG_HEATING "Heating" -#define MSG_HEATING_COMPLETE "Heating done." +#define(length=20) MSG_HEATING_COMPLETE "Heating done." #define MSG_BED_HEATING "Bed Heating" #define MSG_BED_DONE "Bed done" #define MSG_M115_REPORT "FIRMWARE_NAME:Marlin V1.0.2; Sprinter/grbl mashup for gen6 FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" CUSTOM_MENDEL_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n" diff --git a/Firmware/language_it.h b/Firmware/language_it.h index f1c67605..4fbadf8f 100644 --- a/Firmware/language_it.h +++ b/Firmware/language_it.h @@ -2,7 +2,7 @@ #define MSG_SD_INSERTED "SD inserita" #define MSG_SD_REMOVED "SD rimossa" #define MSG_MAIN "Menu principale" -#define MSG_DISABLE_STEPPERS "Disablilita motori" +#define MSG_DISABLE_STEPPERS "Disablilit motori" #define MSG_AUTO_HOME "Trova origine" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Set origin" @@ -46,7 +46,7 @@ #define MSG_NO_MOVE "Nessun movimento." #define MSG_KILLED "IN TILT." #define MSG_STOPPED "ARRESTATO." -#define MSG_FILAMENTCHANGE "Cambiare filamento" +#define MSG_FILAMENTCHANGE "Camb. filamento" #define MSG_INIT_SDCARD "Init. SD card" #define MSG_CNG_SDCARD "Change SD card" #define MSG_ZPROBE_OUT "Z probe out. bed" @@ -177,16 +177,17 @@ #define MSG_CALIBRATE_BED "Calibra XYZ" #define MSG_CALIBRATE_BED_RESET "Reset XYZ calibr." -#define MSG_MOVE_CARRIAGE_TO_THE_TOP "Calibrando X/Y. Muovere carrello Z fino alla massima altezza, poi fare clik." -#define MSG_CONFIRM_NOZZLE_CLEAN "Pulire l'ugello per la calibrazione, poi fare click." -#define MSG_CONFIRM_CARRIAGE_AT_THE_TOP "I carrelli Z sinistro/destro sono alla massima atezza?" +#define MSG_MOVE_CARRIAGE_TO_THE_TOP "Calibrando X/Y. Muovere Z fino massima altezza, poi fare clik." + +#define MSG_CONFIRM_NOZZLE_CLEAN "Pulire l'ugello per la calibrazione, poi fare click." +#define MSG_CONFIRM_CARRIAGE_AT_THE_TOP "I carrelli Z sin/des sono massima atezza?" #define MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 "Ricerca del letto" -#define MSG_FIND_BED_OFFSET_AND_SKEW_LINE2 "punto di calibrazione" +#define MSG_FIND_BED_OFFSET_AND_SKEW_LINE2 "punto di calibraz." #define MSG_FIND_BED_OFFSET_AND_SKEW_LINE3 " su 4" -#define MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 "Perfezionando il letto" -#define MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 "punto di calibrazione" -#define MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE3 " su 9" +#define MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 "Perfezion. il letto" +#define MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 "punto di calibraz." +#define MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE3 " su 9" #define MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND "Calibrazione XYZ fallita. Il punto di calibrazione sul letto non e' stato trovato." #define MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED "Calibrazione XYZ fallita. Si prega di consultare il manuale." @@ -200,23 +201,21 @@ #define MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR "Calibrazione XYZ compromessa. Punto anteriore destro non raggiungibile." #define MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR "Calibrazione XYZ compromessa. Punti anteriori non raggiungibili." -#define MSG_BED_LEVELING_FAILED_POINT_LOW "Livellamento letto fallito. Sensore non scoccato. Detriti sull'ugello? In attesa di reset." -#define MSG_BED_LEVELING_FAILED_POINT_HIGH "Livellamento letto fallito. Sensore scoccato troppo presto. In attesa di reset." -#define MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED "Livellamento letto fallito. Sensore disconnesso o con cavo danneggiato. In attesa di reset." +#define MSG_BED_LEVELING_FAILED_POINT_LOW "Livellamento letto fallito. Sensore non scocc.DetritiUgello? In attesa di reset." +#define MSG_BED_LEVELING_FAILED_POINT_HIGH "Livellamento letto fallito. Sensore scocc. troppo presto In attesa di reset." +#define MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED "Livellamento letto fallito. Sensore disc. oCavoDanneggi. In attesa di reset." -#define MSG_NEW_FIRMWARE_AVAILABLE "Nuova versione del firmware disponibile" -#define MSG_NEW_FIRMWARE_PLEASE_UPGRADE "Si prega di effettuare aggiornamento." +#define MSG_NEW_FIRMWARE_AVAILABLE "Nuova versione del firmware disponibile" +#define MSG_NEW_FIRMWARE_PLEASE_UPGRADE "Prega aggiorna." -#define MSG_BABYSTEP_Z_NOT_SET "Stampante non ancora calibrata. Eseguire il G-code di calibrazione per regolare l'altezza Z." +#define MSG_BABYSTEP_Z_NOT_SET "Stampante non ancora calibrata. Eseguire il G-code di calibrazione per regolare l'altezza Z." #define MSG_BED_CORRECTION_MENU "Correz. liv. letto" #define MSG_BED_CORRECTION_LEFT "Lato sinistro um" #define MSG_BED_CORRECTION_RIGHT "Lato destro um" #define MSG_BED_CORRECTION_FRONT "Lato ateriore um" -#define MSG_BED_CORRECTION_REAR "Lato posteriore um" +#define MSG_BED_CORRECTION_REAR "Lato posteriore" #define MSG_BED_CORRECTION_RESET "Reset" #define MSG_MESH_BED_LEVELING "Mesh livel. letto" #define MSG_MENU_CALIBRATION "Calibrazione" -#define MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF "SD card [normal]" -#define MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON "SD card [FlshAir]" diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1d08b746..b8e8b1e1 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1488,14 +1488,16 @@ canceled: return false; } -static inline bool pgm_is_whitespace(const char *c) +static inline bool pgm_is_whitespace(const char *c_addr) { - return pgm_read_byte(c) == ' ' || pgm_read_byte(c) == '\t' || pgm_read_byte(c) == '\r' || pgm_read_byte(c) == '\n'; + const char c = pgm_read_byte(c_addr); + return c == ' ' || c == '\t' || c == '\r' || c == '\n'; } -static inline bool pgm_is_interpunction(const char *c) +static inline bool pgm_is_interpunction(const char *c_addr) { - return pgm_read_byte(c) == '.' || pgm_read_byte(c) == ',' || pgm_read_byte(c) == ';' || pgm_read_byte(c) == '?' || pgm_read_byte(c) == '!'; + const char c = pgm_read_byte(c_addr); + return c == '.' || c == ',' || c == ':'|| c == ';' || c == '?' || c == '!' || c == '/'; } const char* lcd_display_message_fullscreen_P(const char *msg)