From a4f939cc2758ce148fb2b7468078766fc946ddf8 Mon Sep 17 00:00:00 2001 From: Tommi Lamberg Date: Tue, 10 Feb 2015 10:48:33 +0200 Subject: [PATCH 1/4] Updated Finnish language file --- Marlin/language_fi.h | 58 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/Marlin/language_fi.h b/Marlin/language_fi.h index 234660025..54e56aec5 100644 --- a/Marlin/language_fi.h +++ b/Marlin/language_fi.h @@ -17,29 +17,29 @@ #define MSG_AUTO_HOME "Aja referenssiin" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Aseta origo" -#define MSG_PREHEAT_PLA "Esilammita PLA" -#define MSG_PREHEAT_PLA_N "Esilammita PLA " +#define MSG_PREHEAT_PLA "Esil\344mmit\344 PLA" +#define MSG_PREHEAT_PLA_N "Esil\344mmit\344 PLA " #define MSG_PREHEAT_PLA_ALL "Esila. PLA Kaikki" #define MSG_PREHEAT_PLA_BEDONLY "Esila. PLA Alusta" -#define MSG_PREHEAT_PLA_SETTINGS "Esilamm. PLA konf" -#define MSG_PREHEAT_ABS "Esilammita ABS" -#define MSG_PREHEAT_ABS_N "Esilammita ABS " +#define MSG_PREHEAT_PLA_SETTINGS "Esil\344mm. PLA konf" +#define MSG_PREHEAT_ABS "Esil\344mmit\344 ABS" +#define MSG_PREHEAT_ABS_N "Esil\344mmit\344 ABS " #define MSG_PREHEAT_ABS_ALL "Esila. ABS Kaikki" #define MSG_PREHEAT_ABS_BEDONLY "Esila. ABS Alusta" #define MSG_PREHEAT_ABS_SETTINGS "Esilamm. ABS konf" -#define MSG_COOLDOWN "Jaahdyta" -#define MSG_SWITCH_PS_ON "Virta paalle" +#define MSG_COOLDOWN "J\344\344hdyt\344" +#define MSG_SWITCH_PS_ON "Virta p\344\344lle" #define MSG_SWITCH_PS_OFF "Virta pois" #define MSG_EXTRUDE "Pursota" -#define MSG_RETRACT "Veda takaisin" +#define MSG_RETRACT "Ved\344 takaisin" #define MSG_MOVE_AXIS "Liikuta akseleita" -#define MSG_MOVE_X "Move X" -#define MSG_MOVE_Y "Move Y" -#define MSG_MOVE_Z "Move Z" +#define MSG_MOVE_X "Liikuta X" +#define MSG_MOVE_Y "Liikuta Y" +#define MSG_MOVE_Z "Liikuta Z" #define MSG_MOVE_E "Extruder" -#define MSG_MOVE_01MM "Move 0.1mm" -#define MSG_MOVE_1MM "Move 1mm" -#define MSG_MOVE_10MM "Move 10mm" +#define MSG_MOVE_01MM "Liikuta 0.1mm" +#define MSG_MOVE_1MM "Liikuta 1mm" +#define MSG_MOVE_10MM "Liikuta 10mm" #define MSG_SPEED "Nopeus" #define MSG_NOZZLE "Suutin" #define MSG_BED "Alusta" @@ -73,24 +73,24 @@ #define MSG_YSTEPS "Ysteps/mm" #define MSG_ZSTEPS "Zsteps/mm" #define MSG_ESTEPS "Esteps/mm" -#define MSG_TEMPERATURE "Lampotila" +#define MSG_TEMPERATURE "L\344mp" STR_Oe "tila" #define MSG_MOTION "Liike" #define MSG_VOLUMETRIC "Filament" -#define MSG_VOLUMETRIC_ENABLED "E in mm3" +#define MSG_VOLUMETRIC_ENABLED "E in mm3" #define MSG_FILAMENT_SIZE_EXTRUDER_0 "Fil. Dia. 1" #define MSG_FILAMENT_SIZE_EXTRUDER_1 "Fil. Dia. 2" #define MSG_FILAMENT_SIZE_EXTRUDER_2 "Fil. Dia. 3" -#define MSG_CONTRAST "LCD contrast" +#define MSG_CONTRAST "LCD kontrasti" #define MSG_STORE_EPROM "Tallenna muistiin" #define MSG_LOAD_EPROM "Lataa muistista" #define MSG_RESTORE_FAILSAFE "Palauta oletus" -#define MSG_REFRESH "Paivita" +#define MSG_REFRESH "P\344ivit\344" #define MSG_WATCH "Seuraa" #define MSG_PREPARE "Valmistele" -#define MSG_TUNE "Saada" -#define MSG_PAUSE_PRINT "Keskeyta tulostus" +#define MSG_TUNE "S\344\344d\344" +#define MSG_PAUSE_PRINT "Keskeyt\344 tulostus" #define MSG_RESUME_PRINT "Jatka tulostusta" -#define MSG_STOP_PRINT "Pysayta tulostus" +#define MSG_STOP_PRINT "Pys\344yt\344 tulostus" #define MSG_CARD_MENU "Korttivalikko" #define MSG_NO_CARD "Ei korttia" #define MSG_DWELL "Nukkumassa..." @@ -100,9 +100,9 @@ #define MSG_NO_MOVE "Ei liiketta." #define MSG_KILLED "KILLED. " #define MSG_STOPPED "STOPPED. " -#define MSG_CONTROL_RETRACT "Veda mm" -#define MSG_CONTROL_RETRACT_SWAP "Va. Veda mm" -#define MSG_CONTROL_RETRACTF "Veda V" +#define MSG_CONTROL_RETRACT "Ved\344 mm" +#define MSG_CONTROL_RETRACT_SWAP "Va. Ved\344 mm" +#define MSG_CONTROL_RETRACTF "Ved\344 V" #define MSG_CONTROL_RETRACT_ZLIFT "Z mm" #define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm" #define MSG_CONTROL_RETRACT_RECOVER_SWAP "Va. UnRet +mm" @@ -120,11 +120,11 @@ #define MSG_ENDSTOP_ABORT "Endstop abort" #ifdef DELTA_CALIBRATION_MENU - #define MSG_DELTA_CALIBRATE "Delta Calibration" - #define MSG_DELTA_CALIBRATE_X "Calibrate X" - #define MSG_DELTA_CALIBRATE_Y "Calibrate Y" - #define MSG_DELTA_CALIBRATE_Z "Calibrate Z" - #define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center" + #define MSG_DELTA_CALIBRATE "Delta Kalibrointi" + #define MSG_DELTA_CALIBRATE_X "Kalibroi X" + #define MSG_DELTA_CALIBRATE_Y "Kalibroi Y" + #define MSG_DELTA_CALIBRATE_Z "Kalibroi Z" + #define MSG_DELTA_CALIBRATE_CENTER "Kalibroi Center" #endif // DELTA_CALIBRATION_MENU #endif // LANGUAGE_FI_H From 290ab42d22e5ab5abef979b62a33e42737366549 Mon Sep 17 00:00:00 2001 From: Tommi Lamberg Date: Wed, 11 Feb 2015 08:37:07 +0200 Subject: [PATCH 2/4] Updated Finnish translations --- Marlin/language_fi.h | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Marlin/language_fi.h b/Marlin/language_fi.h index 54e56aec5..69d5d9c9e 100644 --- a/Marlin/language_fi.h +++ b/Marlin/language_fi.h @@ -11,27 +11,27 @@ #define WELCOME_MSG MACHINE_NAME " valmis." #define MSG_SD_INSERTED "Kortti asetettu" #define MSG_SD_REMOVED "Kortti poistettu" -#define MSG_MAIN "Palaa" +#define MSG_MAIN "Status" #define MSG_AUTOSTART "Automaatti" #define MSG_DISABLE_STEPPERS "Vapauta moottorit" #define MSG_AUTO_HOME "Aja referenssiin" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Aseta origo" -#define MSG_PREHEAT_PLA "Esil\344mmit\344 PLA" -#define MSG_PREHEAT_PLA_N "Esil\344mmit\344 PLA " -#define MSG_PREHEAT_PLA_ALL "Esila. PLA Kaikki" -#define MSG_PREHEAT_PLA_BEDONLY "Esila. PLA Alusta" -#define MSG_PREHEAT_PLA_SETTINGS "Esil\344mm. PLA konf" -#define MSG_PREHEAT_ABS "Esil\344mmit\344 ABS" -#define MSG_PREHEAT_ABS_N "Esil\344mmit\344 ABS " -#define MSG_PREHEAT_ABS_ALL "Esila. ABS Kaikki" -#define MSG_PREHEAT_ABS_BEDONLY "Esila. ABS Alusta" -#define MSG_PREHEAT_ABS_SETTINGS "Esilamm. ABS konf" -#define MSG_COOLDOWN "J\344\344hdyt\344" -#define MSG_SWITCH_PS_ON "Virta p\344\344lle" +#define MSG_PREHEAT_PLA "Esil" STR_ae "mmit" STR_ae " PLA" +#define MSG_PREHEAT_PLA_N "Esil" STR_ae "mmit" STR_ae " PLA " +#define MSG_PREHEAT_PLA_ALL "Esil" STR_ae ". PLA Kaikki" +#define MSG_PREHEAT_PLA_BEDONLY "Esil" STR_ae ". PLA Alusta" +#define MSG_PREHEAT_PLA_SETTINGS "Esil" STR_ae "mm. PLA konf" +#define MSG_PREHEAT_ABS "Esil" STR_ae "mmit" STR_ae " ABS" +#define MSG_PREHEAT_ABS_N "Esil" STR_ae "mmit" STR_ae " ABS " +#define MSG_PREHEAT_ABS_ALL "Esil" STR_ae ". ABS Kaikki" +#define MSG_PREHEAT_ABS_BEDONLY "Esil" STR_ae ". ABS Alusta" +#define MSG_PREHEAT_ABS_SETTINGS "Esil" STR_ae "mm. ABS konf" +#define MSG_COOLDOWN "J" STR_ae "" STR_ae "hdyt" STR_ae "" +#define MSG_SWITCH_PS_ON "Virta p" STR_ae "" STR_ae "lle" #define MSG_SWITCH_PS_OFF "Virta pois" #define MSG_EXTRUDE "Pursota" -#define MSG_RETRACT "Ved\344 takaisin" +#define MSG_RETRACT "Ved" STR_ae " takaisin" #define MSG_MOVE_AXIS "Liikuta akseleita" #define MSG_MOVE_X "Liikuta X" #define MSG_MOVE_Y "Liikuta Y" @@ -46,9 +46,9 @@ #define MSG_FAN_SPEED "Tuul. nopeus" #define MSG_FLOW "Virtaus" #define MSG_CONTROL "Kontrolli" -#define MSG_MIN " \002 Min" -#define MSG_MAX " \002 Max" -#define MSG_FACTOR " \002 Kerr" +#define MSG_MIN STR_THERMOMETER " Min" +#define MSG_MAX STR_THERMOMETER " Max" +#define MSG_FACTOR STR_THERMOMETER " Kerr" #define MSG_AUTOTEMP "Autotemp" #define MSG_ON "On " #define MSG_OFF "Off" @@ -73,7 +73,7 @@ #define MSG_YSTEPS "Ysteps/mm" #define MSG_ZSTEPS "Zsteps/mm" #define MSG_ESTEPS "Esteps/mm" -#define MSG_TEMPERATURE "L\344mp" STR_Oe "tila" +#define MSG_TEMPERATURE "L" STR_ae "mp" STR_oe "tila" #define MSG_MOTION "Liike" #define MSG_VOLUMETRIC "Filament" #define MSG_VOLUMETRIC_ENABLED "E in mm3" @@ -84,13 +84,13 @@ #define MSG_STORE_EPROM "Tallenna muistiin" #define MSG_LOAD_EPROM "Lataa muistista" #define MSG_RESTORE_FAILSAFE "Palauta oletus" -#define MSG_REFRESH "P\344ivit\344" +#define MSG_REFRESH "P" STR_ae "ivit" STR_ae "" #define MSG_WATCH "Seuraa" #define MSG_PREPARE "Valmistele" -#define MSG_TUNE "S\344\344d\344" -#define MSG_PAUSE_PRINT "Keskeyt\344 tulostus" +#define MSG_TUNE "S" STR_ae "" STR_ae "d" STR_ae "" +#define MSG_PAUSE_PRINT "Keskeyt" STR_ae " tulostus" #define MSG_RESUME_PRINT "Jatka tulostusta" -#define MSG_STOP_PRINT "Pys\344yt\344 tulostus" +#define MSG_STOP_PRINT "Pys" STR_ae "yt" STR_ae " tulostus" #define MSG_CARD_MENU "Korttivalikko" #define MSG_NO_CARD "Ei korttia" #define MSG_DWELL "Nukkumassa..." @@ -100,9 +100,9 @@ #define MSG_NO_MOVE "Ei liiketta." #define MSG_KILLED "KILLED. " #define MSG_STOPPED "STOPPED. " -#define MSG_CONTROL_RETRACT "Ved\344 mm" -#define MSG_CONTROL_RETRACT_SWAP "Va. Ved\344 mm" -#define MSG_CONTROL_RETRACTF "Ved\344 V" +#define MSG_CONTROL_RETRACT "Ved" STR_ae " mm" +#define MSG_CONTROL_RETRACT_SWAP "Va. Ved" STR_ae " mm" +#define MSG_CONTROL_RETRACTF "Ved" STR_ae " V" #define MSG_CONTROL_RETRACT_ZLIFT "Z mm" #define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm" #define MSG_CONTROL_RETRACT_RECOVER_SWAP "Va. UnRet +mm" @@ -127,4 +127,4 @@ #define MSG_DELTA_CALIBRATE_CENTER "Kalibroi Center" #endif // DELTA_CALIBRATION_MENU -#endif // LANGUAGE_FI_H +#endif // LANGUAGE_FI_H \ No newline at end of file From 622a531d9c4740a2b36d4964c87414f422c09555 Mon Sep 17 00:00:00 2001 From: Tommi Lamberg Date: Wed, 11 Feb 2015 08:50:48 +0200 Subject: [PATCH 3/4] Fixed error in translation --- Marlin/language_fi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/language_fi.h b/Marlin/language_fi.h index 69d5d9c9e..62fdc7638 100644 --- a/Marlin/language_fi.h +++ b/Marlin/language_fi.h @@ -11,7 +11,7 @@ #define WELCOME_MSG MACHINE_NAME " valmis." #define MSG_SD_INSERTED "Kortti asetettu" #define MSG_SD_REMOVED "Kortti poistettu" -#define MSG_MAIN "Status" +#define MSG_MAIN "Palaa" #define MSG_AUTOSTART "Automaatti" #define MSG_DISABLE_STEPPERS "Vapauta moottorit" #define MSG_AUTO_HOME "Aja referenssiin" From dfd4e74a5cf1b4de795686655933e89dd88a46c6 Mon Sep 17 00:00:00 2001 From: DocDawning Date: Tue, 17 Feb 2015 12:37:05 -0700 Subject: [PATCH 4/4] Trivial spelling correction --- Marlin/stepper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp index 1b831cc8f..664971688 100644 --- a/Marlin/stepper.cpp +++ b/Marlin/stepper.cpp @@ -43,7 +43,7 @@ block_t *current_block; // A pointer to the block currently being traced //=========================================================================== //=============================private variables ============================ //=========================================================================== -//static makes it inpossible to be called from outside of this file by extern.! +//static makes it impossible to be called from outside of this file by extern.! // Variables used by The Stepper Driver Interrupt static unsigned char out_bits; // The next stepping-bits to be output