diff --git a/.gitignore b/.gitignore index fe36653..a26923b 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ Configuration_*.h Repetier.depend Repetier.layout activate*.bat +~$Translate.xlsx diff --git a/Translate.xlsx b/Translate.xlsx index 3f06b80..a119c9e 100644 Binary files a/Translate.xlsx and b/Translate.xlsx differ diff --git a/src/ArduinoDUE/Repetier/ui.h b/src/ArduinoDUE/Repetier/ui.h index 3666a31..ca22d2a 100644 --- a/src/ArduinoDUE/Repetier/ui.h +++ b/src/ArduinoDUE/Repetier/ui.h @@ -2000,7 +2000,7 @@ void uiCheckSlowKeys(uint16_t &action) {} #endif //Davinci Specific -#define UI_VERSION_STRING "Repetier " REPETIER_VERSION "Mod" +#define UI_VERSION_STRING "Repetier " REPETIER_VERSION "M" #ifdef UI_HAS_I2C_KEYS #define COMPILE_I2C_DRIVER diff --git a/src/ArduinoDUE/Repetier/uilang.h b/src/ArduinoDUE/Repetier/uilang.h index b39bd56..2b019c8 100644 --- a/src/ArduinoDUE/Repetier/uilang.h +++ b/src/ArduinoDUE/Repetier/uilang.h @@ -3624,8 +3624,8 @@ // *************** French translation **************** -#define UI_TEXT_ON_FR "On" -#define UI_TEXT_OFF_FR "Off" +#define UI_TEXT_ON_FR "Oui" +#define UI_TEXT_OFF_FR "Non" #define UI_TEXT_NA_FR "N/A" // Output for not available #define UI_TEXT_YES_FR "Oui" #define UI_TEXT_NO_FR "Non" @@ -3649,9 +3649,9 @@ #define UI_TEXT_HOME_Z_FR "Init. orig. Z" #define UI_TEXT_PREHEAT_PLA_FR "Prechauf. PLA %B1" #define UI_TEXT_PREHEAT_ABS_FR "Prechauf. ABS %B2" -#define UI_TEXT_LIGHTS_ONOFF_FR "Eclairage :%lo" +#define UI_TEXT_LIGHTS_ONOFF_FR "Eclairage : %lo" #define UI_TEXT_COOLDOWN_FR "Refroidir" -#define UI_TEXT_SET_TO_ORIGIN_FR "M.A.J. origine" +#define UI_TEXT_SET_TO_ORIGIN_FR "R.A.Z. origine" #define UI_TEXT_DISABLE_STEPPER_FR "Arret moteurs" #define UI_TEXT_X_POSITION_FR "Position X" #define UI_TEXT_X_POS_FAST_FR "Pos. Rapide X" @@ -3660,7 +3660,7 @@ #define UI_TEXT_Z_POSITION_FR "Position Z" #define UI_TEXT_Z_POS_FAST_FR "Pos. Rapide Z" #define UI_TEXT_E_POSITION_FR "Position Extr." -#define UI_TEXT_BED_TEMP_FR "Lit :%eb/%Eb\002C" +#define UI_TEXT_BED_TEMP_FR "Plat.:%eb/%Eb\002C" #if NUM_EXTRUDER == 1 #define UI_TEXT_EXTR0_TEMP_FR "Ext :%e0/%E0" cDEG "C" #else @@ -3669,16 +3669,16 @@ #define UI_TEXT_EXTR1_TEMP_FR "Ext2 :%e1/%E1" cDEG "C" #define UI_TEXT_EXTR2_TEMP_FR "Ext3 :%e2/%E2" cDEG "C" #if NUM_EXTRUDER == 1 -#define UI_TEXT_EXTR0_OFF_FR "Arret Ext %B4" +#define UI_TEXT_EXTR0_OFF_FR "Arret Ext %B4" #else -#define UI_TEXT_EXTR0_OFF_FR "Arret Ext1 %B4" +#define UI_TEXT_EXTR0_OFF_FR "Arret Ext1 %B4" #endif -#define UI_TEXT_EXTR1_OFF_FR "Arret Ext2%B5" -#define UI_TEXT_EXTR2_OFF_FR "Arret Ext3%B6" -#define UI_TEXT_EXTR0_SELECT_FR "%X0 Select. Extr. 1" -#define UI_TEXT_EXTR1_SELECT_FR "%X1 Select. Extr. 2" -#define UI_TEXT_EXTR2_SELECT_FR "%X1 Select. Extr. 3" -#define UI_TEXT_EXTR_ORIGIN_FR "M.A.J. origine" +#define UI_TEXT_EXTR1_OFF_FR "Arret Ext2 %B5" +#define UI_TEXT_EXTR2_OFF_FR "Arret Ext3 %B6" +#define UI_TEXT_EXTR0_SELECT_FR "Select. Ext1 %X0" +#define UI_TEXT_EXTR1_SELECT_FR "Select. Ext2 %X1" +#define UI_TEXT_EXTR2_SELECT_FR "Select. Ext3 %X2" +#define UI_TEXT_EXTR_ORIGIN_FR "R.A.Z. origine" #define UI_TEXT_PRINT_X_FR "Imprim. X:%ax" #define UI_TEXT_PRINT_Y_FR "Imprim. Y:%ay" #define UI_TEXT_PRINT_Z_FR "Imprim. Z:%az" @@ -3687,8 +3687,8 @@ #define UI_TEXT_MOVE_Y_FR "Deplac. Y:%aY" #define UI_TEXT_MOVE_Z_FR "Deplac. Z:%aZ" #define UI_TEXT_MOVE_Z_DELTA_FR "Deplac.:%aZ" -#define UI_TEXT_JERK_FR "Jerk:%aj" -#define UI_TEXT_ZJERK_FR "Z-Jerk:%aJ" +#define UI_TEXT_JERK_FR "Jerk: %aj" +#define UI_TEXT_ZJERK_FR "Z-Jerk: %aJ" #define UI_TEXT_ACCELERATION_FR "Acceleration" #define UI_TEXT_STORE_TO_EEPROM_FR "Enreg. \176 EEPROM" #define UI_TEXT_LOAD_EEPROM_FR "Charg. \177 EEPROM" @@ -3791,8 +3791,8 @@ #define UI_TEXT_STRING_HM_BANGBANG_FR "BangBang" #define UI_TEXT_STRING_HM_PID_FR "PID" #define UI_TEXT_STRING_ACTION_FR "Action:%la" -#define UI_TEXT_HEATING_EXTRUDER_FR "Chauff. Extrud.%Ne" -#define UI_TEXT_HEATING_BED_FR "Chauffage plat." +#define UI_TEXT_HEATING_EXTRUDER_FR "Chauffe extrud.%Ne" +#define UI_TEXT_HEATING_BED_FR "Chauffe plat." #define UI_TEXT_KILLED_FR "Arretee" #define UI_TEXT_STEPPER_DISABLED_FR "Moteurs arretes" #define UI_TEXT_EEPROM_STOREDA_FR "Configuration" @@ -3806,10 +3806,10 @@ #define UI_TEXT_PAGE_EXTRUDER2_FR "E2:%e1/%E1\002C\176%o1" #define UI_TEXT_PAGE_EXTRUDER3_FR "E3:%e2/%E2\002C\176%o2" #define UI_TEXT_PAGE_BED_FR " B:%eb/%Eb\002C\176%ob" -#define UI_TEXT_SPEED_MULTIPLY_FR "Vit. Mul.:%om%%%" -#define UI_TEXT_FLOW_MULTIPLY_FR "Flow Mul.:%of%%%" +#define UI_TEXT_SPEED_MULTIPLY_FR "Vitesse :%om%%%" +#define UI_TEXT_FLOW_MULTIPLY_FR "Debit :%of%%%" #define UI_TEXT_SHOW_MEASUREMENT_FR "Montrer mesure" -#define UI_TEXT_RESET_MEASUREMENT_FR "Reset mesure" +#define UI_TEXT_RESET_MEASUREMENT_FR "R.A.Z mesure" #define UI_TEXT_SET_MEASURED_ORIGIN_FR "Regler Z=0" #define UI_TEXT_ZCALIB_FR "Z Calib." #define UI_TEXT_SET_P1_FR "Regler P1" @@ -3832,7 +3832,7 @@ #define UI_TEXT_STRING_HM_DEADTIME_FR "PWM" #define UI_TEXT_STRING_HM_SLOWBANG_FR "TOR" #define UI_TEXT_STOP_PRINT_FR "Arret Impress." -#define UI_TEXT_Z_BABYSTEPPING_FR "Z Pas a Pas:%oYmm" +#define UI_TEXT_Z_BABYSTEPPING_FR "Z P.aP. :%oYmm" #define UI_TEXT_CHANGE_FILAMENT_FR "Changement Filament" #define UI_TEXT_WIZ_CH_FILAMENT1_FR "Changement Filament" #define UI_TEXT_WIZ_CH_FILAMENT2_FR "Tournez Deplacer" @@ -3847,10 +3847,10 @@ #define UI_TEXT_WIZ_WAITTEMP2_FR "desirees ..." #define UI_TEXT_EXTRUDER_JAM_FR "Ext. bloque" #define UI_TEXT_STANDBY_FR "Attente" -#define UI_TEXT_BED_COATING_FR "Revetement de Lit" -#define UI_TEXT_BED_COATING_SET1_FR "Revetement de Lit:" +#define UI_TEXT_BED_COATING_FR "Revetement" +#define UI_TEXT_BED_COATING_SET1_FR "Revetement :" #define UI_TEXT_BED_COATING_SET2_FR "" -#define UI_TEXT_NOCOATING_FR "Aucun Revetement" +#define UI_TEXT_NOCOATING_FR "Aucun" #define UI_TEXT_BUILDTAK_FR "BuildTak" #define UI_TEXT_KAPTON_FR "Kapton" #define UI_TEXT_BLUETAPE_FR "Blue Tape" @@ -3876,15 +3876,15 @@ #elif FEATURE_DITTO_PRINTING #define UI_TEXT_MAINPAGE6_3_FR "Copies: %ed Z:%x2" #else - #define UI_TEXT_MAINPAGE6_3_FR "Flow:\xfd %of%%% Z:%x2" + #define UI_TEXT_MAINPAGE6_3_FR "Debit:\xfd %of%%% Z:%x2" #endif -#define UI_TEXT_MAINPAGE6_4_FR "Mul: %om%%% \xfd E: %x4m" -#define UI_TEXT_MAINPAGE6_5_FR "Buf: %oB" +#define UI_TEXT_MAINPAGE6_4_FR "Vitesse: %om%%% \xfd E: %x4m" +#define UI_TEXT_MAINPAGE6_5_FR "Tampon: %oB" #define UI_TEXT_MAINPAGE6_6_FR "%os" #define UI_TEXT_MAINPAGE_TEMP_BED_FR cTEMP "%ec/%Ec" cDEG "B%eB/%Eb" cDEG #define UI_TEXT_MAINPAGE_BED_FR "B%eB/%Eb" cDEG -#define UI_TEXT_MAINPAGE_Z_BUF_FR "Z:%x2 Buf : %oB" -#define UI_TEXT_MAINPAGE_MUL_EUSAGE_FR "Mul: %om E:%x4" +#define UI_TEXT_MAINPAGE_Z_BUF_FR "Z:%x2 Debit: %oB" +#define UI_TEXT_MAINPAGE_MUL_EUSAGE_FR "Vitesse: %om E:%x4" #define UI_TEXT_MAINPAGE_XY_FR "X:%x0 Y:%x1" #define UI_TEXT_PRINT_TIME_VALUE_FR "%Ut" #define UI_TEXT_PRINT_FILAMENT_VALUE_FR "%Uf m" @@ -3897,9 +3897,9 @@ #define UI_TEXT_EXTR3_TEMP_FR "Temp. 4 :%e3/%E3" cDEG "C" #define UI_TEXT_EXTR4_TEMP_FR "Temp. 5 :%e4/%E4" cDEG "C" #define UI_TEXT_EXTR5_TEMP_FR "Temp. 6 :%e5/%E5" cDEG "C" -#define UI_TEXT_EXTR3_OFF_FR "Extrudeur 4 Off" -#define UI_TEXT_EXTR4_OFF_FR "Extrudeur 5 Off" -#define UI_TEXT_EXTR5_OFF_FR "Extrudeur 6 Off" +#define UI_TEXT_EXTR3_OFF_FR "Extr. 4 eteint" +#define UI_TEXT_EXTR4_OFF_FR "Ext. 5 eteint" +#define UI_TEXT_EXTR5_OFF_FR "Extr. 6 eteint" #define UI_TEXT_EXTR3_SELECT_FR "%X3 Select. Extr. 4" #define UI_TEXT_EXTR4_SELECT_FR "%X4 Select. Extr. 5" #define UI_TEXT_EXTR5_SELECT_FR "%X5 Select. Extr. 6" @@ -3907,11 +3907,11 @@ #define UI_TEXT_DITTO_1_FR "%D1 1 Copie" #define UI_TEXT_DITTO_2_FR "%D2 2 Copies" #define UI_TEXT_DITTO_3_FR "%D3 3 Copies" -#define UI_TEXT_ZPROBE_HEIGHT_FR "Hauteur Z-Sonde:%zh" -#define UI_TEXT_OFFSETS_FR "Set print offsets" -#define UI_TEXT_X_OFFSET_FR "Set X offset:%T0mm" -#define UI_TEXT_Y_OFFSET_FR "Set Y offset:%T1mm" -#define UI_TEXT_Z_OFFSET_FR "Set Z offset:%T2mm" +#define UI_TEXT_ZPROBE_HEIGHT_FR "Sonde Z:%zh" +#define UI_TEXT_OFFSETS_FR "Decalage Imp." +#define UI_TEXT_X_OFFSET_FR "Dec. X:%T0mm" +#define UI_TEXT_Y_OFFSET_FR "Dec. Y:%T1mm" +#define UI_TEXT_Z_OFFSET_FR "Dec. Z:%T2mm" #define UI_TEXT_LOAD_FILAMENT_FR "Inser. Filament" #define UI_TEXT_UNLOAD_FILAMENT_FR "Retir. Filament" #if NUM_EXTRUDER == 1 @@ -3922,7 +3922,7 @@ #define UI_TEXT_EXTR_XOFF_FR "Deca.X:%Xx" #define UI_TEXT_EXTR_YOFF_FR "Deca.Y:%Xy" #else -#define UI_TEXT_FIL_SENSOR_ONOFF_FR "Detect.Fil.:%sf" +#define UI_TEXT_FIL_SENSOR_ONOFF_FR "Detect.Fil:%sf" #define UI_TEXT_CLEAN_DRIPBOX_FR "Nettoyage Reser" #define UI_TEXT_CLEANING_DRIPBOX_FR "Nettoyage Reser" #define UI_TEXT_CLEAN_DRIPBOX_3_FR "les reservoirs" @@ -3933,19 +3933,19 @@ #define UI_TEXT_UNLOAD_RIGHT_FILAMENT_FR "Retirer \005Droit " #define UI_TEXT_LOAD_LEFT_FILAMENT_FR "Inserer \005Gauche" #define UI_TEXT_UNLOAD_LEFT_FILAMENT_FR "Retirer \005Gauche" -#define UI_TEXT_FEED_LOADING_FILAMENT_FR "Load Fil.:%fl" -#define UI_TEXT_FEED_UNLOADING_FILAMENT_FR "Unload F.:%fu" -#define UI_TEXT_LOADING_UNLOADING_DISTANCE_FR "Load dist.: %fd" -#define UI_TEXT_BED_DOWN_FR "Bed Down" +#define UI_TEXT_FEED_LOADING_FILAMENT_FR "Chargmt:%fl" +#define UI_TEXT_FEED_UNLOADING_FILAMENT_FR "Dech. F.:%fu" +#define UI_TEXT_LOADING_UNLOADING_DISTANCE_FR "Dist.charg: %fd" +#define UI_TEXT_BED_DOWN_FR "Plateau en bas" #define UI_TEXT_WIFI_ONOFF_FR "Wifi: %wo" -#define UI_TEXT_REDO_ACTION_FR "Do it again ?" -#define UI_TEXT_X_LENGTH_FR "Longeur X:%Lxmm" -#define UI_TEXT_Y_LENGTH_FR "Longeur Y:%Lymm" -#define UI_TEXT_Z_LENGTH_FR "Longeur Z:%Lzmm" +#define UI_TEXT_REDO_ACTION_FR "Recommencer ?" +#define UI_TEXT_X_LENGTH_FR "LongueurX:%Lxmm" +#define UI_TEXT_Y_LENGTH_FR "LongueurY:%Lymm" +#define UI_TEXT_Z_LENGTH_FR "LongueurZ:%Lzmm" #define UI_TEXT_EXT_TEMP_ABS_FR "T\002Ext.ABS:%t1\002C" #define UI_TEXT_EXT_TEMP_PLA_FR "T\002Ext.PLA:%t2\002C" -#define UI_TEXT_BED_TEMP_ABS_FR "T\002Bed ABS:%t3\002C" -#define UI_TEXT_BED_TEMP_PLA_FR "T\002Bed PLA:%t4\002C" +#define UI_TEXT_BED_TEMP_ABS_FR "T\002PlatABS:%t3\002C" +#define UI_TEXT_BED_TEMP_PLA_FR "T\002PlatPLA:%t4\002C" #define UI_TEXT_ALERT_NO_FILAMENTA_FR "L'extrudeur%Ne n'a" #define UI_TEXT_ALERT_NO_FILAMENTB_FR "pas de filament!" #define UI_TEXT_ALERT_NO_FILAMENTC_FR "Appuyez OK pour" @@ -3994,13 +3994,13 @@ #define UI_TEXT_Y_MIN_SETTING_FR "Ymin: %Hymm" #define UI_TEXT_Z_MIN_SETTING_FR "Zmin: %Hzmm" #define UI_TEXT_TOP_COVER_OPEN_FR "Capot Ouvert!" -#define UI_TEXT_TOP_SENSOR_ONOFF_FR "Capt. capot:%st" +#define UI_TEXT_TOP_SENSOR_ONOFF_FR "Capt.capot:%st" #define UI_TEXT_VERSION_MENU_FR "Version Systeme" -#define UI_TEXT_COOLDOWN_MENU_FR "Refroidiss. %B3" +#define UI_TEXT_COOLDOWN_MENU_FR "Refroidiss. %B3" #define UI_TEXT_WAIT_OK_FR "Ok continuer" #define UI_TEXT_FAILED_FR "Echoue" #define UI_TEXT_PLEASE_WAIT_FR "Attendre,,," -#define UI_TEXT_MANUAL_LEVEL_FR "Niveau Manuel" +#define UI_TEXT_MANUAL_LEVEL_FR "Calib. Manuelle" #define UI_TEXT_WARNING_FR "Attention!!!" #define UI_TEXT_EXTRUDER_COLD_FR "E%Ne trop froid!" #define UI_TEXT_HEAT_EXTRUDER_FR "Chauffe extrud.?" @@ -4008,10 +4008,10 @@ #define UI_TEXT_POWER_SAVE_MENU_FR "Mode Eco" #define UI_TEXT_MAINTENANCE_FR "Maintenance" #define UI_TEXT_SETTINGS_FR "Parametres" -#define UI_TEXT_LOAD_UNLOAD_FR "Charger/Decharg" +#define UI_TEXT_LOAD_UNLOAD_FR "Charg./Dechar." #define UI_TEXT_BED_FR "Plateau" -#define UI_TEXT_BED_OFF_FR "Plateau Off %B7" -#define UI_TEXT_LIGHT_OFF_AFTER_FR "Light AutoOff " +#define UI_TEXT_BED_OFF_FR "Plat. eteint %B7" +#define UI_TEXT_LIGHT_OFF_AFTER_FR "LED eteint " #define UI_TEXT_LIGHT_OFF_AFTER2A_FR "Des. apres:%il" #define UI_TEXT_LIGHT_OFF_AFTER2B_FR "[min] 0=Off" #define UI_TEXT_WARNING_POS_X_UNKNOWN_FR "Pos X inconnue !" @@ -4023,7 +4023,7 @@ #define UI_TEXT_LOADING_FILAMENT_FR "Chargem. Fil. \005" #define UI_TEXT_UNLOADING_FILAMENT_FR "Decharg. Fil. \005" #define UI_TEXT_LOADUNLOAD_FILAMENT_FR "Charg./Decharg." -#define UI_TEXT_AUTOLEVEL_FR "Calibration" +#define UI_TEXT_AUTOLEVEL_FR "Auto calib." #define UI_TEXT_Z_PROBE_FAILED_FR "Echec Calibr." #define UI_TEXT_SAVE_FR "Enr. EEPROM ?" #define UI_TEXT_ZMIN_FR "zMin : %zm" @@ -4037,7 +4037,7 @@ #define UI_TEXT_ADVANCED_MODE_FR "Expert" #define UI_TEXT_POWER_SAVE_FR "Mode Eco: %Ps" #define UI_TEXT_BADGE_LIGHT_ONOFF_FR "Badge :%lb" -#define UI_TEXT_SOUND_ONOF_FR "Son: %so" +#define UI_TEXT_SOUND_ONOF_FR "Son: %so" #define UI_TEXT_YES_SELECTED_FR " [Oui] Non" #define UI_TEXT_NO_SELECTED_FR " Oui [Non]" #define UI_TEXT_PLEASE_CONFIRM_FR "Confimer SVP" @@ -4052,7 +4052,7 @@ #define UI_TEXT_PUSH_FILAMENT_FR "Charger filament" #define UI_TEXT_WAIT_FILAMENT_FR "Ok pour demarrer" #define UI_TEXT_LOAD_FAILSAFE2_FR "Apres chargement" -#define UI_TEXT_LOAD_FAILSAFE_FR "reinitialiser ?" +#define UI_TEXT_LOAD_FAILSAFE_FR "R.A.Z. EEPROM ?" #define UI_TEXT_HEATING_FR "Chauffage..." #define UI_TEXT_WAIT_FOR_OK_FR "OK pour quitter" #if NUM_EXTRUDER == 1 @@ -4066,6 +4066,9 @@ + + + // *************** Czech translation **************** // *************** By Majkl **************** // version: 2014/08/27 diff --git a/src/ArduinoDUE/Repetier/uimenu.h b/src/ArduinoDUE/Repetier/uimenu.h index 7950439..30303d5 100644 --- a/src/ArduinoDUE/Repetier/uimenu.h +++ b/src/ArduinoDUE/Repetier/uimenu.h @@ -1005,7 +1005,7 @@ UI_MENU_SUBMENU_T(ui_menu_conf_accel, UI_TEXT_ACCELERATION_ID, ui_menu_accel) UI_MENU_SUBMENU_T(ui_menu_conf_feed, UI_TEXT_FEEDRATE_ID, ui_menu_feedrate) UI_MENU_SUBMENU_T(ui_menu_conf_extr, UI_TEXT_EXTRUDER_ID, ui_menu_cextr) #if HAVE_HEATED_BED - UI_MENU_SUBMENU_T(ui_menu_conf_bed, UI_TEXT_HEATING_BED_ID, ui_menu_bedconf) + UI_MENU_SUBMENU_T(ui_menu_conf_bed, UI_TEXT_BED_ID, ui_menu_bedconf) #define UI_MENU_BEDCONF_COND ,&ui_menu_conf_bed #define UI_MENU_BEDCONF_CNT 1 #else @@ -1092,7 +1092,7 @@ UI_MENU_ACTIONCOMMAND_T(ui_menu_back,UI_TEXT_BACK_ID,UI_ACTION_BACK, ALL_MODE) #if EEPROM_MODE != 0 #define FIRSTLANG 1 #if LANGUAGE_EN_ACTIVE - UI_MENU_ACTIONCOMMAND(ui_menu_setlang_en,"English %L0",UI_ACTION_LANGUAGE_EN, ADVANCED_MODE) + UI_MENU_ACTIONCOMMAND(ui_menu_setlang_en,"English %L0",UI_ACTION_LANGUAGE_EN, ADVANCED_MODE) #define ADD_LANG_EN &ui_menu_setlang_en #undef FIRSTLANG #define FIRSTLANG 0 @@ -1100,7 +1100,7 @@ UI_MENU_ACTIONCOMMAND_T(ui_menu_back,UI_TEXT_BACK_ID,UI_ACTION_BACK, ALL_MODE) #define ADD_LANG_EN #endif // LANGUAGE_EN_ACTIVE #if LANGUAGE_DE_ACTIVE - UI_MENU_ACTIONCOMMAND(ui_menu_setlang_de,"Deutsch %L1",UI_ACTION_LANGUAGE_DE, ADVANCED_MODE) + UI_MENU_ACTIONCOMMAND(ui_menu_setlang_de,"Deutsch %L1",UI_ACTION_LANGUAGE_DE, ADVANCED_MODE) #if FIRSTLANG #define ADD_LANG_DE &ui_menu_setlang_de #undef FIRSTLANG @@ -1112,7 +1112,7 @@ UI_MENU_ACTIONCOMMAND_T(ui_menu_back,UI_TEXT_BACK_ID,UI_ACTION_BACK, ALL_MODE) #define ADD_LANG_DE #endif // LANGUAGE_DE_ACTIVE #if LANGUAGE_ES_ACTIVE - UI_MENU_ACTIONCOMMAND(ui_menu_setlang_es,"Espanol %L5",UI_ACTION_LANGUAGE_ES, ADVANCED_MODE) + UI_MENU_ACTIONCOMMAND(ui_menu_setlang_es,"Espanol %L5",UI_ACTION_LANGUAGE_ES, ADVANCED_MODE) #if FIRSTLANG #define ADD_LANG_ES &ui_menu_setlang_es #undef FIRSTLANG @@ -1124,7 +1124,7 @@ UI_MENU_ACTIONCOMMAND_T(ui_menu_back,UI_TEXT_BACK_ID,UI_ACTION_BACK, ALL_MODE) #define ADD_LANG_ES #endif // LANGUAGE_ES_ACTIVE #if LANGUAGE_PT_ACTIVE - UI_MENU_ACTIONCOMMAND(ui_menu_setlang_pt,"Portugues %L3",UI_ACTION_LANGUAGE_PT, ADVANCED_MODE) + UI_MENU_ACTIONCOMMAND(ui_menu_setlang_pt,"Portugues %L3",UI_ACTION_LANGUAGE_PT, ADVANCED_MODE) #if FIRSTLANG #define ADD_LANG_PT &ui_menu_setlang_pt #undef FIRSTLANG @@ -1136,7 +1136,7 @@ UI_MENU_ACTIONCOMMAND_T(ui_menu_back,UI_TEXT_BACK_ID,UI_ACTION_BACK, ALL_MODE) #define ADD_LANG_PT #endif // LANGUAGE_PT_ACTIVE #if LANGUAGE_FR_ACTIVE - UI_MENU_ACTIONCOMMAND(ui_menu_setlang_fr,"Francais %L7",UI_ACTION_LANGUAGE_FR, ADVANCED_MODE) + UI_MENU_ACTIONCOMMAND(ui_menu_setlang_fr,"Francais %L7",UI_ACTION_LANGUAGE_FR, ADVANCED_MODE) #if FIRSTLANG #define ADD_LANG_FR &ui_menu_setlang_fr #undef FIRSTLANG @@ -1148,7 +1148,7 @@ UI_MENU_ACTIONCOMMAND_T(ui_menu_back,UI_TEXT_BACK_ID,UI_ACTION_BACK, ALL_MODE) #define ADD_LANG_FR #endif // LANGUAGE_FR_ACTIVE #if LANGUAGE_NL_ACTIVE - UI_MENU_ACTIONCOMMAND(ui_menu_setlang_nl,"Nederlandse %L2",UI_ACTION_LANGUAGE_NL, ADVANCED_MODE) + UI_MENU_ACTIONCOMMAND(ui_menu_setlang_nl,"Nederlandse %L2",UI_ACTION_LANGUAGE_NL, ADVANCED_MODE) #if FIRSTLANG #define ADD_LANG_NL &ui_menu_setlang_nl #undef FIRSTLANG @@ -1160,7 +1160,7 @@ UI_MENU_ACTIONCOMMAND_T(ui_menu_back,UI_TEXT_BACK_ID,UI_ACTION_BACK, ALL_MODE) #define ADD_LANG_NL #endif // LANGUAGE_NL_ACTIVE #if LANGUAGE_IT_ACTIVE - UI_MENU_ACTIONCOMMAND(ui_menu_setlang_it,"Italiano %L4",UI_ACTION_LANGUAGE_IT, ADVANCED_MODE) + UI_MENU_ACTIONCOMMAND(ui_menu_setlang_it,"Italiano %L4",UI_ACTION_LANGUAGE_IT, ADVANCED_MODE) #if FIRSTLANG #define ADD_LANG_IT &ui_menu_setlang_it #undef FIRSTLANG @@ -1172,7 +1172,7 @@ UI_MENU_ACTIONCOMMAND_T(ui_menu_back,UI_TEXT_BACK_ID,UI_ACTION_BACK, ALL_MODE) #define ADD_LANG_IT #endif // LANGUAGE_IT_ACTIVE #if LANGUAGE_SE_ACTIVE - UI_MENU_ACTIONCOMMAND(ui_menu_setlang_se,"Svenska %L6",UI_ACTION_LANGUAGE_SE, ADVANCED_MODE) + UI_MENU_ACTIONCOMMAND(ui_menu_setlang_se,"Svenska %L6",UI_ACTION_LANGUAGE_SE, ADVANCED_MODE) #if FIRSTLANG #define ADD_LANG_SE &ui_menu_setlang_se #undef FIRSTLANG @@ -1184,7 +1184,7 @@ UI_MENU_ACTIONCOMMAND_T(ui_menu_back,UI_TEXT_BACK_ID,UI_ACTION_BACK, ALL_MODE) #define ADD_LANG_SE #endif // LANGUAGE_SE_ACTIVE #if LANGUAGE_CZ_ACTIVE - UI_MENU_ACTIONCOMMAND(ui_menu_setlang_cz,"Cestina %L8",UI_ACTION_LANGUAGE_CZ, ADVANCED_MODE) + UI_MENU_ACTIONCOMMAND(ui_menu_setlang_cz,"Cestina %L8",UI_ACTION_LANGUAGE_CZ, ADVANCED_MODE) #if FIRSTLANG #define ADD_LANG_CZ &ui_menu_setlang_cz #undef FIRSTLANG @@ -1196,7 +1196,7 @@ UI_MENU_ACTIONCOMMAND_T(ui_menu_back,UI_TEXT_BACK_ID,UI_ACTION_BACK, ALL_MODE) #define ADD_LANG_CZ #endif // LANGUAGE_CZ_ACTIVE #if LANGUAGE_PL_ACTIVE - UI_MENU_ACTIONCOMMAND(ui_menu_setlang_pl,"Polski %L9",UI_ACTION_LANGUAGE_PL, ADVANCED_MODE) + UI_MENU_ACTIONCOMMAND(ui_menu_setlang_pl,"Polski %L9",UI_ACTION_LANGUAGE_PL, ADVANCED_MODE) #if FIRSTLANG #define ADD_LANG_PL &ui_menu_setlang_pl #undef FIRSTLANG @@ -1775,15 +1775,15 @@ UI_MENU_SUBMENU_T(ui_menu_conf_extr, UI_TEXT_EXTRUDER_ID, ui_menu_cextr, ADVANCE UI_MENU_CHANGEACTION_T(ui_menu_bed_temp_abs, UI_TEXT_BED_TEMP_ABS_ID, UI_ACTION_BED_TEMP_ABS, ADVANCED_MODE) UI_MENU_CHANGEACTION_T(ui_menu_bed_temp_pla, UI_TEXT_BED_TEMP_PLA_ID, UI_ACTION_BED_TEMP_PLA, ADVANCED_MODE) #if TEMP_PID - #define UI_MENU_BEDCONF {UI_MENU_ADDCONDBACK &ui_menu_bed_temp_abs, &ui_menu_bed_temp_pla ,&ui_menu_cext_manager,&ui_menu_cext_pgain,&ui_menu_cext_igain,&ui_menu_cext_dgain,&ui_menu_cext_dmin,&ui_menu_cext_dmax,&ui_menu_cext_pmax} - UI_MENU(ui_menu_bedconf, UI_MENU_BEDCONF, 10);//BUG without this ; compilation crash + #define UI_MENU_BEDCONF {UI_MENU_ADDCONDBACK &ui_menu_bed_temp_abs, &ui_menu_bed_temp_pla, &ui_menu_cext_manager,&ui_menu_cext_pgain,&ui_menu_cext_igain,&ui_menu_cext_dgain,&ui_menu_cext_dmin,&ui_menu_cext_dmax,&ui_menu_cext_pmax} + UI_MENU(ui_menu_bedconf, UI_MENU_BEDCONF, 9+UI_MENU_BACKCNT);//BUG without this ; compilation crash #else #define UI_MENU_BEDCONF {UI_MENU_ADDCONDBACK &ui_menu_bed_temp_abs, &ui_menu_bed_temp_pla, &ui_menu_cext_manager, &ui_menu_cext_pmax} - UI_MENU(ui_menu_bedconf, UI_MENU_BEDCONF, 5);//BUG without this ; compilation crash + UI_MENU(ui_menu_bedconf, UI_MENU_BEDCONF, 4+UI_MENU_BACKCNT );//BUG without this ; compilation crash , #endif #endif #if HAVE_HEATED_BED - UI_MENU_SUBMENU_T(ui_menu_conf_bed, UI_TEXT_HEATING_BED_ID, ui_menu_bedconf, ADVANCED_MODE) + UI_MENU_SUBMENU_T(ui_menu_conf_bed, UI_TEXT_BED_ID, ui_menu_bedconf, ADVANCED_MODE) #define UI_MENU_BEDCONF_COND ,&ui_menu_conf_bed #define UI_MENU_BEDCONF_CNT 1 #else @@ -1793,7 +1793,7 @@ UI_MENU_CHANGEACTION_T(ui_menu_bed_temp_pla, UI_TEXT_BED_TEMP_PLA_ID, UI_ACTION_ //version #define UI_VERSION_STRING_FULL VERSION_MAJOR "." VERSION_MINOR_YEAR "-" VERSION_MINOR_MONTH "-" VERSION_MINOR_DAY "_" VERSION_BUILD "." DAVINCI_TYPE MODEL_TYPE -#define UI_PAGE_VERSION UI_PRINTER_NAME,"",UI_VERSION_STRING_FULL,"Repetier " REPETIER_VERSION "Mod" +#define UI_PAGE_VERSION UI_PRINTER_NAME,"",UI_VERSION_STRING_FULL,"Repetier " REPETIER_VERSION "M" UI_MENU_ACTION4C(ui_page_version,UI_ACTION_DUMMY,UI_PAGE_VERSION, ALL_MODE) UI_MENU_ACTIONCOMMAND_T(ui_menu_version, UI_TEXT_VERSION_MENU_ID, UI_ACTION_VERSION, ALL_MODE)