Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

issue #23963 update Russian language in tft_Language_ru.h #23978

Merged
merged 2 commits into from
Apr 3, 2022
Merged

issue #23963 update Russian language in tft_Language_ru.h #23978

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d445f5c
issue #23963
ellensp Apr 1, 2022
b4b7f59
Merge 'bugfix-2.0.x' into pr/23978
thinkyhead Apr 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 37 additions & 37 deletions Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
//****************俄语***************************//
#define TOOL_TEXT_RU "инструмент"
#define PREHEAT_TEXT_RU " нагрев"
#define MOVE_TEXT_RU "движение"
#define HOME_TEXT_RU "домой"
#define PRINT_TEXT_RU " печать"
#define MOVE_TEXT_RU "двигать"
#define HOME_TEXT_RU "дом"
#define PRINT_TEXT_RU "печать"
#define EXTRUDE_TEXT_RU "экструзия"
#define LEVELING_TEXT_RU "уровень"
#define AUTO_LEVELING_TEXT_RU "aвтоуровень"
Expand All @@ -40,17 +40,17 @@
#define EXTRUDER_1_TEXT_RU "экструдер1"
#define EXTRUDER_2_TEXT_RU "экструдер2"
#define HEATBED_TEXT_RU "стол"
#define TEXT_1C_RU "1℃"
#define TEXT_5C_RU "5℃"
#define TEXT_10C_RU "10℃"
#define TEXT_1C_RU "1°Ц"
#define TEXT_5C_RU "5°Ц"
#define TEXT_10C_RU "10°Ц"
#define CLOSE_TEXT_RU "выкл"

#define BACK_TEXT_RU "назад"

#define TOOL_PREHEAT_RU "нагрев"
#define TOOL_EXTRUDE_RU "экструдер"
#define TOOL_MOVE_RU "движение"
#define TOOL_HOME_RU "домой"
#define TOOL_MOVE_RU "двигать"
#define TOOL_HOME_RU "дом"
#define TOOL_LEVELING_RU "уровень"
#define TOOL_AUTO_LEVELING_RU "aвтоуровень"
#define TOOL_FILAMENT_RU "замена"
Expand All @@ -62,33 +62,33 @@
#define AXIS_Y_DEC_TEXT_RU "Y -"
#define AXIS_Z_ADD_TEXT_RU "Z +"
#define AXIS_Z_DEC_TEXT_RU "Z -"
#define TEXT_01MM_RU "0.1 mm"
#define TEXT_1MM_RU "1 mm"
#define TEXT_10MM_RU "10 mm"
#define TEXT_01MM_RU "0.1 мм"
#define TEXT_1MM_RU "1 мм"
#define TEXT_10MM_RU "10 мм"

#define HOME_X_TEXT_RU "X"
#define HOME_Y_TEXT_RU "Y"
#define HOME_Z_TEXT_RU "Z"
#define HOME_ALL_TEXT_RU "Home"
#define HOME_STOPMOVE_RU "Quickstop"
#define HOME_ALL_TEXT_RU "Дом"
#define HOME_STOPMOVE_RU "Концевик"

#define PAGE_UP_TEXT_RU "вверх"
#define PAGE_DOWN_TEXT_RU "вниз"

#define EXTRUDER_IN_TEXT_RU "втянуть"
#define EXTRUDER_OUT_TEXT_RU "выдавить"
#define EXTRUDE_1MM_TEXT_RU "1 mm"
#define EXTRUDE_5MM_TEXT_RU "5 mm"
#define EXTRUDE_10MM_TEXT_RU "10 mm"
#define EXTRUDE_LOW_SPEED_TEXT_RU "мин"
#define EXTRUDE_MEDIUM_SPEED_TEXT_RU "сред"
#define EXTRUDE_HIGH_SPEED_TEXT_RU "выс"

#define LEVELING_POINT1_TEXT_RU "1 точка"
#define LEVELING_POINT2_TEXT_RU "2 точка"
#define LEVELING_POINT3_TEXT_RU "3 точка"
#define LEVELING_POINT4_TEXT_RU "4 точка"
#define LEVELING_POINT5_TEXT_RU "5 точка"
#define EXTRUDE_1MM_TEXT_RU "1 мм"
#define EXTRUDE_5MM_TEXT_RU "5 мм"
#define EXTRUDE_10MM_TEXT_RU "10 мм"
#define EXTRUDE_LOW_SPEED_TEXT_RU "минимум"
#define EXTRUDE_MEDIUM_SPEED_TEXT_RU "средний"
#define EXTRUDE_HIGH_SPEED_TEXT_RU "высокий"

#define LEVELING_POINT1_TEXT_RU "Первая позиция"
#define LEVELING_POINT2_TEXT_RU "Вторая позиция"
#define LEVELING_POINT3_TEXT_RU "Третья позиция"
#define LEVELING_POINT4_TEXT_RU "Четвёртое позиция"
#define LEVELING_POINT5_TEXT_RU "Пятая позиция"

#define FILESYS_TEXT_RU "система"
#define WIFI_TEXT_RU "WiFi"
Expand All @@ -115,7 +115,7 @@
#define WIFI_RECONNECT_TEXT_RU "выбор сети"
#define CLOUD_TEXT_RU "облако"
#define CLOUD_BIND_RU "соединён"
#define CLOUD_UNBIND_RU "отсоед."
#define CLOUD_UNBIND_RU "отсоединён"
#define CLOUD_UNBINDING_RU "отвязано"
#define CLOUD_DISCONNECTED_RU "отключено"
#define CLOUD_UNBINDED_RU "несвяз."
Expand All @@ -126,7 +126,7 @@
#define FAN_DEC_TEXT_RU "уменьшить"
#define FAN_OPEN_TEXT_RU "100%"
#define FAN_HALF_TEXT_RU "50%"
#define FAN_CLOSE_TEXT_RU "откл"
#define FAN_CLOSE_TEXT_RU "отключить"
#define FAN_TIPS1_TEXT_RU "вентилятор"
#define FAN_TIPS2_TEXT_RU "вентилятор\nоткл"

Expand Down Expand Up @@ -156,7 +156,7 @@
#define PRE_HEAT_EXT_TEXT_RU "E"
#define PRE_HEAT_BED_TEXT_RU "стол"

#define FILE_LOADING_RU "загрузка......"
#define FILE_LOADING_RU "загрузка"
#define NO_FILE_AND_CHECK_RU "нет файла,попробуйте ещё раз!"

#define NO_FILE_RU "нет файла!"
Expand All @@ -170,11 +170,11 @@
#define ABOUT_VERSION_TEXT_RU "Firmware: "
#define ABOUT_WIFI_TEXT_RU "WiFi: "

#define PRINTING_OPERATION_RU "опции"
#define PRINTING_OPERATION_RU "опций"
#define PRINTING_PAUSE_RU "пауза"
#define PRINTING_TEMP_RU "темп"
#define PRINTING_CHANGESPEED_RU "скорости"
#define PRINTING_RESUME_RU "возобн. "
#define PRINTING_CHANGESPEED_RU "скорост"
#define PRINTING_RESUME_RU "возобновить"
#define PRINTING_STOP_RU "стоп"
#define PRINTING_MORE_RU "больше"
#define PRINTING_EXTRUDER_RU "экстр"
Expand Down Expand Up @@ -222,8 +222,8 @@
#define DIALOG_RETRY_RU "повтор"
#define DIALOG_DISABLE_RU "запретить"
#define DIALOG_PRINT_MODEL_RU "печать модели?"
#define DIALOG_CANCEL_PRINT_RU "стоп?"
#define DIALOG_STOP_RU "стоп"
#define DIALOG_CANCEL_PRINT_RU "Остановить?"
#define DIALOG_STOP_RU "Остановить"
#define DIALOG_REPRINT_FROM_BREAKPOINT_RU "продолжить?"
#define DIALOG_ERROR_TIPS1_RU "ошибка:нет файла, попробуйте ещё раз."
#define DIALOG_ERROR_TIPS2_RU "ошибка:сбой передачи. установите скорость \nпередачи данных как на плате управления!"
Expand All @@ -236,8 +236,8 @@
#define DIALOG_REPRINT_RU "Print again"
#define DIALOG_WIFI_ENABLE_TIPS_RU "The wifi module is being configured,\nplease wait a moment....."

#define MESSAGE_PAUSING_RU "Стоянка..."
#define MESSAGE_CHANGING_RU "Подождите, пока начнется смена филамента"
#define MESSAGE_PAUSING_RU "Пауза"
#define MESSAGE_CHANGING_RU "Подождите"
#define MESSAGE_UNLOAD_RU "Дождитесь выгрузки нити"
#define MESSAGE_WAITING_RU "Нажмите кнопку,чтобы возобновить печать"
#define MESSAGE_INSERT_RU "Вставьте нить и нажмите кнопку,чтобы продолжить"
Expand All @@ -250,7 +250,7 @@
#define MESSAGE_PURGE_MORE_RU "чистка"
#define MESSAGE_CONTINUE_PRINT_RU "Распечатать"
#define EEPROM_SETTINGS_TITLE_RU "Настройки EEPROM"
#define EEPROM_SETTINGS_STORE_RU "Cохранение настроек в EEPROM"
#define EEPROM_SETTINGS_STORE_RU "Cохранить настройки в EEPROM"
#define EEPROM_SETTINGS_READ_RU "Чтение настроек из EEPROM"
#define EEPROM_SETTINGS_REVERT_RU "Bосстановить заводские настройки по умолчанию"

Expand All @@ -272,7 +272,7 @@
#define DISABLE_RU "нет"
#define KEY_CONFIRM_RU "OK"

#define MACHINE_PARA_TITLE_RU "настройки"
#define MACHINE_PARA_TITLE_RU "Настройки"
#define MACHINE_TYPE_CNOFIG_RU "Hастройки принтера"
#define MOTOR_CONFIG_RU "Hастройки моторов"
#define MACHINE_LEVELING_CONFIG_RU "Hастройки уровня"
Expand Down