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.

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

Update russian language #25360

Merged
merged 6 commits into from
Feb 21, 2023

Conversation

EvilGremlin
Copy link
Contributor

It's much less cringe now, and more coherent. To make it completely not cringe we need min LCD_WIDTH of 30, sadly.
@jmz52 can you please sanity check this?

Marlin/src/lcd/language/language_ru.h Outdated Show resolved Hide resolved
Comment on lines +599 to +602
LSTR MSG_THERMAL_RUNAWAY = _UxGT("УТЕЧКА ТЕМПЕРАТУРЫ");
LSTR MSG_THERMAL_RUNAWAY_BED = _UxGT("УТЕЧКА ТЕМП. СТОЛА");
LSTR MSG_THERMAL_RUNAWAY_CHAMBER = _UxGT("УТЕЧКА ТЕМП. КАМЕРЫ");
LSTR MSG_THERMAL_RUNAWAY_COOLER = _UxGT("УТЕЧКА ТЕМП. КУЛЕРА");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would call these "убегание температуры" or "неконтролируемая температура", but these words might be too long

@thinkyhead thinkyhead merged commit bc450b4 into MarlinFirmware:bugfix-2.1.x Feb 21, 2023
@thinkyhead thinkyhead deleted the bf2.1-lang-ru branch February 21, 2023 21:19
mikezs added a commit to mikezs/Marlin that referenced this pull request Feb 27, 2023
* bugfix-2.1.x: (113 commits)
  [cron] Bump distribution date (2023-02-27)
  ✨ LCD_BACKLIGHT_TIMEOUT for Neopixel LCD (MarlinFirmware#25438)
  🔨 Fix env STM32G0B1RE_btt, add …_manta_btt (MarlinFirmware#25431)
  🩹 Native types for RTS overloads (MarlinFirmware#25440)
  📝 Link to archived RA Control Panel page (MarlinFirmware#25424)
  📝 New URL for IA_CREALITY DWIN files  (MarlinFirmware#25423)
  [cron] Bump distribution date (2023-02-24)
  📝 Update DISABLE_INACTIVE_* comment
  🎨 Use LIMIT macro
  ⚡️ Reduce edit_screen code size (MarlinFirmware#25420)
  ♻️ Stepper options refactor (MarlinFirmware#25422)
  [cron] Bump distribution date (2023-02-23)
  🔧 Fix Einsy Rambo TMC driver check
  🔨 Fix marlin_custom.* without lib_deps
  [cron] Bump distribution date (2023-02-22)
  🐛 Fix AVR maths used by Stepper (MarlinFirmware#25338)
  🔨 Encrypt some MKS Robin (MarlinFirmware#25349)
  🌐 Update Russian language (MarlinFirmware#25360)
  🧑‍💻 Fix preheat tests (nested macro limit ~256)
  🧑‍💻 Add get_move_distance for rotation/kinematics (MarlinFirmware#25370)
  ...

# Conflicts:
#	Marlin/Configuration_adv.h
thinkyhead pushed a commit to thinkyhead/Marlin that referenced this pull request Feb 27, 2023
LMBernardo pushed a commit to LMBernardo/Marlin that referenced this pull request Mar 19, 2023
thinkyhead pushed a commit that referenced this pull request Apr 7, 2023
EvilGremlin added a commit to EvilGremlin/Marlin that referenced this pull request Apr 8, 2023
thinkyhead pushed a commit that referenced this pull request Apr 10, 2023
thinkyhead pushed a commit to thinkyhead/Marlin that referenced this pull request May 16, 2023
EvilGremlin added a commit to EvilGremlin/Marlin that referenced this pull request May 17, 2023
tspiva pushed a commit to tspiva/Marlin that referenced this pull request May 25, 2023
Andy-Big pushed a commit to Andy-Big/Marlin_FB_Reborn that referenced this pull request Jul 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants