Skip to content
Snippets Groups Projects
Commit 11e3f337 authored by fmalpartida's avatar fmalpartida
Browse files

Merge commit '764e6170' into bugFixing 

Updated LCD wiki location.
parents 93da52d0 764e6170
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Marlin/Configuration.h
+ 1
− 1
View file @ 11e3f337
......@@ -711,7 +711,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
// ---------------------
// 2 wire Non-latching LCD SR from:
// https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
// LCD configuration: http://reprap.org/wiki/SAV_3D_LCD
//#define SAV_3DLCD
// @section extras
......
Marlin/language_ru.h
+ 35
− 35
View file @ 11e3f337
......@@ -25,37 +25,37 @@
#define MSG_PREHEAT_PLA "Преднагрев PLA"
#define MSG_PREHEAT_PLA_N "Преднагрев PLA"
#define MSG_PREHEAT_PLA_ALL "Преднаг. PLA все"
#define MSG_PREHEAT_PLA_BEDONLY "Пред. PLA Кровать"
#define MSG_PREHEAT_PLA_BEDONLY "Пред. PLA Стол"
#define MSG_PREHEAT_PLA_SETTINGS "Настройки PLA"
#define MSG_PREHEAT_ABS "Преднагрев ABS"
#define MSG_PREHEAT_ABS_N "Преднагрев ABS"
#define MSG_PREHEAT_ABS_ALL "Преднаг. ABS все "
#define MSG_PREHEAT_ABS_BEDONLY "Пред. ABS Кровать"
#define MSG_PREHEAT_ABS_BEDONLY "Пред. ABS Стол"
#define MSG_PREHEAT_ABS_SETTINGS "Настройки ABS"
#define MSG_COOLDOWN "Охлаждение"
#define MSG_SWITCH_PS_ON "Switch Power On"
#define MSG_SWITCH_PS_OFF "Switch Power Off"
#define MSG_SWITCH_PS_ON "Включить Питание"
#define MSG_SWITCH_PS_OFF "Выключить Питание"
#define MSG_EXTRUDE "Экструзия"
#define MSG_RETRACT "Откат"
#define MSG_RETRACT "Втягивание"
#define MSG_MOVE_AXIS "Движение по осям"
#define MSG_MOVE_X "Move X"
#define MSG_MOVE_Y "Move Y"
#define MSG_MOVE_Z "Move 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_LEVEL_BED "Настр. уровня кровати"
#define MSG_MOVE_X "Движение по X"
#define MSG_MOVE_Y "Движение по Y"
#define MSG_MOVE_Z "Движение по Z"
#define MSG_MOVE_E "Экструдер"
#define MSG_MOVE_01MM "Движение по 0.1mm"
#define MSG_MOVE_1MM "Движение по 1mm"
#define MSG_MOVE_10MM "Движение по 10mm"
#define MSG_LEVEL_BED "Настр. уровня стола"
#define MSG_SPEED "Скорость"
#define MSG_NOZZLE LCD_STR_THERMOMETER " Фильера"
#define MSG_BED LCD_STR_THERMOMETER " Кровать"
#define MSG_BED LCD_STR_THERMOMETER " Стол"
#define MSG_FAN_SPEED "Куллер"
#define MSG_FLOW "Поток"
#define MSG_CONTROL "Настройки"
#define MSG_MIN LCD_STR_THERMOMETER " Минимум"
#define MSG_MAX LCD_STR_THERMOMETER " Максимум"
#define MSG_FACTOR LCD_STR_THERMOMETER " Фактор"
#define MSG_AUTOTEMP "Autotemp"
#define MSG_AUTOTEMP "Автотемпература"
#define MSG_ON "Вкл. "
#define MSG_OFF "Выкл. "
#define MSG_PID_P "PID-P"
......@@ -73,20 +73,20 @@
#define MSG_E "e"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-retract"
#define MSG_AMAX "Amax"
#define MSG_A_RETRACT "A-втягивание"
#define MSG_XSTEPS "X шаг/mm"
#define MSG_YSTEPS "Y шаг/mm"
#define MSG_ZSTEPS "Z шаг/mm"
#define MSG_ESTEPS "E шаг/mm"
#define MSG_TEMPERATURE "Температура"
#define MSG_MOTION "Скорости"
#define MSG_VOLUMETRIC "Filament"
#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_VOLUMETRIC "Филамент"
#define MSG_VOLUMETRIC_ENABLED "E в mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER_0 "Диаметр фил-та 1"
#define MSG_FILAMENT_SIZE_EXTRUDER_1 "Диаметр фил-та 2"
#define MSG_FILAMENT_SIZE_EXTRUDER_2 "Диаметр фил-та 3"
#define MSG_CONTRAST "Контраст LCD"
#define MSG_STORE_EPROM "Сохранить в EPROM"
#define MSG_LOAD_EPROM "Загруз. из EPROM"
#define MSG_RESTORE_FAILSAFE "Сброс настроек"
......@@ -101,31 +101,31 @@
#define MSG_NO_CARD "Нет карты"
#define MSG_DWELL "Сон..."
#define MSG_USERWAIT "Ожиданиие"
#define MSG_RESUMING "Resuming print"
#define MSG_PRINT_ABORTED "Print aborted"
#define MSG_RESUMING "Возобновление..."
#define MSG_PRINT_ABORTED "Отмена печати"
#define MSG_NO_MOVE "Нет движения."
#define MSG_KILLED "УБИТО."
#define MSG_STOPPED "ОСТАНОВЛЕНО."
#define MSG_CONTROL_RETRACT "Откат mm"
#define MSG_CONTROL_RETRACT_SWAP "своп Откат mm"
#define MSG_CONTROL_RETRACTF "Откат V"
#define MSG_CONTROL_RETRACT "Втягивание mm"
#define MSG_CONTROL_RETRACT_SWAP "Своп Втягивание mm"
#define MSG_CONTROL_RETRACTF "Втягивание V"
#define MSG_CONTROL_RETRACT_ZLIFT "Прыжок mm"
#define MSG_CONTROL_RETRACT_RECOVER "Возврат +mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "своп Возврат +mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "Своп Возврат +mm"
#define MSG_CONTROL_RETRACT_RECOVERF "Возврат V"
#define MSG_AUTORETRACT "АвтоОткат"
#define MSG_FILAMENTCHANGE "Change filament"
#define MSG_INIT_SDCARD "Init. SD-Card"
#define MSG_CNG_SDCARD "Change SD-Card"
#define MSG_ZPROBE_OUT "Z probe out. bed"
#define MSG_FILAMENTCHANGE "Смена филамента"
#define MSG_INIT_SDCARD "Инициализация SD-Card"
#define MSG_CNG_SDCARD "Смана SD-Card"
#define MSG_ZPROBE_OUT "Z датчик вне стола"
#define MSG_POSITION_UNKNOWN "Home X/Y before Z"
#define MSG_ZPROBE_ZOFFSET "Z Offset"
#define MSG_BABYSTEP_X "Babystep X"
#define MSG_BABYSTEP_Y "Babystep Y"
#define MSG_BABYSTEP_Z "Babystep Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"
#define MSG_END_HOUR "hours"
#define MSG_END_MINUTE "minutes"
#define MSG_END_HOUR "часов"
#define MSG_END_MINUTE "минут"
#ifdef DELTA_CALIBRATION_MENU
#define MSG_DELTA_CALIBRATE "Delta Calibration"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment