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 Ukrainian language #23935

Merged
merged 49 commits into from
Mar 24, 2022
Merged
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
1de4125
Improve STM32 FastIO
thinkyhead Oct 14, 2020
f8612ef
Use STM_PIN
thinkyhead Oct 15, 2020
804b6f9
Apply for all STM32
thinkyhead Oct 15, 2020
dacfcda
Use digitalPinToPinName in pins debug
thinkyhead Oct 15, 2020
7a647e5
Merge pull request #14 from MarlinFirmware/bugfix-2.0.x
Serhiy-K Oct 17, 2020
723a86f
Merge pull request #15 from MarlinFirmware/bugfix-2.0.x
Serhiy-K Dec 18, 2020
f34960e
Update Russian and Ukranian translations
Serhiy-K Dec 19, 2020
03bb937
Cleanup
thinkyhead Dec 20, 2020
b9096d3
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/20508
thinkyhead Dec 20, 2020
35fc41d
Merge pull request #16 from MarlinFirmware/bugfix-2.0.x
Serhiy-K Dec 20, 2020
763206b
Add STM32F1xx support for TFTGLCD
Serhiy-K Dec 20, 2020
2eb6d0e
Update ubl_G29.cpp
thinkyhead Dec 22, 2020
3cc2ac9
Update marlinui_TFTGLCD.cpp
thinkyhead Dec 22, 2020
71c5bb0
Merge pull request #17 from MarlinFirmware/bugfix-2.0.x
Serhiy-K Jan 10, 2021
c80a0cc
Fix for TFTGLCD
Serhiy-K Jan 10, 2021
74a2232
Merge branch 'bugfix-2.0.x' of https://github.com/Serhiy-K/Marlin int…
Serhiy-K Jan 10, 2021
a75cf22
neaten
thinkyhead Jan 11, 2021
80f55d1
Merge pull request #18 from MarlinFirmware/bugfix-2.0.x
Serhiy-K Jun 20, 2021
cc5de44
Update Ukrainian language
Serhiy-K Jun 20, 2021
4f90fab
Update Ukrainian language
Serhiy-K Jun 20, 2021
ed1f556
Merge pull request #19 from MarlinFirmware/bugfix-2.0.x
Serhiy-K Jun 21, 2021
92d5c44
Update Russian language
Serhiy-K Jun 21, 2021
3d23db1
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/22193
thinkyhead Jun 22, 2021
9870970
configurable axis names
thinkyhead Jun 22, 2021
de93f93
Merge pull request #20 from MarlinFirmware/bugfix-2.0.x
Serhiy-K Jun 25, 2021
6f12202
Update Russian and Ukrainian languages
Serhiy-K Jul 3, 2021
a43e885
Revert "Update Russian and Ukrainian languages"
Serhiy-K Jul 3, 2021
053c103
Update platformio.ini
Serhiy-K Jul 3, 2021
55030dd
Delete pins_PILL_F401XX.h
Serhiy-K Jul 3, 2021
2da48eb
Update pins.h
Serhiy-K Jul 3, 2021
bd6fb70
Update Russian and Ukrainian languages
Serhiy-K Jul 3, 2021
6e4e004
Merge branch 'bugfix-2.0.x' of https://github.com/Serhiy-K/Marlin int…
Serhiy-K Jul 3, 2021
a5b2d34
Update Ukrainian language
Serhiy-K Jul 3, 2021
e917109
sp
thinkyhead Jul 7, 2021
4c2bc83
Add laser support for TFTGLCD panel
Serhiy-K Jul 18, 2021
43a8bd1
Merge branch 'bugfix-2.0.x' of https://github.com/Serhiy-K/Marlin int…
Serhiy-K Jul 18, 2021
56f8309
Merge pull request #21 from MarlinFirmware/bugfix-2.0.x
Serhiy-K Jul 18, 2021
ce386e1
Fix ammeter
Serhiy-K Jul 18, 2021
1572748
Revert "Fix ammeter"
Serhiy-K Jul 18, 2021
f310cb9
Merge branch 'bugfix-2.0.x' of https://github.com/Serhiy-K/Marlin int…
Serhiy-K Jul 18, 2021
319e9df
Fix TFTGLCD
Serhiy-K Jul 18, 2021
8549706
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/22391
thinkyhead Jul 19, 2021
4fbace0
Update marlinui_TFTGLCD.cpp
thinkyhead Jul 19, 2021
5f4d802
Temporary del Conditionals_LCD.h
Serhiy-K Sep 18, 2021
b0375a7
New Conditionals_LCD.h
Serhiy-K Sep 18, 2021
159f103
Merge branch 'MarlinFirmware:bugfix-2.0.x' into bugfix-2.0.x
Serhiy-K Sep 18, 2021
d927c71
Merge pull request #23 from MarlinFirmware/bugfix-2.0.x
Serhiy-K Mar 22, 2022
a13ecc7
Update ukrainian language
Serhiy-K Mar 22, 2022
34cae5d
Update Conditionals_LCD
Serhiy-K Mar 22, 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
44 changes: 39 additions & 5 deletions Marlin/src/lcd/language/language_uk.h
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,15 @@ namespace Language_uk {
LSTR MSG_FILAMENT_LOAD = _UxGT("Завантаж., мм");
LSTR MSG_ADVANCE_K = _UxGT("Kоеф. просув.");
LSTR MSG_ADVANCE_K_E = _UxGT("Kоеф. просув. *");
LSTR MSG_CONTRAST = _UxGT("Контраст екрану");
#if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
LSTR MSG_CONTRAST = _UxGT("Контраст екрану");
LSTR MSG_BRIGHTNESS = _UxGT("Яскравість LCD");
#else
LSTR MSG_CONTRAST = _UxGT("Контраст");
LSTR MSG_BRIGHTNESS = _UxGT("Яскравість");
#endif
LSTR MSG_LCD_BKL_TIMEOUT = _UxGT("LCD Таймаут, с");
LSTR MSG_BRIGHTNESS_OFF = _UxGT("Підсвітка вимк.");
LSTR MSG_STORE_EEPROM = _UxGT("Зберегти в EEPROM");
LSTR MSG_LOAD_EEPROM = _UxGT("Зчитати з EEPROM");
LSTR MSG_RESTORE_DEFAULTS = _UxGT("На базові параметри");
Expand Down Expand Up @@ -497,10 +505,17 @@ namespace Language_uk {
LSTR MSG_BUTTON_RESET = _UxGT("Зкинути");
LSTR MSG_BUTTON_IGNORE = _UxGT("Ігнорув.");
LSTR MSG_BUTTON_CANCEL = _UxGT("Відміна");
LSTR MSG_BUTTON_CONFIRM = _UxGT("Підтвер.");
LSTR MSG_BUTTON_CONTINUE = _UxGT("Продовж.");
LSTR MSG_BUTTON_DONE = _UxGT("Готово");
LSTR MSG_BUTTON_BACK = _UxGT("Назад");
LSTR MSG_BUTTON_PROCEED = _UxGT("Продовжити");
LSTR MSG_BUTTON_SKIP = _UxGT("Пропустити");
LSTR MSG_BUTTON_PROCEED = _UxGT("Продовж.");
LSTR MSG_BUTTON_SKIP = _UxGT("Пропуск");
LSTR MSG_BUTTON_INFO = _UxGT("Інфо");
LSTR MSG_BUTTON_LEVEL = _UxGT("Рівень");
LSTR MSG_BUTTON_PAUSE = _UxGT("Пауза");
LSTR MSG_BUTTON_RESUME = _UxGT("Звіт");
LSTR MSG_BUTTON_SAVE = _UxGT("Зберегти");

LSTR MSG_PAUSING = _UxGT("Призупинення...");
LSTR MSG_PAUSE_PRINT = _UxGT("Призупинити друк");
Expand All @@ -518,6 +533,8 @@ namespace Language_uk {
LSTR MSG_USERWAIT = _UxGT("Продовжити...");
LSTR MSG_PRINT_PAUSED = _UxGT("Друк призупинено");
LSTR MSG_PRINTING = _UxGT("Друк...");
LSTR MSG_STOPPING = _UxGT("Зупинка...");
LSTR MSG_REMAINING_TIME = _UxGT("Залишилось");
LSTR MSG_PRINT_ABORTED = _UxGT("Друк скасовано");
LSTR MSG_PRINT_DONE = _UxGT("Друк завершено");
LSTR MSG_NO_MOVE = _UxGT("Немає руху.");
Expand Down Expand Up @@ -702,15 +719,32 @@ namespace Language_uk {

LSTR MSG_INFO_COMPLETED_PRINTS = _UxGT("Завершено");
LSTR MSG_INFO_PRINT_FILAMENT = _UxGT("Екструдовано");
LSTR MSG_PLEASE_PREHEAT = _UxGT("Нагрійте хотенд");
LSTR MSG_COLORS_GET = _UxGT("Отримати колір");
#if LCD_WIDTH >= 20 || HAS_DWIN_E3V2
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Носій не вставлений");
LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Перезавантаження...");
LSTR MSG_INFO_PRINT_COUNT = _UxGT("Кількість друків");
LSTR MSG_INFO_PRINT_TIME = _UxGT("Весь час друку");
LSTR MSG_INFO_PRINT_TIME = _UxGT("Час друку");
LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Найдовший час");
LSTR MSG_COLORS_SELECT = _UxGT("Обрати кольори");
LSTR MSG_COLORS_APPLIED = _UxGT("Кольори застосовані");
#else
LSTR MSG_MEDIA_NOT_INSERTED = _UxGT("Немає носія");
LSTR MSG_PLEASE_WAIT_REBOOT = _UxGT("Перезавантаж...");
LSTR MSG_INFO_PRINT_COUNT = _UxGT("Друків");
LSTR MSG_INFO_PRINT_TIME = _UxGT("Загалом");
LSTR MSG_INFO_PRINT_LONGEST = _UxGT("Найдовше");
#endif
LSTR MSG_COLORS_SELECT = _UxGT("Кольори");
LSTR MSG_COLORS_APPLIED = _UxGT("Кольори застос.");
#endif
LSTR MSG_COLORS_RED = _UxGT("Червоний");
LSTR MSG_COLORS_GREEN = _UxGT("Зелений");
LSTR MSG_COLORS_BLUE = _UxGT("Синій");
LSTR MSG_COLORS_WHITE = _UxGT("Білий");
LSTR MSG_UI_LANGUAGE = _UxGT("Мова");
LSTR MSG_SOUND_ENABLE = _UxGT("Дозволити звук");
LSTR MSG_LOCKSCREEN = _UxGT("Блокувати екран");

LSTR MSG_INFO_MIN_TEMP = _UxGT("Мін. ") LCD_STR_THERMOMETER;
LSTR MSG_INFO_MAX_TEMP = _UxGT("Макс. ") LCD_STR_THERMOMETER;
Expand Down