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

Jump to bottom

Corvax cherrypick 30 #2429

Merged
merged 22 commits into from
Dec 30, 2024
Merged

Corvax cherrypick 30 #2429

merged 22 commits into from
Dec 30, 2024

Conversation

Kirus59
Copy link
Collaborator

@Kirus59 Kirus59 commented Dec 29, 2024 •
edited
Loading

Описание PR

Черри-пик ПРов с Корвакса:

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я ознакомился с наставлениями по работе с репозиторием и следовал им при создании PR'а.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

no cl

lzk228 and others added 12 commits December 29, 2024 21:24
@lzk228 @NotSoDana
@lapatison @Kirus59
Upstream translate space-wizards#2677 (space-wizards#2685)
af6198e 
Co-authored-by: NotSoDamn <[email protected]>
Co-authored-by: lapatison <[email protected]>
@lzk228 @Kirus59
fix locale (space-wizards#2688)
f645fa6
@mhamsterr @Kirus59
Fix morgue.ftl locale (space-wizards#2707)
04b13a3
@lzk228 @NotSoDana
@mhamsterr @lapatison @Kirus59
Translate Upstream space-wizards#2718 (space-wizards#2719)
24b4cfe 
Co-authored-by: NotSoDamn <[email protected]>
Co-authored-by: mhamster <[email protected]>
Co-authored-by: lapatison <[email protected]>
@lzk228 @Kirus59
fix arrivals gender locale (space-wizards#2723)
9b1321b
@lzk228 @Kirus59
fix law locale (space-wizards#2734)
b4d83b6
@Vonsant @Kirus59
Фикс законов боргов. (space-wizards#2754)
49b2623
@lzk228 @Kirus59
replace zzz (space-wizards#2758)
3ea9377
@lapatison @lzk228
@cfif126 @Kirus59
Translate Upstream space-wizards#2785 (space-wizards#2797)
552a0ae 
Co-authored-by: lapatison <[email protected]>
Co-authored-by: lzk <[email protected]>
Co-authored-by: cfif126 <[email protected]>
@lzk228 @Kirus59
translate borer names (space-wizards#2835)
fbc5340
@lapatison @NotSoDana
@lzk228 @cfif126 @Kirus59
Перевод Upstream space-wizards#2830 (space-wizards#2836)
30a8928 
Co-authored-by: lapatison <[email protected]>
Co-authored-by: NotSoDamn <[email protected]>
Co-authored-by: lzk <[email protected]>
Co-authored-by: cfif126 <[email protected]>
@lzk228 @lapatison @Kirus59
Translate Upstream space-wizards#2748 (space-wizards#2837)
e0ec1d7 
Co-authored-by: lapatison <[email protected]>
@github-actions github-actions bot added the Changes: Localization Изменение затронуло файлы ".ftl" label Dec 29, 2024
@Kirus59 Kirus59 requested a review from stalengd December 29, 2024 20:25
@UrPrice
Copy link
Collaborator

UrPrice commented Dec 29, 2024

Вроде всё посмотрел.

@stalengd stalengd merged commit 289be63 into SerbiaStrong-220:master Dec 30, 2024
12 checks passed
@Kirus59 Kirus59 deleted the corvax-cherrypick-30 branch January 1, 2025 10:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@UrPrice UrPrice UrPrice left review comments

@stalengd stalengd stalengd approved these changes

Assignees

@stalengd stalengd

Labels
Changes: Localization Изменение затронуло файлы ".ftl" Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Kirus59 @UrPrice @stalengd @lzk228 @mhamsterr @Vonsant @lapatison